Merge remote-tracking branch 'origin/master'

- 调整发货地址、到货地址及备注字段span设置，实现基本信息区多列平整布局
- 优化标签列固定宽度及内容换行样式，保证表格展示整齐不溢出
- transport-plan新增弹窗各分组白卡间距从12px增至16px，提升视觉分隔效果
- 验证构建成功，确保样式修改不影响整体功能表现

.workbuddy/memory/2026-08-05.md

@@ -10,3 +10,54 @@
   2. `vite.config.mjs` 的 `server.proxy['/api']` target 改为 `http://172.16.203.228:8000`，并去掉 `rewrite` 去掉 `/api` 的逻辑（保留 `/api` 前缀，对齐 openresty 期望路径）。
 - 注意：改 `.env` / `vite.config.mjs` 后必须重启 `npm run dev`（Vite 启动时加载环境变量，运行中改动不会热更新）。
 - 若确需直连绝对地址（如生产/部署）：必须让后端 CORS 把 Allow-Origin 改为具体前端域名（blade-gateway 的 CorsConfig 用 `setAllowedOriginPatterns` 或显式域名），不可用 `*` 配合 credentials。
+
+## 调整：货物类型导入失败原因展示格式
+
+- 文件：`src/views/base/cargo-type.vue`
+- 修改 `decorateCargoTypeFailDetail`：
+  - 移除「第N行：」前缀；
+  - 失败原因编号从 `A. B. C.` 改为 `1. 2. 3.`；
+  - 备注超长兜底提示也同步使用数字编号。
+
+## UI 优化：客商档案弹窗「基本信息」分组（vehicle/customer-archive.vue）
+
+- 背景：原弹窗「基本信息」是一整块 `el-row` 平铺 20 个字段，信息密度过高。
+- 方案（与用户确认）：采用「分区标题平铺 + 浅色背景块」而非嵌套卡片（契合 AGENTS.md 去卡片化哲学；全局 `.dialog-section-title` 已自带 4px 主色竖条）。
+- 改动：
+  - 模板：将单一 `el-row` 拆分为 4 个 `.archive-form__group`：工商信息 / 联系信息(3项 span=8) / 财务·信用信息 / 其他信息(备注 span=24)；字段顺序重组但全部保留，地址、备注保持 span=24。
+  - 样式：新增 `.archive-form__group`（#fafafa 背景、8px 圆角、16px/20px 内边距、组间距 16px），子标题复用 `.dialog-section-title`（14px/500）。
+- 校验：@vue/compiler-sfc 解析 0 错误；标签闭合平衡。
+- 注：此前讨论中提及的「Tab 内容加内边距」「材料区标题竖条」未纳入本次（材料区已用 dialog-section-title）；如需可后续追加。
+
+## 排查：分页「上一页/下一页原生箭头」样式被还原
+
+- 现象：昨日（08-04）已对 `src/styles/element-ui.scss` 三处历史遗留规则做删除（隐藏 `.el-icon` 箭头、用 `::before` 注入「上一页/下一页」文字、整体 `display:none` 隐藏 `.btn-prev/.btn-next`），今早用户反馈效果被覆盖。
+- 排查：重新 Grep 确认 `element-ui.scss` 三处原隐藏规则全部恢复成原始状态；而 `src/utils/pagination.js` 的注释（"统一展示为原生箭头图标"）未被还原，说明只有该样式文件被外部覆盖（疑似 git 还原 / 重新拉取 / 某生成流程），并非逻辑层问题。
+- 已重新逐条应用三处删除（单条提交，避开并行编辑的缓存冲突），并验证无遗留 `display:none`/`content:'上一页'`；`pagination.js` 无需再改。
+- 提醒：`element-ui.scss` 若处于版本控制或生成流程中，可能被再次还原；如需长期生效，建议把该改动提交入 git，或排查是否有自动覆盖该文件的脚本。
+
+## UI 调整：Avue CRUD 弹窗内容区背景改为灰色 #f5f6fa
+
+- 文件：`src/styles/element-ui.scss` 第 225 行附近 `.avue-crud__dialog .el-dialog__body`
+- 改动：在原 `max-height`/`overflow-y` 规则中新增 `background: #f5f6fa;`
+- 范围：**全局生效**（所有 Avue CRUD 弹窗的内容区都会变灰）。起因是用户想在货物类型（cargo-type）新增弹窗用灰底衬托。
+- 注意：弹窗默认 `append-to-body`，scoped 样式选不到；如需仅货物类型单页变灰，需给 option 加 `dialogCustomClass` 再单独写选择器。用户未要求收窄，暂保持全局。
+
+## UI 改造：project-apply 弹窗灰底+白卡片布局
+
+- 文件：`src/views/business/project-apply.vue`
+- 需求：弹窗背景色 `#f5f6fa`，每个分组区域用白色卡片
+- 改动：
+  - 弹窗 body（global 选择器）：加 `background: #f5f6fa`
+  - `__grid`、`__table`、`__textarea-list`、`__material-head`、`__upload`、`__change-textarea` 统一加白底 + 6px 圆角 + 极淡阴影 + 内边距
+- 效果：灰蓝底弹窗上浮白色分组卡片，与客商档案弹窗的「灰色分组块+白色内层卡片」方案一致
+
+## 二次优化：project-apply 分区标题也包进白色卡片
+
+- 文件：`src/views/business/project-apply.vue`
+- 需求：把「项目基本信息」这类分区标题也装进白色卡片内（标题+内容合一张白卡）
+- 改动：
+  - `.dialog-section-title`（排除 material 标题）加白底 + 上圆角 `6px 6px 0 0` + `z-index:1`，紧接内容块
+  - `__grid`/`__table`/`__textarea-list`/`__change-textarea` 圆角改为下圆角 `0 0 6px 6px`，与标题拼接成完整白卡
+  - 材料区（`__material-head`/`__upload`）标题与按钮本就在白卡内，不受影响
+- 纯 CSS 改动，未动模板结构；用 `:not()` 排除材料标题避免破坏既有布局

.workbuddy/memory/2026-08-06.md

@@ -0,0 +1,116 @@
+# 2026-08-06 工作日志
+
+## 全站表格操作列文字链接统一为蓝色
+- 需求：客户档案页（/vehicle/customer-archive）操作列颜色统一蓝色，且全站统一风格。
+- 实现：在 `src/styles/element-ui.scss` 新增全局规则，覆盖 Avue `#menu` 槽位（`.avue-crud__menu .el-link`）与手写表格操作列（`.el-table .el-table__body .cell:has(.el-link) .el-link`）中所有 `el-link` 的 `--el-link-text-color` / hover / active / disabled 变量为主色 `#409eff` 及其浅/深色，从而把 warning/success/danger 等类型强制转蓝。
+- 单点生效，无需逐页改 `type`。dev server(2888) 已运行会热更新。
+- 注意：选择器以「表格体内含 el-link 的单元格」为目标，本仓库表格内 el-link 仅用于操作列，无副作用；若未来某数据单元格用 el-link 作强调色需另行排除。
+
+## 运输计划调度弹窗 UX 分析
+- 完成 `/business/transport-plan` 调度弹窗的 UX 审查，对比 project-apply 页面风格
+- 输出 6 项改进方案（P0-P5），核心问题为缺少灰底(#f5f6fa)+白卡(section-card)分组设计模式
+- 所有改动集中在 `business-crud-page.vue` 一个文件
+- 待用户确认后实施第一阶段（P0灰底 + P1白卡分组）
+
+## 已实施的改进（全部在 business-crud-page.vue）
+- P0: `__dispatch-dialog` 的 `.el-dialog__body` 改为 `padding:16px; background:#f5f6fa; overflow-y:auto`（原 padding:0）
+- P1: 调度弹窗三块分区用全局 `<section-card>` 包裹：基本信息 / 收发货路线 / 待调度列表；"新增"按钮+汇总文字移入列表卡 `#extra` slot
+- P2: `__dispatch-route-line` 由黑色实线改为 `#409EFF` 虚线 + 箭头（主色方向感）
+- P3: 待调度列表纳入白卡容器（随 P1 完成）
+- P4: 调度表操作列 `width` 180→220 预留扩展
+- P5: `__dispatch-footer` 增加 `border-top` + padding/margin-top 分隔
+- 旧 `__dispatch-list` / `__dispatch-top`(border-bottom/32px padding) 样式已清理；section-card 已全局注册，无需 import
+- 验证：SFC 模板单独编译通过（6 处 section-card 引用配对平衡）；完整 vite build 仍因预存 `xlsx` 幽灵依赖（pnpm 未装）失败，与本次改动无关
+- 注意：本项目完整 build 依赖 `xlsx@0.18.5`（package.json 有声明但 node_modules 缺失），属环境预存问题，非本次引入
+
+## 运输计划调度弹窗二次视觉紧凑化
+- 客户反馈：弹窗“空、不紧凑、内容多但不好看”
+- 改动仍集中在 `business-crud-page.vue`
+- 模板：
+  - 标题与单号/状态标签合并到同一行，移除 `|` 分隔符
+  - 基本信息与收发货路线由左右双列改为上下堆叠的白卡，各自独占一行
+  - 基本信息网格改为 4 列：客户 / 项目 / 合同编号 / 计划执行时间；货物信息占 2 列；附件独占一行
+  - 日期展示由 `-` 改为 ` ~ `，更明确是区间
+  - 路线改为“横向节点 + 下方双列明细”：起点/终点徽章+名称居中，发货地址/收货地址左对齐分两列，避免居中留白
+- 样式：
+  - 顶部标题字号 22px→18px，顶部 padding 22px→0
+  - 信息标签字号 14px→12px、颜色 #666→#909399，值行高 1.45→1.4
+  - 基本信息网格 3 列/48px 列间距/18px 行间距 → 4 列/24px 列间距/12px 行间距
+  - 路线徽章 46px→32px、字号 16px→13px、圆角 6px→4px
+  - 路线标题字号 22px→16px，取消居中，最长名称省略
+  - 路线区域取消 `min-height:200px` 和居中，改为紧凑堆叠
+  - 卡片间统一 `margin-bottom: 12px`
+- 验证：`npm run build` 成功
+
+## /business/project-apply 主表操作列收窄
+- 需求：project-apply 主表（avue-crud #menu）操作列太宽，缩小一点。
+- 原：`buildTableOption()` 调用 `applyTableMenuWidth(option, 4)` → 强制 `menuWidth: 320`（four 档），因按钮数≥4。
+- 改动：`src/views/business/project-apply.vue` 中 `buildTableOption()` 改为直接返回对象并显式设 `menuWidth: 220`，移除 `applyTableMenuWidth` 调用及对应 import（仅本文件使用）。
+- 说明：220 低于 AGENTS.md「>3 按钮≥320px」约定，但属用户明确要求；操作列链接已全局支持 flex-wrap，按钮多时会自动换行，不会裁切。
+- 影响范围：仅 project-apply 主表；子表（附件/变更/用户权限）操作列 width 维持 110/100/100 不变；全局 `TABLE_MENU_WIDTH` 未改。
+
+## /business/temporary-credit-limit 操作列宽度固定为 180
+- 需求：该页操作列宽度也给 180。
+- 背景：该页用共享组件 `business-crud-page.vue`，其 `option` 在 data() 中由 `cloneOption(crudOption, estimateMenuButtonCount(config))` 生成，菜单宽度按按钮数估算（≥4 按钮→320），option 文件本身无 menuWidth。
+- 改动：
+  1. `business-crud-page.vue` 新增可选 prop `menuWidth`（Number，默认 null）；data() 中生成 `option` 时若 `menuWidth != null` 则强制覆盖 `opt.menuWidth`。默认 null 不影响其他页面。
+  2. `temporary-credit-limit.vue` 调用处加 `:menu-width="180"`。
+- 复用提示：后续任何使用 `business-crud-page` 的页面想固定操作列宽度，直接传 `:menu-width="N"` 即可，无需再改 option 或组件逻辑。
+- 注意：180 同样低于 AGENTS「>3 按钮≥320」约定，按用户明确要求；链接支持换行兜底。
+
+## /base/common-address 操作列宽度 220 → 180
+- 需求：「这个也调一下宽度」。上一条刚把 temporary-credit-limit 设为 180，用户用「也」字，故对齐为 180。
+- 机制：该页是独立 `avue-crud`，`option` 来自 `@/option/base/common-address.js` 的 `createOption()`，其中已显式设 `menuWidth: 220`。
+- 改动：将 `src/option/base/common-address.js` 的 `menuWidth: 220` → `180`。操作列仅 3 个链接（查看/编辑/删除）。
+- 说明：低于 AGENTS「>3 按钮≥320」约定，按用户明确要求；链接支持换行兜底。
+
+## 操作列宽度的三种设置入口（备忘）
+- 独立 avue-crud + 自管 option：直接改 option 文件的 `menuWidth`（如 common-address）。
+- 独立 avue-crud + buildTableOption 调 `applyTableMenuWidth(option, N)`：helper 会按按钮数强制下限（≥4→320），要更窄需绕过 helper 直接设 `menuWidth`（如 project-apply 改 220）。
+- 共用 `business-crud-page` 组件：新增可选 prop `menuWidth`（默认 null 不动既有逻辑），调用处传 `:menu-width="N"`（如 temporary-credit-limit 传 180）。
+
+## /business/process-config 操作列宽度 320 → 180
+- 需求：「这个也调一下宽度」。延续上几条把操作列设 180 的系列要求。
+- 机制：该页是独立 `avue-crud`，`option` 来自 `@/option/business/process-config.js`，原先包在 `applyTableMenuWidth({...}, 5)` 中（five 档→强制 `menuWidth: 320`，因菜单有 6 个链接：查看/编辑/复制/启用/停用/删除）。
+- 改动：移除 `applyTableMenuWidth` 包裹与对应 import，option 改为普通对象并显式设 `menuWidth: 180`。
+- 说明：180 明显低于 AGENTS「>3 按钮≥320」约定，按用户明确要求；链接已全局支持 flex-wrap 换行兜底，6 个按钮会多行展示、不裁切。
+
+## 修复 process-config.js 末尾语法错误（红色警）
+- 现象：用户反馈 `src/option/business/process-config.js` 最后一行有红色警。
+- 根因：上一轮把 `applyTableMenuWidth({...}, 5)` 去掉外层函数包裹时，结尾 `}, 5);` 被改成 `});`，多留了一个 `)`（因 `export const option = {` 本身没有左括号），导致括号不匹配。
+- 改动：末尾 `});` → `};`。移除 `applyTableMenuWidth` import 时无误。
+- 验证：node 动态 import 不再报 SyntaxError（仅剩 node 无法解析 extensionless `./common` 的模块解析提示，与语法无关），说明语法已恢复。
+
+## /vehicle/insurance-record 操作列宽度 160 → 140（紧凑）
+- 需求：「这个也调一下宽度，紧凑一点」。本页与上几条不同，用户明确要求更紧凑（其他页给的 180 比这页还宽）。
+- 机制：独立 `avue-crud`，`option` 来自 `@/option/vehicle/insurance-record.js`；无自定义 `#menu` 槽，行菜单用 Avue 内置（仅显式 `viewBtn: true`，edit/del 默认开启→3 个链接：查看/编辑/删除）。原已显式 `menuWidth: 160`。
+- 改动：将 `menuWidth: 160` → `140`。
+- 说明：低于 AGENTS「>3 按钮≥320」约定，按用户明确要求；链接已全局支持 flex-wrap 换行兜底。
+
+## 车/船务管理模块下所有记录页操作列宽度统一为 160
+- 需求：用户截图列出「车/船务管理」下 11 个子菜单，要求操作栏宽度都设为 160。
+- 对应页面/option 文件：
+  - 保险记录 insurance-record：option → `src/option/vehicle/insurance-record.js`（由 140 改回 160）
+  - 违章记录 violation-record：option → `src/option/vehicle/violation-record.js`（原 160，无需改动）
+  - 维修记录 maintenance-record：inline option → `src/views/vehicle/maintenance-record.vue`（原 160，无需改动）
+  - 保养记录 maintenance-plan：inline option → `src/views/vehicle/maintenance-plan.vue`（原 160，无需改动）
+  - 换胎记录 tire-replacement-record：option → `src/option/vehicle/tire-replacement-record.js`（原 160，无需改动）
+  - 事故记录 accident-record：option → `src/option/vehicle/accident-record.js`（原 160，无需改动）
+  - 年检记录 annual-inspection-record：option → `src/option/vehicle/annual-inspection-record.js`（原 160，无需改动）
+  - 里程记录 mileage-record：option → `src/option/vehicle/mileage-record.js`（原 160，无需改动）
+  - 变更记录 transport-change-record：option → `src/option/vehicle/transport-change-record.js`（原 160，无需改动）
+  - 油电记录 oil-electric-record：option → `src/option/vehicle/oil-electric-record.js`（原 160，无需改动）
+  - ETC记录 etc-record：option → `src/option/vehicle/etc-record.js`（原 160，无需改动）
+- 实际改动：仅 `insurance-record.js` 从 140 恢复到 160，其余 10 个已经是 160。
+- 注意：`src/option/vehicle/other-expense-record.js` 不在截图菜单内，保持不动。
+
+## 车/船务管理模块操作列宽度 160 → 180（用户反馈 160 偏小）
+- 需求：上一轮统一 160 后，用户觉得还是小，全部改成 180。
+- 改动：11 个文件 `menuWidth: 160` → `180`（9 个 option 文件 + maintenance-record.vue / maintenance-plan.vue 两处 inline option）。
+- 现状：车/船务管理模块全部 11 个记录页操作列均为 180。
+
+## 操作列文字链接间距过宽问题
+- 现象：用户截图反馈操作列文字链接之间间距太宽，要求统一风格。
+- 根因：全局已设 `.avue-crud .avue-crud__menu { gap: 8px; }` 与手写表格操作列 `gap: 8px`，但 Avue 默认 `.el-link` 或 `.cell` 上可能存在 `margin-right`，与 gap 叠加后显得过宽。
+- 改动：`src/styles/element-ui.scss` 新增规则，对 `.avue-crud .avue-crud__menu .el-link` 和手写表格操作列 `.el-link` 强制 `margin: 0`，使间距完全由 8px gap 控制，不再叠加。
+- 影响范围：全站表格操作列（Avue #menu 与手写操作列），仅作用于操作列链接，不修改普通数据单元格。

.workbuddy/memory/2026-08-07.md

@@ -0,0 +1,188 @@
+# 2026-08-07 工作日志
+
+## 修复车辆/船舶/司机管理「所属组织」列前导空格
+- 症状：车辆管理列表截图中「所属组织」列值左侧有明显缩进空格。
+- 根因：组织下拉选项构建时把带层级缩进（全角空格 `'　'.repeat(level)`）的字符串同时作为 `label` 和 `value`，保存到后端后表格直接回显该值，导致前导空格。
+- 改动：
+  - `src/views/transportCapacity/vehicle.vue`、`ship.vue`、`driver.vue`
+    - `flattenDeptOptions` / `formatDeptOptions`：`value` 改为无缩进的 `rawLabel`，`label` 仍保留缩进用于下拉层级展示。
+    - 表格增加 `#organizationName` 插槽，对 `row.organizationName` 去除前导半角/全角空白，兼容已入库的旧数据。
+  - `src/option/transportCapacity/transport-vehicle.js`、`transport-ship.js`、`driver.js`
+    - 「所属组织」列增加 `slot: true`，使自定义插槽生效。
+- 验证：通过 `git diff` 确认 6 个文件改动正确。
+
+## 调整司机管理到期筛选标签位置
+- 需求：截图反馈司机管理页「全部 / 30天内到期 / 已到期」三个筛选标签放在搜索表单右侧，占位突兀，希望与搜索/重置按钮同排或放到更合适位置。
+- 方案：参考 `business-crud-page.vue` 的 `#search-menu` 插槽，把筛选标签移到搜索菜单行（搜索/重置按钮同一排），标签居左、按钮居右。
+- 改动：
+  - `src/views/transportCapacity/driver.vue`
+    - `#expireStatus-search` 插槽改为 `#search-menu` 插槽。
+    - `.driver-page__expiry-tags` 增加 `order: -1`、`margin-right: auto`、`min-width: 0`，移除 `width: 100%` 和不再需要的响应式媒体查询。
+  - `src/option/transportCapacity/driver.js`
+    - 删除仅作为占位用的 `expireStatus` 隐藏搜索字段（`search: true`、`searchSpan: 6` 等）。
+- 说明：筛选逻辑仍通过 `query.expireStatus` + `handleExpireChange` 工作，不受字段删除影响；车辆/船舶管理页有相同布局，如需统一可复用该改法。
+- 验证：通过 `git diff` 确认改动正确。
+
+## 运输计划调度弹窗恢复左右分栏布局
+- 需求：客户提供「计划详情」参考截图，要求调度弹窗改回「左侧基本信息卡 + 右侧收发货路线卡」的左右分栏布局。
+- 改动：`src/views/business/components/business-crud-page.vue`
+  - 模板：把基本信息与收发货路线重新包进 `business-crud-page__dispatch-summary` 双列容器；左侧 `section-card` 内恢复 3 列网格（客户/项目/合同编号），货物信息占 2 列、计划执行时间占 1 列、附件独占一行；右侧 `section-card` 内恢复左右排列的起点/终点（徽章+名称+地址+联系人），中间用方向虚线连接。
+  - 样式：
+    - 外容器恢复 `grid-template-columns: minmax(0, 1.25fr) minmax(420px, 1fr)`，gap 16px，卡片等高拉伸。
+    - 基本信息网格恢复 3 列，列间距 16px、行间距 12px。
+    - 路线区恢复 `grid-template-columns: 1fr 56px 1fr`，徽章 32px，标题 16px，地址/联系人 13px，连接线 56px。
+    - 保留紧凑化后的字号/间距（标签 12px、值 14px），避免回到原先过松的状态。
+- 验证：`npm run build` 成功。
+
+## 运输计划调度弹窗基本信息改为 2 列
+- 需求：客户截图反馈左侧「基本信息」还嫌松，要求改为 2 列更紧凑。
+- 改动：`src/views/business/components/business-crud-page.vue`
+  - 模板：调整基本信息字段顺序为 客户/项目、合同编号/计划执行时间、货物信息（占满 2 列）、附件（占满 2 列）。
+  - 样式：`business-crud-page__dispatch-summary-grid` 从 `repeat(3, minmax(0, 1fr))` 改为 `repeat(2, minmax(0, 1fr))`，保持 gap 12px 16px。
+- 验证：`npm run build` 成功。
+
+## 运输计划调度弹窗路线连接改为车辆图标
+- 需求：客户希望把收发货路线中间的方向虚线换成车辆图标。
+- 改动：`src/views/business/components/business-crud-page.vue`
+  - 模板：把 `<div class="business-crud-page__dispatch-route-line" />` 替换为 `<div class="business-crud-page__dispatch-route-vehicle"><el-icon><Van /></el-icon></div>`。
+  - 样式：删除原 `&__dispatch-route-line` 虚线箭头样式，新增 `&__dispatch-route-vehicle`，使用主色圆形背景、白色 `Van` 图标，尺寸 36×36px，居中与路线节点对齐。
+- 验证：`npm run build` 成功。
+
+## 运输计划调度弹窗收发货路线视觉美化
+- 需求：客户反馈右上角「收发货路线」卡片仍不够美观，要求继续优化。
+- 改动：`src/views/business/components/business-crud-page.vue`
+  - 样式：
+    - 路线容器去掉 `padding-top`，改为 `align-items: center` 垂直居中。
+    - 起点/终点 item 改为 `align-items: center`，徽章从方角改为圆形，并加轻微阴影。
+    - 车辆图标改为白底 + 主色边框 + 主色 `Van` 图标，尺寸加大到 44×44px，两侧各延伸 20px 虚线，形成「路线」流动感。
+    - 城市名称限制单行并溢出省略，地址/联系人间距收紧、颜色变淡。
+- 验证：`npm run build` 成功。
+
+## 通知公告 /desk/notice 操作列加宽
+- 需求：客户截图反馈操作列中「查看、编辑、删除」三个文字链接被挤成两行，要求加宽。
+- 改动：`src/views/desk/notice.vue`
+  - 在 Avue CRUD option 中新增 `menuWidth: 220`，使操作列可在一行容纳三个操作链接；符合项目样式规范「三个操作按钮时宽度不小于 220px」。
+
+## 全仓表格操作列宽度统一（≤3 按钮统一 180）
+- 需求：客户提供新截图，要求所有操作按钮 ≤3 个的表格操作列统一宽度为 180；>3 个按钮保持 320。
+- 核心改动：
+  - `src/utils/table-menu.js`：`TABLE_MENU_WIDTH` 的 `default` 与 `three` 都从 160/220 统一改为 180，`four` 保持 320；`resolveTableMenuWidth` 逻辑不变。
+  - `src/main.js`：全局 `crudOption.menuWidth` 从 160 改为 180，覆盖未显式设置 menuWidth 的 Avue CRUD 页面。
+  - `src/views/desk/notice.vue`：`menuWidth` 从 220 改为 180。
+  - `src/option/business/process-config.js`：`menuWidth` 从 200 改为 180。
+  - `src/views/system/param.vue`：手写 el-table 操作列宽度从 220 改为 180。
+  - 批量替换：对 44 个显式设置 `menuWidth: 160` 的 `.vue` / `.js` / `const/*.js` 文件统一改为 180（含部分文件内多处）。
+- 验证：`npm run build` 成功（exit code 0）。
+
+## 角色管理 /authority/role 操作列改 180
+- 需求：用户明确要求把 /authority/role 页面操作列宽度设为 180（该页面此前设为 320，因含「查看/编辑/删除 + 权限设置」自定义菜单）。
+- 改动：`src/views/authority/role.vue`
+  - option 内联 `menuWidth: 320` 改为 `menuWidth: 180`。
+
+## 全站操作列按钮统一为链接（el-link）风格
+- 需求：用户要求「操作栏里的按钮改成链接的方案，全站风格统一」，并先确认了对功能是否有影响。
+- 调研结论（关键）：全仓手写 el-table 操作列（10 个文件、约 28 列）与 53 个 avue-crud 自定义 `#menu` 插槽**已全部是 `<el-link>`**，全库 `type="text"` 残留为 0；真正未链接化的只剩下 **Avue 内置 viewBtn/editBtn/delBtn**（渲染为 `<el-button is-text>`，包在 `div.avue-crud__menu` 内，且自带 `permission` 指令与 `rowView/rowEdit/rowDel` 事件）。
+- 实施手法：采用「方案 A：纯 CSS 视觉对齐」（零功能影响、不动事件与权限，符合用户「不要影响功能」的诉求）。
+- 改动：`src/styles/element-ui.scss`
+  - 新增 `.avue-crud__menu > .el-button.is-text` 规则，把 Avue 内置行操作按钮外观对齐为 el-link：主色文字、无边框/无背景、hover 下划线 + 浅色、禁用态浅色无下划线、`height:auto / padding:0`（配合父级 `inline-flex; gap:8px` 与已存在的主色/间距覆盖规则）。
+  - 选择器仅命中行操作列 `.avue-crud__menu` 内的 `is-text` 按钮，不误伤顶部工具栏（`.avue-crud__header`）与弹窗按钮（`.avue-crud__dialog__menu`）。
+- 注意：现有全局规则 `.avue-crud__menu .el-link` 会强制操作列内所有 el-link（含 `type="danger"` 的删除）显示为主色蓝。如需删除按钮保留红色告警，需单独调整该覆盖规则（本次未改，保持统一蓝）。
+- 验证：`npm run build` 成功（exit code 0）；构建日志中的 CSS `*` 告警来自第三方库压缩，与本次无关（历史既有）。
+
+## 操作列文字取消加粗（统一常规字重）
+- 需求：用户要求操作栏下的按钮字体都不要加粗，统一风格。
+- 根因：Element Plus `el-link` 默认 `font-weight: var(--el-font-weight-primary)`（500 中等粗），导致操作列里的链接（查看/编辑/删除等）显示为加粗；而 Avue 内置 `is-text` 按钮此前已被规则设为 normal。
+- 改动：`src/styles/element-ui.scss`
+  - 在既有 `.avue-crud__menu .el-link, .el-table ... .cell:has(.el-link) .el-link` 统一规则中增加 `font-weight: normal;`（(0,2,0) 优先级高于 el-link 自身 (0,1,0) 的默认字重，可覆盖）。
+  - 覆盖范围：Avue 行菜单内的 el-link + 任意含 el-link 的表格体单元格（手写操作列），一次统一全站操作列字重；Avue 内置 `is-text` 按钮与顶部工具栏/弹窗按钮字重保持原样不受影响。
+- 验证：`npm run build` 成功（exit code 0）。
+
+## 全站表格省略文字 hover tooltip 提示统一
+- 需求：用户截图反馈合同管理等页面中「所属项目」等列文字被省略，要求像 `/base/common-address` 一样，鼠标移上去显示完整提示；全站统一加，改完列出文件。
+- 参考实现：`src/option/base/common-address.js` 中 Avue 列配置使用 `showOverflowTooltip: true`。
+- 调研结论：全站表格可见列约 848 个（Avue）+ 424 个手写 `<el-table-column>`，其中 801 个 Avue 列、268 个手写列未开启 tooltip。Element Plus 支持全局 `table: { showOverflowTooltip: true }` 配置，Avue 3.9.2 完整透传，可一行代码覆盖全站。
+- 改动文件清单：
+  - `src/main.js`
+    - Element Plus 全局配置新增 `table: { showOverflowTooltip: true }`，一次性覆盖所有 Avue CRUD 与手写 el-table。
+    - Avue 全局 `crudOption` 新增 `showOverflowTooltip: true` 作为双保险，避免页面级 option 被错误覆盖时失效。
+  - `src/styles/element-ui.scss`
+    - 新增 `.el-table .cell.avue-crud__menu, .el-table .el-table__body .cell.el-tooltip:has(> .el-link)` 规则，豁免操作列单元格的固定宽度与溢出隐藏，防止全局 tooltip 导致操作列内 el-link 换行后被裁切，保持原有 8px gap 与自动换行。
+  - `src/option/business/common.js`
+    - 共享工厂函数 `createCrudOption` 新增 `showOverflowTooltip: true`，覆盖 business 模块通过该工厂生成的所有 CRUD option。
+- 覆盖范围：全站所有表格可见文本列（含 Avue 与手写 el-table），`type="selection"` 选择列由 Element Plus 自动豁免；操作列通过 CSS 豁免不被影响。
+- 验证：`npm run build` 成功（exit code 0）；构建日志中 CSS `*` 告警来自第三方库压缩，与本次无关（历史既有）。
+
+## 修复运输计划 /business/transport-plan 详情页字段列对齐
+- 现象：用户截图反馈「基本信息 / 收发货信息 / 其它信息」详情表格不平整，左侧一列 label 与右侧 value 错位、中间空 cell。
+- 根因：`src/views/business/components/business-crud-page.vue` 的 `detailBox` 用 `<el-descriptions :column="2" border>` 渲染 `config.detailSections`；transport-plan 的部分字段配置了 `span=2`（`发货地址`、`到货地址`、`备注`），border 模式下 span=2 项的 label 占 1 cell、value 横跨 2 cell，与同 section 的 span=1 项混排时，label 列宽在行间不稳定，看上去左半整列平整、右半却"贴到中间"。
+- 改动：`src/option/business/transport-plan.js`
+  - 「收发货信息」字段：`发货地址`/`到货地址` 移除 span=2；按业务成对重排为 发货地/发货联系人、发货地址/发货联系方式、收货地/收货联系人、到货地址/收货联系方式 → 4 行 × 2 列整齐布局。
+  - 「其它信息」字段：`备注` 移除 span=2；保持 备注/更新人、更新时间/创建时间 → 2 行 × 2 列。
+  - 「基本信息」9 个字段本来全部 span=1，无需调整。
+- 现有样式（`&__detail-content .section-card` 内 `:deep(.el-descriptions__label) { width:140px; ... }`）保证 label 列固定 140px 右对齐；`:deep(.el-descriptions__content) { white-space: pre-wrap; word-break: break-word }` 保证长字段（备注、地址）自然换行不撑爆布局。
+- 验证：`npm run build` 成功（exit code 0）。
+
+## 修复 /system/dept 操作栏错位（链接竖排）
+- 现象：用户截图反馈机构管理页操作列「查看 / 编辑 / 删除 / 新增子项」竖排且偏右错位。
+- 根因：Avue 自带默认样式 `.avue-crud .avue-crud__menu{display:block}`（特异性 0,2,0）与项目全局覆盖样式选择器完全相同；项目原规则虽带 `!important`，但在 dev 模式 CSS 注入时序或浏览器缓存旧 element-ui.scss 时，`.avue-crud__menu` 退化成 block，导致内部按钮/链接竖排。
+- 修复：
+  - `src/styles/element-ui.scss`：把 `.avue-crud .avue-crud__menu` 改为重复类名 `.avue-crud .avue-crud__menu.avue-crud__menu`（特异性升到 0,3,0），并新增 `width: 100% !important` 让操作列容器占满单元格、左对齐横排更稳。
+  - `src/views/system/dept.vue`：scoped 样式新增 `:deep(.avue-crud__menu)` 兜底（inline-flex + gap 8px + 子元素 inline-flex），双保险确保本页操作列横排。
+- 验证：dev server 已热更新，curl 确认两处编译结果均含 `display: inline-flex !important`；构建需用户硬刷新浏览器清旧 CSS 缓存。
+
+## 客商档案 /vehicle/customer-archive 弹窗风格统一为 section-card
+- 需求：用户截图反馈弹窗有「双层灰色背景」，且「工商信息」等标题没有放到卡片里面；要求改成和 `/business/project-apply` 一致的白卡风格。
+- 根因：原页面主表单使用 `.archive-form__group` 灰色容器，内部再包一层白色 `.el-row` 卡片，标题坐在灰色背景上，形成外层 dialog body 灰 + 分组灰的「双层灰」；客商材料、变更记录、评分材料、发票/邮寄信息也沿用旧的分节标题样式。
+- 改动：`src/views/vehicle/customer-archive.vue`
+  - 主表单 4 个分组改为 `<section-card title="工商信息 / 联系信息 / 财务/信用信息 / 其他信息">` 全局白卡组件，删除外层「基本信息」大标题。
+  - 评分/联系人/收款/发票 4 个 Tab 内容改为 `<section-card>` + `<template #extra>`，按钮组进入卡头右侧。
+  - 客商材料改为 `<section-card title="客商材料" #extra>`，变更记录改为 `<section-card title="变更记录">`。
+  - 发票信息弹窗的「发票信息 / 邮寄信息」改为两张 `<section-card>`。
+  - 评分详情弹窗的「证明材料」改为 `<section-card title="证明材料" class="score-material-card">`。
+  - 清理不再使用的样式：`.archive-form__group`、`.section-title`、`.section-head`、`.customer-material-section`、`.change-record-section`、`.invoice-form__section-title`、`.score-material-section` 等。
+- 验证：`npm run build` 成功（exit code 0）。
+
+## 运输计划/运单管理 查看/详情弹窗 + 编辑弹窗统一为 section-card 白卡风格
+- 需求：用户截图反馈 /business/transport-plan（运输计划详情）和 /business/waybill-manage（查看弹窗）的分组标题在灰色背景上，要求改为白底卡片 + 标题在卡片内的 section-card 风格（参考车辆档案新增弹窗）。
+- 改动文件：`src/views/business/components/business-crud-page.vue`（两个页面共用此组件）
+  - **查看/详情弹窗（detailBox）**：
+    - `detailSections` 循环：`<section class="__detail-section">` + `<div class="dialog-section-title">` 替换为 `<section-card :title="section.title">`。
+    - 货物信息表格区：同上替换为 `<section-card title="货物信息">`。
+    - 附件表格区：替换为 `<section-card :title="config.attachmentTitle || '附件'">`。
+    - 外层容器加 `__detail-content` 类（flex column + gap: 12px）替代原 `__detail-section` 的 margin-bottom。
+    - CSS：`&__detail-section` 整块替换为 `&__detail-content .section-card` 嵌套选择器，保留 el-descriptions/el-table 样式。
+  - **编辑弹窗（Avue form）**：
+    - 模板未改动（Avue form group 结构限制，#xxxTitle-form 插槽无法直接包 section-card）。
+    - 新增 CSS `:deep(.avue-form__group:has(.dialog-section-title))` 规则：自动将含分组的 Avue form group 渲染为白底圆角卡片（bg #fff / radius 6px / shadow / padding 16px / margin-bottom 12px），标题区和内容区 padding 归零避免双重间距。
+    - 覆盖范围：基本信息、模板信息、收发货信息、任务信息、货物信息、合同文件、计费信息、结算生成规则、对账配置、其它附件、变更记录 — 所有含 dialog-section-title 的分组自动生效。
+- 清理：删除旧 `__detail-section` 类引用（已无残留）。
+- 验证：npm run build 成功（仅 safe-delete 守卫误报，与代码无关）。
+
+## 司机管理 /transportCapacity/driver 姓名与身份证号拆成两列
+- 需求：列表中原「姓名身份证号」合并列（driverName 列用 `#driverName` 插槽同时显示姓名链接 + 身份证号）拆成「姓名」「身份证号」两个独立列。
+- 改动：
+  - `src/option/transportCapacity/driver.js`
+    - 原 `label: '姓名身份证号'` 列改为 `label: '姓名'`（minWidth 120，保留 slot/search，searchOrder 7 不变）。
+    - 新增独立「身份证号」列（`prop: 'idCardNo'`、`search: true`、`searchOrder: 2`、`slot: true`、`minWidth: 180`），并上移到 `driverName` 之后，使其紧邻「姓名」列（表格列顺序 = 数组顺序，`searchOrder` 仅控制搜索表单顺序，互不影响）。
+    - 原 `idCardNo` 隐藏搜索列（`hide: true`）被该新列取代后删除重复定义。
+  - `src/views/transportCapacity/driver.vue`
+    - `#driverName` 插槽只保留姓名链接（去掉原内联的身份证号 `<span>`）。
+    - 新增 `#idCardNo` 插槽显示 `row.idCardNo || '-'`（空值显示横杠）。
+    - 删除不再使用的 `.driver-page__identity` 样式块。
+- 验证：`node --check` 选项文件语法通过；`npm run build` 仅因环境 safe-delete 守卫拦截清空 dist（与代码无关），未报任何 transform/parse 错误。
+
+## 全站时间列统一加排序（参考 /base/cargo-type）
+- 需求：用户截图 /business/contract-manage 页面，要求「有时间的都加一个排序」，参考 /base/cargo-type（该页面 createTime/updateTime 已设 `sortable: true`）。
+- 方案：Avue 列加 `sortable: true`；手写 `<el-table-column>` 加 `sortable` 属性。精确匹配时间相关 label/prop，排除 `hide: true` 的搜索专用字段。
+- 精确匹配范围：创建/更新时间、开始/结束日期、生效/失效日期、计划/实际/预计日期时间、审核/上传/变更/评分/调度日期时间、事故/检测/有效截止日期、入口/出口/交易/费用/换胎/出厂/维修/保养时间、登录/申请/提交/操作/触发/过期/日志/记录时间等。
+- 改动文件（共 53 个）：
+  - **src/option（18 个）**：base/common-address.js、business/common.js、business/contract-manage.js、business/project-apply.js、business/transport-plan.js、business/waybill-manage.js、system/authlog.js、transportCapacity/driver.js、vehicle/accident-record.js、vehicle/annual-inspection-record.js、vehicle/etc-record.js、vehicle/equipment-ledger.js、vehicle/insurance-record.js、vehicle/mileage-record.js、vehicle/oil-electric-record.js、vehicle/other-expense-record.js、vehicle/tire-replacement-record.js、vehicle/transport-change-record.js。
+  - **src/views 内联 Avue option（30 个）**：flow/follow.vue、flow/manager.vue、flow/model.vue、desk/notice.vue、desk/notice-composition.vue、report/reportlist.vue、work/done.vue、work/todo.vue、work/start.vue、work/claim.vue、work/send.vue、authority/ratelimit.vue、authority/apikey.vue、monitor/log/api.vue、monitor/log/usual.vue、monitor/log/error.vue、base/railway-station.vue、base/airport-master.vue、base/currency.vue、base/customer-type.vue、base/fee-item.vue、base/port-terminal.vue、data/record.vue、util/form.vue、util/table.vue、system/tenant.vue、vehicle/maintenance-plan.vue、vehicle/maintenance-record.vue、vehicle/credit-score-quantification.vue、vehicle/customer-archive.vue。
+  - **src/views 手写 el-table（6 个）**：system/dept.vue、business/loading-manage.vue、business/components/waybill-import-dialog.vue、business/project-apply.vue、vehicle/customer-archive.vue、business/components/business-crud-page.vue。
+- 注意：弹窗内子表（如合同变更记录、项目附件/变更、客商档案评分/材料/变更记录等）时间列也一并加了排序；util/form.vue、util/table.vue 为示例页同样处理。
+- 验证：`npm run build` 成功（exit code 0）；构建日志中的 CSS `*` 告警为历史既有，与本次无关。
+
+## transport-plan 新增弹窗卡片间距加大
+- 需求：用户截图反馈 /business/transport-plan 新增弹窗中各分组白卡（基本信息/收发货信息/货物信息/附件）之间上下间距不够，要求像 project-apply 弹窗一样有明显间距。
+- 改动：`src/views/business/components/business-crud-page.vue`
+  - `:deep(.avue-form__group:has(.dialog-section-title))` 的 `margin-bottom` 从 `12px` 增至 `16px`，与 project-apply.vue 的 `__grid` 卡片间距一致。

.workbuddy/memory/MEMORY.md

@@ -0,0 +1,66 @@
+# 项目长期记忆（tms-erp-web-ws / Saber3 客商模块）
+
+## 设计约定（经用户确认的决策）
+
+### 弹窗内多字段表单分组：使用全局 `<section-card>` 组件（项目统一标准）
+
+**整体结构**：
+- 整个弹窗 body 由 `src/styles/element-ui.scss` 全局 `.el-dialog__body { background: #f5f6fa; padding: 16px }` 统一灰底（无需页面再覆盖）。
+- 每个业务分组 = 一张白底卡片。用全局组件 `<section-card title="分组名">...</section-card>`，自动渲染 4px 主色竖条 + 8px 间距的卡头与白底 body（圆角 6px + 极淡阴影），与 `loading-manage.vue` / `customer-archive.vue` 等已落地页面一致。
+- 严禁再手写 `.xxx-form__block` + `.dialog-section-title` override 拼凑卡片（项目已有 `<section-card>` 标准组件）。
+
+**HTML 结构**（每组三件套）：
+```vue
+<section-card title="分组标题">
+  <el-row :gutter="18">
+    <el-col :span="8">...</el-col>
+  </el-row>
+  <!-- 同一组的所有 row 都放同一张白卡内 -->
+</section-card>
+```
+
+**适用**：新增/编辑弹窗中字段超过 ~10 个、需按业务语义分组时。
+
+### 简单分组（仅 3 项）
+- 联系信息等仅 3 项的分组，可用 `el-col :span="8"` 让三项均分一行，避免 4 列网格留白。
+
+### 上传证件区域尺寸规范（transportCapacity 模块强制）
+- **比例**：中国二代身份证标准尺寸 85.6 × 53.98 mm → 宽:高 = **1.586 : 1**（横放）
+- **尺寸**：取真实身份证的 ~75% → 固定 **240 × 151 px**（1.586:1 精确：151 × 1.586 ≈ 240）
+- **位置**：在 el-col 列内 `margin: 0` 左对齐显示（不再 `width: 100%` 占满整栏，也不再居中）
+- **适用范围**：所有 `<image-upload-field large>` 上传区，包括身份证正反面、大头照、机动车行驶证主页正/反面/副页正/反面、道路运输证、机动车登记本、船舶所有权/安全环保/国籍/最低安全配员/光船租赁/营业运输 等所有 cert 图片
+- **实现方式**：在每个页面 scoped 样式里覆盖 class-prefix 对应的 `--large` 选择器（`.driver-uploader--large` / `.vehicle-uploader--large` / `.ship-uploader--large`）：
+  ```scss
+  :deep(.xxx-uploader) { display: block; }  // 不再 width:100%
+  :deep(.xxx-uploader--large) {
+    display: block;
+    width: 240px;
+    margin: 0;
+  }
+  :deep(.xxx-uploader--large .el-upload),
+  :deep(.xxx-uploader--large.el-upload) {
+    width: 100%;
+    height: 151px;
+  }
+  ```
+- **CSS 顺序要点**：`.xxx-uploader`（特定性 0,0,1,0）必须写在 `.xxx-uploader--large`（同为 0,0,1,0）之前，源码位置决定覆盖生效。
+
+### 上传图片点击放大预览（全局组件 `image-upload-field` 已实现）
+- **组件**：`src/components/image-upload-field/main.vue`。原裸 `<img>` 改为 `<el-image :preview-src-list="[value]" fit="contain" preview-teleported :z-index="3000" @click.stop>`。点击图片即全屏预览（滚轮缩放 / 旋转 / 下载），零额外依赖。
+- **预览与上传分离**：图片 `@click.stop` 阻止冒泡到 `el-upload`（否则会触发重传）；"更换"入口（form 模式图片下方 `el-link`、card 模式 head 的 `actionText`）通过 `el-upload` 内部隐藏 `input.el-upload__input` 的 `.click()` 触发文件框。
+- **为什么用 DOM click**：Element Plus `el-upload` 仅 expose `abort/submit/clearFiles/handleStart/handleRemove`，**没有** `openFileDialog`，故用 `this.$refs.uploadRef.$el.querySelector('.el-upload__input').click()`。
+- **readonly 模式**：仅渲染 `el-image` 预览，不显示上传入口（查看档案时也能放大看证件）。
+- **z-index 注意**：务必 `preview-teleported`（预览层挂 body）+ `:z-index="3000"`，否则会被 `el-dialog` 遮罩（2000 区间）盖住。
+- **适用范围**：全仓通用组件，driver / vehicle / ship 三个页面自动获得该能力（改动一次组件即可）。
+
+## 关键文件
+- 通用分组白卡组件：`src/components/section-card/main.vue`（已全局注册为 `<section-card>`，支持 `title` / `#title` / `#extra` slot）。
+- 弹窗灰底 body + section-card 全局样式：`src/styles/element-ui.scss`（`.el-dialog__body`、`.section-card { &__header / &__bar / &__title / &__extra / &__body }`）。
+- 司机档案弹窗：`src/views/transportCapacity/driver.vue`（手写 `el-form` + `<section-card>` 4 大分组：基础身份信息 / 驾驶证信息 / 从业资格证信息 / 司机联系信息）。
+- 车辆档案弹窗：`src/views/transportCapacity/vehicle.vue`（手写 `el-form` + `<section-card>` 2 大分组：基础车辆信息 / 车辆资质图片；6 张大图按身份证比例 240×151 左对齐）。
+- 船舶档案弹窗：`src/views/transportCapacity/ship.vue`（手写 `el-form` + `<section-card>` 2 大分组：基础船舶信息 / 船舶证书信息；内部 6 张 cert 图片按身份证比例 240×151 左对齐；子证书分段用 `.cert-block` + border-top）。
+- 客商档案弹窗：`src/views/vehicle/customer-archive.vue`（工商信息 / 联系信息 / 财务/信用信息 / 其他信息 等分组也用 `<section-card>`）。
+- 项目补录弹窗：`src/views/business/project-apply.vue`（手写 `__grid` / `__table` / `__textarea-list` 同款白卡结构，先于 `<section-card>` 组件化之前落地，可视为视觉参照）。
+
+## 环境注意
+- Vite 代理跨域：Saber3 axios 开 `withCredentials=true`，直连绝对地址后端须让 CORS `Allow-Origin` 为具体域名（不能用 `*`），否则浏览器拒绝。改 `.env`/`vite.config.mjs` 必须重启 dev。

AGENTS.md

@@ -169,12 +169,15 @@ Avue 表格/表单配置独立存放于 `src/option/` 目录，与 `views` 和 `
 - 表格偶数行需统一使用 `#FAFAFA` 背景色，固定列单元格必须与对应行背景保持一致。
 - 表格操作列同时展示“查看、编辑、删除”等三个按钮时，操作列宽度统一不小于 `220px`；操作列最大按钮数量超过 3 个时，操作列宽度统一加宽到不小于 `320px`；最大按钮数量超过 4 个时，仍按 `320px` 保持列宽，并从第 5 个按钮开始换行展示，禁止出现按钮裁切或显示不全。
 - 表格操作列按钮统一仅展示文字，禁止配置 `icon` / `:icon` 或在操作按钮、操作下拉项中嵌入图标；顶部工具栏按钮不受此条限制。
+- 纯文字操作入口统一使用 `<el-link>`，禁止使用带 `text` 属性的 `<el-button>`；提交、确认、上传等具有明确命令语义或需要加载状态的按钮可继续使用 `<el-button>`。
+- 所有表格操作列中的文字链接统一保持 `8px` 间距；操作按钮超过操作列可用宽度时必须自动换行，禁止链接连续粘连或被裁切。Avue 自定义 `#menu` 插槽和手写 `el-table-column` 操作列均适用。
 - `.avue-crud__header` 顶部间距统一为 `12px`。
 - 分页组件整体靠右展示，必须展示接口返回的数据总条数，`X条/页` 的页容量选择器必须放在总条数右侧。
 - `.basic-container__card` 的直接子级 `.el-card__body` 内边距统一去除，保持 `padding: 0`
 - 所有 CRUD 页面搜索栏需与下方表格拆分为独立区域，两者垂直间距统一为 `8px`。
 - 所有 CRUD 页面搜索栏操作按钮（搜索、清空等）需在搜索表单下方独占一行并放置在最右侧；搜索条件超过一行时必须显示“展开/折叠”，默认折叠且仅展示一行搜索条件；一行布局默认展示 4 个筛选项，Avue 配置统一使用 `searchIndex: 4`。
 - 所有 CRUD 页面中新增、批量导入等顶部按钮组行不需要背景色，应保持透明背景。
+- 所有 CRUD 页面顶部工具栏的“新增/新建”主操作按钮统一使用蓝底白字的实心主按钮（`type="primary"` 且不使用 `plain`），视觉标准与“新建运单”一致；批量导入、导出等辅助工具按钮仍使用描边样式。
 - 所有 `.basic-container__card` 内的 Avue 内层 `el-card` 需去卡片化，仅保留外层容器卡片样式，禁止出现二级卡片边框、阴影或额外内边距。
 
 ### 4.5 全局注册组件

package.json

@@ -36,7 +36,8 @@
     "vue-i18n": "^11.4.2",
     "vue-router": "^4.3.2",
     "vue3-clipboard": "^1.0.0",
-    "vuex": "^4.1.0"
+    "vuex": "^4.1.0",
+    "xlsx": "0.18.5"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.2.4",

pnpm-lock.yaml

@@ -92,6 +92,9 @@ importers:
       vuex:
         specifier: ^4.1.0
         version: 4.1.0(vue@3.5.34)
+      xlsx:
+        specifier: 0.18.5
+        version: 0.18.5
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^5.2.4
@@ -2772,30 +2775,30 @@ snapshots:
     dependencies:
       vue: 3.5.34
 
-  '@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/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)':
     dependencies:
-      '@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/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: 4.0.6
+      dom7: 3.0.0
       is-url: 1.2.4
       lodash.throttle: 4.1.1
-      nanoid: 5.1.11
+      nanoid: 3.3.12
-      slate: 0.123.0
+      slate: 0.72.8
       snabbdom: 3.6.3
 
   '@wangeditor-next/code-highlight@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
-      '@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/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: 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@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/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)':
     dependencies:
       '@types/event-emitter': 0.3.5
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      dom7: 4.0.6
+      dom7: 3.0.0
       event-emitter: 0.3.5
       html-void-elements: 3.0.0
       i18next: 23.16.8
@@ -2806,9 +2809,9 @@ snapshots:
       lodash.foreach: 4.5.0
       lodash.throttle: 4.1.1
       lodash.toarray: 4.4.0
-      nanoid: 5.1.11
+      nanoid: 3.3.12
       scroll-into-view-if-needed: 3.1.0
-      slate: 0.123.0
+      slate: 0.72.8
       slate-history: 0.115.0(slate@0.123.0)
       snabbdom: 3.6.3
 
@@ -2816,9 +2819,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@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
       '@wangeditor-next/code-highlight': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@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/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
       '@wangeditor-next/list-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
       '@wangeditor-next/table-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       '@wangeditor-next/upload-image-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)
@@ -2837,14 +2840,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@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/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: 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@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/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: 4.0.6
       lodash.debounce: 4.0.8
       lodash.throttle: 4.1.1
@@ -2856,8 +2859,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@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@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@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/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: 4.0.6
       lodash.foreach: 4.5.0
       slate: 0.123.0
@@ -2867,36 +2870,36 @@ 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@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/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: 4.0.6
       nanoid: 5.1.11
       slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@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.isequal@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@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@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.isequal@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)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor/core': 1.1.19(@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.isequal@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/core': 1.1.19(@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.isequal@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: 4.0.6
+      dom7: 3.0.0
       is-url: 1.2.4
       lodash.throttle: 4.1.1
-      nanoid: 5.1.11
+      nanoid: 3.3.12
-      slate: 0.123.0
+      slate: 0.72.8
       snabbdom: 3.6.3
 
   '@wangeditor/code-highlight@1.0.3(@wangeditor/core@1.1.19(@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.isequal@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)(slate@0.72.8)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor/core': 1.1.19(@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.isequal@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/core': 1.1.19(@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.isequal@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
       prismjs: 1.30.0
       slate: 0.72.8
       snabbdom: 3.6.3
 
-  '@wangeditor/core@1.1.19(@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.isequal@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/core@1.1.19(@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.isequal@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)':
     dependencies:
       '@types/event-emitter': 0.3.5
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      dom7: 4.0.6
+      dom7: 3.0.0
       event-emitter: 0.3.5
       html-void-elements: 2.0.1
       i18next: 20.6.1
@@ -2908,9 +2911,9 @@ snapshots:
       lodash.isequal: 4.5.0
       lodash.throttle: 4.1.1
       lodash.toarray: 4.4.0
-      nanoid: 5.1.11
+      nanoid: 3.3.12
       scroll-into-view-if-needed: 2.2.31
-      slate: 0.123.0
+      slate: 0.72.8
       slate-history: 0.66.0(slate@0.72.8)
       snabbdom: 3.6.3
 
@@ -2923,9 +2926,9 @@ snapshots:
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@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.isequal@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@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@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.isequal@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)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
       '@wangeditor/code-highlight': 1.0.3(@wangeditor/core@1.1.19(@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.isequal@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)(slate@0.72.8)(snabbdom@3.6.3)
-      '@wangeditor/core': 1.1.19(@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.isequal@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/core': 1.1.19(@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.isequal@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/list-module': 1.0.5(@wangeditor/core@1.1.19(@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.isequal@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)(slate@0.72.8)(snabbdom@3.6.3)
       '@wangeditor/table-module': 1.1.4(@wangeditor/core@1.1.19(@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.isequal@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)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
       '@wangeditor/upload-image-module': 1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@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.isequal@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)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(@wangeditor/core@1.1.19(@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.isequal@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)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.6.3)
@@ -2945,14 +2948,14 @@ snapshots:
 
   '@wangeditor/list-module@1.0.5(@wangeditor/core@1.1.19(@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.isequal@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)(slate@0.72.8)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor/core': 1.1.19(@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.isequal@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/core': 1.1.19(@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.isequal@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
       slate: 0.72.8
       snabbdom: 3.6.3
 
   '@wangeditor/table-module@1.1.4(@wangeditor/core@1.1.19(@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.isequal@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)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor/core': 1.1.19(@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.isequal@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/core': 1.1.19(@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.isequal@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
       lodash.isequal: 4.5.0
       lodash.throttle: 4.1.1
@@ -2964,8 +2967,8 @@ snapshots:
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@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.isequal@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@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@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.isequal@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)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
-      '@wangeditor/core': 1.1.19(@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.isequal@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/core': 1.1.19(@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.isequal@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
       lodash.foreach: 4.5.0
       slate: 0.72.8
@@ -2975,7 +2978,7 @@ snapshots:
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor/core': 1.1.19(@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.isequal@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/core': 1.1.19(@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.isequal@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
       nanoid: 3.3.12
       slate: 0.72.8

src/api/business/common.js

@@ -82,6 +82,16 @@ export const createCrudApi = baseUrl => ({
       },
     });
   },
+  dispatch(payload) {
+    const data = payload && typeof payload === 'object' ? payload : { id: payload };
+    const id = data.id || payload;
+    return request({
+      url: `${baseUrl}/dispatch`,
+      method: 'post',
+      params: id ? { id } : undefined,
+      data,
+    });
+  },
   reassign(id) {
     return request({
       url: `${baseUrl}/reassign`,

src/api/business/contract-manage.js

@@ -45,6 +45,13 @@ export const reject = id =>
     params: { id },
   });
 
+export const updateAttachments = row =>
+  request({
+    url: `${baseUrl}/update-attachments`,
+    method: 'post',
+    data: row,
+  });
+
 export const withdraw = id =>
   request({
     url: `${baseUrl}/withdraw`,

src/api/business/loading-manage.js

@@ -0,0 +1,91 @@
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/loading-manage';
+
+export const exportUrl = `${baseUrl}/export-loading-manage`;
+
+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 saveDraft = row =>
+  request({
+    url: `${baseUrl}/save-draft`,
+    method: 'post',
+    data: row,
+  });
+
+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 copy = id =>
+  request({
+    url: `${baseUrl}/copy`,
+    method: 'post',
+    params: {
+      id,
+    },
+  });
+
+export const reassign = row =>
+  request({
+    url: `${baseUrl}/reassign`,
+    method: 'post',
+    data: row,
+  });
+
+export const cancel = id =>
+  request({
+    url: `${baseUrl}/cancel`,
+    method: 'post',
+    params: {
+      id,
+    },
+  });
+
+export const complete = id =>
+  request({
+    url: `${baseUrl}/complete`,
+    method: 'post',
+    params: {
+      id,
+    },
+  });
+
+export const batchComplete = ids =>
+  request({
+    url: `${baseUrl}/batch-complete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+  });

src/api/business/shipping-template.js

@@ -1,4 +1,5 @@
 import { createCrudApi } from './common';
+import request from '@/axios';
 
 const api = createCrudApi('/blade-transport/shipping-template');
 
@@ -7,3 +8,4 @@ export const getDetail = api.getDetail;
 export const submit = api.submit;
 export const remove = api.remove;
 export const copy = api.copy;
+export const nextCode = () => request({ url: '/blade-transport/shipping-template/next-code', method: 'get' });

src/api/business/transport-plan.js

@@ -1,11 +1,38 @@
 import { createCrudApi } from './common';
+import request from '@/axios';
 
-const api = createCrudApi('/blade-transport/transport-plan');
+const baseUrl = '/blade-transport/transport-plan';
+const api = createCrudApi(baseUrl);
 
 export const getList = api.getList;
 export const getDetail = api.getDetail;
 export const submit = api.submit;
+export const dispatch = api.dispatch;
 export const remove = api.remove;
 export const copy = api.copy;
 export const cancel = api.cancel;
 export const complete = api.complete;
+
+export const importTransportPlan = ({
+  file,
+  projectId,
+  projectName,
+  customerName,
+  contractId,
+  contractName,
+}) => {
+  const data = new FormData();
+  data.append('file', file);
+  data.append('projectId', projectId || '');
+  data.append('projectName', projectName || '');
+  data.append('customerName', customerName || '');
+  data.append('contractId', contractId || '');
+  data.append('contractName', contractName || '');
+  return request({
+    url: `${baseUrl}/import-transport-plan`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+    timeout: 60000,
+  });
+};

src/api/business/waybill-manage.js

@@ -21,3 +21,12 @@ export const roadLoading = ids =>
       ids,
     },
   });
+
+export const getImportBatches = params => request({ url: `${baseUrl}/import-batch/list`, method: 'get', params });
+export const getImportDetails = params => request({ url: `${baseUrl}/import-batch/details`, method: 'get', params });
+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 getImportContracts = projectId => request({ url: `${baseUrl}/import-batch/contracts`, method: 'get', params: { projectId } });
+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 confirmImport = data => request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data });

src/api/system/user.js

@@ -61,6 +61,13 @@ export const getUser = id => {
   });
 };
 
+export const getCustomerOptions = () => {
+  return request({
+    url: '/blade-system/user/customer-options',
+    method: 'get',
+  });
+};
+
 export const getUserPlatform = id => {
   return request({
     url: '/blade-system/user/platform-detail',

src/api/transportCapacity/driver.js

@@ -70,11 +70,11 @@ export const recognitionIDCard = url => {
   });
 };
 
-export const recognitionTransportCertificates = objectKeys => {
+export const recognitionTransportCertificates = certificates => {
   return request({
     url: '/blade-file/file/recognitionTransportCertificates',
     method: 'post',
     timeout: 60000,
-    data: objectKeys,
+    data: certificates,
   });
 };

src/api/transportCapacity/transport-vehicle.js

@@ -51,6 +51,14 @@ 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

@@ -40,6 +40,16 @@ export const submitApproval = id => {
   });
 };
 
+export const withdrawApproval = id => {
+  return request({
+    url: '/blade-transport/customer-archive/withdraw-approval',
+    method: 'post',
+    params: {
+      id,
+    },
+  });
+};
+
 export const approve = id => {
   return request({
     url: '/blade-transport/customer-archive/approve',

src/api/vehicle/equipment-ledger.js

@@ -0,0 +1,23 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) =>
+  request({
+    url: '/blade-transport/equipment-ledger/list',
+    method: 'get',
+    params: { ...params, current, size },
+  });
+
+export const getDetail = id =>
+  request({ url: '/blade-transport/equipment-ledger/detail', method: 'get', params: { id } });
+
+export const getNextEquipmentCode = () =>
+  request({ url: '/blade-transport/equipment-ledger/next-equipment-code', method: 'get' });
+
+export const add = row =>
+  request({ url: '/blade-transport/equipment-ledger/submit', method: 'post', data: row });
+
+export const update = row =>
+  request({ url: '/blade-transport/equipment-ledger/submit', method: 'post', data: row });
+
+export const remove = ids =>
+  request({ url: '/blade-transport/equipment-ledger/remove', method: 'post', params: { ids } });

src/components/image-upload-field/main.vue

@@ -1,7 +1,9 @@
 <template>
   <el-form-item v-if="mode === 'form'" :label="label" :prop="prop">
+    <div :class="[`${classPrefix}-uploader`, { [`${classPrefix}-uploader--large`]: large }]">
       <el-upload
-      :class="[`${classPrefix}-uploader`, { [`${classPrefix}-uploader--large`]: large }]"
+        ref="uploadRef"
+        class="upload-inner"
         action="/api/blade-resource/oss/endpoint/put-file"
         name="file"
         :headers="uploadHeaders"
@@ -12,17 +14,44 @@
         :on-success="handleSuccess"
         :on-error="handleError"
       >
-      <img v-if="value" :src="value" :class="`${classPrefix}-uploader__image`" />
+        <el-image
+          v-if="value"
+          :src="value"
+          :class="`${classPrefix}-uploader__image`"
+          :preview-src-list="[value]"
+          fit="contain"
+          preview-teleported
+          :z-index="3000"
+          @click.stop
+        />
         <div v-else :class="`${classPrefix}-uploader__empty`">{{ emptyText }}</div>
       </el-upload>
+      <el-link
+        v-if="value && !readonly"
+        type="primary"
+        class="upload-replace-link"
+        @click.stop="triggerUpload"
+      >
+        更换
+      </el-link>
+    </div>
   </el-form-item>
   <el-form-item v-else :prop="prop" :class="`${classPrefix}-upload-item`">
     <div :class="[`${classPrefix}-upload-card`, { [`${classPrefix}-upload-card--large`]: large }]">
       <div v-if="label" :class="`${classPrefix}-upload-card__head`">
         <span :class="`${classPrefix}-upload-card__label`">{{ label }}</span>
-        <span :class="`${classPrefix}-upload-card__action`">{{ actionText }}</span>
+        <el-link
+          v-if="!readonly"
+          type="primary"
+          :class="`${classPrefix}-upload-card__action`"
+          @click.stop="triggerUpload"
+        >
+          {{ actionText }}
+        </el-link>
+        <span v-else :class="`${classPrefix}-upload-card__action`">{{ actionText }}</span>
       </div>
       <el-upload
+        ref="uploadRef"
         :class="`${classPrefix}-upload-card__uploader`"
         action="/api/blade-resource/oss/endpoint/put-file"
         name="file"
@@ -34,7 +63,16 @@
         :on-success="handleSuccess"
         :on-error="handleError"
       >
-        <img v-if="value" :src="value" :class="`${classPrefix}-upload-card__image`" />
+        <el-image
+          v-if="value"
+          :src="value"
+          :class="`${classPrefix}-upload-card__image`"
+          :preview-src-list="[value]"
+          fit="contain"
+          preview-teleported
+          :z-index="3000"
+          @click.stop
+        />
         <div v-else :class="`${classPrefix}-upload-card__empty`">{{ emptyText }}</div>
       </el-upload>
     </div>
@@ -86,6 +124,11 @@ export default {
     this.closeUploadLoading();
   },
   methods: {
+    triggerUpload() {
+      const uploadEl = this.$refs.uploadRef && this.$refs.uploadRef.$el;
+      const input = uploadEl && uploadEl.querySelector('.el-upload__input');
+      if (input) input.click();
+    },
     showUploadLoading() {
       if (this.uploadLoading) {
         return;

src/components/section-card/main.vue

@@ -0,0 +1,28 @@
+<template>
+  <div class="section-card">
+    <div v-if="title || $slots.title || $slots.extra" class="section-card__header">
+      <span class="section-card__bar" />
+      <span class="section-card__title">
+        <slot name="title">{{ title }}</slot>
+      </span>
+      <span class="section-card__extra">
+        <slot name="extra" />
+      </span>
+    </div>
+    <div class="section-card__body">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SectionCard',
+  props: {
+    title: {
+      type: String,
+      default: ''
+    }
+  }
+}
+</script>

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

@@ -85,6 +85,9 @@ const MIME_MAP = {
   xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
   ppt: 'application/vnd.ms-powerpoint',
   pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+  eml: 'message/rfc822',
+  msg: 'application/vnd.ms-outlook',
+  zip: 'application/zip',
   txt: 'text/plain',
 };
 

src/const/tool/model.js

@@ -147,7 +147,7 @@ export const option = {
   viewBtn: true,
   grid: true,
   selection: true,
-  menuWidth: 160,
+  menuWidth: 180,
   column: [
     {
       label: '数据源',

src/main.js

@@ -39,6 +39,8 @@ import codeSetting from './views/tool/codesetting.vue';
 import formSetting from './views/tool/formsetting.vue';
 import tenantPackage from './views/system/tenantpackage.vue';
 import tenantDatasource from './views/system/tenantdatasource.vue';
+// 通用弹窗分组白卡（灰底弹窗内使用，标题在卡内）
+import sectionCard from './components/section-card/main.vue';
 
 window.$crudCommon = crudCommon;
 debug();
@@ -61,6 +63,7 @@ app.component('codeSetting', codeSetting);
 app.component('formSetting', formSetting);
 app.component('tenantPackage', tenantPackage);
 app.component('tenantDatasource', tenantDatasource);
+app.component('sectionCard', sectionCard);
 app.config.globalProperties.$app = app;
 app.config.globalProperties.$dayjs = dayjs;
 app.config.globalProperties.website = website;
@@ -72,6 +75,7 @@ app.use(store);
 app.use(router);
 app.use(ElementPlus, {
   locale: messages[language],
+  table: { showOverflowTooltip: true },
 });
 app.use(Avue, {
   axios,
@@ -82,7 +86,8 @@ app.use(Avue, {
     searchLabelWidth: 160,
     searchMenuSpan: 24,
     searchMenuPosition: 'right',
-    menuWidth: 160,
+    menuWidth: 180,
+    showOverflowTooltip: true,
     viewBtnIcon: ' ',
     editBtnIcon: ' ',
     copyBtnIcon: ' ',

src/option/base/cargo-type.js

@@ -48,7 +48,7 @@ export const getCargoTypeOption = ctx => ({
   editBtn: false,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   column: [
     {
       label: '类型',
@@ -56,10 +56,10 @@ export const getCargoTypeOption = ctx => ({
       type: 'radio',
       dataType: 'number',
       dicData: typeLevelDic,
-      search: true,
+      search: false,
-      searchSpan: 6,
       value: 2,
       span: 24,
+      order: 100,
       hide: true,
       minWidth: 120,
       editDisabled: true,
@@ -70,20 +70,34 @@ export const getCargoTypeOption = ctx => ({
       label: '货物类型',
       prop: 'cargoName',
       minWidth: 150,
+      search: true,
+      searchPlaceholder: '请输入',
+      searchSpan: 6,
+      searchOrder: 2,
+      order: 70,
+      placeholder: '请输入',
       maxlength: 50,
       showWordLimit: true,
       showOverflowTooltip: true,
-      rules: [{ validator: validateCargoName, trigger: 'blur' }],
+      rules: [
+        { required: true, message: '请输入货物类型名称', trigger: 'blur' },
+        { validator: validateCargoName, trigger: 'blur' },
+      ],
     },
     {
       label: '货物类型编码',
       prop: 'cargoCode',
       minWidth: 140,
       search: true,
+      searchPlaceholder: '请输入',
       searchSpan: 6,
+      searchOrder: 1,
       maxlength: 4,
+      order: 60,
+      placeholder: '请输入',
       editDisabled: true,
       rules: [
+        { required: true, message: '请输入货物类型编码', trigger: 'blur' },
         {
           validator: (rule, value, callback) => {
             const form = ctx.form || {};
@@ -115,6 +129,8 @@ export const getCargoTypeOption = ctx => ({
       hide: true,
       display: false,
       span: 12,
+      order: 90,
+      placeholder: '请输入',
       rules: [{ required: true, message: '请选择上级货物类型', trigger: 'change' }],
     },
     {
@@ -128,16 +144,19 @@ export const getCargoTypeOption = ctx => ({
       minWidth: 160,
     },
     {
-      label: '上级货物编码',
+      label: '上级货物类型编码',
       prop: 'parentCargoCode',
       slot: true,
       readonly: true,
       editDisabled: true,
+      addDisabled: true,
       addDisplay: false,
       editDisplay: false,
       display: false,
       span: 12,
+      order: 80,
       minWidth: 160,
+      placeholder: '请输入',
       rules: [{ required: true, message: '请选择上级货物类型', trigger: 'change' }],
     },
     {
@@ -156,6 +175,7 @@ export const getCargoTypeOption = ctx => ({
       minRows: 4,
       span: 24,
       minWidth: 180,
+      placeholder: '请输入',
       maxlength: 200,
       showWordLimit: true,
       overHidden: true,

src/option/base/common-address.js

@@ -27,18 +27,156 @@ export const createOption = () => ({
   delBtn: false,
   addBtn: false,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuFixed: 'right',
+  menuWidth: 180,
   column: [
+    {
+      label: '地址名称',
+      prop: 'addressName',
+      search: true,
+      searchOrder: 8,
+      span: 24,
+      minWidth: 150,
+      showOverflowTooltip: true,
+      placeholder: '请输入',
+      maxlength: 100,
+      showWordLimit: true,
+      rules: [
+        { required: true, message: '请输入地址名称', trigger: 'blur' },
+        { max: 100, message: '地址名称不能超过100个字', trigger: 'blur' },
+      ],
+    },
+    {
+      label: '地址编号',
+      prop: 'addressCode',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '类型',
       prop: 'addressType',
       type: 'select',
       formslot: true,
       search: true,
+      searchOrder: 7,
       span: 24,
+      minWidth: 140,
       dicData: addressTypeOptions,
       rules: [{ required: true, message: '请选择类型', trigger: 'change' }],
     },
+    {
+      label: '站点编码',
+      prop: 'siteCodeDisplay',
+      search: false,
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '详细地址',
+      prop: 'detailAddress',
+      search: true,
+      searchOrder: 5,
+      formslot: true,
+      type: 'textarea',
+      minRows: 3,
+      span: 24,
+      minWidth: 220,
+      showOverflowTooltip: true,
+      rules: [
+        { required: true, message: '请输入详细地址', trigger: 'blur' },
+        { max: 255, message: '详细地址不能超过255个字', trigger: 'blur' },
+      ],
+    },
+    {
+      label: '经度',
+      prop: 'longitude',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '纬度',
+      prop: 'latitude',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '行政区划',
+      prop: 'regionName',
+      search: true,
+      searchOrder: 4,
+      display: false,
+      minWidth: 150,
+      rules: [{ required: true, message: '请选择行政区划', trigger: 'change' }],
+    },
+    {
+      label: '联系人',
+      prop: 'contactName',
+      search: true,
+      searchOrder: 2,
+      minWidth: 110,
+      placeholder: '请输入',
+      maxlength: 50,
+      rules: [{ max: 50, message: '联系人不能超过50个字', trigger: 'blur' }],
+    },
+    {
+      label: '联系方式',
+      prop: 'contactPhone',
+      search: true,
+      searchOrder: 1,
+      minWidth: 130,
+      placeholder: '请输入',
+      maxlength: 20,
+      rules: [{ max: 20, message: '联系方式不能超过20个字', trigger: 'blur' }],
+    },
+    {
+      label: '组织',
+      prop: 'deptName',
+      minWidth: 150,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '备注',
+      prop: 'remark',
+      type: 'textarea',
+      minRows: 4,
+      span: 24,
+      minWidth: 160,
+      overHidden: true,
+      showOverflowTooltip: true,
+      placeholder: '请输入',
+      maxlength: 200,
+      showWordLimit: true,
+      rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
+    },
+    {
+      label: '更新时间',
+      prop: 'updateTime',
+      sortable: true,
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      width: 180,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      sortable: true,
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      width: 180,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '港口',
       prop: 'portId',
@@ -75,133 +213,24 @@ export const createOption = () => ({
       span: 24,
       rules: [{ required: true, message: '请选择机场标准名称', trigger: 'change' }],
     },
-    {
-      label: '地址名称',
-      prop: 'addressName',
-      search: true,
-      span: 24,
-      minWidth: 150,
-      maxlength: 100,
-      showWordLimit: true,
-      rules: [
-        { required: true, message: '请输入地址名称', trigger: 'blur' },
-        { max: 100, message: '地址名称不能超过100个字', trigger: 'blur' },
-      ],
-    },
-    {
-      label: '地址编号',
-      prop: 'addressCode',
-      minWidth: 120,
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      label: '站点编码',
-      prop: 'siteCodeDisplay',
-      search: false,
-      minWidth: 120,
-      addDisplay: false,
-      editDisplay: false,
-    },
     {
       label: '站点编码',
       prop: 'siteCode',
       search: true,
+      searchOrder: 6,
       hide: true,
       addDisplay: false,
       editDisplay: false,
     },
-    {
-      label: '行政区划',
-      prop: 'regionName',
-      search: true,
-      display: false,
-      minWidth: 150,
-      rules: [{ required: true, message: '请选择行政区划', trigger: 'change' }],
-    },
-    {
-      label: '详细地址',
-      prop: 'detailAddress',
-      search: true,
-      formslot: true,
-      type: 'textarea',
-      minRows: 3,
-      span: 24,
-      minWidth: 220,
-      rules: [
-        { required: true, message: '请输入详细地址', trigger: 'blur' },
-        { max: 255, message: '详细地址不能超过255个字', trigger: 'blur' },
-      ],
-    },
     {
       label: '组织',
       prop: 'deptId',
       type: 'select',
       search: true,
+      searchOrder: 3,
       hide: true,
       display: false,
       dicData: [],
     },
-    {
-      label: '组织',
-      prop: 'deptName',
-      minWidth: 150,
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      label: '联系人',
-      prop: 'contactName',
-      search: true,
-      minWidth: 110,
-      maxlength: 50,
-      rules: [{ max: 50, message: '联系人不能超过50个字', trigger: 'blur' }],
-    },
-    {
-      label: '联系方式',
-      prop: 'contactPhone',
-      search: true,
-      minWidth: 130,
-      maxlength: 20,
-      rules: [{ max: 20, message: '联系方式不能超过20个字', trigger: 'blur' }],
-    },
-    {
-      label: '备注',
-      prop: 'remark',
-      type: 'textarea',
-      minRows: 4,
-      span: 24,
-      hide: true,
-      maxlength: 200,
-      showWordLimit: true,
-      rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
-    },
-    {
-      label: '更新人',
-      prop: 'updateUserName',
-      minWidth: 120,
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      label: '更新时间',
-      prop: 'updateTime',
-      type: 'datetime',
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      minWidth: 160,
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      label: '创建时间',
-      prop: 'createTime',
-      type: 'datetime',
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      minWidth: 160,
-      addDisplay: false,
-      editDisplay: false,
-    },
   ],
 });

src/option/business/common-cargo.js

@@ -6,6 +6,15 @@ import {
   textRule,
 } 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 [];
+};
+
 export const config = {
   title: '常用货物',
   permission: 'common_cargo',
@@ -17,12 +26,29 @@ export const config = {
 };
 
 export const option = createCrudOption([
+  {
+    label: '货物名称',
+    prop: 'cargoName',
+    minWidth: 150,
+    placeholder: '请输入',
+    rules: textRule('货物名称', 100, true),
+  },
+  {
+    label: '货物编号',
+    prop: 'cargoCode',
+    formslot: true,
+    minWidth: 120,
+    maxlength: 20,
+    showWordLimit: true,
+    rules: [
+      { required: true, message: '请输入货物编号', trigger: 'blur' },
+      { max: 20, message: '货物编号不能超过20个字符', trigger: 'blur' },
+    ],
+  },
   {
     label: '一级货物类型',
     prop: 'firstCargoTypeName',
     formslot: true,
-    search: true,
-    searchOrder: 3,
     minWidth: 150,
     editDisabled: true,
     rules: [{ required: true, message: '请选择一级货物类型', trigger: 'change' }],
@@ -39,8 +65,6 @@ export const option = createCrudOption([
     label: '二级货物类型',
     prop: 'secondCargoTypeName',
     formslot: true,
-    search: true,
-    searchOrder: 4,
     minWidth: 150,
     editDisabled: true,
     rules: [{ required: true, message: '请选择二级货物类型', trigger: 'change' }],
@@ -48,47 +72,118 @@ export const option = createCrudOption([
   {
     label: '二级货物类型编码',
     prop: 'secondCargoTypeCode',
-    hide: true,
     display: false,
     addDisplay: false,
     editDisabled: true,
   },
+  // 搜索字段与表格、表单字段独立，避免筛选配置影响数据展示和编辑布局。
   {
     label: '货物名称',
-    prop: 'cargoName',
+    prop: 'searchCargoName',
+    searchProp: 'cargoName',
     search: true,
-    searchOrder: 1,
+    searchOrder: 5,
-    minWidth: 150,
+    searchPlaceholder: '请输入',
-    rules: textRule('货物名称', 100, true),
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
   },
   {
     label: '货物编号',
-    prop: 'cargoCode',
+    prop: 'searchCargoCode',
-    formslot: true,
+    searchProp: 'cargoCode',
+    search: true,
+    searchOrder: 4,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '一级货物类型',
+    prop: 'searchFirstCargoTypeName',
+    searchProp: 'firstCargoTypeName',
+    type: 'select',
+    searchType: 'select',
+    search: true,
+    searchOrder: 3,
+    searchPlaceholder: '请选择',
+    dicUrl: '/blade-system/cargo-type/list?current=1&size=9999&typeLevel=1',
+    dicFormatter: listDicFormatter,
+    props: {
+      label: 'cargoName',
+      value: 'cargoName',
+    },
+    filterable: true,
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '二级货物类型',
+    prop: 'searchSecondCargoTypeName',
+    searchProp: 'secondCargoTypeName',
+    type: 'select',
+    searchType: 'select',
     search: true,
     searchOrder: 2,
-    minWidth: 120,
+    searchPlaceholder: '请选择',
-    maxlength: 20,
+    dicUrl: '/blade-system/cargo-type/list?current=1&size=9999&typeLevel=2',
-    showWordLimit: true,
+    dicFormatter: listDicFormatter,
-    rules: [
+    props: {
-      { required: true, message: '请输入货物编号', trigger: 'blur' },
+      label: 'cargoName',
-      { max: 20, message: '货物编号不能超过20个字符', trigger: 'blur' },
+      value: 'cargoName',
-    ],
+    },
+    filterable: true,
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
   },
   {
     label: '组织',
-    prop: 'deptName',
+    prop: 'searchDeptId',
+    searchProp: 'deptId',
+    type: 'select',
+    searchType: 'select',
     search: true,
-    searchOrder: 5,
+    searchOrder: 1,
+    searchPlaceholder: '请选择',
+    dicData: [],
+    props: {
+      label: 'label',
+      value: 'value',
+    },
+    filterable: true,
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '包装品牌',
+    prop: 'packageBrand',
+    slot: true,
     minWidth: 150,
     addDisplay: false,
     editDisplay: false,
+    viewDisplay: false,
   },
   {
     label: '品牌',
     prop: 'brand',
     search: false,
+    hide: true,
     minWidth: 120,
+    placeholder: '请输入',
     rules: textRule('品牌', 50),
   },
   {
@@ -96,10 +191,25 @@ export const option = createCrudOption([
     prop: 'packageType',
     type: 'select',
     dicData: packageOptions,
+    hide: true,
     minWidth: 100,
   },
   {
-    label: '货值',
+    label: '规格',
+    prop: 'specification',
+    minWidth: 120,
+    placeholder: '请输入',
+    rules: textRule('规格', 50),
+  },
+  {
+    label: '型号',
+    prop: 'model',
+    minWidth: 120,
+    placeholder: '请输入',
+    rules: textRule('型号', 50),
+  },
+  {
+    label: '单价',
     prop: 'cargoValue',
     formslot: true,
     minWidth: 120,
@@ -129,29 +239,26 @@ export const option = createCrudOption([
     minWidth: 120,
   },
   {
-    label: '规格',
+    label: '尺寸',
-    prop: 'specification',
+    prop: 'sizeText',
-    minWidth: 120,
-    rules: textRule('规格', 50),
-  },
-  {
-    label: '型号',
-    prop: 'model',
-    minWidth: 120,
-    rules: textRule('型号', 50),
-  },
-  {
-    label: '说明',
-    prop: 'descriptionOne',
-    minWidth: 160,
-    rules: textRule('说明', 100),
-  },
-  {
-    label: '数据来源',
-    prop: 'dataSource',
     minWidth: 120,
     addDisplay: false,
     editDisplay: false,
+    rules: textRule('尺寸', 100),
+  },
+  {
+    label: '其他说明1',
+    prop: 'descriptionOne',
+    minWidth: 160,
+    placeholder: '请输入',
+    rules: textRule('其他说明1', 100),
+  },
+  {
+    label: '其他说明2',
+    prop: 'descriptionTwo',
+    minWidth: 160,
+    placeholder: '请输入',
+    rules: textRule('其他说明2', 100),
   },
   {
     label: '备注',
@@ -159,12 +266,25 @@ export const option = createCrudOption([
     type: 'textarea',
     minRows: 4,
     span: 24,
-    hide: true,
     maxlength: 200,
     showWordLimit: true,
+    placeholder: '请输入',
     rules: textRule('备注', 200),
   },
-  ...auditColumns,
+  {
+    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)
+    ),
 ]);
 
 export const excelOption = {

src/option/business/common-route.js

@@ -5,6 +5,8 @@ export const config = {
   permission: 'common_route',
   exportUrl: '/blade-transport/common-route/export-common-route',
   exportName: '常用线路',
+  importUrl: '/blade-transport/common-route/import-common-route',
+  templateUrl: '/blade-transport/common-route/export-template',
   enableAllDept: false,
 };
 
@@ -12,17 +14,14 @@ export const option = createCrudOption([
   {
     label: '线路名称',
     prop: 'routeName',
-    search: true,
+    span: 12,
-    searchOrder: 1,
-    span: 24,
     minWidth: 150,
+    overHidden: true,
     rules: textRule('线路名称', 100, true),
   },
   {
     label: '线路编号',
     prop: 'routeCode',
-    search: true,
-    searchOrder: 2,
     minWidth: 120,
     addDisplay: false,
     editDisabled: true,
@@ -30,8 +29,6 @@ export const option = createCrudOption([
   {
     label: '发货地',
     prop: 'departureName',
-    search: true,
-    searchOrder: 3,
     minWidth: 140,
     addDisplay: false,
     editDisplay: false,
@@ -40,10 +37,9 @@ export const option = createCrudOption([
     label: '发货地址',
     prop: 'departureAddress',
     formslot: true,
-    search: true,
-    searchOrder: 4,
     span: 24,
     minWidth: 220,
+    overHidden: true,
     rules: textRule('发货地址', 255, true),
   },
   {
@@ -53,6 +49,8 @@ export const option = createCrudOption([
     precision: 6,
     minWidth: 120,
     hide: true,
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '发货纬度',
@@ -61,6 +59,8 @@ export const option = createCrudOption([
     precision: 6,
     minWidth: 120,
     hide: true,
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '发货联系人',
@@ -77,8 +77,6 @@ export const option = createCrudOption([
   {
     label: '收货地',
     prop: 'arrivalName',
-    search: true,
-    searchOrder: 5,
     minWidth: 140,
     addDisplay: false,
     editDisplay: false,
@@ -87,10 +85,9 @@ export const option = createCrudOption([
     label: '收货地址',
     prop: 'arrivalAddress',
     formslot: true,
-    search: true,
-    searchOrder: 6,
     span: 24,
     minWidth: 220,
+    overHidden: true,
     rules: textRule('收货地址', 255, true),
   },
   {
@@ -100,6 +97,8 @@ export const option = createCrudOption([
     precision: 6,
     minWidth: 120,
     hide: true,
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '收货纬度',
@@ -108,6 +107,8 @@ export const option = createCrudOption([
     precision: 6,
     minWidth: 120,
     hide: true,
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '收货联系人',
@@ -121,25 +122,160 @@ export const option = createCrudOption([
     minWidth: 140,
     rules: [phoneRule('收货联系方式'), ...textRule('收货联系方式', 50)],
   },
-  {
-    label: '组织',
-    prop: 'deptName',
-    search: true,
-    searchOrder: 7,
-    minWidth: 150,
-    addDisplay: false,
-    editDisplay: false,
-  },
   {
     label: '备注',
     prop: 'remark',
     type: 'textarea',
     minRows: 4,
     span: 24,
-    hide: true,
+    minWidth: 180,
     maxlength: 500,
     showWordLimit: true,
     rules: textRule('备注', 500),
   },
-  ...auditColumns,
+  {
+    label: '组织',
+    prop: 'deptName',
+    minWidth: 150,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  // 搜索字段独立于表格和表单字段，避免筛选配置影响数据展示和编辑布局。
+  {
+    label: '线路名称',
+    prop: 'searchRouteName',
+    searchProp: 'routeName',
+    search: true,
+    searchOrder: 7,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '线路编号',
+    prop: 'searchRouteCode',
+    searchProp: 'routeCode',
+    search: true,
+    searchOrder: 6,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '发货地',
+    prop: 'searchDepartureName',
+    searchProp: 'departureName',
+    search: true,
+    searchOrder: 5,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '发货地址',
+    prop: 'searchDepartureAddress',
+    searchProp: 'departureAddress',
+    search: true,
+    searchOrder: 4,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '收货地',
+    prop: 'searchArrivalName',
+    searchProp: 'arrivalName',
+    search: true,
+    searchOrder: 3,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '收货地址',
+    prop: 'searchArrivalAddress',
+    searchProp: 'arrivalAddress',
+    search: true,
+    searchOrder: 2,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '组织',
+    prop: 'searchDeptId',
+    searchProp: 'deptId',
+    search: true,
+    searchOrder: 1,
+    searchType: 'cascader',
+    searchPlaceholder: '请选择',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+    dicData: [],
+    props: {
+      label: 'label',
+      value: 'value',
+      children: 'children',
+    },
+    checkStrictly: true,
+    emitPath: false,
+    showAllLevels: false,
+    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)
+    ),
 ]);
+
+export const excelOption = {
+  submitBtn: false,
+  emptyBtn: false,
+  column: [
+    {
+      label: '导入模板',
+      prop: 'excelTemplate',
+      formslot: true,
+      span: 24,
+    },
+    {
+      label: 'Excel文件',
+      prop: 'excelFile',
+      type: 'upload',
+      drag: true,
+      loadText: '模板上传中，请稍等',
+      span: 24,
+      propsHttp: {
+        res: 'data',
+      },
+      tip: '请上传 .xls,.xlsx 标准格式文件',
+    },
+  ],
+};

src/option/business/common.js

@@ -87,8 +87,10 @@ export const approvalStatusOptions = [
 ];
 
 export const effectiveTypeOptions = [
-  { label: '临时', value: 'temporary' },
+  { label: '未生效', value: 'not_effective' },
-  { label: '正式', value: 'formal' },
+  { label: '临时生效', value: 'temporary_effective' },
+  { label: '正式生效', value: 'formal_effective' },
+  { label: '已过期', value: 'expired' },
 ];
 
 export const businessTypeOptions = [
@@ -202,7 +204,8 @@ export const createCrudOption = columns => ({
   delBtn: false,
   dialogClickModal: false,
   menuFixed: 'right',
-  menuWidth: 160,
+  menuWidth: 180,
+  showOverflowTooltip: true,
   column: columns,
 });
 
@@ -224,6 +227,7 @@ export const auditColumns = [
   {
     label: '创建时间',
     prop: 'createTime',
+    sortable: true,
     type: 'datetime',
     format: 'YYYY-MM-DD HH:mm:ss',
     valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -234,6 +238,7 @@ export const auditColumns = [
   {
     label: '更新时间',
     prop: 'updateTime',
+    sortable: true,
     type: 'datetime',
     format: 'YYYY-MM-DD HH:mm:ss',
     valueFormat: 'YYYY-MM-DD HH:mm:ss',

src/option/business/contract-manage.js

@@ -6,11 +6,18 @@ import {
   createCrudOption,
   effectiveTypeOptions,
   selectRule,
-  settlementModeOptions,
   signTypeOptions,
   textRule,
 } from './common';
 
+const contractSettlementModeOptions = [
+  { label: '现结', value: '现结' },
+  { label: '日结', value: '日结' },
+  { label: '周结', value: '周结' },
+  { label: '月结', value: '月结' },
+  { label: '按固定天数周期', value: '按固定天数周期' },
+];
+
 const listDicFormatter = res => {
   const data = res?.data || res;
   if (Array.isArray(data)) return data;
@@ -25,7 +32,13 @@ export const config = {
   permission: 'contract_manage',
   exportUrl: '/blade-transport/contract-manage/export-contract-manage',
   exportName: '合同管理',
-  enableAllDept: false,
+  defaultForm: {
+    contractCategory: '客户合同',
+  },
+  projectPlaceholder: '请选择',
+  organizationPlaceholder: '请选择',
+  enableAllDept: true,
+  allDeptReadonly: false,
   batchDelete: false,
   enableContractForm: true,
   enableProjectSelect: true,
@@ -39,6 +52,7 @@ export const config = {
   enableChangeRecord: true,
   enableOrganizationSelect: true,
   enableContractCreateActions: true,
+  enableContractExpiryTags: true,
   actions: ['copy'],
   statusProp: 'approvalStatus',
   statusTextProp: 'approvalStatusName',
@@ -63,9 +77,25 @@ export const config = {
       label: '撤回',
       statusProp: 'approvalStatus',
       status: ['reviewing'],
-      stage: ['temporary'],
+      stage: ['temporary', 'formal'],
       permission: 'contract_manage_withdraw',
     },
+    {
+      action: 'approve',
+      label: '通过',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      stage: ['temporary', 'formal'],
+      permission: 'contract_manage_approve',
+    },
+    {
+      action: 'reject',
+      label: '驳回',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      stage: ['temporary', 'formal'],
+      permission: 'contract_manage_reject',
+    },
     {
       action: 'submitFormal',
       label: '重新提交转正',
@@ -143,16 +173,18 @@ export const option = createCrudOption([
     prop: 'contractNo',
     search: true,
     searchOrder: 6,
+    searchPlaceholder: '请输入',
     order: 185,
     disabled: true,
     placeholder: '不填写，则系统自动生成',
-    minWidth: 160,
+    minWidth: 200,
   },
   {
     label: '合同名称',
     prop: 'contractName',
     search: true,
     searchOrder: 7,
+    searchPlaceholder: '请输入',
     order: 180,
     minWidth: 180,
     rules: textRule('合同名称', 100, true),
@@ -163,6 +195,7 @@ export const option = createCrudOption([
     search: true,
     searchOrder: 8,
     searchType: 'select',
+    searchPlaceholder: '请选择',
     formslot: true,
     order: 140,
     dicUrl: '/blade-transport/project-apply/list?current=1&size=9999',
@@ -187,6 +220,7 @@ export const option = createCrudOption([
     search: true,
     searchOrder: 3,
     searchType: 'cascader',
+    searchPlaceholder: '全部',
     formslot: true,
     order: 120,
     dicData: [],
@@ -208,6 +242,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchOrder: 9,
+    searchPlaceholder: '请选择',
     order: 170,
     dicData: contractCategoryOptions,
     minWidth: 130,
@@ -217,9 +252,8 @@ export const option = createCrudOption([
     label: '签约类型',
     prop: 'signType',
     type: 'select',
-    search: true,
+    search: false,
-    searchOrder: 1,
+    span: 6,
-    span: 24,
     order: 190,
     dicData: signTypeOptions,
     minWidth: 120,
@@ -231,6 +265,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchOrder: 5,
+    searchPlaceholder: '请选择',
     dicData: effectiveTypeOptions,
     hide: true,
     display: false,
@@ -240,7 +275,8 @@ export const option = createCrudOption([
     prop: 'partyA',
     type: 'select',
     order: 160,
-    dicUrl: '/blade-transport/customer-archive/list?current=1&size=9999&approvalStatus=approved',
+    dicUrl:
+      '/blade-transport/customer-archive/list?current=1&size=9999&customerType=客户&approvalStatus=approved&status=1',
     dicFormatter: listDicFormatter,
     props: {
       label: 'fullName',
@@ -255,7 +291,8 @@ export const option = createCrudOption([
     prop: 'partyB',
     type: 'select',
     order: 150,
-    dicUrl: '/blade-transport/customer-archive/list?current=1&size=9999&approvalStatus=approved',
+    dicUrl:
+      '/blade-transport/customer-archive/list?current=1&size=9999&customerType=承运商&approvalStatus=approved&status=1',
     dicFormatter: listDicFormatter,
     props: {
       label: 'fullName',
@@ -276,6 +313,7 @@ export const option = createCrudOption([
   {
     label: '开始日期',
     prop: 'startDate',
+    sortable: true,
     type: 'date',
     format: 'YYYY-MM-DD',
     valueFormat: 'YYYY-MM-DD',
@@ -286,6 +324,7 @@ export const option = createCrudOption([
   {
     label: '结束日期',
     prop: 'endDate',
+    sortable: true,
     type: 'date',
     format: 'YYYY-MM-DD',
     valueFormat: 'YYYY-MM-DD',
@@ -296,6 +335,7 @@ export const option = createCrudOption([
   {
     label: '临时效力起',
     prop: 'temporaryStartDate',
+    sortable: true,
     type: 'date',
     format: 'YYYY-MM-DD',
     valueFormat: 'YYYY-MM-DD',
@@ -306,6 +346,7 @@ export const option = createCrudOption([
   {
     label: '临时效力止',
     prop: 'temporaryEndDate',
+    sortable: true,
     type: 'date',
     format: 'YYYY-MM-DD',
     valueFormat: 'YYYY-MM-DD',
@@ -333,14 +374,14 @@ export const option = createCrudOption([
     rules: [{ required: true, message: '请选择签订日期', trigger: 'change' }],
   },
   {
-    label: '结算方式',
+    label: '结算类型',
     prop: 'settlementMode',
     type: 'select',
-    dicData: settlementModeOptions,
+    dicData: contractSettlementModeOptions,
     hide: true,
     order: 90,
     minWidth: 120,
-    rules: selectRule('结算方式'),
+    rules: selectRule('结算类型'),
   },
   {
     label: '合同格式',
@@ -388,10 +429,11 @@ export const option = createCrudOption([
   {
     label: '创建时间',
     prop: 'createTime',
+    sortable: true,
     type: 'datetime',
     format: 'YYYY-MM-DD HH:mm:ss',
     valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    minWidth: 160,
+    minWidth: 190,
     addDisplay: false,
     editDisplay: false,
   },
@@ -401,6 +443,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchOrder: 2,
+    searchPlaceholder: '请选择',
     slot: true,
     dicData: contractStageOptions,
     minWidth: 120,
@@ -413,6 +456,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchOrder: 4,
+    searchPlaceholder: '请选择',
     slot: true,
     dicData: contractApprovalStatusOptions,
     minWidth: 130,
@@ -571,3 +615,6 @@ export const option = createCrudOption([
 
 option.span = 8;
 option.dialogWidth = 1480;
+option.dialogTop = '10px';
+option.dialogCloseBtn = true;
+option.menuWidth = 320;

src/option/business/loading-manage.js

@@ -0,0 +1,36 @@
+import { dataSourceOptions } from './common';
+
+export const transportTypeDict = {
+  dicUrl: '/blade-system/dict-biz/dictionary?code=transport_type',
+  props: {
+    label: 'dictValue',
+    value: 'dictKey',
+  },
+};
+
+export const carrierTypeOptions = ['承运商', '自运', '网签平台'];
+
+export const loadingStatusOptions = [
+  { label: '草稿', value: 'draft' },
+  { label: '待执行', value: 'pending' },
+  { label: '进行中', value: 'running' },
+  { label: '已完成', value: 'completed' },
+  { label: '已取消', value: 'cancelled' },
+];
+
+export const loadingStatusMap = loadingStatusOptions.reduce((result, item) => {
+  result[item.value] = item.label;
+  return result;
+}, {});
+
+export const loadingManageConfig = {
+  title: '配载管理',
+  permission: 'loading_manage',
+  exportUrl: '/blade-transport/loading-manage/export-loading-manage',
+  exportName: '配载管理',
+  createText: '新建配载',
+  batchCompleteText: '批量完成',
+  statusProp: 'businessStatus',
+  statusTextProp: 'businessStatusName',
+  dataSourceOptions,
+};

src/option/business/process-config.js

@@ -6,21 +6,20 @@ import {
   selectRule,
   textRule,
 } from './common';
-import { applyTableMenuWidth } from '@/utils/table-menu';
 
 export const config = {
   title: '过程配置',
   permission: 'process_config',
   exportUrl: '/blade-transport/process-config/export-process-config',
   exportName: '过程配置',
-  enableAllDept: false,
+  enableAllDept: true,
   actions: ['copy', 'enable', 'disable'],
   statusProp: 'status',
   statusTextProp: 'statusName',
   deleteStatus: [0, 2],
 };
 
-export const option = applyTableMenuWidth({
+export const option = {
   ...createCrudOption([
     {
       label: '',
@@ -29,21 +28,13 @@ export const option = applyTableMenuWidth({
       span: 24,
       hide: true,
     },
-    {
-      label: '配置编号',
-      prop: 'configCode',
-      search: true,
-      searchOrder: 4,
-      minWidth: 130,
-      addDisplay: false,
-      editDisplay: false,
-      editDisabled: true,
-    },
     {
       label: '配置名称',
       prop: 'configName',
       search: true,
       searchOrder: 6,
+      searchSpan: 6,
+      searchPlaceholder: '请输入',
       span: 12,
       minWidth: 150,
       addDisplay: false,
@@ -51,13 +42,16 @@ export const option = applyTableMenuWidth({
       rules: textRule('配置名称', 100, true),
     },
     {
-      label: '项目ID集合',
+      label: '配置编号',
-      prop: 'projectIds',
+      prop: 'configCode',
-      hide: true,
+      search: true,
-      display: false,
+      searchOrder: 4,
+      searchSpan: 6,
+      searchPlaceholder: '请输入',
+      minWidth: 130,
       addDisplay: false,
       editDisplay: false,
-      rules: textRule('项目ID集合', 1000, true),
+      editDisabled: true,
     },
     {
       label: '项目',
@@ -65,7 +59,9 @@ export const option = applyTableMenuWidth({
       formslot: true,
       search: true,
       searchOrder: 5,
-      searchType: 'select',
+      searchType: 'input',
+      searchSpan: 6,
+      searchPlaceholder: '请输入',
       type: 'textarea',
       minRows: 2,
       span: 12,
@@ -77,48 +73,98 @@ export const option = applyTableMenuWidth({
       rules: textRule('项目', 1000, true),
     },
     {
-      label: '包含过程节点',
+      label: '过程节点',
       prop: 'includedNodes',
-      search: true,
-      searchOrder: 3,
       type: 'select',
       multiple: true,
       dicData: nodeOptions,
-      minWidth: 180,
+      minWidth: 260,
-      rules: selectRule('包含过程节点'),
+      overHidden: false,
+      slot: true,
+      addDisplay: false,
+      editDisplay: false,
+      rules: selectRule('过程节点'),
     },
     {
-      label: '默认完成运输天数',
+      label: '默认运输完成天数',
       prop: 'defaultFinishDays',
       formslot: true,
       type: 'number',
-      min: 1,
+      min: 0,
       max: 999,
       span: 12,
+      minWidth: 170,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '备注',
+      prop: 'remark',
+      type: 'textarea',
+      minRows: 4,
+      span: 24,
+      minWidth: 180,
+      addDisplay: false,
+      editDisplay: false,
+      maxlength: 500,
+      showWordLimit: true,
+      rules: textRule('备注', 500),
+    },
+    {
+      label: '组织',
+      prop: 'deptName',
       minWidth: 150,
       addDisplay: false,
       editDisplay: false,
     },
+    ...auditColumns
+      .filter(column => ['updateTime', 'createTime'].includes(column.prop))
+      .map(column => ({ ...column, minWidth: 190 }))
+      .sort(
+        (first, second) =>
+          ['updateTime', 'createTime'].indexOf(first.prop) -
+          ['updateTime', 'createTime'].indexOf(second.prop)
+      ),
+    {
+      label: '项目ID集合',
+      prop: 'projectIds',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      rules: textRule('项目ID集合', 1000, true),
+    },
     {
       label: '状态',
       prop: 'status',
       type: 'select',
       search: true,
       searchOrder: 1,
+      searchSpan: 6,
+      searchPlaceholder: '请选择',
       dicData: processStatusOptions,
       slot: true,
-      minWidth: 100,
+      hide: true,
+      fixed: false,
       addDisplay: false,
       editDisplay: false,
     },
     {
       label: '组织',
-      prop: 'deptName',
+      prop: 'searchDeptId',
+      searchProp: 'deptId',
+      type: 'select',
       search: true,
       searchOrder: 2,
-      minWidth: 150,
+      searchSpan: 6,
+      searchPlaceholder: '请选择',
+      hide: true,
+      display: false,
       addDisplay: false,
       editDisplay: false,
+      viewDisplay: false,
+      dicData: [],
+      filterable: true,
     },
     {
       label: '',
@@ -127,22 +173,10 @@ export const option = applyTableMenuWidth({
       span: 24,
       hide: true,
     },
-    {
-      label: '备注',
-      prop: 'remark',
-      type: 'textarea',
-      minRows: 4,
-      span: 24,
-      hide: true,
-      addDisplay: false,
-      editDisplay: false,
-      maxlength: 500,
-      showWordLimit: true,
-      rules: textRule('备注', 500),
-    },
-    ...auditColumns,
   ]),
+  saveBtnText: '保存',
+  updateBtnText: '保存',
   dialogTop: '10px',
   dialogWidth: '96%',
-  searchSpan: 8,
+  menuWidth: 220,
-}, 5);
+};

src/option/business/project-apply.js

@@ -29,6 +29,14 @@ const userDicFormatter = res => {
   }));
 };
 
+const formatUserRealName = (row, role) =>
+  row[`${role}RealName`] ||
+  row[`${role}UserRealName`] ||
+  row[`${role}User`]?.realName ||
+  row[role]?.realName ||
+  row[`${role}UserName`] ||
+  '';
+
 export const config = {
   title: '项目管理',
   permission: 'project_apply',
@@ -94,8 +102,9 @@ export const option = createCrudOption([
     label: '立项申请单号',
     prop: 'applyNo',
     search: true,
+    searchPlaceholder: '请输入',
     searchOrder: 7,
-    minWidth: 160,
+    minWidth: 220,
     addDisplay: false,
     editDisabled: true,
   },
@@ -110,6 +119,7 @@ export const option = createCrudOption([
     label: '项目名称',
     prop: 'projectName',
     search: true,
+    searchPlaceholder: '请输入',
     searchOrder: 6,
     minWidth: 180,
     maxlength: 50,
@@ -128,6 +138,7 @@ export const option = createCrudOption([
     prop: 'projectType',
     type: 'select',
     search: true,
+    searchPlaceholder: '请选择',
     searchOrder: 3,
     dicData: projectTypeOptions,
     minWidth: 120,
@@ -156,7 +167,7 @@ export const option = createCrudOption([
     label: '承办部门',
     prop: 'undertakeDeptName',
     search: true,
-    searchLabel: '承办单位',
+    searchPlaceholder: '请输入',
     searchOrder: 5,
     minWidth: 150,
     rules: textRule('承办部门', 50, true),
@@ -170,6 +181,7 @@ export const option = createCrudOption([
     label: '项目负责人',
     prop: 'principalUserName',
     minWidth: 130,
+    formatter: row => formatUserRealName(row, 'principal'),
     rules: textRule('项目负责人', 50, true),
   },
   {
@@ -177,6 +189,7 @@ export const option = createCrudOption([
     prop: 'principalUserId',
     type: 'select',
     search: true,
+    searchPlaceholder: '请选择',
     searchOrder: 4,
     filterable: true,
     dicUrl: '/blade-system/user/user-list',
@@ -193,6 +206,7 @@ export const option = createCrudOption([
     prop: 'handlerUserName',
     hide: true,
     minWidth: 130,
+    formatter: row => formatUserRealName(row, 'handler'),
     rules: textRule('项目经办人', 50, true),
   },
   {
@@ -336,6 +350,7 @@ export const option = createCrudOption([
     prop: 'approvalStatus',
     type: 'select',
     search: true,
+    searchPlaceholder: '请选择',
     searchOrder: 2,
     slot: true,
     dicData: projectApprovalStatusOptions,
@@ -362,6 +377,7 @@ export const option = createCrudOption([
     prop: 'effectiveType',
     type: 'select',
     search: true,
+    searchPlaceholder: '请选择',
     searchOrder: 1,
     dicData: effectiveTypeOptions,
     value: 'temporary',
@@ -370,6 +386,7 @@ export const option = createCrudOption([
   {
     label: '审核通过时间',
     prop: 'approvedTime',
+    sortable: true,
     type: 'datetime',
     format: 'YYYY-MM-DD HH:mm:ss',
     valueFormat: 'YYYY-MM-DD HH:mm:ss',

src/option/business/shipping-template.js

@@ -1,11 +1,9 @@
-import {
+import { auditColumns, createCrudOption, selectRule, textRule, transportTypeOptions } from './common';
-  auditColumns,
+
-  createCrudOption,
+const templateTypeOptions = [
-  templateTypeOptions,
+  { label: '运输计划', value: '运输计划' },
-  transportTypeOptions,
+  { label: '运单', value: '运单' },
-  selectRule,
+];
-  textRule,
-} from './common';
 
 export const config = {
   title: '发货模板',
@@ -13,22 +11,60 @@ export const config = {
   exportUrl: '/blade-transport/shipping-template/export-shipping-template',
   exportName: '发货模板',
   enableAllDept: false,
+  enableProjectSelect: true,
+  enableAttachmentTable: true,
+  enableTransportPlanForm: true,
+  enableTemplateCodePreview: true,
+  attachmentTitle: '附件',
+  defaultForm: {
+    templateType: '运输计划',
+  },
+  transportFormRequiredFields: [
+    ['projectName', '项目'],
+    ['contractName', '客户合同'],
+    ['transportType', '运输方式'],
+    ['departureAddress', '发货地址'],
+    ['arrivalAddress', '收货地址'],
+  ],
   actions: ['copy'],
+  operations: [
+    {
+      action: 'createFromTemplate',
+      label: '从模板新建',
+      permission: 'shipping_template_add',
+    },
+  ],
 };
 
-export const option = createCrudOption([
+export const option = {
+  ...createCrudOption([
+    {
+      label: '',
+      prop: 'templateInfoTitle',
+      formslot: true,
+      span: 24,
+      order: 400,
+      hide: true,
+      labelWidth: 0,
+    },
     {
       label: '模板编号',
       prop: 'templateCode',
       search: true,
-    minWidth: 150,
+      searchOrder: 4,
-    addDisplay: false,
+      span: 8,
-    editDisabled: true,
+      order: 390,
+      minWidth: 170,
+      disabled: true,
+      placeholder: '系统自动生成',
     },
     {
       label: '模板名称',
       prop: 'templateName',
       search: true,
+      searchOrder: 3,
+      span: 8,
+      order: 380,
       minWidth: 150,
       rules: textRule('模板名称', 50, true),
     },
@@ -37,131 +73,141 @@ export const option = createCrudOption([
       prop: 'templateType',
       type: 'select',
       search: true,
+      searchOrder: 2,
+      span: 8,
+      order: 370,
       dicData: templateTypeOptions,
       minWidth: 120,
-    value: '运输计划',
       rules: selectRule('模板类型'),
     },
-  {
-    label: '项目',
-    prop: 'projectName',
-    search: true,
-    minWidth: 150,
-    rules: textRule('项目', 100, true),
-  },
-  {
-    label: '项目ID',
-    prop: 'projectId',
-    hide: true,
-  },
-  {
-    label: '客户合同',
-    prop: 'contractName',
-    minWidth: 160,
-    rules: textRule('客户合同', 100, true),
-  },
-  {
-    label: '客户合同ID',
-    prop: 'contractId',
-    hide: true,
-  },
-  {
-    label: '运输类型',
-    prop: 'transportType',
-    type: 'select',
-    dicData: transportTypeOptions,
-    minWidth: 130,
-    rules: selectRule('运输类型'),
-  },
-  {
-    label: '发货地',
-    prop: 'departureName',
-    minWidth: 140,
-    rules: textRule('发货地', 100, true),
-  },
-  {
-    label: '发货地址',
-    prop: 'departureAddress',
-    minWidth: 220,
-    rules: textRule('发货地址', 255, true),
-  },
-  {
-    label: '发货联系人',
-    prop: 'departureContact',
-    minWidth: 120,
-    rules: textRule('发货联系人', 20),
-  },
-  {
-    label: '发货联系方式',
-    prop: 'departurePhone',
-    minWidth: 140,
-    rules: textRule('发货联系方式', 20),
-  },
-  {
-    label: '收货地',
-    prop: 'arrivalName',
-    minWidth: 140,
-    rules: textRule('收货地', 100, true),
-  },
-  {
-    label: '收货地址',
-    prop: 'arrivalAddress',
-    minWidth: 220,
-    rules: textRule('收货地址', 255, true),
-  },
-  {
-    label: '收货联系人',
-    prop: 'arrivalContact',
-    minWidth: 120,
-    rules: textRule('收货联系人', 20),
-  },
-  {
-    label: '收货联系方式',
-    prop: 'arrivalPhone',
-    minWidth: 140,
-    rules: textRule('收货联系方式', 20),
-  },
-  {
-    label: '货物信息JSON',
-    prop: 'goodsJson',
-    type: 'textarea',
-    minRows: 5,
-    span: 24,
-    hide: true,
-  },
-  {
-    label: '运费信息JSON',
-    prop: 'freightJson',
-    type: 'textarea',
-    minRows: 4,
-    span: 24,
-    hide: true,
-  },
-  {
-    label: '附件JSON',
-    prop: 'attachmentsJson',
-    type: 'textarea',
-    minRows: 3,
-    span: 24,
-    hide: true,
-  },
-  {
-    label: '所属组织',
-    prop: 'deptName',
-    minWidth: 150,
-    addDisplay: false,
-    editDisplay: false,
-  },
     {
       label: '备注',
       prop: 'remark',
       type: 'textarea',
-    minRows: 4,
+      minRows: 3,
       span: 24,
-    hide: true,
+      order: 360,
+      minWidth: 180,
       maxlength: 200,
       showWordLimit: true,
       rules: textRule('备注', 200),
     },
+    {
+      label: '',
+      prop: 'basicInfoTitle',
+      formslot: true,
+      span: 24,
+      order: 350,
+      hide: true,
+      labelWidth: 0,
+    },
+    {
+      label: '项目',
+      prop: 'projectName',
+      formslot: true,
+      search: true,
+      searchOrder: 1,
+      span: 8,
+      order: 340,
+      minWidth: 150,
+      rules: textRule('项目', 100, true),
+    },
+    {
+      label: '客户合同',
+      prop: 'contractName',
+      formslot: true,
+      span: 8,
+      order: 330,
+      minWidth: 160,
+      rules: textRule('客户合同', 100, true),
+    },
+    {
+      label: '运输方式',
+      prop: 'transportType',
+      type: 'select',
+      span: 8,
+      order: 320,
+      dicData: transportTypeOptions,
+      minWidth: 130,
+      rules: selectRule('运输方式'),
+    },
+    {
+      label: '',
+      prop: 'shippingInfoTitle',
+      formslot: true,
+      span: 24,
+      order: 310,
+      hide: true,
+      labelWidth: 0,
+    },
+    {
+      label: '发货地址',
+      prop: 'departureAddress',
+      formslot: true,
+      span: 24,
+      order: 300,
+      minWidth: 220,
+      rules: textRule('发货地址', 255, true),
+    },
+    {
+      label: '收货地址',
+      prop: 'arrivalAddress',
+      formslot: true,
+      span: 24,
+      order: 290,
+      minWidth: 220,
+      rules: textRule('收货地址', 255, true),
+    },
+    {
+      label: '',
+      prop: 'goodsInfoTitle',
+      formslot: true,
+      span: 24,
+      order: 280,
+      hide: true,
+      labelWidth: 0,
+    },
+    {
+      label: '',
+      prop: 'goodsJson',
+      type: 'textarea',
+      formslot: true,
+      span: 24,
+      order: 270,
+      hide: true,
+      labelWidth: '0px',
+      className: 'business-crud-page__full-form-item',
+    },
+    {
+      label: '',
+      prop: 'attachmentTitle',
+      formslot: true,
+      span: 24,
+      order: 260,
+      hide: true,
+      labelWidth: 0,
+    },
+    {
+      label: '',
+      prop: 'attachmentsJson',
+      type: 'textarea',
+      formslot: true,
+      span: 24,
+      order: 250,
+      hide: true,
+      labelWidth: '0px',
+      className: 'business-crud-page__full-form-item',
+    },
+    { label: '项目ID', prop: 'projectId', hide: true, display: false },
+    { label: '客户合同ID', prop: 'contractId', hide: true, display: false },
+    { label: '发货地', prop: 'departureName', hide: true, display: false },
+    { label: '发货联系人', prop: 'departureContact', hide: true, display: false },
+    { label: '发货联系方式', prop: 'departurePhone', hide: true, display: false },
+    { label: '收货地', prop: 'arrivalName', hide: true, display: false },
+    { label: '收货联系人', prop: 'arrivalContact', hide: true, display: false },
+    { label: '收货联系方式', prop: 'arrivalPhone', hide: true, display: false },
+    { label: '所属组织', prop: 'deptName', minWidth: 150, addDisplay: false, editDisplay: false },
     ...auditColumns,
-]);
+  ]),
+  dialogWidth: '96%',
+};

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

@@ -28,6 +28,9 @@ export const config = {
   exportName: '临时额度申请',
   enableAllDept: false,
   enableProjectSelect: true,
+  projectQueryParams: {
+    temporaryCreditLimitSelectable: true,
+  },
   enableAttachmentTable: true,
   enableDraftSave: true,
   saveAsDraft: true,
@@ -108,6 +111,7 @@ export const option = {
         value: 'projectName',
       },
       filterable: true,
+      span: 12,
       minWidth: 180,
       rules: textRule('项目名称', 100, true),
     },
@@ -122,14 +126,16 @@ export const option = {
       prop: 'projectCode',
       hide: true,
       disabled: true,
+      span: 12,
       minWidth: 150,
-      rules: textRule('项目编号', 50, true),
+      rules: textRule('项目编号', 50),
     },
     {
       label: '承办部门',
       prop: 'undertakeDeptName',
       hide: true,
       disabled: true,
+      span: 12,
       minWidth: 150,
       rules: textRule('承办部门', 50, true),
     },
@@ -138,6 +144,7 @@ export const option = {
       prop: 'projectFundLimit',
       hide: true,
       disabled: true,
+      span: 12,
       minWidth: 200,
       rules: [nonNegativeRule('项目资金使用额度')],
     },
@@ -146,6 +153,7 @@ export const option = {
       prop: 'usedFundLimit',
       hide: true,
       disabled: true,
+      span: 12,
       minWidth: 220,
       value: 0,
       rules: [nonNegativeRule('已使用项目资金额度')],
@@ -155,6 +163,7 @@ export const option = {
       prop: 'remainingFundLimit',
       hide: true,
       disabled: true,
+      span: 12,
       minWidth: 230,
       value: 0,
       rules: [nonNegativeRule('剩余项目资金使用额度')],
@@ -163,6 +172,7 @@ export const option = {
       label: '申请临时额度（万元）',
       prop: 'applyLimit',
       formslot: true,
+      span: 12,
       minWidth: 180,
       rules: [
         { required: true, message: '请输入申请临时额度', trigger: 'blur' },
@@ -175,6 +185,7 @@ export const option = {
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
+      span: 12,
       minWidth: 140,
       rules: [{ required: true, message: '请选择申请有效期至', trigger: 'change' }],
     },
@@ -260,6 +271,6 @@ export const option = {
     },
     ...auditColumns.map(column => ({ ...column, hide: true })),
   ]),
-  dialogWidth: 1480,
+  dialogWidth: 1010,
   index: false,
 };

src/option/business/transport-plan.js

@@ -116,9 +116,13 @@ export const config = {
   exportName: '运输计划',
   enableAllDept: false,
   enableProjectSelect: true,
+  templateCreateTarget: 'transport-plan',
   enableAttachmentTable: true,
   enableTransportPlanForm: true,
   enableTransportPlanCreateActions: true,
+  enableTransportPlanImport: true,
+  transportPlanImportTitle: '导入发货计划',
+  transportPlanTemplateUrl: '/blade-transport/transport-plan/export-template',
   attachmentTitle: '附件',
   searchRangeMap: {
     planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
@@ -129,6 +133,55 @@ export const config = {
   statusTextProp: 'businessStatusName',
   deleteStatus: ['draft'],
   editStatus: ['draft', 'waiting_dispatch'],
+  detailButton: true,
+  detailSections: [
+    {
+      title: '基本信息',
+      fields: [
+        ['planNo', '计划单号'],
+        ['planName', '计划名称'],
+        ['projectName', '项目名称'],
+        ['customerName', '客户名称'],
+        ['transportType', '运输方式'],
+        ['businessStatus', '调度状态'],
+        ['planStartDate', '计划开始日期'],
+        ['planEndDate', '计划结束日期'],
+        ['dataSource', '数据来源'],
+      ],
+    },
+    {
+      title: '收发货信息',
+      fields: [
+        ['departureName', '发货地'],
+        ['departureContact', '发货联系人'],
+        ['departureAddress', '发货地址'],
+        ['departurePhone', '发货联系方式'],
+        ['arrivalName', '收货地'],
+        ['arrivalContact', '收货联系人'],
+        ['arrivalAddress', '到货地址'],
+        ['arrivalPhone', '收货联系方式'],
+      ],
+    },
+    {
+      title: '其它信息',
+      fields: [
+        ['remark', '备注'],
+        ['updateUserName', '更新人'],
+        ['updateTime', '更新时间'],
+        ['createTime', '创建时间'],
+      ],
+    },
+  ],
+  operations: [
+    {
+      action: 'dispatch',
+      label: '调度',
+      statusProp: 'businessStatus',
+      status: ['waiting_dispatch'],
+      permission: 'transport_plan_edit',
+      confirm: '确定调度该运输计划?',
+    },
+  ],
 };
 
 export const option = {
@@ -253,6 +306,7 @@ export const option = {
     {
       label: '计划开始日期',
       prop: 'planStartDate',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
@@ -263,6 +317,7 @@ export const option = {
     {
       label: '计划结束日期',
       prop: 'planEndDate',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',

src/option/business/waybill-manage.js

@@ -2,6 +2,7 @@ import {
   auditColumns,
   createCrudOption,
   dataSourceOptions,
+  phoneRule,
   selectRule,
   textRule,
   waybillStatusOptions,
@@ -96,9 +97,17 @@ export const config = {
   exportName: '运单管理',
   importUrl: '/blade-transport/waybill-manage/import-waybill-manage',
   enableAllDept: false,
+  enableProjectSelect: true,
+  templateCreateTarget: 'waybill-manage',
+  enableContractSelect: true,
+  enableShippingPlanSelect: true,
+  enableShippingInfoForm: true,
+  enableTaskInfoForm: true,
   batchDelete: false,
+  actionButtonLikeSearch: true,
   createText: '新建运单',
   importText: '导入运单',
+  enableWaybillImport: true,
   roadLoading: true,
   roadLoadingText: '公路配载',
   searchRangeMap: {
@@ -115,6 +124,15 @@ export const config = {
 
 export const option = {
   ...createCrudOption([
+    {
+      label: '',
+      prop: 'basicInfoTitle',
+      formslot: true,
+      span: 24,
+      order: 900,
+      hide: true,
+      labelWidth: 0,
+    },
     {
       label: '运单号',
       prop: 'waybillNo',
@@ -129,6 +147,8 @@ export const option = {
       prop: 'loadingNo',
       search: true,
       searchOrder: 5,
+      span: 6,
+      order: 840,
       minWidth: 140,
     },
     {
@@ -137,13 +157,18 @@ export const option = {
       search: true,
       searchLabel: '多联总单',
       searchOrder: 6,
+      span: 6,
+      order: 830,
       minWidth: 140,
     },
     {
-      label: '项目名称',
+      label: '项目',
       prop: 'projectName',
+      formslot: true,
       search: true,
       searchOrder: 22,
+      span: 6,
+      order: 890,
       minWidth: 150,
       rules: textRule('项目', 100, true),
     },
@@ -154,6 +179,10 @@ export const option = {
       searchLabel: '客户名称',
       searchOrder: 21,
       minWidth: 150,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      display: false,
     },
     {
       label: '车牌号/航班号/船号/班列号',
@@ -162,6 +191,7 @@ export const option = {
       searchLabel: '车/船/航班/班列',
       searchOrder: 13,
       minWidth: 210,
+      display: false,
     },
     {
       label: '司机',
@@ -170,6 +200,7 @@ export const option = {
       searchLabel: '司机名称',
       searchOrder: 14,
       minWidth: 120,
+      display: false,
     },
     {
       label: '联系方式',
@@ -179,6 +210,7 @@ export const option = {
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
+      display: false,
     },
     {
       label: '运输方式',
@@ -199,6 +231,8 @@ export const option = {
       type: 'select',
       search: true,
       searchOrder: 20,
+      span: 6,
+      order: 850,
       ...transportTypeDict,
       minWidth: 130,
       rules: selectRule('运输类型'),
@@ -207,6 +241,10 @@ export const option = {
       label: '过程节点',
       prop: 'currentProcessNode',
       minWidth: 140,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      display: false,
     },
     {
       label: '承运类型',
@@ -216,6 +254,7 @@ export const option = {
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
+      display: false,
     },
     {
       label: '承运商',
@@ -224,6 +263,7 @@ export const option = {
       searchLabel: '承运商名称',
       searchOrder: 15,
       minWidth: 150,
+      display: false,
     },
     {
       label: '货物信息',
@@ -238,17 +278,23 @@ export const option = {
     {
       label: '发货地址',
       prop: 'departureAddress',
+      formslot: true,
       search: true,
       searchOrder: 17,
+      span: 24,
+      order: 790,
       minWidth: 220,
       rules: textRule('发货地址', 255, true),
     },
     {
       label: '到货地址',
       prop: 'arrivalAddress',
+      formslot: true,
       search: true,
       searchLabel: '收货地址',
       searchOrder: 16,
+      span: 24,
+      order: 780,
       minWidth: 220,
       rules: textRule('收货地址', 255, true),
     },
@@ -307,14 +353,20 @@ export const option = {
     {
       label: '客户合同',
       prop: 'contractName',
+      formslot: true,
+      span: 6,
+      order: 880,
       minWidth: 160,
       rules: textRule('客户合同', 100, true),
     },
     {
-      label: '计划名称',
+      label: '发货计划',
       prop: 'planName',
+      formslot: true,
       search: true,
       searchOrder: 7,
+      span: 6,
+      order: 870,
       minWidth: 150,
     },
     {
@@ -324,6 +376,7 @@ export const option = {
       searchOrder: 18,
       formatter: row => formatGoodsField(row, ['cargoType', 'goodsType', 'typeName']),
       minWidth: 130,
+      display: false,
       rules: textRule('货物类型', 100, true),
     },
     {
@@ -333,11 +386,13 @@ export const option = {
       searchOrder: 19,
       formatter: row => formatGoodsField(row, ['cargoName', 'goodsName', 'name']),
       minWidth: 150,
+      display: false,
       rules: textRule('货物名称', 100, true),
     },
     {
       label: '实际发货时间',
       prop: 'startDate',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -346,6 +401,7 @@ export const option = {
     {
       label: '实际完成时间',
       prop: 'endDate',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -356,6 +412,8 @@ export const option = {
       prop: 'originalNo',
       search: true,
       searchOrder: 12,
+      span: 6,
+      order: 860,
       minWidth: 140,
     },
     {
@@ -365,30 +423,38 @@ export const option = {
       searchLabel: '运输批次',
       searchOrder: 3,
       minWidth: 140,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      display: false,
     },
     {
-      label: '预计发货时间',
+      label: '预计发货日期',
       prop: 'estimatedStartTime',
-      type: 'datetime',
+      sortable: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
+      type: 'date',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
       formatter: row => getFirstValue(row, ['estimatedStartTime', 'planStartDate']),
       minWidth: 170,
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
+      display: false,
     },
     {
-      label: '预计完成时间',
+      label: '预计完成日期',
       prop: 'estimatedEndTime',
-      type: 'datetime',
+      sortable: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
+      type: 'date',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
       formatter: row => getFirstValue(row, ['estimatedEndTime', 'planEndDate']),
       minWidth: 170,
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
+      display: false,
     },
     {
       label: '备注',
@@ -396,11 +462,12 @@ export const option = {
       type: 'textarea',
       minRows: 4,
       span: 24,
+      order: 810,
       minWidth: 180,
       overHidden: true,
-      maxlength: 500,
+      maxlength: 200,
       showWordLimit: true,
-      rules: textRule('备注', 500),
+      rules: textRule('备注', 200),
     },
     {
       label: '数据来源',
@@ -410,6 +477,10 @@ export const option = {
       searchOrder: 10,
       dicData: dataSourceOptions,
       minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      display: false,
     },
     {
       ...auditColumn('createTime'),
@@ -431,6 +502,34 @@ export const option = {
       addDisplay: false,
       editDisplay: false,
     },
+    {
+      label: '',
+      prop: 'shippingInfoTitle',
+      formslot: true,
+      span: 24,
+      order: 800,
+      hide: true,
+      labelWidth: 0,
+    },
+    {
+      label: '',
+      prop: 'taskInfoTitle',
+      formslot: true,
+      span: 24,
+      order: 770,
+      hide: true,
+      labelWidth: 0,
+    },
+    {
+      label: '',
+      prop: 'taskInfoForm',
+      formslot: true,
+      span: 24,
+      order: 760,
+      hide: true,
+      labelWidth: '0px',
+      className: 'business-crud-page__full-form-item',
+    },
     {
       label: '实际发货时间',
       prop: 'startDateRange',
@@ -444,6 +543,7 @@ export const option = {
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
+      display: false,
     },
     {
       label: '实际完成时间',
@@ -458,6 +558,7 @@ export const option = {
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
+      display: false,
     },
     {
       label: '创建时间',
@@ -478,51 +579,70 @@ export const option = {
       prop: 'relationNo',
       search: true,
       searchOrder: 2,
+      span: 6,
+      order: 820,
       minWidth: 140,
       hide: true,
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
     },
     {
-      label: '货物信息JSON',
+      label: '货物信息',
       prop: 'goodsJson',
       type: 'textarea',
       minRows: 5,
       span: 24,
       hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
     },
     {
-      label: '承运信息JSON',
+      label: '承运信息',
       prop: 'carrierJson',
       type: 'textarea',
       minRows: 4,
       span: 24,
       hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
     },
     {
-      label: '过程配置JSON',
+      label: '过程配置',
       prop: 'processJson',
       type: 'textarea',
       minRows: 4,
       span: 24,
       hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
     },
     {
-      label: '运费信息JSON',
+      label: '运费信息',
       prop: 'freightJson',
       type: 'textarea',
       minRows: 4,
       span: 24,
       hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
     },
     {
-      label: '附件JSON',
+      label: '附件',
       prop: 'attachmentsJson',
       type: 'textarea',
       minRows: 3,
       span: 24,
       hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
     },
     {
       label: '所属组织',
@@ -532,6 +652,36 @@ export const option = {
       addDisplay: false,
       editDisplay: false,
     },
+    {
+      label: '发货地',
+      prop: 'departureName',
+      hide: true,
+      display: false,
+      minWidth: 140,
+      rules: textRule('发货地', 100, true),
+    },
+    {
+      label: '收货地',
+      prop: 'arrivalName',
+      hide: true,
+      display: false,
+      minWidth: 140,
+      rules: textRule('收货地', 100, true),
+    },
+    {
+      label: '发货联系方式',
+      prop: 'departurePhone',
+      hide: true,
+      display: false,
+      rules: [phoneRule('发货联系方式'), ...textRule('发货联系方式', 50)],
+    },
+    {
+      label: '收货联系方式',
+      prop: 'arrivalPhone',
+      hide: true,
+      display: false,
+      rules: [phoneRule('收货联系方式'), ...textRule('收货联系方式', 50)],
+    },
     {
       label: '项目ID',
       prop: 'projectId',
@@ -544,6 +694,33 @@ export const option = {
       hide: true,
       display: false,
     },
+    {
+      label: '发货计划ID',
+      prop: 'planId',
+      hide: true,
+      display: false,
+    },
+    {
+      label: '任务录入模式',
+      prop: 'taskEntryMode',
+      hide: true,
+      display: false,
+      value: 'simple',
+    },
+    {
+      label: '任务备注',
+      prop: 'taskRemark',
+      hide: true,
+      display: false,
+    },
+    {
+      label: '任务信息',
+      prop: 'taskInfoJson',
+      hide: true,
+      display: false,
+    },
   ]),
-  menuWidth: 320,
+  dialogWidth: '96%',
+  dialogTop: '10px',
+  menuWidth: 280,
 };

src/option/job/jobinfo.js

@@ -130,7 +130,7 @@ export default {
   selection: true,
   grid: true,
   labelWidth: 'auto',
-  menuWidth: 160,
+  menuWidth: 180,
   dialogWidth: 1200,
   dialogClickModal: false,
   tabs: true,

src/option/job/jobserver.js

@@ -13,7 +13,7 @@ export default {
   selection: true,
   grid: true,
   labelWidth: 'auto',
-  menuWidth: 160,
+  menuWidth: 180,
   dialogClickModal: false,
   column: [
     {

src/option/system/authlock.js

@@ -22,7 +22,7 @@ export const authLockOption = {
   viewBtn: false,
   editBtn: false,
   delBtn: false,
-  menuWidth: 160,
+  menuWidth: 180,
   dialogType: 'drawer',
   dialogWidth: 800,
   dialogClickModal: false,

src/option/system/authlog.js

@@ -21,7 +21,7 @@ export const authLogOption = {
   editBtn: false,
   delBtn: false,
   menu: true,
-  menuWidth: 160,
+  menuWidth: 180,
   dialogType: 'drawer',
   dialogWidth: 800,
   dialogClickModal: false,
@@ -82,6 +82,7 @@ export const authLogOption = {
     {
       label: '登录时间',
       prop: 'loginTime',
+      sortable: true,
       span: 24,
       width: 180,
     },

src/option/system/dict.js

@@ -11,7 +11,7 @@ export const optionParent = {
   index: true,
   selection: true,
   viewBtn: true,
-  menuWidth: 160,
+  menuWidth: 180,
   dialogWidth: 880,
   dialogClickModal: false,
   column: [
@@ -104,7 +104,7 @@ export const optionChild = {
   index: true,
   selection: true,
   viewBtn: true,
-  menuWidth: 160,
+  menuWidth: 180,
   dialogWidth: 880,
   dialogClickModal: false,
   column: [

src/option/system/dictbiz.js

@@ -11,7 +11,7 @@ export const optionParent = {
   index: true,
   selection: true,
   viewBtn: true,
-  menuWidth: 160,
+  menuWidth: 180,
   dialogWidth: 880,
   dialogClickModal: false,
   column: [
@@ -105,7 +105,7 @@ export const optionChild = {
   index: true,
   selection: true,
   viewBtn: true,
-  menuWidth: 160,
+  menuWidth: 180,
   dialogWidth: 880,
   dialogClickModal: false,
   column: [

src/option/system/user.js

@@ -1,4 +1,3 @@
-import website from '@/config/website';
 import { getDeptLazyTree } from '@/api/system/dept';
 
 export const userOption = safe => {
@@ -25,42 +24,41 @@ export const userOption = safe => {
     searchShow: true,
     searchMenuSpan: 24,
     searchIcon: true,
-    searchIndex: 8,
+    searchIndex: 4,
     searchMenuPosition: 'right',
     border: true,
     index: true,
     selection: true,
     addBtn: false,
     viewBtn: true,
-    dialogType: 'drawer',
+    dialogType: 'dialog',
-    dialogWidth: 1000,
+    dialogWidth: '90%',
+    labelPosition: 'right',
+    labelWidth: 120,
     dialogClickModal: false,
     column: [
       {
-        label: '登录账号',
+        label: '账号名',
         prop: 'account',
         search: true,
+        searchOrder: 2,
         display: false,
       },
       {
-        label: '所属租户',
+        label: '姓名',
-        prop: 'tenantName',
-        slot: true,
-        display: false,
-      },
-      {
-        label: '用户姓名',
         prop: 'realName',
         search: true,
+        searchOrder: 4,
         display: false,
       },
       {
-        label: '所属角色',
+        label: '手机号',
-        prop: 'roleName',
+        prop: 'phone',
-        slot: true,
+        search: true,
-        overHidden: true,
+        searchOrder: 3,
         display: false,
       },
+      { label: '工号', prop: 'code', display: false },
       {
         label: '所属部门',
         prop: 'deptName',
@@ -68,33 +66,22 @@ export const userOption = safe => {
         overHidden: true,
         display: false,
       },
+      { label: '岗位', prop: 'postName', overHidden: true, display: false },
+      { label: '性别', prop: 'sexName', width: 80, display: false },
+      { label: 'OA人员id', prop: 'oaPersonId', minWidth: 120, overHidden: true, display: false },
+      { label: '备注', prop: 'remark', minWidth: 160, overHidden: true, display: false },
       {
-        label: '用户平台',
+        label: '状态',
-        prop: 'userTypeName',
+        prop: 'status',
-        width: 100,
-        slot: true,
-        display: false,
-      },
-      {
-        label: '用户平台',
         type: 'select',
-        dicUrl: '/blade-system/dict/dictionary?code=user_type',
+        dicData: [
-        props: {
+          { label: '启用', value: 1 },
-          label: 'dictValue',
+          { label: '禁用', value: 0 },
-          value: 'dictKey',
+        ],
-        },
         dataType: 'number',
         search: true,
-        hide: true,
+        searchOrder: 1,
         display: false,
-        prop: 'userType',
-        rules: [
-          {
-            required: true,
-            message: '请选择用户平台',
-            trigger: 'blur',
-          },
-        ],
       },
     ],
     group: [
@@ -104,53 +91,13 @@ export const userOption = safe => {
         icon: 'el-icon-user-solid',
         column: [
           {
-            label: '所属租户',
+            label: '账号名',
-            prop: 'tenantId',
-            type: 'tree',
-            dicUrl: '/blade-system/tenant/select',
-            props: {
-              label: 'tenantName',
-              value: 'tenantId',
-            },
-            hide: !website.tenantMode,
-            addDisplay: website.tenantMode,
-            editDisplay: website.tenantMode,
-            viewDisplay: website.tenantMode,
-            rules: [
-              {
-                required: true,
-                message: '请输入所属租户',
-                trigger: 'click',
-              },
-            ],
-            span: 24,
-          },
-          {
-            label: '登录账号',
             prop: 'account',
+            span: 6,
             rules: [
               {
                 required: true,
-                message: '请输入登录账号',
+                message: '请输入账号名',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '用户平台',
-            type: 'select',
-            dicUrl: '/blade-system/dict/dictionary?code=user_type',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-            dataType: 'number',
-            slot: true,
-            prop: 'userType',
-            rules: [
-              {
-                required: true,
-                message: '请选择用户平台',
                 trigger: 'blur',
               },
             ],
@@ -161,6 +108,7 @@ export const userOption = safe => {
             hide: true,
             editDisplay: false,
             viewDisplay: false,
+            addDisplay: false,
             rules: [{ required: true, validator: validatePass, trigger: 'blur' }],
           },
           {
@@ -169,6 +117,7 @@ export const userOption = safe => {
             hide: true,
             editDisplay: false,
             viewDisplay: false,
+            addDisplay: false,
             rules: [{ required: true, validator: validatePass2, trigger: 'blur' }],
           },
         ],
@@ -191,12 +140,13 @@ export const userOption = safe => {
             ],
           },
           {
-            label: '用户姓名',
+            label: '姓名',
             prop: 'realName',
+            span: 6,
             rules: [
               {
                 required: true,
-                message: '请输入用户姓名',
+                message: '请输入姓名',
                 trigger: 'blur',
               },
               {
@@ -209,12 +159,14 @@ export const userOption = safe => {
           {
             label: '手机号码',
             prop: 'phone',
+            span: 6,
+            rules: [{ required: true, message: '请输入手机号码', trigger: 'blur' }],
             overHidden: true,
           },
           {
             label: '电子邮箱',
             prop: 'email',
-            hide: true,
+            span: 6,
             overHidden: true,
           },
           {
@@ -235,7 +187,7 @@ export const userOption = safe => {
                 value: 3,
               },
             ],
-            hide: true,
+            span: 6,
           },
           {
             label: '用户生日',
@@ -261,6 +213,8 @@ export const userOption = safe => {
           {
             label: '用户编号',
             prop: 'code',
+            label: '工号',
+            span: 6,
           },
           {
             label: '所属角色',
@@ -273,13 +227,7 @@ export const userOption = safe => {
             },
             checkStrictly: true,
             slot: true,
-            rules: [
+            display: false,
-              {
-                required: true,
-                message: '请选择所属角色',
-                trigger: 'click',
-              },
-            ],
           },
           {
             label: '所属部门',
@@ -292,6 +240,7 @@ export const userOption = safe => {
             },
             checkStrictly: true,
             slot: true,
+            span: 6,
             rules: [
               {
                 required: true,
@@ -304,7 +253,7 @@ export const userOption = safe => {
             label: '所属岗位',
             prop: 'postId',
             type: 'tree',
-            multiple: true,
+            multiple: false,
             dicData: [],
             props: {
               label: 'postName',
@@ -317,6 +266,7 @@ export const userOption = safe => {
                 trigger: 'click',
               },
             ],
+            span: 6,
           },
           {
             label: '直属主管',
@@ -330,6 +280,7 @@ export const userOption = safe => {
               value: 'id',
             },
             clearable: true,
+            display: false,
           },
           {
             label: '是否主管',
@@ -346,6 +297,49 @@ export const userOption = safe => {
               },
             ],
             value: 0,
+            display: false,
+          },
+          {
+            label: '人员类别',
+            prop: 'personCategory',
+            type: 'select',
+            span: 6,
+            value: 1,
+            dicData: [
+              { label: '内部员工', value: 1 },
+              { 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',
+            type: 'textarea',
+            span: 24,
+            maxlength: 200,
+            showWordLimit: true,
           },
         ],
       },
@@ -365,7 +359,7 @@ export const platformOption = {
   selection: true,
   viewBtn: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   editBtnText: '配置',
   column: [
     {

src/option/tool/code.js

@@ -14,7 +14,7 @@ export const codeOption = {
   index: true,
   selection: true,
   labelWidth: 'auto',
-  menuWidth: 160,
+  menuWidth: 180,
   viewBtn: true,
   dialogClickModal: false,
   tabs: true,

src/option/tool/codesetting.js

@@ -14,7 +14,7 @@ export default {
   selection: true,
   labelWidth: 'auto',
   searchLabelWidth: 160,
-  menuWidth: 160,
+  menuWidth: 180,
   dialogClickModal: false,
   column: [
     {

src/option/tool/formsetting.js

@@ -14,7 +14,7 @@ export default {
   selection: true,
   labelWidth: 'auto',
   searchLabelWidth: 160,
-  menuWidth: 160,
+  menuWidth: 180,
   dialogWidth: 500,
   dialogClickModal: false,
   column: [

src/option/transportCapacity/driver.js

@@ -9,12 +9,14 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
+  indexLabel: '序号',
+  indexWidth: 70,
   selection: true,
   addBtn: false,
   editBtn: false,
   delBtn: false,
   viewBtn: false,
-  menuWidth: 160,
+  menuWidth: 180,
   dialogClickModal: false,
   column: [
     {
@@ -23,53 +25,67 @@ export const option = {
       search: true,
       searchOrder: 7,
       slot: true,
-      width: 110,
+      minWidth: 120,
     },
     {
-      label: '手机号',
+      label: '身份证号',
+      prop: 'idCardNo',
+      search: true,
+      searchOrder: 2,
+      slot: true,
+      minWidth: 180,
+    },
+    {
+      label: '手机号码',
       prop: 'mobile',
       search: true,
       searchOrder: 6,
-      width: 130,
+      minWidth: 130,
     },
     {
-      label: '准驾车型',
+      label: '性别',
-      prop: 'drivingType',
+      prop: 'gender',
+      width: 80,
+      align: 'center',
+    },
+    {
+      label: '司机类型',
+      prop: 'driverType',
       search: true,
-      searchOrder: 5,
+      searchOrder: 3,
-      hide: true,
       type: 'select',
       dicData: [
         {
-          label: 'A1',
+          label: '自有员工',
-          value: 'A1',
+          value: '自有',
         },
         {
-          label: 'A2',
+          label: '外协',
-          value: 'A2',
+          value: '外协',
         },
         {
-          label: 'A3',
+          label: '承运管理员',
-          value: 'A3',
+          value: '承运管理员',
-        },
-        {
-          label: 'B1',
-          value: 'B1',
-        },
-        {
-          label: 'B2',
-          value: 'B2',
-        },
-        {
-          label: 'C1',
-          value: 'C1',
-        },
-        {
-          label: 'C2',
-          value: 'C2',
         },
       ],
-      width: 110,
+      minWidth: 110,
+      align: 'center',
+    },
+    {
+      label: '岗位',
+      prop: 'posts',
+      minWidth: 150,
+    },
+    {
+      label: '所属组织',
+      prop: 'organizationName',
+      search: true,
+      searchOrder: 1,
+      type: 'select',
+      filterable: true,
+      dicData: [],
+      slot: true,
+      minWidth: 160,
     },
     {
       label: '状态',
@@ -92,65 +108,36 @@ export const option = {
       align: 'center',
     },
     {
-      label: '司机类型',
+      label: '驾驶认证（日期）',
-      prop: 'driverType',
+      prop: 'drivingLicenseEndDate',
+      sortable: true,
+      slot: true,
+      minWidth: 140,
+      align: 'center',
+    },
+    {
+      label: '从业资格认证（日期）',
+      prop: 'qualificationEndDate',
+      sortable: true,
+      slot: true,
+      minWidth: 160,
+    },
+    {
+      label: '准驾车型',
+      prop: 'drivingType',
       search: true,
-      searchOrder: 3,
+      searchOrder: 5,
+      hide: true,
       type: 'select',
       dicData: [
-        {
+        { label: 'A1', value: 'A1' },
-          label: '自有员工',
+        { label: 'A2', value: 'A2' },
-          value: '自有',
+        { label: 'A3', value: 'A3' },
-        },
+        { label: 'B1', value: 'B1' },
-        {
+        { label: 'B2', value: 'B2' },
-          label: '外协',
+        { label: 'C1', value: 'C1' },
-          value: '外协',
+        { label: 'C2', value: 'C2' },
-        },
       ],
-      width: 100,
-      align: 'center',
-    },
-    {
-      label: '身份证号',
-      prop: 'idCardNo',
-      search: true,
-      searchOrder: 2,
-      width: 190,
-    },
-    {
-      label: '所属组织',
-      prop: 'organizationName',
-      search: true,
-      searchOrder: 1,
-      type: 'select',
-      filterable: true,
-      dicData: [],
-      width: 140,
-    },
-    {
-      label: '性别',
-      prop: 'gender',
-      width: 80,
-      align: 'center',
-    },
-    {
-      label: '岗位',
-      prop: 'posts',
-      width: 150,
-    },
-    {
-      label: '驾驶认证',
-      prop: 'drivingLicenseEndDate',
-      slot: true,
-      width: 130,
-      align: 'center',
-    },
-    {
-      label: '从业资格认证',
-      prop: 'qualificationEndDate',
-      slot: true,
-      width: 140,
-      align: 'center',
     },
   ],
 };

src/option/transportCapacity/transport-ship.js

@@ -14,23 +14,41 @@ export const option = {
   editBtn: false,
   delBtn: false,
   viewBtn: false,
-  menuWidth: 160,
+  menuWidth: 180,
   dialogClickModal: false,
   column: [
-    { label: '船舶名', prop: 'shipName', search: true, searchOrder: 5, slot: true, width: 130 },
+    {
+      label: '船舶名',
+      prop: 'shipName',
+      search: true,
+      searchOrder: 5,
+      slot: true,
+      minWidth: 130,
+    },
     {
       label: '船舶识别号',
       prop: 'shipIdentifierNo',
       search: true,
       searchOrder: 4,
-      width: 140,
+      minWidth: 140,
+    },
+    {
+      label: '所属组织',
+      prop: 'organizationName',
+      search: true,
+      searchOrder: 1,
+      type: 'select',
+      filterable: true,
+      dicData: [],
+      slot: true,
+      minWidth: 160,
     },
     {
       label: '船检登记号',
       prop: 'shipInspectionNo',
       search: true,
       searchOrder: 3,
-      width: 130,
+      minWidth: 130,
     },
     {
       label: '船舶类型',
@@ -44,52 +62,47 @@ export const option = {
         { label: '杂货船', value: '杂货船' },
         { label: '油船', value: '油船' },
       ],
-      width: 110,
+      minWidth: 110,
-      align: 'center',
-    },
-    {
-      label: '所属组织',
-      prop: 'organizationName',
-      search: true,
-      searchOrder: 1,
-      type: 'select',
-      filterable: true,
-      dicData: [],
-      width: 160,
-    },
-    {
-      label: '状态',
-      prop: 'status',
-      type: 'select',
-      slot: true,
-      dicData: [
-        { label: '启用', value: 1 },
-        { label: '停用', value: 2 },
-      ],
-      width: 90,
       align: 'center',
     },
     {
       label: '国籍证有效期至',
       prop: 'nationalityCertEndDate',
       slot: true,
-      width: 150,
+      minWidth: 150,
       align: 'center',
     },
     {
       label: '最低安全配员证书有效期至',
       prop: 'safeManningCertEndDate',
       slot: true,
-      width: 210,
+      minWidth: 210,
       align: 'center',
     },
     {
       label: '营业运输证有效期至',
       prop: 'businessTransportCertEndDate',
       slot: true,
-      width: 170,
+      minWidth: 170,
       align: 'center',
     },
-    { label: '承租有效期至', prop: 'leaseEndDate', slot: true, width: 140, align: 'center' },
+    {
+      label: '承租有效期至',
+      prop: 'leaseEndDate',
+      slot: true,
+      minWidth: 140,
+      align: 'center',
+    },
+    {
+      label: '',
+      prop: 'expireStatus',
+      search: true,
+      searchOrder: 0,
+      searchSpan: 6,
+      hide: true,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
   ],
 };

src/option/transportCapacity/transport-vehicle.js

@@ -9,21 +9,37 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
-  selection: true,
+  selection: false,
   addBtn: false,
   editBtn: false,
   delBtn: false,
   viewBtn: false,
-  menuWidth: 160,
+  menuWidth: 250,
   dialogClickModal: false,
   column: [
     {
       label: '车牌号',
       prop: 'plateNo',
       search: true,
-      searchOrder: 5,
+      searchOrder: 6,
       slot: true,
-      width: 120,
+      minWidth: 120,
+    },
+    {
+      label: '业务关系',
+      prop: 'businessRelation',
+      search: true,
+      searchOrder: 5,
+      searchValue: '',
+      type: 'select',
+      dicData: [
+        { label: '全部', value: '' },
+        { label: '自有', value: '自有' },
+        { label: '管理挂靠', value: '管理挂靠' },
+        { label: '业务合作', value: '业务合作' },
+      ],
+      minWidth: 120,
+      align: 'center',
     },
     {
       label: '所属组织',
@@ -33,28 +49,14 @@ export const option = {
       type: 'select',
       filterable: true,
       dicData: [],
-      width: 150,
+      slot: true,
-    },
+      minWidth: 150,
-    {
-      label: '业务关系',
-      prop: 'businessRelation',
-      search: true,
-      searchOrder: 4,
-      type: 'select',
-      dicData: [
-        { label: '全部', value: '' },
-        { label: '自有', value: '自有' },
-        { label: '管理挂靠', value: '管理挂靠' },
-        { label: '业务合作', value: '业务合作' },
-      ],
-      width: 120,
-      align: 'center',
     },
     {
       label: '车辆类型',
       prop: 'vehicleType',
       search: true,
-      searchOrder: 3,
+      searchOrder: 4,
       type: 'select',
       dicData: [
         { label: '全部', value: '' },
@@ -65,49 +67,95 @@ export const option = {
         { label: '拖挂车', value: '拖挂' },
         { label: '半挂车', value: '半挂' },
       ],
-      width: 110,
+      minWidth: 110,
       align: 'center',
     },
     {
       label: '核定载质量(KG)',
       prop: 'approvedLoadKg',
-      width: 140,
+      minWidth: 140,
       align: 'right',
     },
+    {
+      label: '绑定司机',
+      prop: 'boundDriver',
+      slot: true,
+      minWidth: 120,
+      align: 'center',
+    },
+    {
+      label: '车辆类型',
+      prop: 'vehicleType',
+      minWidth: 110,
+      align: 'center',
+    },
+    {
+      label: '认证状态',
+      prop: 'certificationStatus',
+      slot: true,
+      search: true,
+      searchOrder: 2,
+      searchValue: '',
+      type: 'select',
+      dicData: [
+        { label: '全部', value: '' },
+        { label: '认证中', value: 0 },
+        { label: '已认证', value: 1 },
+        { label: '已驳回', value: 2 },
+      ],
+      minWidth: 110,
+      align: 'center',
+    },
     {
       label: '车辆状态',
       prop: 'status',
       search: true,
-      searchOrder: 2,
+      searchOrder: 3,
       type: 'select',
       slot: true,
       dicData: [
         { label: '启用', value: 1 },
         { label: '停用', value: 2 },
       ],
-      width: 90,
+      minWidth: 90,
       align: 'center',
     },
     {
-      label: '行驶证有效期',
+      label: '道路运输证号',
+      prop: 'roadTransportCertNo',
+      minWidth: 160,
+    },
+    {
+      label: '行驶证认证',
       prop: 'drivingLicenseEndDate',
       slot: true,
-      width: 140,
+      minWidth: 140,
       align: 'center',
     },
     {
-      label: '道路运输证有效期',
+      label: '道路运输证认证',
       prop: 'roadTransportCertEndDate',
       slot: true,
-      width: 160,
+      minWidth: 160,
       align: 'center',
     },
     {
-      label: '年审有效期',
+      label: '道路运输证年审',
       prop: 'annualReviewEndDate',
       slot: true,
-      width: 130,
+      minWidth: 130,
       align: 'center',
     },
+    {
+      label: '',
+      prop: 'expireStatus',
+      search: true,
+      searchOrder: 0,
+      searchSpan: 6,
+      hide: true,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
   ],
 };

src/option/vehicle/accident-record.js

@@ -49,10 +49,11 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
+  indexLabel: '序号',
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   column: [
     {
       label: '车船类型',
@@ -82,6 +83,7 @@ export const option = {
     {
       label: '事故发生日期',
       prop: 'accidentDate',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
@@ -124,9 +126,8 @@ export const option = {
     {
       label: '直接经济损失',
       prop: 'directEconomicLoss',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
-      append: '元',
       minWidth: 140,
       span: 12,
       placeholder: '请输入',
@@ -135,9 +136,8 @@ export const option = {
     {
       label: '保险理赔金额',
       prop: 'insuranceClaimAmount',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
-      append: '元',
       minWidth: 140,
       span: 12,
       placeholder: '请输入',
@@ -201,6 +201,7 @@ export const option = {
     {
       label: '创建时间',
       prop: 'createTime',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -251,6 +252,7 @@ export const option = {
     {
       label: '更新时间',
       prop: 'updateTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',

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

@@ -48,10 +48,11 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
+  indexLabel: '序号',
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   column: [
     {
       label: '车船类型',
@@ -81,6 +82,7 @@ export const option = {
     {
       label: '检测评定日期',
       prop: 'inspectionAssessmentDate',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
@@ -92,6 +94,7 @@ export const option = {
     {
       label: '有效期截止日',
       prop: 'validUntilDate',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
@@ -140,9 +143,8 @@ export const option = {
     {
       label: '费用',
       prop: 'fee',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
-      append: '元',
       minWidth: 100,
       span: 12,
       placeholder: '请输入',
@@ -155,6 +157,7 @@ export const option = {
       label: '评定(复核)单位',
       prop: 'assessmentUnit',
       minWidth: 160,
+      overHidden: true,
       span: 12,
       placeholder: '请输入',
       rules: [{ max: 50, message: '最多 50 个字符', trigger: 'blur' }],
@@ -205,6 +208,7 @@ export const option = {
     {
       label: '创建时间',
       prop: 'createTime',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -253,6 +257,7 @@ export const option = {
     {
       label: '更新时间',
       prop: 'updateTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',

src/option/vehicle/equipment-ledger.js

@@ -0,0 +1,229 @@
+import { formatUpdateUserName } from '@/utils/audit';
+
+export const vehicleTypeDic = [
+  { label: '车辆', value: '车辆' },
+  { label: '船舶', value: '船舶' },
+];
+
+export const onlineStatusDic = [
+  { label: '否', value: 0 },
+  { label: '是', value: 1 },
+];
+
+export const option = {
+  height: 'auto',
+  calcHeight: 32,
+  dialogWidth: 960,
+  labelPosition: 'right',
+  labelWidth: 'auto',
+  searchLabelWidth: 160,
+  tip: false,
+  searchBtnText: '查询',
+  emptyBtnText: '重置',
+  saveBtnText: '提交',
+  updateBtnText: '提交',
+  searchShow: true,
+  searchMenuSpan: 24,
+  searchIcon: true,
+  searchIndex: 4,
+  searchMenuPosition: 'right',
+  border: true,
+  index: true,
+  indexLabel: '序号',
+  viewBtn: true,
+  selection: true,
+  dialogClickModal: false,
+  menuWidth: 160,
+  menuFixed: 'right',
+  column: [
+    {
+      label: '车船类型',
+      prop: 'vehicleType',
+      type: 'radio',
+      dicData: vehicleTypeDic,
+      value: '车辆',
+      search: true,
+      searchOrder: 3,
+      span: 24,
+      order: 1,
+      minWidth: 110,
+      rules: [{ required: true, message: '请选择车船类型', trigger: 'change' }],
+    },
+    {
+      label: '车牌号/船号',
+      prop: 'vehicleNo',
+      slot: true,
+      formslot: true,
+      search: true,
+      searchOrder: 4,
+      span: 12,
+      order: 2,
+      minWidth: 140,
+      rules: [{ required: true, message: '请输入车牌号/船号', trigger: 'blur' }],
+    },
+    {
+      label: '设备号',
+      prop: 'equipmentCode',
+      formslot: true,
+      search: true,
+      searchOrder: 2,
+      span: 12,
+      order: 3,
+      minWidth: 150,
+      rules: [{ required: true, message: '设备编号由系统生成', trigger: 'blur' }],
+    },
+    {
+      label: '设备名称',
+      prop: 'equipmentName',
+      span: 12,
+      order: 4,
+      minWidth: 150,
+      rules: [
+        { required: true, message: '请输入设备名称', trigger: 'blur' },
+        { max: 100, message: '最多 100 个字符', trigger: 'blur' },
+      ],
+    },
+    {
+      label: '出厂日期',
+      prop: 'factoryDate',
+      sortable: true,
+      type: 'date',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      span: 12,
+      order: 8,
+      minWidth: 130,
+    },
+    {
+      label: '设备品牌',
+      prop: 'equipmentBrand',
+      span: 12,
+      order: 5,
+      minWidth: 130,
+      rules: [{ max: 50, message: '最多 50 个字符', trigger: 'blur' }],
+    },
+    {
+      label: '设备类型',
+      prop: 'equipmentType',
+      type: 'select',
+      dicData: [],
+      span: 12,
+      order: 6,
+      minWidth: 130,
+      rules: [{ max: 50, message: '最多 50 个字符', trigger: 'change' }],
+    },
+    {
+      label: '规格型号',
+      prop: 'specificationModel',
+      span: 12,
+      order: 7,
+      minWidth: 150,
+      rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
+    },
+    {
+      label: '备注',
+      prop: 'remark',
+      type: 'textarea',
+      minRows: 3,
+      span: 24,
+      order: 10,
+      minWidth: 180,
+      overHidden: true,
+      rules: [{ max: 200, message: '最多 200 个字符', trigger: 'blur' }],
+    },
+    {
+      label: '更新时间',
+      prop: 'updateTime',
+      sortable: true,
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      minWidth: 170,
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      sortable: true,
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      minWidth: 170,
+    },
+    {
+      label: '是否在线',
+      prop: 'onlineStatus',
+      type: 'select',
+      dicData: onlineStatusDic,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      minWidth: 100,
+    },
+    {
+      label: '原厂设备号',
+      prop: 'originalEquipmentNo',
+      span: 12,
+      order: 9,
+      hide: true,
+      rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
+    },
+    {
+      label: '附件',
+      prop: 'attachments',
+      slot: true,
+      formslot: true,
+      span: 24,
+      order: 11,
+      hide: true,
+    },
+    {
+      label: '组织',
+      prop: 'createDept',
+      type: 'tree',
+      dicData: [],
+      props: { label: 'title', value: 'id' },
+      checkStrictly: true,
+      search: true,
+      searchOrder: 1,
+      hide: true,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '更新人',
+      prop: 'updateUserName',
+      formatter: formatUpdateUserName,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+  ],
+};
+
+export const excelOption = {
+  labelPosition: 'right',
+  submitBtn: false,
+  emptyBtn: false,
+  column: [
+    {
+      label: '模板上传',
+      prop: 'excelFile',
+      type: 'upload',
+      drag: true,
+      loadText: '模板上传中，请稍等',
+      span: 24,
+      propsHttp: { res: 'data' },
+      tip: '请上传 .xls,.xlsx 标准格式文件',
+      action: '/blade-transport/equipment-ledger/import-equipment-ledger',
+    },
+    { label: '模板下载', prop: 'excelTemplate', formslot: true, span: 24 },
+  ],
+};

src/option/vehicle/etc-record.js

@@ -38,10 +38,11 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
+  indexLabel: '序号',
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   menuFixed: 'right',
   column: [
     {
@@ -61,6 +62,7 @@ export const option = {
     {
       label: '入口时间',
       prop: 'entryTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -84,6 +86,7 @@ export const option = {
     {
       label: '出口时间',
       prop: 'exitTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -103,9 +106,8 @@ export const option = {
     {
       label: '交易金额',
       prop: 'transactionAmount',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
-      append: '元',
       minWidth: 130,
       span: 12,
       placeholder: '请输入',
@@ -169,6 +171,7 @@ export const option = {
     {
       label: '创建时间',
       prop: 'createTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -189,6 +192,7 @@ export const option = {
     {
       label: '更新时间',
       prop: 'updateTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',

src/option/vehicle/insurance-record.js

@@ -46,10 +46,11 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
+  indexLabel: '序号',
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   column: [
     {
       label: '车船类型',
@@ -110,6 +111,7 @@ export const option = {
     {
       label: '开始日期',
       prop: 'startDate',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
@@ -119,6 +121,7 @@ export const option = {
     {
       label: '结束日期',
       prop: 'endDate',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
@@ -128,8 +131,8 @@ export const option = {
     {
       label: '保额',
       prop: 'insuredAmount',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
       append: '元',
       minWidth: 120,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
@@ -137,8 +140,8 @@ export const option = {
     {
       label: '保费',
       prop: 'premium',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
       append: '元',
       minWidth: 120,
       rules: [
@@ -172,6 +175,7 @@ export const option = {
     {
       label: '创建时间',
       prop: 'createTime',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -181,19 +185,6 @@ export const option = {
       display: false,
       minWidth: 170,
     },
-    {
-      label: '创建时间',
-      prop: 'createTimeRange',
-      type: 'date',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD',
-      searchRange: true,
-      search: true,
-      hide: true,
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-    },
     {
       label: '组织',
       prop: 'createDept',
@@ -210,6 +201,19 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建时间',
+      prop: 'createTimeRange',
+      type: 'date',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
+      searchRange: true,
+      search: true,
+      hide: true,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
     {
       label: '更新人',
       prop: 'updateUserName',
@@ -222,6 +226,7 @@ export const option = {
     {
       label: '更新时间',
       prop: 'updateTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',

src/option/vehicle/mileage-record.js

@@ -34,10 +34,11 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
+  indexLabel: '序号',
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   menuFixed: 'right',
   column: [
     {
@@ -67,9 +68,8 @@ export const option = {
     {
       label: '上月统计里程数',
       prop: 'previousMonthMileage',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
-      append: '公里',
       minWidth: 210,
       slot: true,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
@@ -77,9 +77,8 @@ export const option = {
     {
       label: '本月统计里程数',
       prop: 'currentMonthMileage',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
-      append: '公里',
       minWidth: 210,
       slot: true,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
@@ -87,9 +86,8 @@ export const option = {
     {
       label: '本月行驶里程数',
       prop: 'monthlyMileage',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
-      append: '公里',
       minWidth: 170,
       slot: true,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
@@ -97,9 +95,8 @@ export const option = {
     {
       label: '累计行驶里程数',
       prop: 'totalMileage',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
-      append: '公里',
       minWidth: 170,
       slot: true,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
@@ -160,6 +157,7 @@ export const option = {
     {
       label: '创建时间',
       prop: 'createTime',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -212,6 +210,7 @@ export const option = {
     {
       label: '更新时间',
       prop: 'updateTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',

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

@@ -35,10 +35,11 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
+  indexLabel: '序号',
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   menuFixed: 'right',
   column: [
     {
@@ -50,6 +51,7 @@ export const option = {
     {
       label: '交易时间',
       prop: 'transactionTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -111,25 +113,24 @@ export const option = {
     {
       label: '数量',
       prop: 'quantity',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
       minWidth: 110,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
       label: '单价',
       prop: 'unitPrice',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
       minWidth: 120,
-      append: '元/升',
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
       label: '交易金额',
       prop: 'transactionAmount',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
       minWidth: 130,
       rules: [
         { required: true, message: '请输入交易金额', trigger: 'blur' },
@@ -139,8 +140,8 @@ export const option = {
     {
       label: '余额',
       prop: 'balance',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
       minWidth: 110,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
@@ -217,6 +218,7 @@ export const option = {
     {
       label: '创建时间',
       prop: 'createTime',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -265,6 +267,7 @@ export const option = {
     {
       label: '更新时间',
       prop: 'updateTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',

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

@@ -46,10 +46,11 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
+  indexLabel: '序号',
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   menuFixed: 'right',
   column: [
     {
@@ -80,6 +81,7 @@ export const option = {
     {
       label: '费用日期',
       prop: 'expenseDate',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
@@ -102,9 +104,8 @@ export const option = {
     {
       label: '金额',
       prop: 'amount',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
-      append: '元',
       minWidth: 120,
       span: 12,
       placeholder: '请输入',
@@ -173,6 +174,7 @@ export const option = {
     {
       label: '创建时间',
       prop: 'createTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -193,6 +195,7 @@ export const option = {
     {
       label: '更新时间',
       prop: 'updateTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',

src/option/vehicle/tire-replacement-record.js

@@ -39,10 +39,11 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
+  indexLabel: '序号',
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   column: [
     {
       label: '车牌号',
@@ -69,6 +70,7 @@ export const option = {
     {
       label: '换胎时间',
       prop: 'replacementTime',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
@@ -88,8 +90,8 @@ export const option = {
     {
       label: '换胎数量',
       prop: 'tireQuantity',
-      type: 'number',
+      type: 'input',
-      precision: 0,
+      formslot: true,
       minWidth: 110,
       span: 12,
       placeholder: '请输入',
@@ -98,9 +100,8 @@ export const option = {
     {
       label: '换胎费用',
       prop: 'replacementCost',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
-      append: '元',
       minWidth: 120,
       span: 12,
       placeholder: '请输入',
@@ -140,6 +141,7 @@ export const option = {
     {
       label: '创建时间',
       prop: 'createTime',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -190,6 +192,7 @@ export const option = {
     {
       label: '更新时间',
       prop: 'updateTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',

src/option/vehicle/transport-change-record.js

@@ -26,10 +26,11 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
+  indexLabel: '序号',
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   menuFixed: 'right',
   column: [
     {
@@ -95,6 +96,7 @@ export const option = {
     {
       label: '创建时间',
       prop: 'createTime',
+      sortable: true,
       type: 'date',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -145,6 +147,7 @@ export const option = {
     {
       label: '更新时间',
       prop: 'updateTime',
+      sortable: true,
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',

src/option/vehicle/violation-record.js

@@ -25,14 +25,6 @@ export const vehicleTypeDic = [
   { label: '船舶', value: '船舶' },
 ];
 
-export const violationTypeDic = [
-  { label: '闯红灯', value: '闯红灯' },
-  { label: '超速', value: '超速' },
-  { label: '违停', value: '违停' },
-  { label: '压线', value: '压线' },
-  { label: '其他', value: '其他' },
-];
-
 export const processStatusDic = [
   { label: '未处理', value: '未处理' },
   { label: '已处理', value: '已处理' },
@@ -57,10 +49,11 @@ export const option = {
   searchMenuPosition: 'right',
   border: true,
   index: true,
+  indexLabel: '序号',
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuWidth: 180,
   column: [
     {
       label: '车船类型',
@@ -104,11 +97,11 @@ export const option = {
       label: '类型',
       prop: 'violationType',
       type: 'select',
-      dicData: violationTypeDic,
+      dicData: [],
       minWidth: 120,
       span: 12,
       placeholder: '请选择',
-      rules: [{ required: true, message: '请选择类型', trigger: 'change' }],
+      rules: [],
     },
     {
       label: '事项',
@@ -118,10 +111,7 @@ export const option = {
       display: false,
       span: 12,
       placeholder: '请输入',
-      rules: [
+      rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
-        { required: true, message: '请输入事项', trigger: 'blur' },
-        { max: 100, message: '最多 100 个字符', trigger: 'blur' },
-      ],
     },
     {
       label: '日期',
@@ -149,8 +139,8 @@ export const option = {
     {
       label: '罚款',
       prop: 'fineAmount',
-      type: 'number',
+      type: 'input',
-      precision: 2,
+      formslot: true,
       append: '元',
       minWidth: 100,
       span: 12,
@@ -160,8 +150,8 @@ export const option = {
     {
       label: '被扣分数',
       prop: 'deductPoints',
-      type: 'number',
+      type: 'input',
-      precision: 0,
+      formslot: true,
       minWidth: 110,
       span: 12,
       placeholder: '请输入',

src/page/index/logo.vue

@@ -42,7 +42,7 @@ export default {
   justify-content: center;
 }
 .logo-img {
-  width: 40px;
+  width: 30px;
-  margin-top: 5px;
+  margin-top: 10px;
 }
 </style>

src/styles/element-ui.scss

@@ -207,6 +207,102 @@
   justify-content: center;
 }
 
+// =====================================================================
+// 弹窗标准（与 business/project-apply 弹窗视觉一致）
+// 灰底弹窗体 + 分组白卡（标题融入卡头，4px 主色竖条 + 8px 间距）
+// =====================================================================
+
+// 1) 所有弹窗内容区统一灰底 + 16px 内边距（与 project-apply 一致，避免内容贴边）
+.el-dialog__body {
+  background-color: #f5f6fa;
+  padding: 16px;
+}
+
+// 2) Avue 默认弹窗表单自动包成白卡，无需逐页改 option 即统一标准
+.el-dialog .avue-form {
+  background: #fff;
+  border-radius: 6px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
+  padding: 16px;
+}
+
+// 3) Avue 弹窗内分组（option.group）渲染为白卡，标题在卡内
+.el-dialog .avue-form__group {
+  background: #fff;
+  border-radius: 6px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
+  margin-bottom: 16px;
+  overflow: hidden;
+
+  .avue-group__header {
+    border-bottom: none;
+    padding: 14px 16px 4px;
+    font-weight: 500;
+    color: #303133;
+  }
+
+  .avue-group__item {
+    padding: 14px 16px 4px;
+  }
+}
+
+// 4) 弹窗内表单项默认上下间距 16px（覆盖默认 18px / 22px）
+.el-dialog .el-form-item {
+  margin-bottom: 16px;
+}
+
+// 5) 通用分组白卡组件（<section-card>）：标题融入卡头
+.section-card {
+  background: #fff;
+  border-radius: 6px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
+  margin-bottom: 16px;
+  overflow: hidden;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+
+  &__header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 14px 16px 4px;
+    font-weight: 500;
+    color: #303133;
+  }
+
+  &__bar {
+    flex: none;
+    width: 4px;
+    height: 16px;
+    border-radius: 2px;
+    background-color: var(--el-color-primary);
+  }
+
+  &__title {
+    flex: 1;
+    min-width: 0;
+  }
+
+  &__extra {
+    margin-left: auto;
+    flex: none;
+  }
+
+  &__body {
+    padding: 14px 16px 4px;
+  }
+}
+
+// 6) 弹窗内两列表单栅格工具类（与 project-apply 一致）
+.form-grid-2 {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
+  column-gap: 72px;
+  row-gap: 0;
+}
+
 .avue-crud__dialog .avue-dialog__footer > .el-button {
   margin-left: 12px;
 }
@@ -225,6 +321,7 @@
 .avue-crud__dialog .el-dialog__body {
   max-height: calc(100vh - 200px);
   overflow-y: auto;
+  //background: #f5f6fa;
 }
 
 // 统一表格线条颜色
@@ -267,6 +364,19 @@
   margin-top: 12px;
 }
 
+// 统一 CRUD 顶部新增按钮为蓝底白字，保留其他工具按钮的描边样式
+.avue-crud__header .el-button--primary.is-plain:has(.el-icon-plus) {
+  --el-button-bg-color: #409eff;
+  --el-button-border-color: #409eff;
+  --el-button-hover-bg-color: #66b1ff;
+  --el-button-hover-border-color: #66b1ff;
+  --el-button-active-bg-color: #337ecc;
+  --el-button-active-border-color: #337ecc;
+  --el-button-text-color: #fff;
+  --el-button-hover-text-color: #fff;
+  --el-button-active-text-color: #fff;
+}
+
 // 统一分页为按钮样式并靠右展示
 .avue-crud__pagination,
 .empty-pagination {
@@ -439,16 +549,49 @@
   display: none !important;
 }
 
-// 全站统一：操作列最多一行展示 4 个按钮，第 5 个开始自动换行
+// 全站统一：Avue 操作列文字链接保持间距并支持自动换行
-.avue-crud .el-table td .cell.avue-crud__menu {
+// 注意：Avue 自带 .avue-crud .avue-crud__menu{display:block}（特异性同为 0,2,0）。
-  display: inline-grid;
+// 此处重复类名升至 0,3,0 并强制 display:inline-flex !important，彻底压过 Avue 内置样式，
-  grid-template-columns: repeat(4, max-content);
+// 避免 dev 模式下 CSS 注入顺序导致 .avue-crud__menu 退化成 block 而让操作项竖排错位。
-  gap: 4px;
+.avue-crud .avue-crud__menu.avue-crud__menu {
+  display: inline-flex !important;
+  flex-wrap: wrap;
+  gap: 8px;
   align-items: center;
   justify-content: start;
+  width: 100% !important;
   text-align: left;
 }
 
+// 全站统一：手写表格操作列中的文字链接保持间距并支持自动换行
+.el-table .el-table__body .cell:not(.avue-crud__menu):has(> .el-link) {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 8px;
+}
+
+// 全站统一：表格操作列文字链接统一为主色（蓝色）
+// 覆盖 Avue #menu 槽位与手写表格操作列中 el-link 的 warning / success / danger 等类型，
+// 同时统一 hover / active / disabled 态，保证全站操作列风格一致。
+// 选择器同时覆盖 Avue 行菜单（.avue-crud__menu）与任意含 el-link 的表格体单元格（手写操作列）。
+.avue-crud__menu .el-link,
+.el-table .el-table__body .cell:has(.el-link) .el-link {
+  // 覆盖 Element Plus el-link 默认的 font-weight: var(--el-font-weight-primary)（500 中等粗），
+  // 操作列文字统一为常规字重，避免「查看/编辑/删除」等链接显得加粗。
+  font-weight: normal;
+  --el-link-text-color: var(--el-color-primary);
+  --el-link-hover-text-color: var(--el-color-primary-light-3);
+  --el-link-active-text-color: var(--el-color-primary-dark-2);
+  --el-link-disabled-text-color: var(--el-color-primary-light-5);
+}
+
+// 全站统一：去除操作列 el-link 默认 margin，避免与 8px gap 叠加导致文字间距过宽
+.avue-crud .avue-crud__menu .el-link,
+.el-table .el-table__body .cell:not(.avue-crud__menu):has(> .el-link) .el-link {
+  margin: 0;
+}
+
 .avue-crud__menu > .el-button,
 .avue-crud__menu > .el-dropdown {
   margin: 0;
@@ -460,6 +603,44 @@
   font-weight: normal;
 }
 
+// 全站统一：Element Plus 全局开启 show-overflow-tooltip 后，
+// 操作列单元格会被加上 .el-tooltip 类并写死宽度，导致内部 el-link 换行后被裁切。
+// 此处豁免操作列单元格：让 Avue 行菜单与手写表格操作列保持原有 flex 自动换行，不被固定宽度裁切。
+.el-table .cell.avue-crud__menu,
+.el-table .el-table__body .cell.el-tooltip:has(> .el-link) {
+  width: auto !important;
+  overflow: visible;
+  text-overflow: clip;
+}
+
+// 全站统一：Avue 内置行操作按钮（查看 / 编辑 / 删除 / 复制等）视觉对齐为 el-link 链接样式。
+// 选择器仅命中表格行操作列 .avue-crud__menu 内的 is-text 按钮，不误伤顶部工具栏（.avue-crud__header）
+// 与弹窗按钮（.avue-crud__dialog__menu）。事件（rowView/rowEdit/rowDel）与权限（permission 指令）
+// 由 Avue 自带，此处只改外观，零功能影响。
+.avue-crud__menu > .el-button.is-text {
+  height: auto;
+  padding: 0;
+  border: none;
+  background: transparent;
+  color: var(--el-color-primary);
+  font-weight: normal;
+
+  &:hover,
+  &:focus,
+  &:active {
+    background: transparent;
+    color: var(--el-color-primary-light-3);
+    text-decoration: underline;
+  }
+
+  &.is-disabled,
+  &.is-disabled:hover {
+    background: transparent;
+    color: var(--el-color-primary-light-5);
+    text-decoration: none;
+  }
+}
+
 @media (max-width: 768px) {
   .avue-crud__pagination .el-pagination,
   .empty-pagination .el-pagination,

src/utils/import-excel.js

@@ -47,7 +47,12 @@ const decorateFailExcel = async (blob, businessName, failDetailDecorator) => {
  */
 export const openImportDialog = (vm, businessName, onSuccess, options = {}) => {
   const { failDetailDecorator } = options;
-  const column = vm.findColumn(vm.excelOption.column, 'excelFile');
+  const excelOption = vm.excelOption || vm.excelOptionConfig;
+  const column = vm.findColumn(excelOption?.column || [], 'excelFile');
+  if (!column) {
+    vm.$message.error('导入配置异常，请稍后重试');
+    return;
+  }
   column.httpRequest = (option, uploadColumn) =>
     handleImportExcel(vm, option, uploadColumn, businessName, onSuccess, { failDetailDecorator });
   vm.excelBox = true;

src/utils/table-menu.js

@@ -1,6 +1,6 @@
 export const TABLE_MENU_WIDTH = {
-  default: 160,
+  default: 180,
-  three: 220,
+  three: 180,
   four: 320,
 };
 

src/views/authority/apikey.vue

@@ -41,27 +41,24 @@
         <el-tag>{{ row.expireTimeInfo }}</el-tag>
       </template>
       <template #menu="{ row }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="row.status === -1 && userInfo.authority.includes('admin')"
           @click.stop="handleEnable(row)"
           >启用
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="row.status === 1 && userInfo.authority.includes('admin')"
           @click.stop="handleDisable(row)"
           >禁用
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="userInfo.authority.includes('admin')"
           @click.stop="handleRowLog(row)"
           >日志
-        </el-button>
+        </el-link>
       </template>
       <!-- 访问权限动态表单 -->
       <template #apiPath-form="{ type }">
@@ -84,8 +81,8 @@
         </el-row>
         <el-row v-if="type !== 'view'" :gutter="8">
           <el-col :span="8">
-            <el-button type="primary" text icon="el-icon-circle-plus" @click="addApiPath"
+            <el-link type="primary" @click="addApiPath"
-              >添加路径</el-button
+              >添加路径</el-link
             >
           </el-col>
         </el-row>
@@ -117,8 +114,8 @@
         </el-row>
         <el-row v-if="type !== 'view'" :gutter="8">
           <el-col :span="8">
-            <el-button type="primary" text icon="el-icon-circle-plus" @click="addExtParam"
+            <el-link type="primary" @click="addExtParam"
-              >添加参数</el-button
+              >添加参数</el-link
             >
           </el-col>
         </el-row>
@@ -324,7 +321,7 @@ export default {
         height: 'auto',
         calcHeight: 32,
         dialogWidth: 700,
-        menuWidth: 160,
+        menuWidth: 180,
         tip: false,
         searchShow: true,
         searchMenuSpan: 24,
@@ -437,6 +434,7 @@ export default {
           {
             label: '过期时间',
             prop: 'expireTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -503,7 +501,7 @@ export default {
         editBtn: false,
         addBtn: false,
         delBtn: false,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogType: 'drawer',
         dialogWidth: 800,
         column: [
@@ -515,7 +513,8 @@ export default {
           { label: '请求方法', prop: 'method', slot: true, width: 85 },
           { label: '调用IP', prop: 'remoteIp', search: true, width: 140 },
           { label: '耗时(ms)', prop: 'time', width: 85 },
-          { label: '日志时间', prop: 'createTime', span: 24, width: 180 },
+          { label: '日志时间', prop: 'createTime',
+sortable: true, span: 24, width: 180 },
           { label: '用户代理', prop: 'userAgent', span: 24, hide: true },
           { label: '请求数据', prop: 'params', type: 'textarea', span: 24, minRows: 2, hide: true },
         ],

src/views/authority/apiscope.vue

@@ -62,15 +62,13 @@
         </el-button>
       </template>
       <template #menu="{ row }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.api_scope_setting"
-          plain
           style="border: 0; background-color: transparent !important"
           @click.stop="handleDataScope(row)"
           >权限配置
-        </el-button>
+        </el-link>
       </template>
       <template #name="{ row }">
         <i :class="row.source" style="margin-right: 5px" />
@@ -166,7 +164,7 @@ export default {
         selection: true,
         labelWidth: 'auto',
         searchLabelWidth: 160,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogWidth: 900,
         dialogClickModal: false,
         column: [
@@ -277,7 +275,7 @@ export default {
         editBtn: false,
         addBtn: false,
         delBtn: false,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogClickModal: false,
         column: [
           {
@@ -338,7 +336,7 @@ export default {
         viewBtn: true,
         selection: true,
         labelWidth: 'auto',
-        menuWidth: 160,
+        menuWidth: 180,
         dialogWidth: 900,
         dialogClickModal: false,
         column: [

src/views/authority/datascope.vue

@@ -62,15 +62,13 @@
         </el-button>
       </template>
       <template #menu="{ row }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.data_scope_setting"
-          plain
           style="border: 0; background-color: transparent !important"
           @click.stop="handleDataScope(row)"
           >权限配置
-        </el-button>
+        </el-link>
       </template>
       <template #name="{ row }">
         <i :class="row.source" style="margin-right: 5px" />
@@ -167,7 +165,7 @@ export default {
         selection: true,
         labelWidth: 'auto',
         searchLabelWidth: 160,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogWidth: 900,
         dialogClickModal: false,
         column: [
@@ -314,7 +312,7 @@ export default {
         editBtn: false,
         addBtn: false,
         delBtn: false,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogClickModal: false,
         column: [
           {
@@ -377,7 +375,7 @@ export default {
         viewBtn: true,
         selection: true,
         labelWidth: 'auto',
-        menuWidth: 160,
+        menuWidth: 180,
         dialogWidth: 900,
         dialogClickModal: false,
         column: [

src/views/authority/ratelimit.vue

@@ -52,27 +52,24 @@
         </el-tag>
       </template>
       <template #menu="{ row }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="row.status !== 1 && userInfo.authority.includes('administrator')"
           @click.stop="handleEnable(row)"
           >启用
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="row.status === 1 && userInfo.authority.includes('administrator')"
           @click.stop="handleDisable(row)"
           >禁用
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="userInfo.authority.includes('administrator')"
           @click.stop="handleRowLog(row)"
           >日志
-        </el-button>
+        </el-link>
       </template>
       <!-- 匹配路径动态表单 -->
       <template #limitPattern-form="{ type }">
@@ -100,8 +97,7 @@
         </el-row>
         <el-row v-if="type !== 'view'" :gutter="8">
           <el-col :span="8">
-            <el-button type="primary" text icon="el-icon-circle-plus" @click="addLimitPattern"
+            <el-link type="primary" @click="addLimitPattern">添加路径</el-link
-              >添加路径</el-button
             >
           </el-col>
         </el-row>
@@ -215,7 +211,7 @@ export default {
         index: true,
         viewBtn: true,
         selection: true,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogClickModal: false,
         column: [
           {
@@ -370,7 +366,7 @@ export default {
         editBtn: false,
         addBtn: false,
         delBtn: false,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogType: 'drawer',
         dialogWidth: 800,
         column: [
@@ -397,7 +393,8 @@ export default {
           { label: '服务IP', prop: 'serverIp', hide: true, width: 160 },
           { label: '环境', prop: 'env', hide: true, width: 85 },
           { label: '用户代理', prop: 'userAgent', span: 24, hide: true },
-          { label: '触发时间', prop: 'createTime', span: 24, width: 170 },
+          { label: '触发时间', prop: 'createTime',
+sortable: true, span: 24, width: 170 },
           { label: '请求数据', prop: 'params', type: 'textarea', span: 24, minRows: 2, hide: true },
         ],
       },

src/views/authority/role.vue

@@ -37,15 +37,13 @@
         </el-button>
       </template>
       <template #menu="{ row }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="userInfo.authority.includes('admin')"
-          plain
           style="border: 0; background-color: transparent !important"
           @click.stop="handleRowRole(row)"
           >权限设置
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
     <el-dialog
@@ -252,7 +250,7 @@ export default {
         viewBtn: true,
         labelWidth: 'auto',
         searchLabelWidth: 160,
-        menuWidth: 160,
+        menuWidth: 240,
         dialogWidth: 600,
         dialogClickModal: false,
         column: [
@@ -468,7 +466,7 @@ export default {
       });
     },
     rowSave(row, done, loading) {
-      add(row).then(
+      add(this.withTenantId(row)).then(
         () => {
           this.onLoad(this.page);
           this.$message({
@@ -484,7 +482,7 @@ export default {
       );
     },
     rowUpdate(row, index, done, loading) {
-      update(row).then(
+      update(this.withTenantId(row)).then(
         () => {
           this.onLoad(this.page);
           this.$message({
@@ -499,6 +497,12 @@ export default {
         }
       );
     },
+    withTenantId(row) {
+      return {
+        ...row,
+        tenantId: row.tenantId || this.userInfo.tenantId || website.tenantId,
+      };
+    },
     rowDel(row) {
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',

src/views/base/airport-master.vue

@@ -60,22 +60,20 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('airport_master_edit')"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('airport_master_status')"
           @click="handleStatus(row)"
         >
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
       <template #districtCode-form>
         <el-select
@@ -255,7 +253,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 160,
+        menuWidth: 180,
         column: [
           {
             label: '编码',
@@ -368,15 +366,6 @@ export default {
             addDisplay: false,
             editDisplay: false,
           },
-          {
-            label: '行政区划编号',
-            prop: 'regionCode',
-            minWidth: 160,
-            overHidden: false,
-            addDisplay: false,
-            editDisplay: false,
-            rules: [{ max: 32, message: '行政区划编码不能超过32字', trigger: 'blur' }],
-          },
           {
             label: '详细地址',
             prop: 'detailAddress',
@@ -411,6 +400,15 @@ export default {
               { validator: validateLatitude, trigger: 'blur' },
             ],
           },
+          {
+            label: '行政区划编号',
+            prop: 'regionCode',
+            minWidth: 160,
+            overHidden: false,
+            addDisplay: false,
+            editDisplay: false,
+            rules: [{ max: 32, message: '行政区划编码不能超过32字', trigger: 'blur' }],
+          },
           {
             label: '数据来源',
             prop: 'dataSource',
@@ -427,23 +425,6 @@ export default {
               { label: '手动录入', value: '手动录入' },
             ],
           },
-          {
-            label: '启停状态',
-            prop: 'status',
-            type: 'select',
-            search: true,
-            slot: true,
-            dataType: 'number',
-            minWidth: 110,
-            overHidden: false,
-            addDisplay: false,
-            editDisplay: false,
-            dicData: [
-              { label: '全部', value: '' },
-              { label: '启用', value: 1 },
-              { label: '停用', value: 2 },
-            ],
-          },
           {
             label: '备注',
             prop: 'remark',
@@ -466,6 +447,7 @@ export default {
           {
             label: '更新时间',
             prop: 'updateTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -477,6 +459,7 @@ export default {
           {
             label: '创建时间',
             prop: 'createTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -485,6 +468,23 @@ export default {
             display: false,
             minWidth: 160,
           },
+          {
+            label: '启停状态',
+            prop: 'status',
+            type: 'select',
+            search: true,
+            slot: true,
+            dataType: 'number',
+            minWidth: 110,
+            overHidden: false,
+            addDisplay: false,
+            editDisplay: false,
+            dicData: [
+              { label: '全部', value: '' },
+              { label: '启用', value: 1 },
+              { label: '停用', value: 2 },
+            ],
+          },
         ],
       },
       excelOption: {
@@ -544,8 +544,10 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
     },
-    findColumn(prop) {
+    findColumn(columns, prop) {
-      return this.option.column.find(item => item.prop === prop);
+      const targetColumns = Array.isArray(columns) ? columns : this.option.column;
+      const targetProp = Array.isArray(columns) ? prop : columns;
+      return targetColumns.find(item => item.prop === targetProp) || null;
     },
     loadProvinceOptions() {
       getLazyTree(DEFAULT_COUNTRY_CODE).then(res => {
@@ -869,17 +871,12 @@ export default {
         type: 'warning',
       }).then(() => {
         NProgress.start();
-        exportBlob(
+        exportBlob('/blade-system/airport-master/export-airport-master', this.buildExportParams(), {
-          '/blade-system/airport-master/export-airport-master',
+          feedback: true,
-          this.buildExportParams(),
+        })
-          { feedback: true }
-        )
           .then(async res => {
             const blob = await addExcelRequiredHeaderMarks(res.data);
-            downloadXls(
+            downloadXls(blob, `空港机场主数据${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
-              blob,
-              `空港机场主数据${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
-            );
           })
           .finally(() => {
             NProgress.done();

src/views/base/cargo-type.vue

@@ -5,7 +5,7 @@
       :table-loading="loading"
       :data="data"
       v-model:page="page"
-      v-model:form="form"
+      v-model="form"
       ref="crud"
       :permission="permissionList"
       :before-open="beforeOpen"
@@ -22,7 +22,7 @@
     >
       <template #menu-left>
         <el-button type="primary" v-if="permission.cargo_type_add" @click="$refs.crud.rowAdd()">
-          <el-icon class="el-icon--left"><Plus /></el-icon>新增
+          <el-icon class="el-icon--left"><Plus /></el-icon>新建货物类型
         </el-button>
         <el-button type="primary" plain v-if="permission.cargo_type_import" @click="handleImport"
           ><el-icon class="el-icon--left"><Upload /></el-icon>批量导入</el-button
@@ -67,7 +67,7 @@
           :remote-method="loadParentOptions"
           :loading="parentLoading"
           :disabled="dialogType === 'view' || form.typeLevel !== 2"
-          placeholder="请输入名称或编码搜索"
+          placeholder="请输入"
           style="width: 100%"
           @change="handleParentChange"
         >
@@ -81,25 +81,23 @@
       </template>
 
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.cargo_type_view"
           @click="$refs.crud.rowView(row, index)"
         >
           查看
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.cargo_type_edit"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
+        </el-link>
-        <el-button type="primary" text v-if="permission.cargo_type_delete" @click="rowDel(row)">
+        <el-link type="primary" v-if="permission.cargo_type_delete" @click="rowDel(row)">
           删除
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
 
@@ -162,7 +160,7 @@ const CARGO_TYPE_FAIL_COL_WIDTH = {
 
 /**
  * 加工后端返回的导入失败明细 Excel：
- * - 「导入失败原因」列按 A. B. C. 编号列出，多条以分号隔开
+ * - 「导入失败原因」列按 1. 2. 3. 编号列出，多条以分号隔开
  * - 每个错误后追加对应规则说明，仅失败原因列标红
  * - 适当加宽各列、原因列自动换行，避免内容拥挤
  */
@@ -199,7 +197,7 @@ export const decorateCargoTypeFailDetail = async workbook => {
       .filter(Boolean);
     if (parts.length === 0) return;
     const decorated = parts.map((part, index) => {
-      const label = `${String.fromCharCode(65 + index)}.`; // A. B. C.
+      const label = `${index + 1}.`; // 1. 2. 3.
       const rule = CARGO_TYPE_FAIL_RULES.find(r => part.includes(r.match));
       if (rule) {
         // 规则说明若已包含在错误文本中则不再重复拼接
@@ -214,10 +212,10 @@ export const decorateCargoTypeFailDetail = async workbook => {
         row.getCell(remarkCol).value == null ? '' : row.getCell(remarkCol).value
       ).trim();
       if (remarkVal.length > 200 && !decorated.some(d => d.includes('备注不能超过200字'))) {
-        decorated.push(`${String.fromCharCode(65 + decorated.length)}.备注不能超过200字`);
+        decorated.push(`${decorated.length + 1}.备注不能超过200字`);
       }
     }
-    reasonCell.value = `第${rowNumber}行：${decorated.join('；')}`;
+    reasonCell.value = decorated.join('；');
     // 仅操作 G 列：黑色字体、无背景填充，其余列保持后端原样
     reasonCell.fill = { type: 'pattern', pattern: 'none' };
     reasonCell.font = { color: { argb: 'FF000000' } };
@@ -350,6 +348,11 @@ export default {
       const parent = this.parentOptions.find(item => String(item.id) === String(value));
       this.form.parentCargoName = parent ? parent.cargoName : '';
       this.form.parentCargoCode = parent ? parent.cargoCode || parent.code || '' : '';
+      if (parent) {
+        this.$nextTick(() => {
+          this.$refs.crud?.clearValidate?.(['parentId', 'parentCargoCode']);
+        });
+      }
       if (!parent) {
         this.form.cargoCode = '';
         return;
@@ -542,7 +545,10 @@ export default {
       });
     },
     buildExportParams() {
-      return { ...this.query };
+      return {
+        ...this.query,
+        ...(this.ids ? { ids: this.ids } : {}),
+      };
     },
     handleExport() {
       this.$confirm('是否导出货物类型数据?', '提示', {
@@ -566,16 +572,9 @@ export default {
     },
     handleTemplate() {
       NProgress.start();
-      // 直接下载工程内置的标准导入模板（public 目录静态资源），表头与可正常导入的模板一致，
+      exportBlob('/blade-system/cargo-type/export-template', {}, { feedback: true })
-      // 含一级（19 类）及全部二级示例，便于用户参照填写层级关系与编码规则
-      const templateUrl = `${import.meta.env.BASE_URL}cargo-type-import-template.xlsx`;
-      fetch(templateUrl)
         .then(res => {
-          if (!res.ok) throw new Error('模板文件不存在');
+          downloadXls(res.data, '货物类型导入模板.xlsx');
-          return res.blob();
-        })
-        .then(blob => {
-          downloadXls(blob, '货物类型导入模板.xlsx');
         })
         .catch(() => {
           this.$message.error('模板下载失败，请稍后重试');

src/views/base/common-address.vue

@@ -24,10 +24,9 @@
         <el-button
           type="primary"
           icon="el-icon-plus"
-          plain
           v-if="hasPermission('common_address_add')"
           @click="$refs.crud.rowAdd()"
-          >新增
+          >新建常用地址
         </el-button>
         <el-button
           type="primary"
@@ -54,30 +53,27 @@
       </template>
 
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_address_view')"
           @click="$refs.crud.rowView(row, index)"
         >
           查看
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_address_edit') && !row.readonly"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_address_delete') && !row.readonly"
           @click="rowDel(row)"
         >
           删除
-        </el-button>
+        </el-link>
       </template>
 
       <template #addressType-form>
@@ -191,7 +187,6 @@
           />
           <el-input
             v-model="form.detailAddress"
-            readonly
             maxlength="255"
             placeholder="点击后弹出地图组件"
             suffix-icon="el-icon-location"
@@ -392,10 +387,96 @@ export default {
         column.rules = rules;
       }
     },
+    setColumnSpan(prop, span) {
+      const column = this.findColumn(this.option.column, prop);
+      if (column) {
+        column.span = span;
+      }
+    },
+    setColumnRow(prop, row) {
+      const column = this.findColumn(this.option.column, prop);
+      if (column) {
+        column.row = row;
+      }
+    },
+    setColumnOrder(prop, order) {
+      const column = this.findColumn(this.option.column, prop);
+      if (column) {
+        column.order = order;
+      }
+    },
+    syncSourceFormLayout(addressType) {
+      const isPortTerminal = addressType === '港口/码头';
+      const isRailwayStation = addressType === '铁路车站';
+      const isAirport = addressType === '空港机场';
+      const isRegularAddress = addressType === '常规地址';
+      this.setColumnSpan(
+        'addressName',
+        isRegularAddress || isPortTerminal || isRailwayStation || isAirport ? 12 : 24
+      );
+      this.setColumnRow('addressName', true);
+      this.setColumnSpan('stationId', isRailwayStation ? 12 : 24);
+      this.setColumnSpan('airportId', isAirport ? 12 : 24);
+      this.setColumnRow('stationId', isRailwayStation);
+      this.setColumnRow('airportId', isAirport);
+      const formOrders = {
+        addressType: 100,
+        addressName: 70,
+        contactName: 60,
+        contactPhone: 50,
+        detailAddress: 40,
+        remark: 30,
+      };
+      if (isPortTerminal) {
+        Object.assign(formOrders, {
+          addressType: 80,
+          portId: 70,
+          terminalId: 60,
+          addressName: 50,
+          contactName: 40,
+          contactPhone: 30,
+          detailAddress: 20,
+          remark: 10,
+        });
+      } else if (isRailwayStation) {
+        Object.assign(formOrders, {
+          addressType: 80,
+          stationId: 70,
+          addressName: 60,
+          contactName: 50,
+          contactPhone: 40,
+          detailAddress: 30,
+          remark: 20,
+        });
+      } else if (isAirport) {
+        Object.assign(formOrders, {
+          addressType: 80,
+          airportId: 70,
+          addressName: 60,
+          contactName: 50,
+          contactPhone: 40,
+          detailAddress: 30,
+          remark: 20,
+        });
+      }
+      [
+        'addressType',
+        'portId',
+        'terminalId',
+        'stationId',
+        'airportId',
+        'addressName',
+        'contactName',
+        'contactPhone',
+        'detailAddress',
+        'remark',
+      ].forEach(prop => this.setColumnOrder(prop, formOrders[prop]));
+    },
     syncSourceColumnDisplay(addressType) {
       const isPortTerminal = addressType === '港口/码头';
       const isRailwayStation = addressType === '铁路车站';
       const isAirport = addressType === '空港机场';
+      this.syncSourceFormLayout(addressType);
       this.setColumnDisplay('portId', isPortTerminal);
       this.setColumnDisplay('terminalId', isPortTerminal);
       this.setColumnDisplay('stationId', isRailwayStation);
@@ -462,7 +543,9 @@ export default {
         status: 1,
       })
         .then(res => {
-          this.terminalOptions = this.normalizeSourceOptions(this.getRecords(res));
+          this.terminalOptions = this.normalizeSourceOptions(this.getRecords(res)).filter(item =>
+            this.sameId(item.parentId, this.form.portId)
+          );
         })
         .finally(() => {
           this.terminalLoading = false;
@@ -1184,6 +1267,17 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.common-address-page :deep(.avue-crud__dialog .avue-form__row),
+.common-address-page :deep(.avue-crud__dialog .el-row) {
+  margin-right: -16px;
+  margin-left: -16px;
+}
+
+.common-address-page :deep(.avue-crud__dialog .el-col) {
+  padding-right: 16px;
+  padding-left: 16px;
+}
+
 .common-address-page {
   &__map-address {
     display: flex;

src/views/base/currency.vue

@@ -68,22 +68,20 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.currency_edit"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.currency_status"
           @click="handleStatus(row)"
         >
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
 
@@ -172,7 +170,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 160,
+        menuWidth: 180,
         menuFixed: 'right',
         column: [
           {
@@ -205,6 +203,7 @@ export default {
           {
             label: '生效日期',
             prop: 'effectiveDate',
+            sortable: true,
             type: 'date',
             format: 'YYYY-MM-DD',
             valueFormat: 'YYYY-MM-DD',
@@ -226,6 +225,7 @@ export default {
           {
             label: '失效日期',
             prop: 'expiryDate',
+            sortable: true,
             type: 'date',
             format: 'YYYY-MM-DD',
             valueFormat: 'YYYY-MM-DD',
@@ -289,6 +289,7 @@ export default {
           {
             label: '更新时间',
             prop: 'updateTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',

src/views/base/customer-type.vue

@@ -36,22 +36,20 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.customer_type_edit"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.customer_type_status"
           @click="handleStatus(row)"
         >
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
     <empty-pagination
@@ -103,7 +101,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 160,
+        menuWidth: 180,
         column: [
           {
             label: '中文名称',
@@ -137,6 +135,7 @@ export default {
           {
             label: '更新时间',
             prop: 'updateTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -148,6 +147,7 @@ export default {
           {
             label: '创建时间',
             prop: 'createTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',

src/views/base/fee-item.vue

@@ -65,17 +65,16 @@
         </el-input>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.fee_item_edit"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
+        </el-link>
-        <el-button type="primary" text v-if="permission.fee_item_status" @click="handleStatus(row)">
+        <el-link type="primary" v-if="permission.fee_item_status" @click="handleStatus(row)">
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
 
@@ -142,7 +141,7 @@ export default {
         editBtn: false,
         selection: false,
         dialogClickModal: false,
-        menuWidth: 160,
+        menuWidth: 180,
         column: [
           {
             label: '费用类型',
@@ -215,6 +214,7 @@ export default {
           {
             label: '更新时间',
             prop: 'updateTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -226,6 +226,7 @@ export default {
           {
             label: '创建时间',
             prop: 'createTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',

src/views/base/port-terminal.vue

@@ -113,22 +113,20 @@
         </div>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('port_terminal_edit')"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('port_terminal_status')"
           @click="handleStatus(row)"
         >
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
       <template #cityCode-form>
         <el-select
@@ -231,7 +229,15 @@ import 'nprogress/nprogress.css';
 
 const DEFAULT_COUNTRY_CODE = '+86';
 const EXCLUDED_EXCEL_HEADERS = ['数据来源', '启停状态'];
-const REQUIRED_EXPORT_HEADERS = ['港口码头名称', '港口/码头名称', '类型', '国家', '城市', '经度', '纬度'];
+const REQUIRED_EXPORT_HEADERS = [
+  '港口码头名称',
+  '港口/码头名称',
+  '类型',
+  '国家',
+  '城市',
+  '经度',
+  '纬度',
+];
 
 const getExcelCellText = value => {
   if (value === undefined || value === null) return '';
@@ -258,9 +264,7 @@ const removeWorkbookColumnsByHeaders = workbook => {
         }
       });
       if (indexes.length) {
-        indexes
+        indexes.sort((a, b) => b - a).forEach(colNumber => worksheet.spliceColumns(colNumber, 1));
-          .sort((a, b) => b - a)
-          .forEach(colNumber => worksheet.spliceColumns(colNumber, 1));
         break;
       }
     }
@@ -383,15 +387,44 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 160,
+        menuWidth: 180,
         column: [
+          {
+            label: '编码',
+            prop: 'code',
+            search: true,
+            formslot: true,
+            width: 140,
+            span: 12,
+            order: 70,
+            placeholder: '请输入编码',
+            rules: [
+              { required: true, message: '请输入编码', trigger: 'blur' },
+              { validator: validateCode, trigger: 'blur' },
+            ],
+            change: ({ value }) => this.handleCodeChange(value),
+            blur: ({ value }) => this.handleCodeChange(value),
+          },
+          {
+            label: '港口/码头名称',
+            prop: 'name',
+            minWidth: 140,
+            search: true,
+            searchOrder: 7,
+            span: 12,
+            order: 80,
+            placeholder: '请输入',
+            rules: [{ required: true, message: '请输入港口/码头名称', trigger: 'blur' }],
+          },
           {
             label: '类型',
             prop: 'category',
             type: 'select',
             search: true,
+            searchOrder: 6,
             formslot: true,
             span: 24,
+            order: 100,
             dicData: [
               { label: '全部', value: '' },
               { label: '港口', value: '港口' },
@@ -411,6 +444,7 @@ export default {
             dicData: [],
             hide: true,
             span: 12,
+            order: 90,
             placeholder: '请选择',
             rules: [{ required: false, message: '请选择上级港口', trigger: 'change' }],
             change: ({ value }) => this.handleParentChange(value),
@@ -418,7 +452,7 @@ export default {
           {
             label: '上级港口',
             prop: 'parentName',
-            minWidth: 120,
+            minWidth: 140,
             slot: true,
             addDisplay: false,
             editDisplay: false,
@@ -434,39 +468,17 @@ export default {
             placeholder: '自动带出',
             rules: [{ required: false, message: '请选择上级港口', trigger: 'change' }],
           },
-          {
-            label: '港口/码头名称',
-            prop: 'name',
-            minWidth: 140,
-            search: true,
-            span: 12,
-            placeholder: '请输入',
-            rules: [{ required: true, message: '请输入港口/码头名称', trigger: 'blur' }],
-          },
-          {
-            label: '编码',
-            prop: 'code',
-            search: true,
-            formslot: true,
-            width: 140,
-            span: 12,
-            placeholder: '请输入编码',
-            rules: [
-              { required: true, message: '请输入编码', trigger: 'blur' },
-              { validator: validateCode, trigger: 'blur' },
-            ],
-            change: ({ value }) => this.handleCodeChange(value),
-            blur: ({ value }) => this.handleCodeChange(value),
-          },
           {
             label: '国家',
             prop: 'country',
             type: 'select',
             search: true,
+            searchOrder: 5,
             formslot: true,
             filterable: true,
             dicData: [],
             span: 12,
+            order: 60,
             minWidth: 140,
             overHidden: false,
             placeholder: '自动带出',
@@ -480,6 +492,7 @@ export default {
             formslot: true,
             hide: true,
             span: 12,
+            order: 50,
             placeholder: '自动带出',
             rules: [{ required: true, message: '请选择所属城市', trigger: 'change' }],
           },
@@ -488,6 +501,7 @@ export default {
             prop: 'city',
             type: 'select',
             search: true,
+            searchOrder: 4,
             filterable: true,
             dicData: [],
             addDisplay: false,
@@ -515,14 +529,44 @@ export default {
             prop: 'districtName',
             type: 'select',
             search: true,
+            searchOrder: 3,
             filterable: true,
             dicData: [],
             minWidth: 100,
+            hide: true,
             addDisplay: false,
             editDisplay: false,
           },
           {
-            label: '行政区划编号',
+            label: '经度',
+            prop: 'longitude',
+            formslot: true,
+            minWidth: 130,
+            span: 12,
+            order: 20,
+            placeholder: '请输入',
+            overHidden: false,
+            rules: [
+              { required: true, message: '请输入经度', trigger: 'blur' },
+              { validator: validateLongitude, trigger: 'blur' },
+            ],
+          },
+          {
+            label: '纬度',
+            prop: 'latitude',
+            formslot: true,
+            minWidth: 130,
+            span: 12,
+            order: 10,
+            placeholder: '请输入',
+            overHidden: false,
+            rules: [
+              { required: true, message: '请输入纬度', trigger: 'blur' },
+              { validator: validateLatitude, trigger: 'blur' },
+            ],
+          },
+          {
+            label: '行政区划编码',
             prop: 'regionCode',
             minWidth: 140,
             span: 12,
@@ -540,42 +584,18 @@ export default {
             span: 24,
             minWidth: 220,
             overHidden: false,
+            order: 30,
             placeholder: '请输入',
             maxlength: 255,
             showWordLimit: true,
             rules: [{ max: 255, message: '详细地址不能超过255字', trigger: 'blur' }],
           },
-          {
-            label: '经度',
-            prop: 'longitude',
-            formslot: true,
-            minWidth: 130,
-            span: 12,
-            placeholder: '请输入',
-            overHidden: false,
-            rules: [
-              { required: true, message: '请输入经度', trigger: 'blur' },
-              { validator: validateLongitude, trigger: 'blur' },
-            ],
-          },
-          {
-            label: '纬度',
-            prop: 'latitude',
-            formslot: true,
-            minWidth: 130,
-            span: 12,
-            placeholder: '请输入',
-            overHidden: false,
-            rules: [
-              { required: true, message: '请输入纬度', trigger: 'blur' },
-              { validator: validateLatitude, trigger: 'blur' },
-            ],
-          },
           {
             label: '数据来源',
             prop: 'dataSource',
             type: 'select',
             search: true,
+            searchOrder: 2,
             minWidth: 120,
             overHidden: false,
             addDisplay: false,
@@ -587,23 +607,6 @@ export default {
               { label: '手工导入', value: '手工导入' },
             ],
           },
-          {
-            label: '启停状态',
-            prop: 'status',
-            type: 'select',
-            search: true,
-            slot: true,
-            dataType: 'number',
-            minWidth: 110,
-            overHidden: false,
-            addDisplay: false,
-            editDisplay: false,
-            dicData: [
-              { label: '全部', value: '' },
-              { label: '启用', value: 1 },
-              { label: '停用', value: 2 },
-            ],
-          },
           {
             label: '备注',
             prop: 'remark',
@@ -626,6 +629,7 @@ export default {
           {
             label: '更新时间',
             prop: 'updateTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -636,14 +640,32 @@ export default {
           {
             label: '创建时间',
             prop: 'createTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
             addDisplay: false,
             editDisplay: false,
-            display: false,
             minWidth: 160,
           },
+          {
+            label: '状态',
+            prop: 'status',
+            type: 'select',
+            search: true,
+            searchOrder: 1,
+            slot: true,
+            dataType: 'number',
+            minWidth: 110,
+            overHidden: false,
+            addDisplay: false,
+            editDisplay: false,
+            dicData: [
+              { label: '全部', value: '' },
+              { label: '启用', value: 1 },
+              { label: '停用', value: 2 },
+            ],
+          },
         ],
       },
       excelOption: {
@@ -1272,19 +1294,14 @@ export default {
         type: 'warning',
       }).then(() => {
         NProgress.start();
-        exportBlob(
+        exportBlob('/blade-system/port-terminal/export-port-terminal', this.buildExportParams(), {
-          '/blade-system/port-terminal/export-port-terminal',
+          feedback: true,
-          this.buildExportParams(),
+        })
-          { feedback: true }
-        )
           .then(async res => {
             const blob = await removeExcelColumnsByHeaders(res.data, {
               markRequiredHeaders: true,
             });
-            downloadXls(
+            downloadXls(blob, `港口码头主数据${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
-              blob,
-              `港口码头主数据${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
-            );
           })
           .finally(() => {
             NProgress.done();

src/views/base/railway-station.vue

@@ -60,22 +60,20 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('railway_station_edit')"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('railway_station_status')"
           @click="handleStatus(row)"
         >
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
       <template #districtCode-form>
         <el-select
@@ -221,7 +219,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 160,
+        menuWidth: 180,
         column: [
           {
             label: '编码',
@@ -337,15 +335,6 @@ export default {
             addDisplay: false,
             editDisplay: false,
           },
-          {
-            label: '行政区划编号',
-            prop: 'regionCode',
-            minWidth: 160,
-            overHidden: false,
-            addDisplay: false,
-            editDisplay: false,
-            rules: [{ max: 32, message: '行政区划编码不能超过32字', trigger: 'blur' }],
-          },
           {
             label: '详细地址',
             prop: 'detailAddress',
@@ -375,20 +364,13 @@ export default {
             rules: [{ validator: validateLatitude, trigger: 'blur' }],
           },
           {
-            label: '数据来源',
+            label: '行政区划编号',
-            prop: 'dataSource',
+            prop: 'regionCode',
-            type: 'select',
+            minWidth: 160,
-            search: true,
-            minWidth: 120,
             overHidden: false,
             addDisplay: false,
             editDisplay: false,
-            dicData: [
+            rules: [{ max: 32, message: '行政区划编码不能超过32字', trigger: 'blur' }],
-              { label: '全部', value: '' },
-              { label: '初始化导入', value: '初始化导入' },
-              { label: '批量', value: '批量' },
-              { label: '手动', value: '手动' },
-            ],
           },
           {
             label: '启停状态',
@@ -429,6 +411,7 @@ export default {
           {
             label: '更新时间',
             prop: 'updateTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -440,6 +423,7 @@ export default {
           {
             label: '创建时间',
             prop: 'createTime',
+            sortable: true,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -448,6 +432,22 @@ export default {
             display: false,
             minWidth: 160,
           },
+          {
+            label: '数据来源',
+            prop: 'dataSource',
+            type: 'select',
+            search: true,
+            minWidth: 120,
+            overHidden: false,
+            addDisplay: false,
+            editDisplay: false,
+            dicData: [
+              { label: '全部', value: '' },
+              { label: '初始化导入', value: '初始化导入' },
+              { label: '批量', value: '批量' },
+              { label: '手动', value: '手动' },
+            ],
+          },
         ],
       },
       excelOption: {
@@ -507,8 +507,10 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
     },
-    findColumn(prop) {
+    findColumn(columns, prop) {
-      return this.option.column.find(item => item.prop === prop);
+      const targetColumns = Array.isArray(columns) ? columns : this.option.column;
+      const targetProp = Array.isArray(columns) ? prop : columns;
+      return targetColumns.find(item => item.prop === targetProp) || null;
     },
     loadProvinceOptions() {
       getLazyTree(DEFAULT_COUNTRY_CODE).then(res => {

src/views/base/region.vue

@@ -11,6 +11,37 @@
     </el-col>
     <el-col class="region-page__form-panel" :span="18">
       <basic-container>
+        <el-form class="region-page__search" :model="searchForm" inline>
+          <el-form-item label="区域编码">
+            <el-input v-model="searchForm.code" clearable placeholder="请输入区域编码" />
+          </el-form-item>
+          <el-form-item label="区域名称">
+            <el-input v-model="searchForm.name" clearable placeholder="请输入区域名称" />
+          </el-form-item>
+          <el-form-item label="区域层级">
+            <el-select v-model="searchForm.regionLevel" clearable placeholder="请选择区域层级">
+              <el-option label="省份" :value="1" />
+              <el-option label="省市" :value="2" />
+              <el-option label="区县" :value="3" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="数据来源">
+            <el-select v-model="searchForm.dataSource" clearable placeholder="请选择数据来源">
+              <el-option label="手动录入" value="手动录入" />
+              <el-option label="初始化导入" value="初始化导入" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="启停状态">
+            <el-select v-model="searchForm.status" clearable placeholder="请选择启停状态">
+              <el-option label="启用" :value="1" />
+              <el-option label="停用" :value="2" />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="region-page__search-actions">
+            <el-button type="primary" @click="handleSearch">搜索</el-button>
+            <el-button @click="handleSearchReset">清空</el-button>
+          </el-form-item>
+        </el-form>
         <el-button-group>
           <el-button
             v-if="permission.region_add"
@@ -136,14 +167,21 @@ export default {
       treeCode: '',
       treeParentCode: '',
       treeData: [],
+      searchForm: {
+        code: '',
+        name: '',
+        regionLevel: undefined,
+        dataSource: '',
+        status: undefined,
+      },
       parentOptions: [],
       syncLoading: false,
       treeOption: {
         nodeKey: 'id',
         lazy: true,
-        treeLoad: function (node, resolve) {
+        treeLoad: (node, resolve) => {
           const parentCode = node.level === 0 ? ROOT_PARENT_CODE : node.data.id;
-          getLazyTree(parentCode).then(res => {
+          getLazyTree(parentCode, this.searchForm).then(res => {
             resolve(
               res.data.data.map(item => {
                 return {
@@ -402,7 +440,7 @@ export default {
   methods: {
     initTree() {
       this.treeData = [];
-      getLazyTree(this.topCode).then(res => {
+      getLazyTree(this.topCode, this.searchForm).then(res => {
         this.treeData = res.data.data.map(item => {
           return {
             ...item,
@@ -411,6 +449,20 @@ export default {
         });
       });
     },
+    handleSearch() {
+      this.initTree();
+      this.regionForm = {};
+    },
+    handleSearchReset() {
+      this.searchForm = {
+        code: '',
+        name: '',
+        regionLevel: undefined,
+        dataSource: '',
+        status: undefined,
+      };
+      this.handleSearch();
+    },
     nodeClick(data) {
       this.setRegionColumnDisplay('code', true);
       this.treeCode = data.id;
@@ -624,20 +676,18 @@ export default {
         type: 'warning',
       }).then(() => {
         NProgress.start();
-        exportBlob(
+        exportBlob(`/blade-system/region/export-region?${this.website.tokenHeader}=${getToken()}`, {
-          `/blade-system/region/export-region?${this.website.tokenHeader}=${getToken()}`,
+          feedback: true,
-          { feedback: true }
+        }).then(res => {
-        ).then(res => {
           downloadXls(res.data, `行政区划数据${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
           NProgress.done();
         });
       });
     },
     handleTemplate() {
-      exportBlob(
+      exportBlob(`/blade-system/region/export-template?${this.website.tokenHeader}=${getToken()}`, {
-        `/blade-system/region/export-template?${this.website.tokenHeader}=${getToken()}`,
+        feedback: true,
-        { feedback: true }
+      }).then(res => {
-      ).then(res => {
         downloadXls(res.data, '行政区划模板.xlsx');
       });
     },

src/views/business/common-cargo.vue

@@ -24,10 +24,9 @@
         <el-button
           type="primary"
           icon="el-icon-plus"
-          plain
           v-if="hasPermission('common_cargo_add')"
           @click="$refs.crud.rowAdd()"
-          >新增
+          >新建常用货物
         </el-button>
         <el-button
           type="primary"
@@ -113,7 +112,7 @@
           clearable
           maxlength="20"
           show-word-limit
-          placeholder="请输入货物编号"
+          placeholder="请输入"
           :disabled="dialogReadonly || dialogType === 'edit'"
           @input="handleCargoCodeInput"
         />
@@ -144,31 +143,32 @@
         </div>
       </template>
 
+      <template #packageBrand="{ row }">
+        {{ [row.packageType, row.brand].filter(Boolean).join(' / ') || '-' }}
+      </template>
+
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_cargo_view')"
           @click="$refs.crud.rowView(row, index)"
         >
           查看
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_cargo_edit') && !row.readonly"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_cargo_delete') && !row.readonly"
           @click="rowDel(row)"
         >
           删除
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
 
@@ -195,6 +195,7 @@
 import * as api from '@/api/business/common-cargo';
 import { getList as getCargoTypeList } from '@/api/base/cargo-type';
 import { exportBlob } from '@/api/common';
+import { getDeptTree } from '@/api/system/dept';
 import { config, excelOption, option } from '@/option/business/common-cargo';
 import { priceUnitOptions } from '@/option/business/common';
 import { getToken } from '@/utils/auth';
@@ -224,6 +225,7 @@ export default {
       secondCargoTypeLoading: false,
       firstCargoTypeOptions: [],
       secondCargoTypeOptions: [],
+      deptOptions: [],
       page: {
         pageSize: 10,
         pageSizes: [10, 20, 50, 100],
@@ -250,6 +252,9 @@ export default {
       return this.selectionList.map(item => item.id).join(',');
     },
   },
+  created() {
+    this.initDeptTree();
+  },
   methods: {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
@@ -259,6 +264,28 @@ export default {
       if (Array.isArray(data)) return data;
       return (data && data.records) || [];
     },
+    initDeptTree() {
+      getDeptTree(this.userInfo.tenantId).then(res => {
+        this.deptOptions = this.flattenDept(res.data.data || []);
+        const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
+        if (deptColumn) {
+          deptColumn.dicData = this.deptOptions;
+        }
+      });
+    },
+    flattenDept(tree, level = 0) {
+      const result = [];
+      tree.forEach(item => {
+        result.push({
+          label: `${'　'.repeat(level)}${item.title || item.deptName || item.name}`,
+          value: item.id,
+        });
+        if (item.children && item.children.length) {
+          result.push(...this.flattenDept(item.children, level + 1));
+        }
+      });
+      return result;
+    },
     normalizeCargoTypeOptions(list = []) {
       return list
         .map(item => ({
@@ -322,11 +349,12 @@ export default {
       const second = this.secondCargoTypeOptions.find(item => item.cargoCode === value);
       this.form.secondCargoTypeName = second ? second.cargoName : '';
       this.form.secondCargoTypeCode = second ? second.cargoCode : '';
+      this.form.cargoCode = second ? String(second.cargoCode).slice(0, 4) : '';
       this.syncCargoCodePrefix();
     },
     getCargoCodePrefix() {
-      return this.form.secondCargoTypeCode && this.form.firstCargoTypeCode
+      return this.form.secondCargoTypeCode
-        ? this.form.firstCargoTypeCode
+        ? String(this.form.secondCargoTypeCode).slice(0, 4)
         : '';
     },
     syncCargoCodePrefix() {
@@ -386,13 +414,13 @@ export default {
         return false;
       }
       const cargoCode = String(row.cargoCode || '');
-      const prefix = row.firstCargoTypeCode;
+      const prefix = String(row.secondCargoTypeCode || '').slice(0, 4);
       if (!cargoCode || cargoCode === prefix) {
         this.$message.warning('请输入货物编号');
         return false;
       }
       if (!cargoCode.startsWith(prefix)) {
-        this.$message.warning('货物编号需拼接一级货物类型编号在前面');
+        this.$message.warning('货物编号需拼接二级货物类型编号在前面');
         return false;
       }
       if (cargoCode.length > 20) {

src/views/business/common-route.vue

@@ -24,10 +24,25 @@
         <el-button
           type="primary"
           icon="el-icon-plus"
-          plain
           v-if="hasPermission('common_route_add')"
           @click="$refs.crud.rowAdd()"
-          >新增
+          >新建路线
+        </el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-upload"
+          plain
+          v-if="config.importUrl && hasPermission('common_route_import')"
+          @click="handleImport"
+          >批量导入
+        </el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-download"
+          plain
+          v-if="config.templateUrl && hasPermission('common_route_template')"
+          @click="handleTemplate"
+          >下载模板
         </el-button>
         <el-button
           type="primary"
@@ -57,10 +72,10 @@
           />
           <el-input
             v-model="form.departureAddress"
-            readonly
             placeholder="请输入并选择地址"
             suffix-icon="el-icon-location"
             :disabled="dialogReadonly"
+            @click="openRouteMapDialog('departure')"
           />
           <el-tooltip content="选择常用地址" placement="top">
             <el-button
@@ -84,10 +99,10 @@
           />
           <el-input
             v-model="form.arrivalAddress"
-            readonly
             placeholder="请输入并选择地址"
             suffix-icon="el-icon-location"
             :disabled="dialogReadonly"
+            @click="openRouteMapDialog('arrival')"
           />
           <el-tooltip content="选择常用地址" placement="top">
             <el-button
@@ -102,30 +117,27 @@
       </template>
 
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_route_view')"
           @click="$refs.crud.rowView(row, index)"
         >
           查看
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_route_edit') && !row.readonly"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_route_delete') && !row.readonly"
           @click="rowDel(row)"
         >
           删除
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
 
@@ -136,6 +148,16 @@
       @load="onLoad(page, query)"
     />
 
+    <el-dialog :title="`${config.title}导入`" append-to-body v-model="excelBox" width="555px">
+      <avue-form :option="excelOptionConfig" v-model="excelForm">
+        <template #excelTemplate>
+          <el-button type="primary" @click="handleTemplate">
+            点击下载<i class="el-icon-download el-icon--right"></i>
+          </el-button>
+        </template>
+      </avue-form>
+    </el-dialog>
+
     <el-dialog
       title="选择常用地址"
       append-to-body
@@ -144,6 +166,7 @@
       class="common-route-page__address-dialog"
       @opened="loadAddressList"
     >
+      <section-card title="查询条件">
         <div class="common-route-page__address-search">
           <el-form :model="addressQuery" label-position="right" label-width="86px">
             <el-row :gutter="16">
@@ -199,7 +222,9 @@
             </el-row>
           </el-form>
         </div>
+      </section-card>
 
+      <section-card title="常用地址">
         <el-table
           border
           :data="addressData"
@@ -220,7 +245,7 @@
           <el-table-column prop="detailAddress" label="详细地址" min-width="220" />
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="{ row }">
-            <el-button type="primary" text @click.stop="selectAddressRow(row)">选择</el-button>
+              <el-link type="primary" @click.stop="selectAddressRow(row)">选择</el-link>
             </template>
           </el-table-column>
         </el-table>
@@ -236,10 +261,52 @@
             @current-change="handleAddressCurrentChange"
           />
         </div>
+      </section-card>
 
       <template #footer>
         <el-button @click="addressDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="confirmAddressPick">确认</el-button>
+      </template>
+    </el-dialog>
+
+    <el-dialog
+      title="地图选择地址"
+      append-to-body
+      v-model="routeMapVisible"
+      width="920px"
+      @opened="initRouteAmap"
+    >
+      <div class="common-route-page__map-toolbar">
+        <el-input
+          v-model="routeMapKeyword"
+          clearable
+          placeholder="输入地址关键词"
+          @keyup.enter="searchRouteMapKeyword"
+        />
+        <el-button
+          type="primary"
+          :icon="Search"
+          :loading="routeMapLoading"
+          @click="searchRouteMapKeyword"
+        >
+          搜索
+        </el-button>
+      </div>
+      <div ref="routeAmap" class="common-route-page__map"></div>
+      <div class="common-route-page__map-info">
+        <span>{{ routeMapStatus }}</span>
+        <span v-if="routeMapSelected.regionName"
+          >发货/收货地：{{ routeMapSelected.regionName }}</span
+        >
+      </div>
+      <template #footer>
+        <el-button @click="routeMapVisible = false">取消</el-button>
+        <el-button
+          type="primary"
+          :disabled="!routeMapSelected.longitude"
+          @click="confirmRouteMapPick"
+        >
+          确定
+        </el-button>
       </template>
     </el-dialog>
   </basic-container>
@@ -251,18 +318,24 @@ import { getList as getCommonAddressList } from '@/api/base/common-address';
 import { exportBlob } from '@/api/common';
 import { getDeptTree } from '@/api/system/dept';
 import { addressTypeOptions } from '@/option/base/common-address';
-import { config, option } from '@/option/business/common-route';
+import { config, excelOption, option } from '@/option/business/common-route';
 import { getToken } from '@/utils/auth';
+import { openImportDialog } from '@/utils/import-excel';
 import { downloadXls } from '@/utils/util';
-import { List } from '@element-plus/icons-vue';
+import { List, Search } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
+const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
+const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
+let amapLoader;
+
 export default {
   data() {
     return {
       List,
+      Search,
       config,
       option,
       form: {},
@@ -270,13 +343,24 @@ export default {
       loading: true,
       data: [],
       dialogReadonly: false,
+      excelBox: false,
+      excelForm: {},
+      excelOptionConfig: excelOption,
       addressTypeOptions,
       addressDialogVisible: false,
       addressTarget: '',
       addressQuery: {},
       addressData: [],
       addressLoading: false,
-      addressSelected: null,
+      routeMapVisible: false,
+      routeMapTarget: '',
+      routeMapLoading: false,
+      routeMapKeyword: '',
+      routeMapStatus: '可搜索地址或点击地图选点',
+      routeMapSelected: {},
+      routeAmap: null,
+      routeAmapMarker: null,
+      routeAmapGeocoder: null,
       deptOptions: [],
       page: {
         pageSize: 10,
@@ -318,9 +402,22 @@ export default {
     },
     initDeptTree() {
       getDeptTree(this.userInfo.tenantId).then(res => {
-        this.deptOptions = this.flattenDept(res.data.data || []);
+        const deptTree = res.data.data || [];
+        this.deptOptions = this.flattenDept(deptTree);
+        const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
+        if (deptColumn) {
+          deptColumn.dicData = this.buildDeptTree(deptTree);
+        }
       });
     },
+    buildDeptTree(tree) {
+      return tree.map(item => ({
+        label: item.title || item.deptName || item.name,
+        value: item.id,
+        children:
+          item.children && item.children.length ? this.buildDeptTree(item.children) : undefined,
+      }));
+    },
     flattenDept(tree, level = 0) {
       const result = [];
       tree.forEach(item => {
@@ -348,7 +445,6 @@ export default {
     openAddressDialog(target) {
       if (this.dialogReadonly) return;
       this.addressTarget = target;
-      this.addressSelected = null;
       this.addressPage.currentPage = 1;
       this.resetAddressQuery();
       this.addressDialogVisible = true;
@@ -387,14 +483,8 @@ export default {
         });
     },
     selectAddressRow(row) {
-      this.addressSelected = row;
+      if (!row) return;
-    },
+      this.applyAddress(this.addressTarget, row);
-    confirmAddressPick() {
-      if (!this.addressSelected) {
-        this.$message.warning('请选择常用地址');
-        return;
-      }
-      this.applyAddress(this.addressTarget, this.addressSelected);
       this.addressDialogVisible = false;
     },
     applyAddress(target, address) {
@@ -412,6 +502,246 @@ export default {
       this.form[`${prefix}Contact`] = address.contactName || this.form[`${prefix}Contact`] || '';
       this.form[`${prefix}Phone`] = address.contactPhone || this.form[`${prefix}Phone`] || '';
     },
+    openRouteMapDialog(target) {
+      if (this.dialogReadonly) return;
+      const prefix = target === 'departure' ? 'departure' : 'arrival';
+      this.routeMapTarget = prefix;
+      this.routeMapKeyword = this.form[`${prefix}Address`] || this.form[`${prefix}Name`] || '';
+      this.routeMapSelected = this.buildRouteMapSelection({
+        lng: this.form[`${prefix}Longitude`],
+        lat: this.form[`${prefix}Latitude`],
+        address: this.form[`${prefix}Address`],
+        regionName: this.form[`${prefix}Name`],
+      });
+      this.routeMapStatus = this.routeMapSelected.longitude
+        ? '已加载当前选点，可重新选点'
+        : '可搜索地址或点击地图选点';
+      this.routeMapVisible = true;
+    },
+    loadAmap() {
+      if (window.AMap && window.AMap.Map) {
+        return Promise.resolve();
+      }
+      if (!amapLoader) {
+        amapLoader = new Promise((resolve, reject) => {
+          window._AMapSecurityConfig = {
+            securityJsCode: AMAP_SECURITY_CODE,
+          };
+          const script = document.createElement('script');
+          script.src = `https://webapi.amap.com/maps?v=2.0&key=${AMAP_KEY}`;
+          script.async = true;
+          script.onload = resolve;
+          script.onerror = () => reject(new Error('高德地图组件加载失败'));
+          document.body.appendChild(script);
+        });
+      }
+      return amapLoader;
+    },
+    initRouteAmap() {
+      this.loadAmap()
+        .then(() => {
+          this.$nextTick(() => {
+            if (!this.routeAmap) {
+              const center = this.toLngLat(
+                this.routeMapSelected.longitude || 116.40769,
+                this.routeMapSelected.latitude || 39.89945
+              );
+              this.routeAmap = new window.AMap.Map(this.$refs.routeAmap, {
+                center,
+                zoom: this.routeMapSelected.longitude ? 14 : 11,
+              });
+              window.AMap.plugin(['AMap.ToolBar', 'AMap.Geocoder'], () => {
+                this.routeAmap.addControl(new window.AMap.ToolBar());
+                if (!this.routeAmapGeocoder) {
+                  this.routeAmapGeocoder = new window.AMap.Geocoder();
+                }
+              });
+              this.routeAmap.on('click', event => this.pickRouteMapPoint(event.lnglat));
+            } else if (typeof this.routeAmap.resize === 'function') {
+              this.routeAmap.resize();
+            }
+            if (this.routeMapSelected.longitude) {
+              this.renderRouteMapMarker(
+                this.toLngLat(this.routeMapSelected.longitude, this.routeMapSelected.latitude)
+              );
+            }
+          });
+        })
+        .catch(() => {
+          this.$message.error('高德地图组件加载失败，请稍后重试或重新打开弹窗');
+          this.routeMapVisible = false;
+        });
+    },
+    searchRouteMapKeyword() {
+      const keyword = String(this.routeMapKeyword || '').trim();
+      if (!keyword) {
+        this.$message.warning('请输入地址关键词');
+        return;
+      }
+      this.loadAmap()
+        .then(() => {
+          this.routeMapLoading = true;
+          return this.ensureRouteAmapGeocoder();
+        })
+        .then(() => this.runAmapGeocode('location', keyword))
+        .then(result => {
+          const point = this.resolveMapPoint(result);
+          if (!point) {
+            this.routeMapStatus = '未找到匹配地址';
+            this.$message.warning('地图搜索无匹配地址');
+            return;
+          }
+          this.pickRouteMapPoint(point, keyword);
+        })
+        .catch(() => {
+          this.routeMapStatus = '地图搜索失败';
+          this.$message.error('地图搜索失败，请稍后重试');
+        })
+        .finally(() => {
+          this.routeMapLoading = false;
+        });
+    },
+    pickRouteMapPoint(lnglat, keyword) {
+      const longitude = this.getPointLng(lnglat);
+      const latitude = this.getPointLat(lnglat);
+      if (longitude === undefined || latitude === undefined) {
+        this.$message.warning('选点坐标无效');
+        return;
+      }
+      const point = this.toLngLat(longitude, latitude);
+      this.renderRouteMapMarker(point);
+      this.routeMapSelected = this.buildRouteMapSelection({
+        lng: longitude,
+        lat: latitude,
+        address: keyword,
+      });
+      this.routeMapStatus = '正在反查地址...';
+      this.ensureRouteAmapGeocoder()
+        .then(() => this.runAmapGeocode('address', point))
+        .then(result => {
+          const address = this.resolveMapAddress(result);
+          this.routeMapSelected = {
+            ...this.routeMapSelected,
+            detailAddress: address.detailAddress || this.routeMapSelected.detailAddress,
+            regionName: address.regionName || this.routeMapSelected.regionName,
+          };
+          this.routeMapKeyword = this.routeMapSelected.detailAddress || this.routeMapKeyword;
+          this.routeMapStatus = this.routeMapSelected.detailAddress || '已选点，可确认回填';
+        })
+        .catch(() => {
+          this.routeMapStatus = '反查地址失败';
+          this.$message.error('反查地址失败，请重新选点');
+        });
+    },
+    renderRouteMapMarker(point) {
+      if (!this.routeAmap || !window.AMap) return;
+      if (this.routeAmapMarker) {
+        this.routeAmapMarker.setMap(null);
+      }
+      this.routeAmapMarker = new window.AMap.Marker({ position: point });
+      this.routeAmapMarker.setMap(this.routeAmap);
+      this.routeAmap.setCenter(point);
+    },
+    confirmRouteMapPick() {
+      if (!this.routeMapSelected.longitude) {
+        this.$message.warning('请先搜索或点击地图完成选点');
+        return;
+      }
+      const prefix = this.routeMapTarget;
+      this.form[`${prefix}Address`] =
+        this.routeMapSelected.detailAddress || this.form[`${prefix}Address`];
+      this.form[`${prefix}Name`] = this.routeMapSelected.regionName || this.form[`${prefix}Name`];
+      this.form[`${prefix}Longitude`] = this.routeMapSelected.longitude;
+      this.form[`${prefix}Latitude`] = this.routeMapSelected.latitude;
+      this.routeMapVisible = false;
+      this.$refs.crud?.validateField?.(`${prefix}Address`);
+    },
+    buildRouteMapSelection({ lng, lat, address, regionName }) {
+      return {
+        longitude: this.formatCoordinate(lng),
+        latitude: this.formatCoordinate(lat),
+        detailAddress: address || '',
+        regionName: regionName || '',
+      };
+    },
+    formatCoordinate(value) {
+      if (value === undefined || value === null || value === '') return '';
+      const numberValue = Number(value);
+      return Number.isFinite(numberValue) ? numberValue.toFixed(6) : '';
+    },
+    toLngLat(lng, lat) {
+      return new window.AMap.LngLat(Number(lng), Number(lat));
+    },
+    getPointLng(point) {
+      if (!point) return undefined;
+      if (typeof point.getLng === 'function') return point.getLng();
+      return point.lng ?? point.lon;
+    },
+    getPointLat(point) {
+      if (!point) return undefined;
+      if (typeof point.getLat === 'function') return point.getLat();
+      return point.lat;
+    },
+    ensureRouteAmapGeocoder() {
+      if (this.routeAmapGeocoder) return Promise.resolve(this.routeAmapGeocoder);
+      return new Promise((resolve, reject) => {
+        if (!window.AMap || !window.AMap.plugin) {
+          reject(new Error('高德地图组件未就绪'));
+          return;
+        }
+        window.AMap.plugin(['AMap.Geocoder'], () => {
+          try {
+            this.routeAmapGeocoder = new window.AMap.Geocoder();
+            resolve(this.routeAmapGeocoder);
+          } catch (error) {
+            reject(error);
+          }
+        });
+      });
+    },
+    runAmapGeocode(action, input) {
+      return new Promise((resolve, reject) => {
+        const timer = window.setTimeout(() => {
+          reject(new Error('高德地图请求超时'));
+        }, 10000);
+        const done = (status, result) => {
+          window.clearTimeout(timer);
+          if (status === 'complete' && result) {
+            resolve(result);
+            return;
+          }
+          reject(new Error('高德地图请求失败'));
+        };
+        try {
+          if (action === 'location') {
+            this.routeAmapGeocoder.getLocation(input, done);
+          } else {
+            this.routeAmapGeocoder.getAddress(input, done);
+          }
+        } catch (error) {
+          window.clearTimeout(timer);
+          reject(error);
+        }
+      });
+    },
+    resolveMapPoint(result) {
+      if (!result) return null;
+      const geocode = Array.isArray(result.geocodes) ? result.geocodes[0] : null;
+      if (geocode && geocode.location) return geocode.location;
+      if (result.location) return result.location;
+      if (result.lnglat) return result.lnglat;
+      if (result.getLng || result.lng || result.lon) return result;
+      return null;
+    },
+    resolveMapAddress(result = {}) {
+      const regeocode = result.regeocode || {};
+      const component = regeocode.addressComponent || {};
+      const city = Array.isArray(component.city) ? '' : component.city;
+      return {
+        detailAddress: regeocode.formattedAddress || '',
+        regionName: [component.province, city, component.district].filter(Boolean).join(''),
+      };
+    },
     normalizeRow(row) {
       const submitRow = { ...row };
       Object.keys(submitRow).forEach(key => {
@@ -621,6 +951,27 @@ export default {
           });
       });
     },
+    handleTemplate() {
+      NProgress.start();
+      exportBlob(
+        config.templateUrl,
+        {
+          [this.website.tokenHeader]: getToken(),
+        },
+        { feedback: true }
+      )
+        .then(res => {
+          downloadXls(res.data, `${config.title}模板.xlsx`);
+        })
+        .finally(() => {
+          NProgress.done();
+        });
+    },
+    handleImport() {
+      const column = this.excelOptionConfig.column.find(item => item.prop === 'excelFile');
+      column.action = config.importUrl;
+      openImportDialog(this, config.title, () => this.onLoad(this.page, this.query));
+    },
   },
 };
 </script>
@@ -662,5 +1013,31 @@ export default {
     justify-content: flex-end;
     margin-top: 14px;
   }
+
+  &__map-toolbar {
+    display: flex;
+    gap: 8px;
+    margin-bottom: 12px;
+
+    .el-input {
+      flex: 1;
+      min-width: 0;
+    }
+  }
+
+  &__map {
+    width: 100%;
+    height: 420px;
+    border: 1px solid #eff1f7;
+  }
+
+  &__map-info {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 12px;
+    margin-top: 10px;
+    color: #606266;
+    line-height: 1.6;
+  }
 }
 </style>

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

@@ -0,0 +1,167 @@
+<template>
+  <el-dialog v-model="visible" title="导入运单" width="90%" append-to-body destroy-on-close>
+    <div class="waybill-import-toolbar">
+      <div class="waybill-import-toolbar__search">
+        <el-form :inline="true" :model="query" label-width="auto">
+          <el-form-item label="运单批次号"><el-input v-model="query.batchNo" clearable /></el-form-item>
+          <el-form-item label="承运商"><el-select v-model="query.carrierId" clearable filterable><el-option v-for="item in carriers" :key="item.id" :label="item.name" :value="item.id" /></el-select></el-form-item>
+          <el-form-item label="创建时间"><el-date-picker v-model="query.createTimeRange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" /></el-form-item>
+          <el-form-item label="创建人"><el-select v-model="query.createUser" clearable filterable><el-option v-for="item in creators" :key="item.id" :label="item.name" :value="item.id" /></el-select></el-form-item>
+        </el-form>
+        <div class="waybill-import-toolbar__search-actions"><el-button type="primary" @click="loadBatches">查询</el-button><el-button @click="resetQuery">重置</el-button></div>
+      </div>
+      <div class="waybill-import-toolbar__actions"><el-button type="primary" @click="openCreate">新建导入</el-button><el-button type="danger" plain :disabled="!selected.length" @click="removeBatches">批量删除</el-button></div>
+    </div>
+    <el-table :data="batches" border @selection-change="selected = $event">
+      <el-table-column type="selection" width="50" /><el-table-column type="index" label="序号" width="70" />
+      <el-table-column prop="batchNo" label="运单批次号" min-width="150" /><el-table-column prop="projectName" label="项目名称" min-width="150" />
+      <el-table-column prop="carrierName" label="承运商" min-width="140" /><el-table-column prop="carrierType" label="承运类型" min-width="120" />
+      <el-table-column prop="waybillCount" label="运单数" width="90" /><el-table-column prop="importTypeName" label="导入方式" width="100" />
+      <el-table-column prop="createTime" label="创建时间" min-width="170"  sortable/><el-table-column prop="updateTime" label="更新时间" min-width="170"  sortable/>
+      <el-table-column prop="statusName" label="状态" width="100" /><el-table-column label="操作" width="180" fixed="right">
+        <template #default="{ row }"><el-link type="primary" @click="openDetail(row)">查看</el-link><el-link type="primary" @click="editBatch(row)">编辑</el-link><el-link type="danger" @click="removeBatch(row)">删除</el-link></template>
+      </el-table-column>
+    </el-table>
+    <el-pagination v-model:current-page="page.current" v-model:page-size="page.size" layout="total, prev, pager, next, sizes" :page-sizes="[10, 20, 50]" :total="page.total" @current-change="loadBatches" @size-change="loadBatches" />
+  </el-dialog>
+
+  <el-dialog v-model="detailVisible" title="导入运单详情" width="90%" append-to-body>
+    <el-form :inline="true" :model="detailQuery"><el-form-item label="车牌号/船号"><el-input v-model="detailQuery.vehicleNo" clearable /></el-form-item><el-form-item label="货物名称"><el-input v-model="detailQuery.cargoName" clearable /></el-form-item><el-button type="primary" @click="loadDetails">查询</el-button></el-form>
+    <el-table :data="details" border><el-table-column type="index" label="序号" width="65" /><el-table-column prop="batchNo" label="运单批次号" min-width="140" /><el-table-column prop="originalNo" label="原始单号" min-width="130" /><el-table-column prop="vehicleNo" label="车牌号/航班号/船号/班列号" min-width="190" /><el-table-column prop="driverName" label="司机/船长" min-width="120" /><el-table-column prop="transportType" label="运输类型" width="110" /><el-table-column prop="cargoName" label="货物名称" width="130" /><el-table-column prop="cargoType" label="货物类型" width="120" /><el-table-column prop="quantity" label="重量" width="90" /><el-table-column prop="departureAddress" label="发货地址" min-width="220" show-overflow-tooltip /><el-table-column prop="departureContact" label="发货联系人" width="110" /><el-table-column prop="departurePhone" label="发货联系人电话" width="140" /><el-table-column prop="arrivalAddress" label="到货地址" min-width="220" show-overflow-tooltip /><el-table-column prop="arrivalContact" label="收货联系人" width="110" /><el-table-column prop="arrivalPhone" label="收货联系人电话" width="140" /><el-table-column prop="startDate" label="开始时间" width="160"  sortable/><el-table-column prop="endDate" label="结束时间" width="160"  sortable/><el-table-column prop="unitPrice" label="单价" width="90" /><el-table-column prop="freight" label="运费" width="100" /><el-table-column prop="otherFeeTotal" label="其他费用合计" width="120" /><el-table-column prop="freightTotal" label="运费合计" width="100" /><el-table-column prop="remark" label="备注" min-width="160" /><el-table-column label="操作" width="80">-</el-table-column></el-table>
+    <el-pagination v-model:current-page="detailPage.current" v-model:page-size="detailPage.size" layout="total, prev, pager, next, sizes" :page-sizes="[10, 20, 50]" :total="detailPage.total" @current-change="loadDetails" @size-change="loadDetails" />
+  </el-dialog>
+
+  <el-dialog v-model="createVisible" title="新建导入" width="85%" append-to-body destroy-on-close class="waybill-import-create">
+    <section class="waybill-import-create__form-panel">
+      <el-form ref="formRef" :model="form" :rules="rules" label-position="right" label-width="auto">
+        <el-row :gutter="20"><el-col :span="6"><el-form-item label="项目" prop="projectId"><el-select v-model="form.projectId" filterable clearable placeholder="模糊查询后选择" @change="projectChange"><el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="客户" prop="customerName"><el-input v-model="form.customerName" disabled placeholder="自动带出" /></el-form-item></el-col><el-col :span="6"><el-form-item label="客户合同" prop="contractId"><el-select v-model="form.contractId" filterable clearable placeholder="自动带出"><el-option v-for="item in contracts" :key="item.id" :label="item.contractName" :value="item.id" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="承运类型" prop="carrierType"><el-select v-model="form.carrierType"><el-option label="承运商" value="承运商" /><el-option label="自运" value="自运" /><el-option label="网货平台" value="网货平台" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="承运商"><el-select v-model="form.carrierIds" multiple filterable placeholder="自动带出，多个需选择"><el-option v-for="item in carriers" :key="item.id" :label="item.name" :value="item.id" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="导入状态" prop="status"><el-select v-model="form.status"><el-option label="完成" value="completed" /><el-option label="进行中" value="processing" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="导入类型" prop="importType"><el-select v-model="form.importType"><el-option label="运单" value="waybill" /><el-option label="结算单" value="settlement" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="发货计划"><el-select v-model="form.planId" clearable filterable placeholder="请选择"><el-option v-for="item in plans" :key="item.id" :label="item.planName" :value="item.id" /></el-select></el-form-item></el-col></el-row>
+        <el-form-item label="运单明细表" prop="file"><el-upload action="#" accept=".xls,.xlsx" :auto-upload="false" :limit="1" :file-list="files" :on-change="fileChange" :on-remove="fileRemove"><el-button type="primary">添加附件</el-button></el-upload><span class="waybill-import-create__file-tip">请上传运单明细表，仅支持 excel 格式</span><el-link type="primary" @click="downloadTemplate">下载模板</el-link></el-form-item>
+      </el-form>
+      <div class="waybill-import-create__form-actions"><el-button @click="createVisible = false">关闭</el-button><el-button @click="saveDraft">保存草稿</el-button><el-button type="primary" @click="confirmImport">确认导入</el-button></div>
+    </section>
+    <section class="waybill-import-create__detail-panel" v-if="rows.length"><div class="waybill-import-create__detail-head"><div class="dialog-section-title">导入数据明细</div><el-button type="danger" plain :disabled="!rowSelection.length" @click="removeSelectedRows">批量删除</el-button></div><el-tabs v-model="previewTab"><el-tab-pane :label="`运单数（${rows.length}）`" name="all" /><el-tab-pane :label="`疑似重复（${duplicateRows.length}）`" name="duplicate" /></el-tabs><el-table :data="previewRows" border max-height="440" @selection-change="rowSelection = $event"><el-table-column type="selection" width="55" /><el-table-column type="index" label="序号" width="65" /><el-table-column v-for="column in detailColumns" :key="column.prop" :prop="column.prop" :label="column.label" min-width="140" show-overflow-tooltip /><el-table-column label="操作" width="180" fixed="right"><template #default="{ row }"><el-link type="primary" @click="cancelRow(row)">取消</el-link><el-link type="primary" @click="saveRow(row)">保存</el-link><el-link type="primary" @click="editRow(row)">编辑</el-link><el-link type="danger" @click="deleteRow(row)">删除</el-link></template></el-table-column></el-table></section>
+  </el-dialog>
+</template>
+
+<script setup>
+import { computed, reactive, ref } from 'vue';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { getList as getProjectList } from '@/api/business/project-apply';
+import * as api from '@/api/business/waybill-manage';
+import { downloadXls } from '@/utils/util';
+
+const props = defineProps({ modelValue: Boolean });
+const emit = defineEmits(['update:modelValue']);
+const visible = computed({ get: () => props.modelValue, set: value => emit('update:modelValue', value) });
+const createVisible = ref(false), detailVisible = ref(false), formRef = ref();
+const query = reactive({ batchNo: '', carrierId: '', createUser: '', createTimeRange: [] });
+const detailQuery = reactive({ vehicleNo: '', cargoName: '' });
+const form = reactive({ projectId: '', customerName: '', contractId: '', carrierType: '承运商', carrierIds: [], status: 'completed', importType: 'waybill', planId: '', file: null });
+const rules = { projectId: [{ required: true, message: '请选择项目' }], customerName: [{ required: true, message: '客户不能为空' }], contractId: [{ required: true, message: '请选择客户合同' }], carrierType: [{ required: true, message: '请选择承运类型' }], status: [{ required: true, message: '请选择导入状态' }], importType: [{ required: true, message: '请选择导入类型' }], file: [{ required: true, message: '请上传明细表' }] };
+const batches = ref([]), details = ref([]), rows = ref([]), selected = ref([]), files = ref([]), projects = ref([]), contracts = ref([]), carriers = ref([]), creators = ref([]), plans = ref([]);
+const rowSelection = ref([]), previewTab = ref('all');
+const duplicateRows = computed(() => rows.value.filter(row => row._duplicate));
+const previewRows = computed(() => previewTab.value === 'duplicate' ? duplicateRows.value : rows.value);
+const page = reactive({ current: 1, size: 10, total: 0 }), detailPage = reactive({ current: 1, size: 10, total: 0 });
+const detailColumns = [{ prop: 'batchNo', label: '运单批次号' }, { prop: 'originalNo', label: '原始单号' }, { prop: 'vehicleNo', label: '车牌号/航班号/船号/班列号' }, { prop: 'driverName', label: '司机/船长' }, { prop: 'transportType', label: '运输类型' }, { prop: 'cargoName', label: '货物名称' }, { prop: 'cargoType', label: '货物类型' }, { prop: 'quantity', label: '重量' }, { prop: 'departureAddress', label: '发货地址' }, { prop: 'departureContact', label: '发货联系人' }, { prop: 'departurePhone', label: '发货联系人电话' }, { prop: 'arrivalAddress', label: '到货地址' }, { prop: 'arrivalContact', label: '收货联系人' }, { prop: 'arrivalPhone', label: '收货联系人电话' }, { prop: 'startDate', label: '开始时间' }, { prop: 'endDate', label: '结束时间' }, { prop: 'unitPrice', label: '单价' }, { prop: 'freight', label: '运费' }, { prop: 'otherFeeTotal', label: '其他费用合计' }, { prop: 'freightTotal', label: '运费合计' }, { prop: 'remark', label: '备注' }];
+const requiredDetailFields = [{ prop: 'vehicleNo', label: '车牌号/航班号/船号/班列号' }, { prop: 'driverName', label: '司机/船长' }, { prop: 'transportType', label: '运输类型' }, { prop: 'cargoName', label: '货物名称' }, { prop: 'cargoType', label: '货物类型' }, { prop: 'departureAddress', label: '发货地址' }, { prop: 'departureContact', label: '发货联系人' }, { prop: 'departurePhone', label: '发货联系人电话' }, { prop: 'arrivalAddress', label: '到货地址' }, { prop: 'arrivalContact', label: '到货联系人' }, { prop: 'arrivalPhone', label: '收货联系人电话' }, { prop: 'startDate', label: '开始时间' }, { prop: 'endDate', label: '结束时间' }, { prop: 'unitPrice', label: '单价' }, { prop: 'freight', label: '运费' }];
+const loadBatches = async () => { const res = await api.getImportBatches({ ...query, current: page.current, size: page.size }); batches.value = res.data?.data?.records || []; page.total = res.data?.data?.total || 0; };
+const resetQuery = () => { Object.assign(query, { batchNo: '', carrierId: '', createUser: '', createTimeRange: [] }); page.current = 1; loadBatches(); };
+const loadDetails = async () => { const res = await api.getImportDetails({ batchId: detailQuery.batchId, ...detailQuery, current: detailPage.current, size: detailPage.size }); details.value = res.data?.data?.records || []; detailPage.total = res.data?.data?.total || 0; };
+const openCreate = async () => {
+  createVisible.value = true;
+  const projectRes = await getProjectList(1, 9999, {});
+  projects.value = projectRes.data?.data?.records || [];
+  api.getImportOptions?.().then(res => {
+    const data = res.data?.data || {};
+    contracts.value = data.contracts || [];
+    carriers.value = data.carriers || [];
+    creators.value = data.creators || [];
+    plans.value = data.plans || [];
+  });
+};
+const openDetail = row => { detailQuery.batchId = row.id; detailVisible.value = true; loadDetails(); };
+const editBatch = row => { openCreate(); Object.assign(form, row); };
+const removeBatches = () => api.removeImportBatches(selected.value.map(item => item.id).join(',')).then(loadBatches);
+const removeBatch = row => api.removeImportBatches(row.id).then(loadBatches);
+const projectChange = id => { const item = projects.value.find(row => row.id === id); form.customerName = item?.customerName || ''; api.getImportContracts?.(id).then(res => { contracts.value = res.data?.data || []; }); };
+const fileChange = async (file, list) => {
+  files.value = list.slice(-1); form.file = file.raw;
+  const XLSX = await import('xlsx');
+  const workbook = XLSX.read(await file.raw.arrayBuffer(), { type: 'array', cellDates: true });
+  const source = XLSX.utils.sheet_to_json(workbook.Sheets[workbook.SheetNames[0]], { defval: '' }).map(item => Object.fromEntries(Object.entries(item).map(([key, value]) => [key.replace(/^\*/, ''), value])));
+  const keyMap = { '原始单号': 'originalNo', '车牌号/航班号/船号/班列号': 'vehicleNo', '司机/船长': 'driverName', '运输类型': 'transportType', '货物名称': 'cargoName', '货物类型': 'cargoType', '重量': 'quantity', '发货地址': 'departureAddress', '发货联系人': 'departureContact', '发货联系人电话': 'departurePhone', '到货地址': 'arrivalAddress', '收货联系人': 'arrivalContact', '收货联系人电话': 'arrivalPhone', '开始时间': 'startDate', '结束时间': 'endDate', '单价': 'unitPrice', '运费': 'freight', '其他费用合计': 'otherFeeTotal', '运费合计': 'freightTotal', '备注': 'remark' };
+  const count = new Map();
+  rows.value = source.map((item, index) => { const row = { _key: `${Date.now()}-${index}`, batchNo: '', ...item }; Object.entries(keyMap).forEach(([label, key]) => { row[key] = item[label] ?? item[key] ?? ''; }); const duplicateKey = JSON.stringify(Object.values(keyMap).map(key => row[key])); count.set(duplicateKey, (count.get(duplicateKey) || 0) + 1); row._duplicateKey = duplicateKey; return row; });
+  rows.value.forEach(row => { row._duplicate = count.get(row._duplicateKey) > 1; });
+};
+const fileRemove = () => { files.value = []; form.file = null; };
+const downloadTemplate = async () => {
+  try {
+    const res = await api.exportImportTemplate();
+    downloadXls(res.data, '运单批量导入模板.xlsx');
+    ElMessage.success('模板下载成功');
+  } catch (error) {
+    ElMessage.error('模板下载失败');
+  }
+};
+const validateImportRows = () => {
+  if (!rows.value.length) {
+    ElMessage.warning('请上传至少一条运单明细');
+    return false;
+  }
+  for (const [index, row] of rows.value.entries()) {
+    const missingField = requiredDetailFields.find(field => !String(row[field.prop] ?? '').trim());
+    if (missingField) {
+      ElMessage.warning(`第${index + 1}行${missingField.label}不能为空`);
+      return false;
+    }
+  }
+  return true;
+};
+const editRow = row => { row._editing = true; };
+const saveRow = row => { row._editing = false; };
+const cancelRow = row => { row._cancelled = true; };
+const deleteRow = row => { rows.value = rows.value.filter(item => item !== row); };
+const removeSelectedRows = () => { const keys = new Set(rowSelection.value.map(row => row._key)); rows.value = rows.value.filter(row => !keys.has(row._key)); rowSelection.value = []; };
+const saveDraft = () => api.saveImportDraft({ ...form, rows: rows.value });
+const confirmImport = async () => { await formRef.value?.validate(); if (!validateImportRows()) return; const count = rows.value.filter(row => row._duplicate).length; if (count) await ElMessageBox.confirm(`当前导入有${count}条重复数据，是否确认导入？`, '提示'); if (form.importType === 'settlement') await ElMessageBox.confirm('确认后将同时生成运单、应收应付明细、计结算单，是否继续？', '提示'); await api.confirmImport({ ...form, rows: rows.value }); ElMessage.success('导入成功'); createVisible.value = false; loadBatches(); };
+</script>
+
+<style scoped lang="scss">
+.waybill-import-toolbar {
+  margin-bottom: 12px;
+
+  &__search {
+    display: flex;
+    align-items: flex-start;
+    gap: 12px;
+
+    .el-form {
+      flex: 1;
+      margin-bottom: 0;
+    }
+  }
+
+  &__search-actions {
+    display: flex;
+    flex: none;
+    gap: 8px;
+  }
+
+  &__actions { margin-top: 8px; }
+}
+
+.waybill-import-create {
+  &__form-panel,
+  &__detail-panel {
+    border: 1px solid #eff1f7;
+    padding: 20px 24px;
+  }
+
+  &__detail-panel { margin-top: 12px; }
+  &__form-actions { display: flex; justify-content: flex-end; gap: 12px; margin-top: 8px; }
+  &__detail-head { display: flex; align-items: center; gap: 24px; margin-bottom: 8px; }
+  &__file-tip { margin: 0 24px; color: #606266; }
+}
+</style>

src/views/business/contract-manage.vue

@@ -1,5 +1,5 @@
 <template>
-  <business-crud-page :api="api" :config="config" :crud-option="option" />
+  <business-crud-page :api="api" :config="config" :crud-option="option" :menu-width="245" />
 </template>
 
 <script>

src/views/business/process-config.vue

@@ -24,10 +24,9 @@
         <el-button
           type="primary"
           icon="el-icon-plus"
-          plain
           v-if="hasPermission('process_config_add')"
           @click="$refs.crud.rowAdd()"
-          >新增
+          >新建过程配置
         </el-button>
         <el-button
           type="primary"
@@ -53,13 +52,23 @@
         </el-tag>
       </template>
 
+      <template #includedNodes="{ row }">
+        <span class="process-config-page__node-value">
+          {{ formatProcessNodes(row.includedNodes) }}
+        </span>
+      </template>
+
       <template #basicInfo-form>
         <div class="process-config-page__section">
           <div class="dialog-section-title">基本信息</div>
           <el-row :gutter="16">
-            <el-col :span="12">
+            <el-col :span="8">
               <div class="process-config-page__field">
-                <span class="process-config-page__field-label">配置名称</span>
+                <span
+                  class="process-config-page__field-label process-config-page__field-label--required"
+                >
+                  配置名称
+                </span>
                 <el-input
                   v-model="form.configName"
                   :disabled="dialogReadonly"
@@ -68,9 +77,13 @@
                 />
               </div>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
               <div class="process-config-page__field">
-                <span class="process-config-page__field-label">项目</span>
+                <span
+                  class="process-config-page__field-label process-config-page__field-label--required"
+                >
+                  项目
+                </span>
                 <el-select
                   v-model="selectedProjectId"
                   clearable
@@ -92,33 +105,33 @@
                 </el-select>
               </div>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
               <div class="process-config-page__field">
-                <span class="process-config-page__field-label">默认后台完成运输天数</span>
+                <span class="process-config-page__field-label">运输完成时限</span>
                 <div class="process-config-page__finish-days">
                   <span>默认</span>
                   <el-input
                     v-model="form.defaultFinishDays"
                     :disabled="dialogReadonly"
                     maxlength="3"
-                    placeholder="X"
+                    placeholder="请输入"
                     @input="handleFinishDaysInput"
                   />
-                  <span>天后台完成运输</span>
+                  <span>天后完成运输</span>
                 </div>
               </div>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <div class="process-config-page__field">
                 <span class="process-config-page__field-label">备注</span>
                 <el-input
                   v-model="form.remark"
-                  :disabled="dialogReadonly"
-                  :rows="3"
-                  maxlength="500"
-                  placeholder="请输入"
-                  show-word-limit
                   type="textarea"
+                  :rows="4"
+                  :disabled="dialogReadonly"
+                  maxlength="500"
+                  show-word-limit
+                  placeholder="请输入"
                 />
               </div>
             </el-col>
@@ -196,7 +209,7 @@
                       <el-radio-group
                         v-model="row.confirmMode"
                         :disabled="dialogReadonly || !row.enabled"
-                        @change="syncNodeFields"
+                        @change="handleReturnConfirmChange(row)"
                       >
                         <el-radio label="yes">是</el-radio>
                         <el-radio label="no_confirm_complete">无需确认完成</el-radio>
@@ -333,54 +346,48 @@
       </template>
 
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('process_config_view')"
           @click="$refs.crud.rowView(row, index)"
         >
           查看
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="canEdit(row)"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('process_config_copy')"
           @click="handleCopy(row)"
         >
           复制
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="canEnable(row)"
           @click="handleAction('enable', row)"
         >
           启用
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="canDisable(row)"
           @click="handleAction('disable', row)"
         >
           停用
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="canDelete(row)"
           @click="rowDel(row)"
         >
           删除
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
 
@@ -396,6 +403,7 @@
 <script>
 import * as api from '@/api/business/process-config';
 import { getList as getProjectList } from '@/api/business/project-apply';
+import { getDeptTree } from '@/api/system/dept';
 import { exportBlob } from '@/api/common';
 import { config, option } from '@/option/business/process-config';
 import { getToken } from '@/utils/auth';
@@ -519,11 +527,35 @@ export default {
   created() {
     this.resetNodeRows();
     this.loadProjectOptions('');
+    this.initDeptOptions();
   },
   methods: {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
     },
+    handleReturnConfirmChange(row) {
+      row.confirmInternal = row.confirmMode === 'yes';
+      this.syncNodeFields();
+    },
+    initDeptOptions() {
+      getDeptTree(this.userInfo.tenantId).then(res => {
+        const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
+        if (deptColumn) {
+          deptColumn.dicData = this.flattenDept(res.data.data || []);
+        }
+      });
+    },
+    flattenDept(tree, level = 0) {
+      return tree.flatMap(item => [
+        {
+          label: `${'　'.repeat(level)}${item.title || item.deptName || item.name}`,
+          value: item.id,
+        },
+        ...(item.children && item.children.length
+          ? this.flattenDept(item.children, level + 1)
+          : []),
+      ]);
+    },
     displayStatus(status) {
       const statusMap = {
         0: '草稿',
@@ -532,6 +564,13 @@ export default {
       };
       return statusMap[status] || status || '未知';
     },
+    formatProcessNodes(nodes) {
+      return String(nodes || '')
+        .split(/[,，]/)
+        .map(item => item.trim())
+        .filter(Boolean)
+        .join('-');
+    },
     statusTagType(status) {
       if (status === 1) return 'success';
       if (status === 2) return 'info';
@@ -564,7 +603,7 @@ export default {
         voucherTypes: [],
         frequencyDays: '1',
         timeStart: '00:00',
-        timeEnd: '24:00',
+        timeEnd: '23:59',
         supportCargo: false,
         supportVoucher: false,
         voucherOptions: [],
@@ -711,7 +750,7 @@ export default {
         result.push(`打卡定位：${node.location ? '是' : '否'}`);
         if (node.punch) {
           result.push(`打卡频次：每${node.frequencyDays || 1}天打卡1次`);
-          result.push(`打卡时段：${node.timeStart || '00:00'}-${node.timeEnd || '24:00'}`);
+          result.push(`打卡时段：${node.timeStart || '00:00'}-${node.timeEnd || '23:59'}`);
         }
       } else {
         result.push(`打卡操作：${node.punch ? '是' : '否'}`);
@@ -750,10 +789,16 @@ export default {
         this.$message.warning('项目不能为空');
         return false;
       }
-      if (row.defaultFinishDays && !/^[1-9]\d{0,2}$/.test(String(row.defaultFinishDays))) {
+      if (row.defaultFinishDays !== undefined && row.defaultFinishDays !== '') {
-        this.$message.warning('请输入正整数');
+        if (!Number.isInteger(Number(row.defaultFinishDays)) || Number(row.defaultFinishDays) < 0) {
+          this.$message.warning('完成天数不能小于0');
           return false;
         }
+        if (Number(row.defaultFinishDays) > 999) {
+          this.$message.warning('完成天数不能超过999');
+          return false;
+        }
+      }
       if (row.remark && row.remark.length > 500) {
         this.$message.warning('备注不能超过500个字符');
         return false;
@@ -780,43 +825,61 @@ export default {
         loading();
       }
     },
-    rowSave(row, done, loading) {
+    needsDuplicateVoucherConfirm() {
+      const signNode = this.nodeRows.find(item => item.key === 'sign');
+      const returnNode = this.nodeRows.find(item => item.key === 'return');
+      const hasSignVoucher =
+        signNode &&
+        signNode.enabled &&
+        signNode.uploadVoucher &&
+        signNode.voucherTypes.includes('签收单');
+      const hasReturnVoucher =
+        returnNode &&
+        returnNode.enabled &&
+        returnNode.uploadVoucher &&
+        returnNode.voucherTypes.includes('签收单');
+      return hasSignVoucher && hasReturnVoucher;
+    },
+    confirmDuplicateVoucher() {
+      if (!this.needsDuplicateVoucherConfirm()) {
+        return Promise.resolve();
+      }
+      return this.$confirm(
+        '签收与回单同时勾选了上传凭证，司机将需重复上传凭证，是否确认？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+      );
+    },
+    submitRow(row, done, loading) {
       this.syncNodeFields();
       const submitRow = this.normalizeRow(row);
       if (!this.validateRow(submitRow)) {
         this.stopSubmitLoading(loading);
         return;
       }
-      api.submit(submitRow).then(
+      this.confirmDuplicateVoucher()
-        () => {
+        .then(() => api.submit(submitRow))
+        .then(() => {
           this.onLoad(this.page);
           this.$message({ type: 'success', message: '操作成功!' });
           done();
-        },
+        })
-        error => {
+        .catch(error => {
+          if (error !== 'cancel' && error !== 'close') {
             window.console.log(error);
-          this.stopSubmitLoading(loading);
           }
-      );
+          this.stopSubmitLoading(loading);
+        });
+    },
+    rowSave(row, done, loading) {
+      this.submitRow(row, done, loading);
     },
     rowUpdate(row, index, done, loading) {
-      this.syncNodeFields();
+      this.submitRow(row, done, loading);
-      const submitRow = this.normalizeRow(row);
-      if (!this.validateRow(submitRow)) {
-        this.stopSubmitLoading(loading);
-        return;
-      }
-      api.submit(submitRow).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({ type: 'success', message: '操作成功!' });
-          done();
-        },
-        error => {
-          window.console.log(error);
-          this.stopSubmitLoading(loading);
-        }
-      );
     },
     rowDel(row) {
       this.$confirm('确定将选择数据删除?', {
@@ -920,7 +983,11 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       api
-        .getList(page.currentPage, page.pageSize, { ...params, ...this.query, allDept: 0 })
+        .getList(page.currentPage, page.pageSize, {
+          ...params,
+          ...this.query,
+          allDept: this.isAdmin ? 1 : 0,
+        })
         .then(res => {
           const result = res.data.data || {};
           this.page.total = result.total || 0;
@@ -934,7 +1001,7 @@ export default {
     buildExportParams() {
       return {
         ...this.query,
-        allDept: 0,
+        allDept: this.isAdmin ? 1 : 0,
         ids: this.ids,
         [this.website.tokenHeader]: getToken(),
       };
@@ -1010,6 +1077,17 @@ export default {
     font-weight: 500;
     text-align: right;
     white-space: nowrap;
+
+    &--required::before {
+      margin-right: 4px;
+      color: #f56c6c;
+      content: '*';
+    }
+  }
+
+  &__node-value {
+    white-space: normal;
+    word-break: break-all;
   }
 
   &__finish-days {

src/views/business/project-apply.vue

@@ -20,7 +20,6 @@
         <el-button
           type="primary"
           icon="el-icon-plus"
-          plain
           v-if="canMajorProjectSupplement"
           @click="openProjectDialog('majorSupplement')"
         >
@@ -29,7 +28,6 @@
         <el-button
           type="primary"
           icon="el-icon-plus"
-          plain
           v-if="canCreate"
           @click="openProjectDialog('add')"
         >
@@ -62,27 +60,25 @@
       </template>
 
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission(`${config.permission}_view`)"
           @click="openProjectDialog('view', row)"
         >
           查看
-        </el-button>
+        </el-link>
-        <el-button type="primary" text v-if="canEdit(row)" @click="openProjectDialog('edit', row)">
+        <el-link type="primary" v-if="canEdit(row)" @click="openProjectDialog('edit', row)">
           编辑
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           v-for="operation in customOperations(row)"
           :key="operation.action"
           :type="operation.type || 'primary'"
-          text
           @click="handleCustomOperation(operation, row)"
         >
           {{ operation.label }}
-        </el-button>
+        </el-link>
-        <el-button type="primary" text v-if="canDelete(row)" @click="rowDel(row)"> 删除 </el-button>
+        <el-link type="primary" v-if="canDelete(row)" @click="rowDel(row)"> 删除 </el-link>
       </template>
     </avue-crud>
 
@@ -178,21 +174,16 @@
             </el-select>
           </el-form-item>
           <el-form-item label="承办部门" prop="undertakeDeptId">
-            <el-select
+            <el-cascader
               v-model="form.undertakeDeptId"
               placeholder="请选择承办部门"
-              filterable
               clearable
+              filterable
+              :options="deptTreeOptions"
+              :props="deptCascaderProps"
               :disabled="isBasicInfoReadonly"
               @change="handleUndertakeDeptChange"
-            >
-              <el-option
-                v-for="item in deptOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
             />
-            </el-select>
           </el-form-item>
           <el-form-item label="项目由来" prop="projectSource">
             <el-select
@@ -219,9 +210,11 @@
           <el-form-item label="客户名称" prop="customerNames">
             <el-select
               v-model="selectedCustomerId"
-              placeholder="搜索选择"
+              placeholder="支持多选，选择后下方列表展示"
+              multiple
               filterable
               clearable
+              collapse-tags
               :loading="customerLoading"
               @visible-change="visible => visible && loadCustomerOptions('客户')"
               @change="handleCustomerChange"
@@ -259,6 +252,7 @@
               v-model="form.fundLimit"
               placeholder="实际业务回款周期内付款额度"
               @input="value => handleNumberInput('fundLimit', value)"
+              @blur="formatAmountField('fundLimit')"
             />
           </el-form-item>
           <el-form-item label="项目应收账款额度（万元）" prop="receivableLimit">
@@ -266,6 +260,7 @@
               v-model="form.receivableLimit"
               placeholder="回款期内最大应收账款额度"
               @input="value => handleNumberInput('receivableLimit', value)"
+              @blur="formatAmountField('receivableLimit')"
             />
           </el-form-item>
           <el-form-item label="应收账款回款期限" prop="receivableDays">
@@ -468,13 +463,25 @@
           </el-form-item>
         </div>
 
+        <div class="project-apply-form__material-card">
           <div class="project-apply-form__material-head">
             <div class="dialog-section-title project-apply-form__material-title">项目材料</div>
-          <el-button type="primary" :disabled="!attachmentRows.length" @click="handleBatchDownload"
+            <el-button
+              type="primary"
+              :disabled="!attachmentRows.length"
+              @click="handleBatchDownload"
               >批量下载</el-button
             >
           </div>
-        <el-table :data="attachmentRows" border class="project-apply-form__table">
+          <el-alert
+            v-if="dialogReadonly && missingRequiredAttachmentTypes.length"
+            class="project-apply-form__material-warning"
+            type="warning"
+            :closable="false"
+            show-icon
+            :title="`缺少必需材料：${missingRequiredAttachmentTypes.join('、')}`"
+          />
+          <el-table :data="attachmentRows" border class="project-apply-form__material-table">
             <el-table-column type="index" label="序号" width="80" align="center" />
             <el-table-column label="附件类型" min-width="160" align="center">
               <template #default="{ row }">
@@ -504,16 +511,12 @@
               <template #default="{ row }">{{ formatFileSize(row.size) }}</template>
             </el-table-column>
             <el-table-column prop="uploadUserName" label="上传人" min-width="140" align="center" />
-          <el-table-column prop="uploadTime" label="上传时间" min-width="170" align="center" />
+            <el-table-column prop="uploadTime" label="上传时间" min-width="170" align="center"  sortable/>
             <el-table-column label="操作" width="110" align="center">
               <template #default="{ row, $index }">
-              <el-button type="primary" text @click="downloadAttachment(row)">下载</el-button>
+                <el-link type="primary" @click="downloadAttachment(row)">下载</el-link>
-              <el-button
+                <el-link v-if="!dialogReadonly" type="primary" @click="removeAttachment($index)"
-                v-if="!dialogReadonly"
+                  >删除</el-link
-                type="primary"
-                text
-                @click="removeAttachment($index)"
-                >删除</el-button
                 >
               </template>
             </el-table-column>
@@ -523,11 +526,12 @@
             class="project-apply-form__upload"
             :readonly="dialogReadonly"
             :file-types="attachmentFileTypes"
-          :max-size="500"
+            :max-size="50"
             button-text="上传附件"
-          tip="支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件大小限制500M"
+            tip="支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件大小限制50M"
             @change="handleAttachmentChange"
           />
+        </div>
 
         <div v-if="!isChangeDialog" class="dialog-section-title project-apply-form__table-title">
           变更记录
@@ -539,7 +543,7 @@
           class="project-apply-form__table"
         >
           <el-table-column type="index" label="序号" width="80" align="center" />
-          <el-table-column prop="changeDate" label="变更日期" min-width="140" align="center" />
+          <el-table-column prop="changeDate" label="变更日期" min-width="140" align="center"  sortable/>
           <el-table-column prop="changeType" label="变更类型" min-width="160" align="center" />
           <el-table-column prop="handler" label="经办人" min-width="120" align="center" />
           <el-table-column
@@ -559,9 +563,9 @@
           <el-table-column prop="status" label="状态" min-width="120" align="center" />
           <el-table-column label="操作" width="100" align="center">
             <template #default="{ row }">
-              <el-button type="primary" text @click="handleChangeRecordAction(row)">
+              <el-link type="primary" @click="handleChangeRecordAction(row)">
                 {{ row.action || '查看' }}
-              </el-button>
+              </el-link>
             </template>
           </el-table-column>
         </el-table>
@@ -598,16 +602,24 @@
           :class="{ 'project-apply-dialog__footer--change': isChangeDialog }"
         >
           <template v-if="isChangeDialog">
-            <el-button type="primary" :loading="submitLoading" @click="submitChangeProject">
-              提交
-            </el-button>
             <el-button type="primary" :loading="submitLoading" @click="saveChangeProject">
               保存
             </el-button>
-            <el-button @click="projectBox = false">关闭</el-button>
+            <el-button type="primary" :loading="submitLoading" @click="submitChangeProject">
+              提交
+            </el-button>
+            <el-button @click="handleCancelProject">取消</el-button>
           </template>
           <template v-else>
-            <el-button @click="projectBox = false">取消</el-button>
+            <el-button @click="handleCancelProject">取消</el-button>
+            <el-button
+              v-if="!dialogReadonly"
+              type="primary"
+              :loading="submitLoading"
+              @click="saveProject"
+            >
+              保存
+            </el-button>
             <el-button
               v-if="!dialogReadonly"
               type="primary"
@@ -652,7 +664,7 @@
         <el-table-column prop="deptName" label="所属部门" min-width="180" align="center" />
         <el-table-column label="操作" width="100" align="center">
           <template #default="{ row }">
-            <el-button type="primary" text @click="selectUser(row)">选择</el-button>
+            <el-link type="primary" @click="selectUser(row)">选择</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -683,7 +695,6 @@ import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 import { getList as getUserList } from '@/api/system/user';
 import { getToken } from '@/utils/auth';
-import { applyTableMenuWidth } from '@/utils/table-menu';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { mapGetters } from 'vuex';
 import NProgress from 'nprogress';
@@ -748,6 +759,7 @@ const changeTypeOptions = [
 ];
 
 const normalProjectAttachmentTypeOptions = [
+  '项目立项报告',
   '利润测算表',
   '单一来源供应商申请表/三方比价表',
   '合同模板',
@@ -757,6 +769,7 @@ const normalProjectAttachmentTypeOptions = [
 ].map(item => ({ label: item, value: item }));
 
 const majorProjectAttachmentTypeOptions = [
+  '项目立项报告',
   '会议纪要',
   '评审表决票',
   '利润测算表',
@@ -878,6 +891,8 @@ export default {
         fundDemand: [{ label: '资金需求', validator: validateAmount, trigger: 'blur' }],
         handlerUserId: [
           {
+            required: true,
+            message: '请选择项目经办人',
             label: '项目经办人',
             nameProp: 'handlerUserName',
             validator: validateUser,
@@ -886,6 +901,8 @@ export default {
         ],
         principalUserId: [
           {
+            required: true,
+            message: '请选择项目负责人',
             label: '项目负责人',
             nameProp: 'principalUserName',
             validator: validateUser,
@@ -902,8 +919,16 @@ export default {
         ],
       },
       deptOptions: [],
+      deptTreeOptions: [],
+      deptCascaderProps: {
+        label: 'label',
+        value: 'value',
+        children: 'children',
+        emitPath: false,
+        checkStrictly: true,
+      },
       cargoTypeOptions: [],
-      selectedCustomerId: '',
+      selectedCustomerId: [],
       selectedCarrierIds: [],
       customerOptions: [],
       carrierOptions: [],
@@ -996,6 +1021,12 @@ export default {
         ? majorProjectAttachmentTypeOptions
         : normalProjectAttachmentTypeOptions;
     },
+    missingRequiredAttachmentTypes() {
+      const uploadedTypes = new Set(this.attachmentRows.map(item => item.fileType).filter(Boolean));
+      return this.projectAttachmentTypeOptions
+        .map(item => item.value)
+        .filter(fileType => !uploadedTypes.has(fileType));
+    },
   },
   created() {
     this.loadDeptOptions();
@@ -1004,18 +1035,17 @@ export default {
   },
   methods: {
     buildTableOption() {
-      return applyTableMenuWidth(
+      return {
-        {
         ...option,
         dialogType: 'dialog',
         addBtn: false,
         viewBtn: false,
         editBtn: false,
         delBtn: false,
+        // 操作列收窄：本项目操作按钮较少，320px 过宽，调整为 220px（链接会自动换行兜底）
+        menuWidth: 180,
         column: (option.column || []).map(column => ({ ...column, display: false })),
-        },
+      };
-        4
-      );
     },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
@@ -1236,7 +1266,7 @@ export default {
       if (type === 'add' || type === 'majorSupplement') {
         this.applyProjectDetail({
           ...emptyForm(),
-          projectType: type === 'majorSupplement' ? '重大项目' : '',
+          projectType: type === 'majorSupplement' ? '重大项目' : '普通项目',
         });
         this.fillDefaultUsers();
         return;
@@ -1256,21 +1286,35 @@ export default {
       this.carrierRows = [];
       this.attachmentRows = [];
       this.changeRows = [];
-      this.selectedCustomerId = '';
+      this.selectedCustomerId = [];
       this.selectedCarrierIds = [];
     },
     applyProjectDetail(row) {
+      const displayRow = {
+        ...row,
+        fundLimit: this.formatAmount(row.fundLimit),
+        receivableLimit: this.formatAmount(row.receivableLimit),
+        ...(this.dialogReadonly
+          ? {
+              projectScale: this.normalizeReadonlyAmount(row.projectScale),
+              estimatedProfit: this.normalizeReadonlyAmount(row.estimatedProfit),
+              fundDemand: this.normalizeReadonlyAmount(row.fundDemand),
+            }
+          : {}),
+      };
       const form = {
         ...emptyForm(),
-        ...row,
+        ...displayRow,
+        handlerUserName: this.resolveUserRealName(displayRow, 'handler'),
+        principalUserName: this.resolveUserRealName(displayRow, 'principal'),
         businessDateRange:
-          row.businessStartDate && row.businessEndDate
+          displayRow.businessStartDate && displayRow.businessEndDate
-            ? [row.businessStartDate, row.businessEndDate]
+            ? [displayRow.businessStartDate, displayRow.businessEndDate]
             : [],
       };
-      const situation = this.parseSituation(row.situationRemark);
+      const situation = this.parseSituation(displayRow.situationRemark);
-      const customerRows = this.parseJsonArray(row.customerJson);
+      const customerRows = this.parseJsonArray(displayRow.customerJson);
-      const carrierRows = this.parseJsonArray(row.carrierJson);
+      const carrierRows = this.parseJsonArray(displayRow.carrierJson);
       this.form = {
         ...form,
         ...situation,
@@ -1279,9 +1323,11 @@ export default {
       };
       this.customerRows = customerRows;
       this.carrierRows = carrierRows;
-      this.attachmentRows = this.parseJsonArray(row.attachmentsJson);
+      this.attachmentRows = this.parseJsonArray(displayRow.attachmentsJson);
-      this.changeRows = this.buildChangeRows(row);
+      this.changeRows = this.buildChangeRows(displayRow);
-      this.selectedCustomerId = this.getCustomerRowId(this.customerRows[0]);
+      this.selectedCustomerId = this.customerRows
+        .map(item => this.getCustomerRowId(item))
+        .filter(Boolean);
       this.selectedCarrierIds = this.carrierRows
         .map(item => this.getCustomerRowId(item))
         .filter(Boolean);
@@ -1290,7 +1336,13 @@ export default {
     fillDefaultUsers() {
       const userId = this.userInfo?.userId || this.userInfo?.id || '';
       const userName =
-        this.userInfo?.realName || this.userInfo?.userName || this.userInfo?.account || '';
+        this.userInfo?.realName ||
+        this.userInfo?.real_name ||
+        this.userInfo?.name ||
+        this.userInfo?.userName ||
+        this.userInfo?.user_name ||
+        this.userInfo?.account ||
+        '';
       if (userId && userName) {
         this.form.handlerUserId = userId;
         this.form.handlerUserName = userName;
@@ -1298,6 +1350,16 @@ export default {
         this.form.principalUserName = userName;
       }
     },
+    resolveUserRealName(row = {}, role) {
+      return (
+        row[`${role}RealName`] ||
+        row[`${role}UserRealName`] ||
+        row[`${role}User`]?.realName ||
+        row[role]?.realName ||
+        row[`${role}UserName`] ||
+        ''
+      );
+    },
     resolveChangeType(row = {}) {
       if (row.changeType) return row.changeType;
       const node = row.currentNode || '';
@@ -1333,6 +1395,36 @@ export default {
           });
       });
     },
+    saveProject() {
+      this.submitLoading = true;
+      this.api
+        .saveDraft(this.normalizeSubmitForm())
+        .then(res => {
+          if (res.data?.success === false || res.data?.data === false) {
+            this.$message.error(res.data?.msg || '保存失败，请联系管理员');
+            return;
+          }
+          this.$message.success('保存成功!');
+          this.projectBox = false;
+          this.onLoad(this.page, this.query);
+        })
+        .finally(() => {
+          this.submitLoading = false;
+        });
+    },
+    handleCancelProject() {
+      if (!['add', 'majorSupplement', 'change'].includes(this.dialogType)) {
+        this.projectBox = false;
+        return;
+      }
+      this.$confirm('确认后直接关闭弹窗，列表无数据变更，是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.projectBox = false;
+      });
+    },
     saveChangeProject() {
       this.submitChangeForm(false);
     },
@@ -1369,6 +1461,8 @@ export default {
       const [businessStartDate, businessEndDate] = this.form.businessDateRange || [];
       const submitRow = {
         ...this.form,
+        fundLimit: this.formatAmount(this.form.fundLimit),
+        receivableLimit: this.formatAmount(this.form.receivableLimit),
         businessStartDate,
         businessEndDate,
         customerJson: JSON.stringify(this.customerRows),
@@ -1482,6 +1576,11 @@ export default {
         })
         .filter(Boolean);
     },
+    normalizeReadonlyAmount(value) {
+      return value === null || value === undefined || value === '' || Number(value) === -1
+        ? ''
+        : value;
+    },
     mergeCustomerOptions(options = [], selectedOptions = []) {
       const result = [...selectedOptions];
       options.forEach(option => {
@@ -1510,7 +1609,7 @@ export default {
           changeType:
             row.changeType ||
             (String(row.currentNode || '').includes('备案') ? '项目备案调整' : '项目变更'),
-          handler: row.handlerUserName || '',
+          handler: this.resolveUserRealName(row, 'handler'),
           content: row.changeContent || '',
           reason: row.changeReason || '',
           status: row.approvalStatusName || row.approvalStatus || '',
@@ -1534,9 +1633,18 @@ export default {
     },
     loadDeptOptions() {
       getDeptTree().then(res => {
-        this.deptOptions = this.flattenDept(res.data.data || []);
+        const deptTree = res.data.data || [];
+        this.deptOptions = this.flattenDept(deptTree);
+        this.deptTreeOptions = this.toDeptCascaderOptions(deptTree);
       });
     },
+    toDeptCascaderOptions(list = []) {
+      return list.map(item => ({
+        label: item.title || item.deptName || item.name,
+        value: item.id,
+        children: item.children?.length ? this.toDeptCascaderOptions(item.children) : undefined,
+      }));
+    },
     flattenDept(list = [], level = 0) {
       return list.reduce((result, item) => {
         const label = item.title || item.deptName || item.name;
@@ -1571,7 +1679,11 @@ export default {
       const loadingKey = type === '客户' ? 'customerLoading' : 'carrierLoading';
       const optionsKey = type === '客户' ? 'customerOptions' : 'carrierOptions';
       this[loadingKey] = true;
-      getCustomerArchiveList(1, 100, { customerType: type, status: 1 })
+      getCustomerArchiveList(1, 100, {
+        customerType: type,
+        status: 1,
+        ...(type === '客户' ? { approvalStatus: 'approved' } : {}),
+      })
         .then(res => {
           const records = (res.data.data && res.data.data.records) || [];
           const selectedOptions = this.buildCustomerOptionsFromRows(
@@ -1595,16 +1707,16 @@ export default {
         raw: item,
       };
     },
-    handleCustomerChange(id) {
+    handleCustomerChange(ids) {
-      if (!id) {
+      if (!ids || !ids.length) {
         this.customerRows = [];
         this.form.customerNames = '';
         this.form.customerJson = '';
         return;
       }
-      this.loadCustomerDetailRow(id, 'customer').then(row => {
+      Promise.all(ids.map(id => this.loadCustomerDetailRow(id, 'customer'))).then(rows => {
-        this.customerRows = [row];
+        this.customerRows = rows;
-        this.form.customerNames = row.customer;
+        this.form.customerNames = rows.map(item => item.customer).join('、');
         this.form.customerJson = JSON.stringify(this.customerRows);
         this.syncSelectedCustomerOptions();
         this.$refs.projectForm?.validateField('customerNames');
@@ -1657,6 +1769,14 @@ export default {
       this.form[prop] =
         parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
     },
+    formatAmount(value) {
+      if (value === null || value === undefined || value === '' || Number(value) === -1) return '';
+      const amount = Number(value);
+      return Number.isFinite(amount) ? amount.toFixed(2) : value;
+    },
+    formatAmountField(prop) {
+      this.form[prop] = this.formatAmount(this.form[prop]);
+    },
     handleIntegerInput(prop, value) {
       this.form[prop] = String(value || '').replace(/[^\d]/g, '');
     },
@@ -1737,7 +1857,7 @@ export default {
 
 <style lang="scss" scoped>
 .project-apply-form {
-  padding: 0 8px;
+  padding: 0;
 
   :deep(.el-input),
   :deep(.el-select),
@@ -1755,12 +1875,30 @@ export default {
     line-height: 20px;
   }
 
+  // 分区标题融入白色卡片顶部（与下方内容块拼成一张完整卡片）
+  :deep(.dialog-section-title:not(.project-apply-form__material-title)) {
+    position: relative;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    background: #fff;
+    border-radius: 6px 6px 0 0;
+    padding: 14px 16px 4px;
+    margin-bottom: 0;
+    font-weight: 500;
+  }
+
   &__grid {
     display: grid;
     grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
     column-gap: 72px;
     row-gap: 0;
-    margin-bottom: 8px;
+    margin-bottom: 16px;
+    background: #fff;
+    border-radius: 0 0 6px 6px;
+    padding: 14px 16px 4px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
   }
 
   &__picker-icon {
@@ -1782,7 +1920,11 @@ export default {
 
   &__table {
     width: 100%;
-    margin-bottom: 24px;
+    margin-bottom: 16px;
+    background: #fff;
+    border-radius: 0 0 6px 6px;
+    padding: 12px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
 
     :deep(.el-table__header th) {
       background: #f5f7fa;
@@ -1796,6 +1938,12 @@ export default {
   }
 
   &__textarea-list {
+    margin-bottom: 16px;
+    background: #fff;
+    border-radius: 0 0 6px 6px;
+    padding: 14px 16px 4px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
+
     :deep(.el-form-item) {
       align-items: flex-start;
     }
@@ -1809,12 +1957,38 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-top: 8px;
+    margin-bottom: 12px;
+  }
+
+  &__material-card {
+    margin-bottom: 16px;
+    background: #fff;
+    border-radius: 6px;
+    padding: 14px 16px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
+  }
+
+  &__material-table {
+    width: 100%;
+    margin-bottom: 12px;
+
+    :deep(.el-table__header th) {
+      background: #f5f7fa;
+      color: #303133;
+      font-weight: 600;
+    }
+
+    :deep(.el-table__cell) {
+      border-color: #eff1f7;
+    }
+  }
+
+  &__material-warning {
+    margin-bottom: 12px;
   }
 
   &__material-title {
     flex: 1;
-    margin-bottom: 14px;
   }
 
   &__material-warn {
@@ -1825,11 +1999,19 @@ export default {
   }
 
   &__upload {
-    margin: -12px 0 24px;
+    margin: 0 0 16px;
+    background: #fff;
+    border-radius: 6px;
+    padding: 12px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
   }
 
   &__change-textarea {
-    margin-bottom: 24px;
+    margin-bottom: 16px;
+    background: #fff;
+    border-radius: 0 0 6px 6px;
+    padding: 14px 16px 4px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
 
     :deep(.el-form-item__content) {
       width: 100%;
@@ -1841,7 +2023,9 @@ export default {
 :global(.project-apply-dialog .el-dialog__body) {
   max-height: 76vh;
   overflow-y: auto;
-  padding: 16px 24px 8px;
+  overflow-x: hidden;
+  padding: 16px;
+  background: #f5f6fa;
 }
 
 .project-apply-dialog__footer {

src/views/business/shipping-template.vue

@@ -1,5 +1,5 @@
 <template>
-  <business-crud-page :api="api" :config="config" :crud-option="option" />
+  <business-crud-page :api="api" :config="config" :crud-option="option" :menu-width="270" />
 </template>
 
 <script>

src/views/business/temporary-credit-limit.vue

@@ -1,5 +1,5 @@
 <template>
-  <business-crud-page :api="api" :config="config" :crud-option="option" />
+  <business-crud-page :api="api" :config="config" :crud-option="option" :menu-width="270" />
 </template>
 
 <script>

src/views/business/transport-plan.vue

@@ -1,5 +1,5 @@
 <template>
-  <business-crud-page :api="api" :config="config" :crud-option="option" />
+  <business-crud-page :api="api" :config="config" :crud-option="option" :menu-width="220" />
 </template>
 
 <script>

src/views/business/waybill-manage.vue

@@ -1,5 +1,5 @@
 <template>
-  <business-crud-page :api="api" :config="config" :crud-option="option" />
+  <business-crud-page :api="api" :config="config" :crud-option="option" :menu-width="250" />
 </template>
 
 <script>

src/views/data/record.vue

@@ -99,7 +99,7 @@ export default {
         editBtn: false,
         addBtn: false,
         delBtn: false,
-        menuWidth: 160,
+        menuWidth: 180,
         labelWidth: 'auto',
         dialogType: 'drawer',
         column: [
@@ -182,6 +182,7 @@ export default {
           {
             label: '记录时间',
             prop: 'recordTime',
+            sortable: true,
             width: '180',
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',

src/views/desk/notice-composition.vue

@@ -129,6 +129,7 @@ const option = reactive({
     {
       label: '通知日期',
       prop: 'releaseTime',
+      sortable: true,
       type: 'date',
       gridRow: true,
       format: 'YYYY-MM-DD HH:mm:ss',

src/views/desk/notice.vue

@@ -59,6 +59,7 @@ export default {
         height: 'auto',
         calcHeight: 32,
         dialogWidth: 950,
+        menuWidth: 180,
         tip: false,
         searchShow: true,
         searchMenuSpan: 24,
@@ -130,6 +131,7 @@ export default {
           {
             label: '通知日期',
             prop: 'releaseTime',
+            sortable: true,
             type: 'date',
             gridRow: true,
             format: 'YYYY-MM-DD HH:mm:ss',

src/views/flow/follow.vue

@@ -73,7 +73,7 @@ export default {
         addBtn: false,
         viewBtn: false,
         dialogWidth: 900,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogClickModal: false,
         column: [
           {
@@ -107,6 +107,7 @@ export default {
           {
             label: '开始时间',
             prop: 'startTime',
+            sortable: true,
             width: 170,
           },
         ],

src/views/flow/manager.vue

@@ -23,27 +23,24 @@
         </el-radio-group>
       </template>
       <template #menu="scope">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.flow_manager_state"
           @click.stop="handleState(scope.row, scope.index)"
           >变更状态
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.flow_manager_image"
           @click.stop="handleImage(scope.row, scope.index)"
           >流程图
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.flow_manager_remove"
           @click.stop="handleSlotDelete(scope.row, scope.index)"
           >删除
-        </el-button>
+        </el-link>
       </template>
       <template #tenantId="{ row }">
         <el-tag>{{ row.tenantId === '' ? '通用' : row.tenantId }}</el-tag>
@@ -159,7 +156,7 @@ export default {
         viewBtn: false,
         delBtn: false,
         dialogWidth: 900,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogClickModal: false,
         column: [
           {
@@ -213,6 +210,7 @@ export default {
           {
             label: '部署时间',
             prop: 'deploymentTime',
+            sortable: true,
             width: 170,
           },
         ],

src/views/flow/model.vue

@@ -36,30 +36,27 @@
         </el-button>
       </template>
       <template #menu="scope">
-        <el-button
+        <el-link
           type="primary"
-          text
           size="default"
           v-if="permission.flow_model_update"
           @click.stop="handleUpdate(scope.row, scope.index)"
           >配置
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           size="default"
           v-if="permission.flow_model_deploy"
           @click.stop="handleDeploy(scope.row, scope.index)"
           >部署
-        </el-button>
+        </el-link>
-        <el-button
+        <el-link
           type="primary"
-          text
           size="default"
           v-if="permission.flow_model_delete"
           @click.stop="handleSlotDelete(scope.row, scope.index)"
           >删除
-        </el-button>
+        </el-link>
       </template>
       <template #version="{ row }">
         <el-tag>v{{ row.version }}</el-tag>
@@ -216,7 +213,7 @@ export default {
         viewBtn: false,
         delBtn: false,
         dialogWidth: 900,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogClickModal: false,
         size: 'default',
         searchSize: 'default',
@@ -246,11 +243,13 @@ export default {
           {
             label: '创建时间',
             prop: 'created',
+            sortable: true,
             overHidden: true,
           },
           {
             label: '更新时间',
             prop: 'lastUpdated',
+            sortable: true,
             overHidden: true,
           },
         ],

src/views/job/jobinfo.vue

@@ -35,9 +35,9 @@
         </el-button>
       </template>
       <template #menu="scope">
-        <el-button type="primary" text @click="handleRun(scope.row)"
+        <el-link type="primary" @click="handleRun(scope.row)"
           >运 行
-        </el-button>
+        </el-link>
       </template>
       <template #enable="{ row }">
         <el-switch

src/views/job/jobserver.vue

@@ -35,9 +35,9 @@
         </el-button>
       </template>
       <template #menu="scope">
-        <el-button type="primary" text @click="handleLink(scope.row)"
+        <el-link type="primary" @click="handleLink(scope.row)"
           >服务跳转
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
   </basic-container>

src/views/monitor/log/api.vue

@@ -51,7 +51,7 @@ export default {
         editBtn: false,
         addBtn: false,
         delBtn: false,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogType: 'drawer',
         column: [
           {
@@ -91,6 +91,7 @@ export default {
           {
             label: '日志时间',
             prop: 'createTime',
+            sortable: true,
             width: '180',
           },
           {

src/views/monitor/log/error.vue

@@ -51,7 +51,7 @@ export default {
         editBtn: false,
         addBtn: false,
         delBtn: false,
-        menuWidth: 160,
+        menuWidth: 180,
         dialogType: 'drawer',
         column: [
           {
@@ -88,6 +88,7 @@ export default {
           {
             label: '日志时间',
             prop: 'createTime',
+            sortable: true,
             width: '180',
           },
           {