🐛 axios网络级失败（502/504/超时）补充统一错误提示，修复接口报错页面无感知

- 批量同步后解析返回结果，按"同步失败"标识区分成功与失败条目
- 部分失败时以 warning 提示成功/失败条数及具体失败原因（停留8秒），全部成功仍提示已同步条数

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

@@ -0,0 +1,215 @@
+
+## 付款比例设置提示改为 tooltip（contract-manage / contract-manage-change）
+- 需求：将「付款比例设置」区块原有的红色文字提示改为标题右侧的 `?` 图标悬停提示。
+- 改动：编辑弹窗、详情弹窗、合同变更页三处标题后添加 `el-tooltip` + `el-icon-question-filled`，content 为「非必填；配置付款比例时，合计必须等于100%。」；同时移除 contract-manage.vue 中原 `.contract-manage-form__tip` 红色提示文字及对应样式。
+
+## 必填星号与 label 首行齐平（全局）
+- 根因：`element-ui.scss` 中 `.el-form-item--label-right .el-form-item__label { align-items:center }` 使 inline-flex label 的星号 `::before`（独立 flex 子项）在多行折行时被垂直居中。
+- 修复：label 改 `align-self:center`（整体仍随行垂直居中）+ `align-items:flex-start`（星号/文字首行齐平），覆盖 label-right/left/top 三种位置；旧 inline-block 注释已修正。
+- 影响页面：project-apply 独立表单页等所有多行 label 场景（弹窗内 `white-space:nowrap` 不受影响）。
+
+## 必填星号首行对齐：改用 align-items: normal（stretch 方案）
+- 最终写法（`src/styles/element-ui.scss`）：`.is-required .el-form-item__label { align-self:center; align-items:normal; }` + `::before { display:inline-block; height:auto; line-height:inherit; margin-right:4px }`。
+- 原理：stretch 让星号盒子在「换行时」被拉伸到 label 全高、内容从顶部排布 → 贴首行；单行时盒子=一行高，视觉不变（比 flex-start 更贴合「只换行才生效」）。
+- 前提：::before 高度必须 auto 且继承行高；label 不能是 固定 height + 等高 line-height，否则退化成居中，需 JS 判行数加 class。
+
+## 合同变更页（contract-manage-change.vue）
+- 「其它附件」上传按钮改为 `type="primary" plain icon="el-icon-upload"`，与「变更材料」区 vehicle-attachment-upload 内置按钮一致。
+- 分区标题必填星号：`.dialog-section-title.is-required::after { content:'*'; color:#f56c6c }`（`::before` 已被蓝色竖条占用，星号走 `::after`）。
+- 再次变更逻辑：`load()` 里 form 强制重置 `changeContent/changeReason/changeAttachmentsJson = ''`、`changeMaterials = []`（不带上一次内容）；新增 `mergeChangeAttachments()` 把上一次的 `changeAttachmentsJson` 归集进 `attachments`（其它附件），按 url/名去重，数字 size 转格式化文本，提交时随 attachmentsJson 持久化。
+
+## 合同变更记录对齐客商变更记录（contract-manage.vue）
+- 编辑页与详情弹窗的两处「变更记录」表格新增「变更内容」列：`formatContractChangeContent(row)` 复用 `buildDetailChangeRecordRows` 生成「字段：变更前：x → 变更后：y」摘要，单行省略 + `el-tooltip` 全量悬浮（样式 `.contract-change-record-content-cell/-tooltip` 照搬客商 `change-record-content-*`）。
+- 编辑页操作列由单个「流程」改为「详情 + 流程」（`openDetailChangeRecord` + `openFlow`，宽度 120→150）；详情弹窗表格「查看详情」改「详情」与客商一致。
+- 值格式化增强：`billingPlanJson`→方案名（默认）列表、`paymentRatioJson`→「第N笔 xx%」、`settlementRuleJson/preSettlementConfigJson/formalSettlementConfigJson`→可读摘要（自动生成开关/结算类型/周期类型/截单日/周期天数，含预结算+正式结算双段）。
+- `buildDetailChangeRecordRows` 过滤条件补「前后都为空则跳过」（原来只比 JSON 字符串，'' 与 null 会漏）。
+
+## 星号方案补丁（关键）
+- EP 的 `.el-form-item__label` 写死 `height:32px; line-height:32px`（项目只覆盖了 line-height:14px），导致 stretch 方案文字顶到 32px 盒子顶部、单行不居中。
+- 修复：`.is-required .el-form-item__label { height:auto; align-self:center; align-items:normal }`——height:auto 收缩到内容高 + align-self:center 行内居中 + normal(stretch) 仅换行时星号贴首行。
+
+## 车辆认证审核弹窗重构（transportCapacity/vehicle.vue）
+- 背景：用户反馈「样式不统一、内容不全」。根因是审核弹窗用 `<el-descriptions :column="3" border>`（大白表 + 居中 label），与同页编辑弹窗的 `<section-card>` 白卡分组风格不一致。
+- 改造：弹窗主体改为 4 个 `section-card` 分组 —— 基础信息 / 尺寸重量 / 证件信息 / 证件图片；内部 `el-form label-position="right" label-width="auto"` + `el-row/el-col`（3 列 `:span="8"`，所属组织与备注占 `:span="24"`）。
+- 内容补全：新增「证件图片」分组，6 张证件照用 `<image-upload-field readonly large class-prefix="vehicle">` 只读展示（可点击放大）；证件图片尺寸 240×151 复用已有全局 `:deep(.vehicle-uploader--large)` 规则，无需新写。
+- label 单位统一为中文全角括号：`外廓长度（毫米）` / `核定载质量（KG）`（原为半角 `外廓长度(mm)`）。
+- 方法重构：`formatAuditValue(item)` → `auditValue(prop)`，签名更简洁；新增 longTermMap，对 drivingLicenseEndDate / roadTransportCertEndDate / annualReviewEndDate / compulsoryScrapDate 在勾选长期有效时返回「长期有效」，避免与未填写的「-」混淆（与列表页 formatEndDate 行为一致）。
+- 删除已无引用的 `auditDetailItems` computed。
+
+## 全站弹窗标题补 4px 主色竖条（全局 element-ui.scss）
+- 发现：`.el-dialog__title` 全局只配了 `inline-flex + gap:8px`，**没有竖条**（竖条此前只在 `.dialog-section-title::before`），导致全站 el-dialog 标题都不带竖条，不符合 AGENTS.md 4.8。
+- 修复：新增 `.el-dialog__title:not(:empty)::before { width:4px; height:16px; border-radius:2px; background:var(--el-color-primary) }`。
+- 注意：必须加 `:not(:empty)`，否则无标题弹窗会出现孤立蓝条。
+- customer-archive.vue 评分详情弹窗：将「临时额度申请使用期限」区间行（span=12 + 至 连接）拆分为两个 span=6 独立字段「临时申请额度有效期起 / 止」，字段名 tempCreditStartDate/End 不变，删除废弃样式 .score-detail-form__range。
+- temporary-credit-limit 文案调整：option 增加 addTitle/editTitle/viewTitle=「新增/编辑/查看临时额度申请」（覆盖 crud-dialog-title mixin 按菜单名注入的「临时额度管理」）；remark label 改「临时额度信息」（hide:true 无表格副作用，rules 同步）；projectName 表单 label 用 `#projectName-label` 插槽改「项目额度信息」，列 label 保持「项目名称」不动表格列头/搜索。Avue 支持-{prop}-label / -header / -search 插槽分离表单/表头/搜索文案。
+- temporary-credit-limit「申请有效期至」增加「必须晚于当前日期」校验：common.js 新增通用 `futureDateRule(label)`（trigger: ['change','blur']，空值/非法值放行，按 0 点比较，当天也算过期），temporary-credit-limit.js 的 validUntil rules 追加该规则。已验证 Element Plus 通用 picker 在选中日期时调用 formItem.validate('change')，故选择即刻提示；form.validate() 不带 trigger 时会跑全部规则，提交仍拦截。
+- temporary-credit-limit 搜索占位文案统一：createCrudOption(withSearchPlaceholders([...]))，搜索栏 placeholder 变为「请输入/请选择」不带字段名，与 waybill-manage / transport-plan / shipping-template 同一模式。
+- temporary-credit-limit 弹窗表单 placeholder 统一为「请输入/请选择」不带字段名：option 各列加 placeholder（projectCode/undertakeDeptName/projectFundLimit/usedFundLimit/remainingFundLimit/remark=请输入，validUntil=请选择），视图 formslot 自定义控件（projectName select、applyLimit input）placeholder 同步改。
+
+## 【项目管理】列表增加「项目资金使用预警」（project-apply）
+- 需求：列表新增「资金使用风险」列，高风险红色、中风险黄色；列表头部增加「资金使用风险」快速筛选标签（高风险(数)/中风险(数)），点击筛选。规则 tooltip：中风险≥80%、高风险≥90%，使用率=已使用资金/项目资金使用额度×100%。
+- 前端（已落地，src/views/business/project-apply.vue + src/option/business/project-apply.js + src/api/business/project-apply.js）：
+  - option/project-apply.js 新增列 `fundUseRisk`(slot:true, hide 列表显示) + 导出 `fundUseRiskOptions`(high/medium/none) 与 `fundUseRiskThreshold`{high:90, medium:80}。
+  - view 新增 `#header` 插槽：`el-check-tag` 快速筛选（复用 contract-manage 到期标签交互），带数量（fundRiskStats[statKey]）与 `?` tooltip 规则；新增 `#fundUseRisk` 插槽渲染彩色 `el-tag`（high→type=danger 红，medium→type=warning 黄，无→"-"）。
+  - data 加 fundRiskScope/fundRiskStats{high,medium,none}/fundRiskTagOptions；onLoad 追加 `fundUseRisk` 筛选参数 + 成功后 refreshFundRiskStats；新增 changeFundRiskScope（再次点击取消）、refreshFundRiskStats；searchReset 清空风险筛选。
+  - api 新增 `getFundRiskStats` → GET /blade-transport/project-apply/fund-risk-stats。
+- 后端契约（未改，待确认数据来源）：ProjectApplyVO 补齐 `fundUseRisk`(high/medium/none)、`fundUseRiskName`、`fundUseRate`、`usedFundLimit`/`remainingFundLimit`；列表 selectProjectApplyPage 填充每行风险 + buildQuery 支持 `fundUseRisk` 过滤；新增 `/fund-risk-stats` 返回 {high,medium,none}。
+- ⚠️ 关键阻塞：系统里项目与任何费用表（运输计划/运单/账单/客商）均无关联字段，`usedFundLimit`(已使用资金) 无真实取数来源；临时额度模块的 project-apply/list 返回里 usedFundLimit 实际为空。需业务方确认「已使用资金」口径后才能算风险等级，否则列表风险列全空、统计为 0。
+
+## 合同文件「批量下载」按钮与标题同排（contract-manage.vue 内联 AttachmentSection）
+- 需求：编辑页「合同文件」分组里「批量下载」按钮目前独立一行、靠右偏上，高度与标题区错位；要放到「合同文件」标题右侧同排、垂直居中。
+- 修复：`const AttachmentSection = defineComponent(...)` 内联组件 render() —— 原结构是 `div.dialog-section-title`(标题) 与 `div.contract-manage-form__attachment-head`(批量下载按钮) 两个并列 div；改为把标题与按钮放进同一个 `contract-manage-form__attachment-head` flex 容器（标题左、按钮右）。
+- 样式：`:deep(.contract-manage-form__attachment-head)` 由 `justify-content:flex-end` 改为 `space-between` + `align-items:center`，并 `.dialog-section-title { margin-bottom:0 }` 抵消标题自身 20px 下边距（2674 行 `:deep(.dialog-section-title)` 会命中子组件渲染的标题）。
+- 注意：AttachmentSection 用 render 函数产出 DOM，不带当前组件 scoped data 属性，因此样式必须走 `:deep()`；scoped 的 `&__billing-head, &__attachment-head`(2723) 只作用于当前组件模板内（计费信息），对子组件 DOM 无效。
+- 影响：4 处使用（编辑/详情 × 合同文件/其它附件）布局统一变为「标题 + 批量下载」同排。
+- 主人二次反馈「下面的其它附件也一样」——确认 L463(编辑/其它附件 description) / L765(详情/其它附件 description+readonly) 与 L313(编辑/合同文件) / L671(详情/合同文件) 都走同一份 render+样式，无需新代码；指挥浏览器 Cmd+Shift+R 硬刷即可看到效果（render 函数组件的 :deep() 样式改 HMR 经常不传播）。
+
+## 合同格式下拉改读业务字典 contractFormat（contract-manage.vue）
+- 需求：新增/编辑合同管理页「合同格式」下拉由硬编码改为读取业务字典 `contractFormat`。
+- 原实现：`option/business/contract-manage.js` 里 `contractFormat` 列 `dicData` 硬编码 `[{label:'电子合同',value:'电子合同'},{label:'纸质合同',value:'纸质合同'}]`，view 里 `contractFormatOptions` computed 直接 `columnOptions('contractFormat')` 读 column.dicData。
+- 修复（4 处）：
+  1. data 加 `contractFormatDictOptions: []`（与 settlementModeDictOptions 并列）。
+  2. computed `contractFormatOptions` 改为优先 `contractFormatDictOptions`，为空回退 `columnOptions('contractFormat')`（保留静态兜底）。
+  3. `loadSettlementDictionaries` 的 `Promise.all` 追加 `getBizDictionary({ code: 'contractFormat' })`，用 `records()` 映射 `{label:dictValue,value:dictKey}` 填充 `contractFormatDictOptions`；再**条件覆盖** column.dicData（仅当字典非空时），避免字典未配时清掉静态兜底。
+  4. `detailValue` 的字典映射分支加入 `prop === 'contractFormat'`，详情页「合同格式」也走 `displayStatus` 显示 label。
+- 后端契约：`getBizDictionary` → `GET /blade-system/dict-biz/dictionary?code=contractFormat`，返回 `List<DictBiz>{code,dictKey,dictValue,remark}`（DictBizController#dictionary 按 code 精确匹配）。字典 code 按用户口述用驼峰 `contractFormat`（现有 settle_method 为下划线，若后台实际是 `contract_format` 需调整 code）。
+- 参考模式：与 `settlementMode`（settle_method）完全一致。
+
+## 合同类别 contractCategory 也读业务字典（contract-manage.vue，续上）
+- 需求：模板里 label 实为「合同类型」（prop `contractCategory`），下拉由硬编码 `common.js#contractCategoryOptions`（客户合同/承运商合同/补充协议，value 中文）改为读业务字典 `contractCategory`。
+- 修复（3 处，与 contractFormat 同模式）：
+  1. data 加 `contractCategoryDictOptions: []`。
+  2. computed `contractCategoryOptions` 改为优先 `contractCategoryDictOptions`，空回退 `columnOptions('contractCategory')`（静态兜底）。
+  3. `loadSettlementDictionaries` 的 `Promise.all` 追加 `getBizDictionary({ code: 'contractCategory' })`，映射填充后**条件覆盖** `contractCategory` 列 dicData（仅非空时）。
+- 列表页列显示/搜索下拉、详情页（detailValue 已有 `prop==='contractCategory'` 分支走 displayStatus）均因 column.dicData 覆盖而自动跟随业务字典。
+- 注意：`config.defaultForm.contractCategory: '客户合同'`（option/contract-manage.js）为硬编码中文默认值，若业务字典 dictKey 非中文需同步调整。
+
+## 车辆新增弹窗：所有组织移位 + 使用部门 + 长期有效清空（vehicle.vue + 后端）
+- 需求（transportCapacity/vehicle）：①所有组织移到「基础车辆信息」区末尾；②新增「使用部门」字段（后端 transport_vehicle 无该字段，需加）；③车牌号三段（省/号码/颜色）包成整体输入框+减宽；④勾选「长期有效」清空对应日期且不可编辑。
+- 用户确认：所有组织+使用部门放「基础车辆信息」区末尾；使用部门用部门下拉（复用 getDeptTree→organizationOptions，存部门名，仅部门名非级联）；车牌号包成整体输入框+减宽；长期有效 4 组全部统一清空（强制报废/行驶证/道路运输证/年审）。
+- 前端（vehicle.vue）：
+  1. emptyForm 加 `useDepartment: ''`。
+  2. 删「基础车辆信息」首行的「所有组织」（原 span24），在区末新增一行：`使用部门`(span8, el-select+organizationOptions, 存 rawLabel) + `所有组织`(span8, el-cascader)。organizationOptions 由 initDeptTree 填充。
+  3. `.plate-group` 由 grid(112px 1fr 112px) 改为 flex 整体输入框：外层 border+radius+focus-within 变化；内部 el-select/el-input 去 box-shadow、无边框，第一/最后 select flex 0 0 30%、中间 input flex 1，子项间用 `::before` 竖线分隔。
+  4. 4 组 date-picker 加 `:disabled="xxxLongTerm === 1"`（行驶证/道路运输证原缺，补上），checkbox 加 `@change="handleLongTermChange(日期prop, longterm prop)"`；新增方法 handleLongTermChange（勾选时清空日期并 validateField）。
+  5. formRules：drivingLicenseEndDate / roadTransportCertEndDate 由 required 改为 validator（新增 validateDrivingLicenseEndDate / validateRoadTransportCertEndDate，longTerm===1 时跳过必填），annualReview 原 validator 已支持。
+- 后端（tms-erp-api-ws，新增 use_department 列）：
+  - `TransportVehicle.java` 加 `private String useDepartment`。
+  - `blade_transport_vehicle.sql` 建表加 `use_department varchar(50)`。
+  - `TransportVehicleExcel.java` 加 `使用部门` 列。
+  - `TransportVehicleMapper.xml` resultMap + BaseColumn + QueryCondition(useDepartment LIKE) 各加。
+  - `TransportVehicleServiceImpl.prepare()` trim useDepartment；validate() 加长度≤50 校验。
+  - 新增增量迁移 `doc/sql/transport/blade_transport_vehicle_use_department_patch_20260909.sql`（ALTER ADD use_department AFTER organization_name）。
+- 注意：VO 继承 entity 无需改；Wrapper BeanUtil 同名透传。已上线库须执行 patch SQL（建表脚本是 DROP+CREATE，勿直接跑）。
+- 后续补充（vehicle.vue「车辆资质图片」区输入框对齐）：第一行原 span `6/8/10` 不等宽（行驶证档案编号 6 / 行驶证有效期 8 / 道路运输证号 10）导致输入框宽度不齐，统一改为 `8/8/8`，与下方各行 span=8 一致。仅改 2 处 span，无逻辑改动。
+
+## 车辆车牌号：改为单一 input 输入框（vehicle.vue，3 段 → 1 段）
+- 需求：基础车辆信息区「车牌号」原本是「省简称 select + 号码 input + 车牌颜色 select」三段拼装（plateProvince/plateNoBody/plateColor），改为**单个 el-input** 直接输入完整车牌号（如 京A12345）。
+- 改动（vehicle.vue）：
+  1. 模板：`plate-group` 三段 → `<el-input v-model="vehicleForm.plateNo" maxlength="8" show-word-limit placeholder="如：京A12345" @input="handlePlateNoInput" @blur="validatePlateFormat">`。删除 `.plate-group` 样式（含 focus-within、竖线分隔、child flex 占比等整段）。
+  2. emptyForm：删 `plateProvince`、`plateNoBody`，保留 `plateNo`、`plateColor`（后端字段继续存历史车牌颜色）。
+  3. data：删 `plateProvinceOptions`、`plateColorOptions` 暴露；常量 `plateProvinceOptions`（31 省简称数组）整段删除；`plateColorOptions` 常量删除。
+  4. validatePlateNo 重写：直接校验 `value`（完整车牌号），正则 `/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼港澳]{1}[A-Z][A-Z0-9挂学警港澳]{5,6}$/`，错误提示改为「请输入标准车牌号（如：京A12345）」。
+  5. syncPlateNo / splitPlateNo 重写：splitPlateNo 改为 noop（保留以兼容 OCR 后回调链路）；syncPlateNo 改为 trim+upperCase 单一字段。
+  6. handlePlateBodyInput 改名为 handlePlateNoInput，新增 validatePlateFormat 失焦校验。
+  7. 车辆认证审核弹窗只读详情同步删「车牌颜色」展示（与录入表单一致）。
+- 后端不动：`plate_no` / `plate_color` 字段保留（数据库兼容历史车牌颜色），Service 无强制校验。
+- 受影响：OCR 自动识别（行驶证/机动车销售统一发票）后续调用链路无需改，因 syncPlateNo 仍对 plateNo 做归一化。
+
+## 车辆新增/编辑弹窗：输入框宽度统一（vehicle.vue，前后两区）
+- 需求（transportCapacity/vehicle）：新增/编辑弹窗「基础车辆信息」+「车辆资质图片」两个 section 各输入框宽度要一致；截图红框重点为车牌号、外廓尺寸、所有组织/使用部门。
+- 根因：基础区原本列宽混乱（车牌号 span10 / 车辆类型 span6 / 外廓尺寸 span6，其余 span6），行内 3 列与 2 列混排；图片区文本字段全 span6，与基础区不一致。
+- 改动（vehicle.vue 仅模板 el-col span）：
+  1. 「基础车辆信息」区所有字段统一为 **span=8（3 列布局）**：车牌号、车辆类型、外廓尺寸、核定载质量、准牵引总质量、业务关系、能源类型、强制报废日期、海关备案号、所有组织、使用部门。
+  2. 「车辆资质图片」区文本/日期字段（行驶证档案编号、行驶证有效期、道路运输证号、道路运输证有效期、道路运输年审有效期、机动车登记编号、机动车登记日期）统一为 **span=8**。
+- 不改：只读「车辆认证审核」弹窗（L140 起的 span6 只读详情 + large 图片上传）与新增弹窗内「证件图片」上传控件（固定尺寸）保持 span6。外廓尺寸为复合控件（长/宽/高三 input），口径同 span8。
+- ⚠️ 注意：操作中曾误删核定载质量 el-col 标签（453-460 行开始时少 el-col、尾部多一个 `</el-col>`），已修复为完整 `<el-col :span="8">...`。
+- 后续纠偏（2026-09-09 傍晚）：主人反馈「为什么不是按4列显示」——上一步把"基础车辆信息/车辆资质图片"两区误改成 3 列（span8）。同项目惯例 driver.vue/customer-archive.vue 全为 **4 列（span6，仅复合长字段 span12）**，故统一重排为 4 列：
+  - 基础车辆信息：`车牌号(6)+车辆类型(6)+外廓尺寸(12)` → `核定载质量/准牵引总质量/业务关系/能源类型(4×6)` → `强制报废日期/海关备案号/所有组织/使用部门(4×6)`
+  - 车辆资质图片：`行驶证有效期/道路运输证号/道路运输证有效期/道路运输年审有效期(4×6)` → `机动车登记编号/机动车登记日期/行驶证档案编号(3×6)`，图片上传控件仍 span6
+  - 该区 span8 已全部移除，编辑表单区仅剩外廓尺寸 span12（复合控件长/宽/高）+ 图片上传 span6。
+- 宽度微调（2026-09-09 傍晚2）：主人圈出「所有组织」字段宽度与同行不一致。根因：`.vehicle-form` 里的 `:deep(...){width:100%}` 选择器只列了 `el-select / el-input / el-input-number / el-date-editor`，**漏了 `el-cascader`**（所有组织用的就是级联选择器，默认不撑满整列）。已补 `:deep(.el-cascader)` 进该规则，全表单仅此一处用到 el-cascader，故所有组织与同行等宽。
+
+## 司机弹窗：补 placeholder + 每行统一 3 列（transportCapacity/driver.vue）
+- 需求：新增/编辑司机弹窗 ①输入框无提示文案；②基础身份信息 3 列，其它 4 列 / 6 列行不统一。
+- 改动（仅 1819 行 driver.vue 的 126-540 行 `<driver-dialog>` 模板，script/style 不动）：
+  1. **基础身份信息**：行结构不动，7 个 el-form-item 控件补 placeholder（司机姓名/身份证号/出生年月/性别/民族/学历/详细地址）。住址已有「请选择省市区」、驾驶车辆已有「请输入或选择车辆」，不动。
+  2. **驾驶证信息**：第一行 4 列（:span=6）拆为两行 — 行 1（准驾车型 / 档案编号 / 有效期 date-range，:span=8）+ 行 2（长期有效，:span=8）。起/止 placeholder 保留简短「起」「止」，符合主人 1.B 偏好（保留原 date-range 二联结构，不改 daterange）。
+  3. **从业资格证信息**：第一行 4 列拆为两行 — 行 1（从业资格认证类型 / 资格证号 / 有效期，:span=8）+ 行 2（长期有效，:span=8）。资格证号 placeholder 保留「默认身份证号」不动。
+  4. **司机联系信息**：一行 6 列拆为两行 — 行 1（司机类型 / 手机号 / 紧急联系人姓名，:span=8）+ 行 2（紧急联系人手机号 / 与联系人关系 / 所属组织，:span=8）。所属组织已有 placeholder，不动。
+- 决策点（主人确认）：1.B（保留原 date-range 二联 + 第三列留空后拆行的方案）；2 保留；3.A（驾驶证主页/副页、封面页/内容页两组上传图仍 :span=12，与占整行宽的原貌一致）。
+- 校验：node 脚本统计 4 个 section-card / 13 个 el-row / 31 个 el-col / 24 个 el-form-item，全平衡。改动只在 driver.vue 一文件，~25 处 Edit 调用。
+
+## 新增/修改司机弹窗改为 4 列布局（driver.vue，16:xx）
+- 主人要求 /transportCapacity/driver 新增司机弹窗改 4 列显示。原文件各分组已是 span=6（4 列栅格）但每行只放 3 个字段，第 4 列空置。
+- 重排结果（仅删行断 + 移动字段顺序，字段/校验/逻辑零改动）：
+  1. 基础身份信息：行1 司机姓名/身份证号/出生年月/性别；行2 民族/学历/住址/详细地址；行3 驾驶车辆/岗位；行4 三张证件照（不变）。
+  2. 驾驶证信息：行1 准驾车型/档案编号/有效期/长期有效；上传主页/副页 span 12→6。
+  3. 从业资格证信息：行1 类型/资格证号/有效期/长期有效；上传封面页/内容页 span 12→6。
+  4. 司机联系信息：行1 司机类型/手机号/紧急联系人姓名/紧急联系人手机号；行2 与联系人关系/所属组织。
+- 注意：此前日志记录的「3 列 span=8」方案已被后续改动覆盖为 span=6，本次以当前文件实际状态为准。
+
+## 客商档案：客商类型→客商分类 + 新增客商类型（customer-archive.vue）
+- ⚠️ 补救（17:34）：data 里的 `customerKindOptions`/`customerKindMap` 定义一度丢失（模板 v-for 空 → 下拉显示「无数据」，主人截图反馈），已补回 data（customerTypeOptions 之后）。其余 8 处改动经 grep 确认完好。
+- 需求：原「客商类型」（prop `customerType`，字典 customer_type：客户/承运商，多选）改名「客商分类」；另新增「客商类型」字段，取值为 外部客商 / 内部组织。
+- 约定：prop `customerType` 不动（其它页面 loading-manage / dept / business-crud-page 都以 `customerType:'承运商'` 作为后端查询参数），只改中文标签。
+- 新增字段 prop = **`customerKind`**（前端自定义命名，后端尚无对应字段，需后端在客商表加列并透传），值 `external`(外部客商) / `internal`(内部组织)，单选下拉，默认 `external`。
+- 改动点（8 处，全在 `src/views/vehicle/customer-archive.vue`）：
+  1. 表单：227 行 label 改「客商分类」；其后新增一个 `el-col :span="6"` 表单项「客商类型」prop `customerKind`（el-select + `customerKindOptions`）。
+  2. data 新增 `customerKindOptions` / `customerKindMap`（external/internal ↔ 中文）。
+  3. formRules：`customerType` 提示文案改「请选择客商分类」。
+  4. 列表列：「客户类型」label 改「客商分类」；新增「客商类型」列（prop customerKind，type select，dicData 内外部，minWidth 120，**未加 search**）。
+  5. `emptyArchive()` 加 `customerKind: 'external'`。
+  6. `normalizeDetail()` 加 `customerKind: detail.customerKind || 'external'`。
+  7. 变更记录 `getChangeFieldLabel`：`customerType:'客商分类'`，新增 `customerKind:'客商类型'`。
+  8. `formatChangeFieldValue`：别名映射加 `客商分类/客户类型 → customerType`、`客商类型 → customerKind`；valueMap 加 `customerKind:{external:'外部客商',internal:'内部组织'}`。
+- 校验：用 @vue/compiler-sfc 编译模板，0 错误。
+
+## 上传证件项 label 贴顶修复（全局 archive-form 垂直居中提升）
+- 症状：driver.vue 司机弹窗「驾驶证主页/副页」「封面页/内容页」等证件上传项（el-form-item 内容高 151px）label 文字贴顶，普通 32px 控件行看不出来。
+- 根因：`archive-form` class 被 driver / vehicle / ship / credit-score-quantification / loading-manage / waybill-import-dialog 等 8+ 页面复用，但「label 与控件垂直居中」规则 `.archive-form :deep(.el-form-item){align-items:center}` 锁在 customer-archive.vue 的 scoped 样式里，其它页面拿不到；flex 容器默认 stretch，label(32px) 在高控件行内贴顶。
+- 修复：规则提升到 `src/styles/element-ui.scss` 全局（紧跟 is-required 星号配套规则之后）：`.archive-form .el-form-item { align-items:center }`。全站 archive-form 表单一并生效，label 与控件垂直居中。SCSS 编译通过。
+
+## 司机弹窗「驾驶证信息」：有效期必填、长期有效不必填（transportCapacity/driver.vue）
+- 需求：驾驶证信息区「有效期」（起/止，prop `drivingLicenseEndDate`）要必填（显示红*），「长期有效」复选框（prop `drivingLicenseLongTerm`）不必填（去掉红*）。
+- 改动（formRules 两处）：
+  1. `drivingLicenseEndDate` 规则加 `required: true`（`{ required: true, validator: this.validateDrivingLicenseEndDate, trigger: 'change' }`）——仅用于渲染红*，实际校验仍走自定义 validator。
+  2. 删除 `drivingLicenseLongTerm` 的 `{ required: true, message: '请选择驾驶证是否长期有效' }` 规则块。
+- 关键机制（Element Plus 2.14 + async-validator 4.2.5 已核实）：
+  - 红* 由 `form-item` 的 `isRequired = normalizedRules.some(rule => rule.required)` 决定，只要规则对象带 `required` 就显示。
+  - async-validator 的 `rule.validate` 中，若存在 `rule.validator`，直接走自定义 validator 并 return，**不会**再执行 required 空值检查 → 勾「长期有效」时止日被清空/disabled 也不会误报必填。
+  - 校验逻辑保持原样：起始日期恒必填；`longTerm !== 1` 时止日必填。
+- 未同步：「从业资格证信息」区仍是「有效期无红* + 长期有效有红*」的旧形态（待主人确认是否一并统一）。
+
+## 司机弹窗 placeholder 统一为「请输入/请选择」（transportCapacity/driver.vue）
+- 需求：新增/修改司机弹窗输入框 placeholder 去掉后面的字段名称，只保留「请输入」「请选择」。
+- 改动：18 处 placeholder 简化（7 处 → `请输入`，10 处 → `请选择`，1 处动态 cascader `driverForm.addressRegion || '请选择省市区'` → `|| '请选择'`）。
+- **保留 4 处**（主人明确确认）：
+  1. 驾驶车辆 `请输入或选择车辆` —— 复合操作（既可输入又可点按钮选车），去掉会丢语义。
+  2. 日期范围 `起` / `止` —— 起止标记，非字段提示。
+  3. 资格证号 `默认身份证号` —— 默认值说明，非「请输入」格式。
+- 未动：表单**校验错误提示 message 仍带字段名**（如「请选择准驾车型」），因报错需指明具体字段，与 placeholder 定位不同；主人未要求，暂保持。
+- 做法：Python 脚本按完整 placeholder 字符串精确替换（18 规则全命中，未匹配即 exit 1 中断），比逐个 Edit 高效且不会误伤。
+- 校验：`@vue/compiler-sfc` parse + compileTemplate + compileScript 三项全通过。注意脚本必须放在**项目根目录**下运行（放 /tmp 解析不到 node_modules 里的 @vue/compiler-sfc）。
+- ⚠️ git diff 显示的 `drivingLicenseLongTerm` 校验规则变动是**本次之前工作区已有的未提交改动**（见上一条日志），非本次引入，勿混淆。
+
+## 「自动生成结算单」开关加 ? 悬浮提示（3 处）
+- 需求：开关「开启」后面加问号图标，hover 提示「开启时，系统根据配置规则归集运单，定时生成结算单」。
+- 改动文件（同一文案，为保持全站一致）：
+  1. `src/views/business/components/business-crud-page.vue`（1884 行附近，`.business-crud-page__settlement-switch`）
+  2. `src/views/business/contract-manage.vue`（357 行附近，`.contract-manage-form__settlement-switch`）
+  3. `src/views/business/contract-manage-change.vue`（55 行，`.settlement-switch`，原为单行长标签已拆行）
+- 写法：`<el-radio :label="1">开启</el-radio>` 后插 `<el-tooltip content="..." placement="top"><el-icon class="settlement-switch-tip"><QuestionFilled /></el-icon></el-tooltip>`，再接「关闭」radio。
+- 样式：`.settlement-switch-tip { margin:0 4px; color:#a8abb2; cursor:help; font-size:14px }`，各文件 scoped 样式内一份（contract-manage 写在 `&__settlement-switch` 内）。
+- 注意：图标走 main.js 全局注册（@element-plus/icons-vue 全量注册），无需 import；写法与 `project-apply.vue` 的 `__label-tip` 一致。
+- 这三个大文件本身已存在 prettier 格式问题（改动前 git HEAD 版本同样 fail），非本次引入。
+
+## 车辆认证审核弹窗排版对齐新增弹窗（vehicle.vue）
+- 诊断 `/project-apply/fund-risk-stats` No endpoint：前端已定义 getFundRiskStats（api/business/project-apply.js:13），后端未实现；方案已给（后端补 R<{high,medium}> / 前端 catch 降级），待主人选。
+- vehicle.vue 认证审核弹窗重排对齐新增弹窗：取消独立「尺寸重量」卡片，外廓尺寸改长/宽/高组合(span12，dimension-group)；基础信息 3 行×4 列（车牌号/车辆类型/外廓尺寸；载质量/牵引质量/业务关系/能源类型；强制报废日期/海关备案号/所有组织/使用部门）；证件信息按新增「车辆资质图片」行分布（止+运输证号+止+年审 / 登记编号+登记日期+档案编号+行驶证起 / 运输证起 / 备注整行）；label「所属组织」改「所有组织」对齐新增；dimension-group 样式复制进 .certification-audit 作用域。@vue/compiler-sfc 编译校验通过。
+- vehicle.vue 行驶证有效期必填星号：原规则是纯 validator（Element Plus 不渲染星号），改为 data 内 baseRules + computed formRules，drivingLicenseEndDate 动态返回 required 规则（长期有效=1 时返回 []，星号与校验同步消失）；删除 validateDrivingLicenseEndDate。经验：Element Plus 星号只在规则含 required:true 时渲染，且 el-form-item 的 :required 属性会被注入为 {required} 规则并产生英文默认提示，不宜用它控制星号。
+- 备注：车辆保存的「车牌颜色不能为空」「行驶证有效期：必填」均为后端校验（前端无对应规则），需后端改。
+- driver.vue 从业资格证有效期对齐驾驶证：单日期改 date-range 起/止（列宽 6+6+6+6 → 6+6+8+4），新增 qualificationStartDate 字段（emptyForm + handleSubmit normalize）；qualificationEndDate 规则加 required:true（渲染星号，validator 豁免长期）；删除 qualificationLongTerm 的 required 规则（长期有效不必填）；勾长期后起止均 disabled（比驾驶证更严，驾驶证起仍可编辑）。⚠️ 后端需新增 qualification_start_date 字段否则起日期无法存取。
+- driver.vue 补充：驾驶证「有效期起」加 :disabled（长期=1 时禁用）；驾驶证与从业资格证两个 validator 统一在「长期有效=1」时直接 callback() 放行（起止都不校验、不提示）。禁用不清空旧值，提交时保留原日期（后端以 longTerm 为准）。
+- contract-manage-change.vue「合同文件」批量下载按钮上移：标题与按钮合并进 .section-head（flex space-between 同排），与「其它附件/计费信息」分区一致；删除无引用的 .attachment-head 样式。
+- contract-manage-change.vue「自动生成结算单」问号提示图标位置：原 icon 夹在开启/关闭 radio 之间，因 .el-radio 默认 margin-right:32px 导致离开启远、贴关闭；修复 = 开启 radio margin-right 清零 + icon margin 改 0 32px 0 8px。

.workbuddy/memory/MEMORY.md

@@ -2,6 +2,17 @@
 
 ## 设计约定（已确认）
 
+### 表单 placeholder 统一为「请输入 / 请选择」（不带字段名）
+- **规范**：输入框 placeholder 只写动作词 `请输入` / `请选择`，**后面不跟字段名称**（label 已说明是什么字段，重复无意义）。
+- 已生效页面：waybill-manage、transport-plan、shipping-template、temporary-credit-limit（搜索栏 + 弹窗表单）、**driver.vue**（2026-09-09 补齐 18 处）。
+- **3 类例外必须保留，不要误简化**：
+  1. 复合操作：如 `请输入或选择车辆`（既可键盘输入又可点按钮弹窗选车），丢掉会损失语义。
+  2. 日期区间的 `起` / `止`：是起止标记，不是字段提示。
+  3. 默认值说明：如资格证号 `默认身份证号`、车牌号 `如：京A12345`，属于示例/默认值提示，非「请输入」格式。
+- **校验错误提示 message 保持带字段名**（如「请选择准驾车型」「请输入档案编号」），与 placeholder 定位不同——报错必须指明具体哪个字段，不能只说「请选择」。
+- Avue 配置化表单：在 option 各列加 `placeholder`；搜索栏可用通用工具 `withSearchPlaceholders([...])`（见 temporary-credit-limit.js）。
+- 批量改法：Python 脚本按**完整 placeholder 字符串**做精确替换，每规则校验 `count > 0` 否则中断，避免误伤；改完用 `@vue/compiler-sfc` 的 parse + compileTemplate + compileScript 验证（脚本须放项目根目录下跑，放 /tmp 解析不到 node_modules）。
+
 ### 弹窗分组：统一用全局 `<section-card>`
 - 弹窗 body 背景由 `src/styles/element-ui.scss` 全局 `.el-dialog__body { background:#f5f6fa; padding:16px }` 统一灰底。
 - 每组 = 白底卡片：4px 主色竖条 + 8px 间距 + 圆角 6px + 淡阴影。组件全局注册 `<section-card title="...">`，支持 `#title` / `#extra` slot。

src/api/base/currency.js

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

src/api/base/measurement-unit.js

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

src/api/business/common.js

@@ -92,13 +92,12 @@ export const createCrudApi = baseUrl => ({
       data,
     });
   },
-  reassign(id) {
+  reassign(data) {
+    const payload = data && typeof data === 'object' ? data : { id: data };
     return request({
       url: `${baseUrl}/reassign`,
       method: 'post',
-      params: {
-        id,
-      },
+      data: payload,
     });
   },
   batchComplete(ids) {

src/api/business/process-config.js

@@ -13,11 +13,14 @@ export const getDetail = (id, waybillId) =>
       ...(waybillId === undefined ? {} : { waybillId }),
     },
   });
-export const getVoucherImages = waybillId =>
+export const getVoucherImages = (waybillId, params = {}) =>
   request({
     url: '/blade-transport/process-config/voucher-images',
     method: 'get',
-    params: { waybillId },
+    params: {
+      waybillId,
+      ...params,
+    },
   });
 export const submit = api.submit;
 export const remove = api.remove;

src/api/business/project-apply.js

@@ -6,9 +6,23 @@ const api = createCrudApi(baseUrl);
 
 export const getList = api.getList;
 export const getDetail = api.getDetail;
+export const getChangeRecordDetail = (id, recordIndex) =>
+  request({
+    url: `${baseUrl}/change-record/detail`,
+    method: 'get',
+    params: { id, recordIndex },
+  });
 export const submit = api.submit;
 export const remove = api.remove;
 
+// 项目资金使用风险统计（高风险 / 中风险数量），供列表头部快速筛选标签使用
+export const getFundRiskStats = params =>
+  request({
+    url: `${baseUrl}/fund-risk-stats`,
+    method: 'get',
+    params,
+  });
+
 export const saveDraft = row =>
   request({
     url: `${baseUrl}/save-draft`,

src/api/business/transport-plan.js

@@ -35,3 +35,27 @@ export const importTransportPlan = ({
     timeout: 60000,
   });
 };
+
+export const validateTransportPlan = ({
+  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}/validate-transport-plan`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+    timeout: 60000,
+  });
+};

src/api/business/voucher-manage.js

@@ -5,7 +5,29 @@ const baseUrl = '/blade-transport/voucher-manage';
 export const getList = (current, size, params) =>
   request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
 export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
+export const getFolderPage = (voucherId, current, size, params) =>
+  request({ url: `${baseUrl}/folder-page`, method: 'get', params: { voucherId, current, size, ...params } });
+export const getFolderDetail = (voucherId, plateNo) =>
+  request({ url: `${baseUrl}/folder-detail`, method: 'get', params: { voucherId, plateNo } });
+export const replaceFolder = (voucherId, plateNo, file) => {
+  const data = new FormData();
+  data.append('voucherId', voucherId);
+  data.append('plateNo', plateNo);
+  data.append('file', file);
+  return request({ url: `${baseUrl}/folder-replace`, method: 'post', data });
+};
+export const replaceFolderByObject = (voucherId, plateNo, fileInfo) =>
+  request({
+    url: `${baseUrl}/folder-replace-object`,
+    method: 'post',
+    params: { voucherId, plateNo, ...fileInfo },
+    timeout: 120000,
+  });
+export const removeFolder = (voucherId, plateNo) =>
+  request({ url: `${baseUrl}/folder-remove`, method: 'post', params: { voucherId, plateNo } });
 export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
+export const changeWaybillBatch = data =>
+  request({ url: `${baseUrl}/change-waybill-batch`, method: 'post', data });
 export const createUploadDraft = data =>
   request({ url: `${baseUrl}/upload-draft`, method: 'post', data });
 export const completeUploadFile = data =>
@@ -17,6 +39,9 @@ export const getWaybillBatches = (current, size, params) =>
     method: 'get',
     params: { current, size, ...params },
   });
+export const auditPass = id => request({ url: `${baseUrl}/audit-pass`, method: 'post', params: { id } });
+export const auditReject = (id, rejectReason) =>
+  request({ url: `${baseUrl}/audit-reject`, method: 'post', params: { id, rejectReason } });
 
 const fileTaskBaseUrl = '/blade-file/fileTask';
 export const queryFileTask = md5 =>

src/api/business/waybill-manage.js

@@ -26,6 +26,13 @@ export const maintainMileage = data =>
     method: 'post',
     data,
   });
+/** 运单打卡记录 + 司机上传凭证图 */
+export const getPunchRecords = waybillId =>
+  request({
+    url: `${baseUrl}/punch-records`,
+    method: 'get',
+    params: { waybillId },
+  });
 export const roadLoading = ids =>
   request({
     url: `${baseUrl}/road-loading`,
@@ -36,9 +43,11 @@ export const roadLoading = ids =>
   });
 
 export const getImportBatches = params => request({ url: `${baseUrl}/import-batch/list`, method: 'get', params });
+export const getImportBatchNextCode = () => request({ url: `${baseUrl}/import-batch/next-code`, method: 'get' });
 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 exportImportTemplate = () => request({ url: `${baseUrl}/import-batch/export-template`, method: 'get', responseType: 'blob' });
 export const saveImportDraft = data => request({ url: `${baseUrl}/import-batch/draft`, method: 'post', data });
+export const validateImport = data => request({ url: `${baseUrl}/import-batch/validate`, method: 'post', data, responseType: 'blob' });
 export const confirmImport = data => request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data });

src/api/payment/paymentApplication.js

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

src/api/settlement/formalSettlement.js

@@ -4,6 +4,8 @@ const baseUrl = '/blade-transport/formal-settlement';
 
 export const getList = (current, size, params) =>
   request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
+export const exportList = params =>
+  request({ url: `${baseUrl}/export`, method: 'get', params, responseType: 'blob' });
 export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
 export const getCandidates = (current, size, params) =>
   request({
@@ -44,3 +46,7 @@ export const applyPayment = data =>
   request({ url: `${baseUrl}/apply-payment`, method: 'post', data });
 export const applyPayments = data =>
   request({ url: `${baseUrl}/apply-payments`, method: 'post', data });
+export const claimInvoices = data =>
+  request({ url: `${baseUrl}/claim-invoices`, method: 'post', data });
+export const queryInvoicePool = params =>
+  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });

src/api/settlement/transportReconciliation.js

@@ -4,6 +4,8 @@ const baseUrl = '/blade-transport/transport-reconciliation';
 
 export const getList = (current, size, params) =>
   request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
+export const exportList = params =>
+  request({ url: `${baseUrl}/export`, method: 'get', params, responseType: 'blob' });
 export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
 export const getFormalOptions = (current, size, params) =>
   request({
@@ -14,17 +16,21 @@ export const getFormalOptions = (current, size, params) =>
 export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
 export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
 export const match = id => request({ url: `${baseUrl}/match`, method: 'post', params: { id } });
+export const matchPreview = data =>
+  request({ url: `${baseUrl}/match-preview`, method: 'post', data });
 export const manualMatch = data =>
   request({ url: `${baseUrl}/manual-match`, method: 'post', data });
 export const unmatch = internalId =>
   request({ url: `${baseUrl}/unmatch`, method: 'post', params: { internalId } });
 export const adjust = data => request({ url: `${baseUrl}/adjust`, method: 'post', data });
-export const updateByMatch = id =>
-  request({ url: `${baseUrl}/update-by-match`, method: 'post', params: { id } });
+export const updateByMatch = (id, data) =>
+  request({ url: `${baseUrl}/update-by-match`, method: 'post', params: { id }, data });
 export const complete = id =>
   request({ url: `${baseUrl}/complete`, method: 'post', params: { id } });
-export const template = mode =>
-  request({ url: `${baseUrl}/template`, method: 'get', params: { mode }, responseType: 'blob' });
+export const completeWithData = data =>
+  request({ url: `${baseUrl}/complete-with-data`, method: 'post', data });
+export const template = (mode, params) =>
+  request({ url: `${baseUrl}/template`, method: 'get', params: { mode, ...params }, responseType: 'blob' });
 
 const importFile = (url, id, file) => {
   const data = new FormData();

src/api/system/dept.js

@@ -78,3 +78,10 @@ export const getDeptLazyTree = parentId => {
     },
   });
 };
+
+export const getPlatformCompanySelect = () => {
+  return request({
+    url: '/blade-system/dept/platform-company-select',
+    method: 'get',
+  });
+};

src/api/transportCapacity/vehicle-dispatch.js

@@ -0,0 +1,25 @@
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/vehicle-dispatch';
+
+export const getList = (current, size, params) =>
+  request({ url: `${baseUrl}/list`, method: 'get', params: { ...params, current, size } });
+
+export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
+
+export const submit = row => request({ url: `${baseUrl}/submit`, method: 'post', data: row });
+
+export const remove = ids => request({ url: `${baseUrl}/remove`, method: 'post', params: { ids } });
+
+export const submitApproval = id =>
+  request({ url: `${baseUrl}/submit-approval`, method: 'post', params: { id } });
+
+export const approve = id => request({ url: `${baseUrl}/approve`, method: 'post', params: { id } });
+
+export const exportVehicleDispatch = params =>
+  request({
+    url: `${baseUrl}/export-vehicle-dispatch`,
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });

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

@@ -47,3 +47,11 @@ export const update = row => {
     data: row,
   });
 };
+
+export const getExpiryStat = params => {
+  return request({
+    url: '/blade-transport/annual-inspection-record/expiry-stat',
+    method: 'get',
+    params,
+  });
+};

src/api/vehicle/customer-archive.js

@@ -113,6 +113,26 @@ export const getScoreTemplate = quantificationId => {
   });
 };
 
+export const queryKingdeeCustomer = creditCode => {
+  return request({
+    url: '/blade-transport/bfi/customer/query-by-credit-code',
+    method: 'get',
+    params: {
+      creditCode,
+    },
+  });
+};
+
+export const syncKingdee = id => {
+  return request({
+    url: '/blade-transport/customer-archive/sync-kingdee',
+    method: 'post',
+    params: {
+      id,
+    },
+  });
+};
+
 export const recognizeBusinessLicenseOcr = imageUrl => {
   return request({
     url: '/blade-transport/baidu-ocr/recognize-url',

src/axios.js

@@ -223,6 +223,14 @@ axios.interceptors.response.use(
   },
   error => {
     NProgress.done();
+    // 网络级失败（HTTP 状态 >500、网关错误、超时、断网等 validateStatus 放行之外的响应）
+    // 原为静默 reject，接口报错页面无任何感知；统一补错误提示，取消请求与刷新令牌请求除外
+    if (!axios.isCancel(error) && !isRefreshTokenRequest(error?.config)) {
+      ElMessage({
+        message: error?.response?.data?.msg || '请求失败，请稍后重试',
+        type: 'error',
+      });
+    }
     return Promise.reject(new Error(error));
   }
 );

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

@@ -1,11 +1,5 @@
 <template>
-  <el-dialog
-    v-model="visible"
-    title="地图选择地址"
-    width="920px"
-    append-to-body
-    @opened="initMap"
-  >
+  <el-dialog v-model="visible" title="地图选择地址" width="920px" append-to-body @opened="initMap">
     <div class="address-map-picker__toolbar">
       <el-input
         v-model="keyword"
@@ -15,7 +9,14 @@
       />
       <el-button type="primary" :loading="searching" @click="searchKeyword">搜索</el-button>
     </div>
-    <div ref="map" class="address-map-picker__map"></div>
+    <div class="address-map-picker__content">
+      <map-search-results
+        v-if="searchResults.length"
+        :results="searchResults"
+        @select="selectSearchResult"
+      />
+      <div ref="map" class="address-map-picker__map"></div>
+    </div>
     <div class="address-map-picker__info">{{ status }}</div>
     <template #footer>
       <el-button @click="visible = false">取消</el-button>
@@ -54,6 +55,8 @@ export default {
       amap: null,
       marker: null,
       geocoder: null,
+      searchResults: [],
+      mapInitializing: null,
     };
   },
   watch: {
@@ -65,6 +68,7 @@ export default {
           this.keyword = this.address || '';
           this.selected = {};
           this.status = '可搜索地址或点击地图选点';
+          this.searchResults = [];
         }
       },
     },
@@ -96,25 +100,39 @@ export default {
       return amapLoader;
     },
     initMap() {
-      this.loadAmap()
+      if (this.mapInitializing) return this.mapInitializing;
+
+      this.mapInitializing = this.loadAmap()
         .then(() => {
-          this.$nextTick(() => {
-            if (!this.amap) {
-              this.amap = new window.AMap.Map(this.$refs.map, {
-                center: [116.40769, 39.89945],
-                zoom: 11,
-              });
-              this.amap.on('click', event => this.pickPoint(event.lnglat));
-            } else {
-              this.amap.resize();
-              this.clearMarker();
-            }
+          if (!window.AMap?.Map) {
+            throw new Error('高德地图组件未就绪');
+          }
+          return new Promise(resolve => {
+            this.$nextTick(() => {
+              if (!this.$refs.map) return resolve(null);
+              if (!this.amap) {
+                this.amap = new window.AMap.Map(this.$refs.map, {
+                  center: [116.40769, 39.89945],
+                  zoom: 11,
+                });
+                this.amap.on('click', event => this.pickPoint(event.lnglat));
+              } else {
+                this.amap.resize();
+                this.clearMarker();
+              }
+              resolve(this.amap);
+            });
           });
         })
         .catch(() => {
           this.$message.error('高德地图组件加载失败，请稍后重试');
           this.visible = false;
+          return null;
+        })
+        .finally(() => {
+          this.mapInitializing = null;
         });
+      return this.mapInitializing;
     },
     ensureGeocoder() {
       if (this.geocoder) return Promise.resolve(this.geocoder);
@@ -154,15 +172,28 @@ export default {
         this.$message.warning('请输入地址关键词');
         return;
       }
+      if (this.searching) return;
+      this.searchResults = [];
       this.searching = true;
-      this.loadAmap()
-        .then(() => this.runGeocode('location', keyword))
+      this.initMap()
+        .then(map => (map ? this.runGeocode('location', keyword) : null))
         .then(result => {
-          const point = result.geocodes?.[0]?.location || result.location;
+          if (!result) return;
+          const geocodes = result.geocodes || (result.location ? [result] : []);
+          this.searchResults = geocodes.map((item, index) => ({
+            id: item.id || index,
+            name: item.formattedAddress || item.address || keyword,
+            address: item.formattedAddress || item.address || keyword,
+            location: item.location,
+          }));
+          const point = geocodes[0]?.location || result.location;
           if (!point) {
             throw new Error('未找到匹配地址');
           }
-          this.pickPoint(point, keyword);
+          return this.$nextTick().then(() => {
+            this.amap?.resize();
+            this.pickPoint(point, geocodes[0]?.formattedAddress || keyword);
+          });
         })
         .catch(() => {
           this.status = '未找到匹配地址';
@@ -172,6 +203,11 @@ export default {
           this.searching = false;
         });
     },
+    selectSearchResult(item) {
+      if (item && item.location) {
+        this.pickPoint(item.location, item.address || item.name || '');
+      }
+    },
     pickPoint(point, fallbackAddress = '') {
       const longitude = typeof point.getLng === 'function' ? point.getLng() : point.lng;
       const latitude = typeof point.getLat === 'function' ? point.getLat() : point.lat;
@@ -181,7 +217,11 @@ export default {
       }
       const lnglat = new window.AMap.LngLat(Number(longitude), Number(latitude));
       this.renderMarker(lnglat);
-      this.selected = { longitude: Number(longitude), latitude: Number(latitude), address: fallbackAddress };
+      this.selected = {
+        longitude: Number(longitude),
+        latitude: Number(latitude),
+        address: fallbackAddress,
+      };
       this.status = '正在解析地址...';
       this.resolving = true;
       this.runGeocode('address', lnglat)
@@ -238,11 +278,19 @@ export default {
   }
 
   &__map {
+    flex: 1 1 auto;
     width: 100%;
+    min-width: 0;
     height: 420px;
     border: 1px solid #eff1f7;
   }
 
+  &__content {
+    display: flex;
+    gap: 12px;
+    min-width: 0;
+  }
+
   &__info {
     margin-top: 10px;
     color: #606266;

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

@@ -0,0 +1,65 @@
+<template>
+  <div v-if="results.length" class="map-search-results">
+    <div class="map-search-results__title">搜索结果</div>
+    <el-empty v-if="!results.length" description="暂无搜索结果" :image-size="60" />
+    <div
+      v-for="(item, index) in results"
+      :key="item.id || index"
+      class="map-search-results__item"
+      @click="$emit('select', item)"
+    >
+      <div class="map-search-results__name">{{ item.name || item.address || '未命名地址' }}</div>
+      <div class="map-search-results__address">{{ item.address || item.name || '-' }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    results: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  emits: ['select'],
+};
+</script>
+
+<style lang="scss" scoped>
+.map-search-results {
+  width: 260px;
+  height: 420px;
+  overflow-y: auto;
+  border: 1px solid #eff1f7;
+  background: #fff;
+  flex: 0 0 260px;
+
+  &__title {
+    padding: 10px 12px;
+    border-bottom: 1px solid #eff1f7;
+    font-weight: 600;
+  }
+
+  &__item {
+    padding: 10px 12px;
+    cursor: pointer;
+    border-bottom: 1px solid #f5f5f5;
+  }
+
+  &__item:hover {
+    background: #f5f9ff;
+  }
+
+  &__name {
+    color: #303133;
+    font-size: 14px;
+  }
+
+  &__address {
+    margin-top: 4px;
+    color: #909399;
+    font-size: 12px;
+  }
+}
+</style>

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

@@ -75,8 +75,8 @@ import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
 import { baseUrl } from '@/config/env';
 import { getUploadHeaders } from '@/utils/upload';
 
-const UNIFIED_ATTACHMENT_TIP =
-  '支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过500M';
+const UNIFIED_ATTACHMENT_TIP_PREFIX =
+  '支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过';
 
 const MIME_MAP = {
   jpg: 'image/jpeg',
@@ -215,7 +215,7 @@ export default {
       return this.acceptedList.join(',');
     },
     tipText() {
-      return this.tip || UNIFIED_ATTACHMENT_TIP;
+      return this.tip || `${UNIFIED_ATTACHMENT_TIP_PREFIX}${this.maxSize}M`;
     },
     uploadingCount() {
       return this.fileList.filter(file => ['ready', 'uploading'].includes(file.status)).length;
@@ -335,7 +335,12 @@ export default {
       const data = (file.response && file.response.data) || file.data || file;
       const url = data.link || data.url || data.domain || file.url || '';
       const originalName =
-        data.originalName || file.originalName || data.name || file.name || this.getFileName(url) || '附件';
+        data.originalName ||
+        file.originalName ||
+        file.name ||
+        data.name ||
+        this.getFileName(url) ||
+        '附件';
       const extension = this.getExtension({ name: originalName, url });
       return {
         ...data,

src/main.js

@@ -43,6 +43,7 @@ import tenantPackage from './views/system/tenantpackage.vue';
 import tenantDatasource from './views/system/tenantdatasource.vue';
 // 通用弹窗分组白卡（灰底弹窗内使用，标题在卡内）
 import sectionCard from './components/section-card/main.vue';
+import mapSearchResults from './components/map-search-results/main.vue';
 
 window.$crudCommon = crudCommon;
 debug();
@@ -66,6 +67,7 @@ app.component('formSetting', formSetting);
 app.component('tenantPackage', tenantPackage);
 app.component('tenantDatasource', tenantDatasource);
 app.component('sectionCard', sectionCard);
+app.component('mapSearchResults', mapSearchResults);
 app.config.globalProperties.$app = app;
 app.config.globalProperties.$dayjs = dayjs;
 app.config.globalProperties.website = website;

src/option/base/measurement-unit.js

@@ -0,0 +1,133 @@
+const dimensionOptions = [
+  { label: '重量', value: '重量' },
+  { label: '体积', value: '体积' },
+  { label: '数量', value: '数量' },
+];
+
+const statusOptions = [
+  { label: '启用', value: 1 },
+  { label: '停用', value: 2 },
+];
+
+export const createOption = () => ({
+  height: 'auto',
+  calcHeight: 32,
+  dialogWidth: 680,
+  labelPosition: 'right',
+  labelWidth: 'auto',
+  tip: false,
+  searchBtnText: '查询',
+  emptyBtnText: '重置',
+  saveBtnText: '提交',
+  updateBtnText: '提交',
+  searchShow: true,
+  searchMenuSpan: 24,
+  searchIcon: true,
+  searchIndex: 4,
+  searchMenuPosition: 'right',
+  border: true,
+  index: true,
+  indexLabel: '序号',
+  indexWidth: 70,
+  addBtn: false,
+  viewBtn: false,
+  editBtn: false,
+  delBtn: false,
+  selection: true,
+  dialogClickModal: false,
+  menuWidth: 240,
+  menuFixed: 'right',
+  column: [
+    {
+      label: '计量单位',
+      prop: 'unitName',
+      minWidth: 150,
+      search: true,
+      searchOrder: 3,
+      searchSpan: 6,
+      maxlength: 50,
+      showWordLimit: true,
+      rules: [
+        { required: true, message: '请输入计量单位', trigger: 'blur' },
+        { max: 50, message: '计量单位不能超过50个字', trigger: 'blur' },
+      ],
+    },
+    {
+      label: '计量维度',
+      prop: 'dimension',
+      type: 'select',
+      minWidth: 130,
+      search: true,
+      searchOrder: 2,
+      searchSpan: 6,
+      dicData: dimensionOptions,
+      rules: [{ required: true, message: '请选择计量维度', trigger: 'change' }],
+    },
+    {
+      label: '备注',
+      prop: 'remark',
+      type: 'textarea',
+      minRows: 2,
+      span: 24,
+      minWidth: 200,
+      maxlength: 200,
+      showWordLimit: true,
+      overHidden: true,
+      rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
+    },
+    {
+      label: '状态',
+      prop: 'status',
+      type: 'select',
+      search: true,
+      searchOrder: 1,
+      searchSpan: 6,
+      slot: true,
+      dataType: 'number',
+      dicData: statusOptions,
+      clearable: true,
+      value: 1,
+      addDisplay: false,
+      editDisplay: false,
+      minWidth: 100,
+    },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      display: false,
+    },
+    {
+      label: '更新人',
+      prop: 'updateUserName',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      display: false,
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      sortable: true,
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+    },
+    {
+      label: '更新时间',
+      prop: 'updateTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      sortable: true,
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+    },
+  ],
+});

src/option/business/common.js

@@ -41,7 +41,7 @@ export const planStatusOptions = [
 export const waybillStatusOptions = [
   { label: '草稿', value: 'draft' },
   { label: '待执行', value: 'pending' },
-  { label: '进行中', value: 'processing' },
+  { label: '进行中', value: 'running' },
   { label: '已完成', value: 'completed' },
   { label: '已取消', value: 'cancelled' },
 ];
@@ -97,6 +97,11 @@ export const businessTypeOptions = [
   { label: '普通业务', value: '普通业务' },
 ];
 
+export const businessModeOptions = [
+  { label: '国内运输', value: '国内运输' },
+  { label: '跨境运输', value: '跨境运输' },
+];
+
 export const settlementModeOptions = [
   { label: '先票后款', value: '先票后款' },
   { label: '先款后票', value: '先款后票' },
@@ -125,12 +130,18 @@ export const contractApprovalStatusOptions = [
   { label: '草稿', value: 'draft' },
   { label: '审批中', value: 'reviewing' },
   { label: '已驳回', value: 'rejected' },
+  { label: '已撤回', value: 'withdrawn' },
   { label: '审批通过', value: 'approved' },
   { label: '变更审批中', value: 'change_reviewing' },
   { label: '变更驳回', value: 'change_rejected' },
   { label: '变更审批通过', value: 'change_approved' },
 ];
 
+export const contractArchiveStatusOptions = [
+  { label: '未归档', value: '未归档' },
+  { label: '已归档', value: '已归档' },
+];
+
 export const nodeOptions = [
   { label: '接单', value: '接单' },
   { label: '到场', value: '到场' },
@@ -169,6 +180,32 @@ export const nonNegativeRule = label => ({
   trigger: 'blur',
 });
 
+// 日期必须晚于当前日期（当天不可选）：选择后立即校验，trigger 固定为 change
+// 取值支持 YYYY-MM-DD / YYYY-MM-DD HH:mm:ss / 时间戳
+export const futureDateRule = label => ({
+  validator: (rule, value, callback) => {
+    if (value === undefined || value === null || value === '') {
+      callback();
+      return;
+    }
+    const raw = String(value).trim().replace(/-/g, '/');
+    const selected = new Date(raw);
+    if (Number.isNaN(selected.getTime())) {
+      callback();
+      return;
+    }
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+    selected.setHours(0, 0, 0, 0);
+    if (selected.getTime() <= today.getTime()) {
+      callback(new Error(`${label}必须晚于当前日期`));
+      return;
+    }
+    callback();
+  },
+  trigger: ['change', 'blur'],
+});
+
 export const phoneRule = label => ({
   pattern: /^1[3-9]\d{9}$/,
   message: `${label}格式不正确`,

src/option/business/contract-manage.js

@@ -1,6 +1,7 @@
 import {
   auditColumns,
   contractApprovalStatusOptions,
+  contractArchiveStatusOptions,
   contractCategoryOptions,
   contractStageOptions,
   createCrudOption,
@@ -27,6 +28,12 @@ const listDicFormatter = res => {
   return [];
 };
 
+const projectNameDicFormatter = res => {
+  const list = listDicFormatter(res);
+  // 过滤掉 projectName 为空的记录
+  return list.filter(item => item && item.projectName && String(item.projectName).trim());
+};
+
 export const config = {
   title: '合同管理',
   permission: 'contract_manage',
@@ -42,7 +49,7 @@ export const config = {
   batchDelete: false,
   enableProjectSelect: true,
   projectQueryParams: {
-    approvalStatuses: 'approved,change_approved',
+    contractSelectable: true,
   },
   actions: ['copy'],
   statusProp: 'approvalStatus',
@@ -65,6 +72,10 @@ export const config = {
         ['legalSealFlag', '是否需要加盖法人章'],
         ['copyCount', '一式（份）'],
         ['paymentDays', '回款账期（天）'],
+        ['contractAmount', '合同金额'],
+        ['templateFlag', '是否范本'],
+        ['originalContractNo', '原件合同编号'],
+        ['electronicSealFlag', '是否电子章'],
         ['remark', '备注', 2],
       ],
     },
@@ -78,6 +89,7 @@ export const config = {
         ['effectiveType', '生效类型'],
         ['contractStage', '合同阶段'],
         ['approvalStatus', '审核状态'],
+        ['archiveStatus', '归档状态'],
         ['currentNode', '当前节点'],
         ['currentProcessor', '当前处理人'],
       ],
@@ -98,7 +110,7 @@ export const config = {
   },
   deleteStatus: ['draft'],
   deleteStage: ['draft'],
-  editStatus: ['draft', 'rejected', 'change_rejected'],
+  editStatus: ['draft', 'withdrawn', 'rejected', 'change_rejected'],
   operations: [
     {
       action: 'flow',
@@ -265,8 +277,8 @@ export const option = createCrudOption([
     formslot: true,
     order: 165,
     dicUrl:
-      '/blade-transport/project-apply/list?current=1&size=9999&approvalStatuses=approved,change_approved',
-    dicFormatter: listDicFormatter,
+      '/blade-transport/project-apply/list?current=1&size=9999&contractSelectable=true',
+    dicFormatter: projectNameDicFormatter,
     props: {
       label: 'projectName',
       value: 'projectName',
@@ -479,6 +491,47 @@ export const option = createCrudOption([
     order: 50,
     minWidth: 130,
   },
+  {
+    label: '合同金额',
+    prop: 'contractAmount',
+    type: 'number',
+    min: 0,
+    precision: 2,
+    hide: true,
+    order: 45,
+    minWidth: 130,
+  },
+  {
+    label: '是否范本',
+    prop: 'templateFlag',
+    type: 'select',
+    dicData: [
+      { label: '否', value: 0 },
+      { label: '是', value: 1 },
+    ],
+    hide: true,
+    order: 40,
+    minWidth: 100,
+  },
+  {
+    label: '原件合同编号',
+    prop: 'originalContractNo',
+    hide: true,
+    order: 35,
+    minWidth: 160,
+  },
+  {
+    label: '是否电子章',
+    prop: 'electronicSealFlag',
+    type: 'select',
+    dicData: [
+      { label: '否', value: 0 },
+      { label: '是', value: 1 },
+    ],
+    hide: true,
+    order: 30,
+    minWidth: 110,
+  },
   {
     label: '创建时间',
     prop: 'createTime',
@@ -516,6 +569,19 @@ export const option = createCrudOption([
     addDisplay: false,
     editDisplay: false,
   },
+  {
+    label: '归档状态',
+    prop: 'archiveStatus',
+    type: 'select',
+    search: true,
+    searchOrder: 5,
+    searchPlaceholder: '请选择',
+    slot: true,
+    dicData: contractArchiveStatusOptions,
+    minWidth: 110,
+    addDisplay: false,
+    editDisplay: false,
+  },
   {
     label: '当前节点',
     prop: 'currentNode',

src/option/business/loading-manage.js

@@ -8,7 +8,7 @@ export const transportTypeDict = {
   },
 };
 
-export const carrierTypeOptions = ['承运商', '自运', '网货平台'];
+export const carrierTypeOptions = ['承运商', '自运'];
 
 export const loadingStatusOptions = [
   { label: '草稿', value: 'draft' },

src/option/business/project-apply.js

@@ -1,5 +1,6 @@
 import {
   auditColumns,
+  businessModeOptions,
   businessTypeOptions,
   createCrudOption,
   nonNegativeRule,
@@ -16,6 +17,18 @@ const projectEffectiveTypeOptions = [
   { label: '正式', value: 'formal' },
 ];
 
+export const fundUseRiskOptions = [
+  { label: '高风险', value: 'high' },
+  { label: '中风险', value: 'medium' },
+  { label: '正常', value: 'none' },
+];
+
+// 项目资金额度使用率阈值：中风险 ≥ 80%，高风险 ≥ 90%
+export const fundUseRiskThreshold = {
+  high: 90,
+  medium: 80,
+};
+
 const amountRules = label => [
   { required: true, message: `请输入${label}`, trigger: 'blur' },
   nonNegativeRule(label),
@@ -117,7 +130,7 @@ export const option = createCrudOption([
     hide: true,
     minWidth: 140,
     maxlength: 20,
-    rules: textRule('项目简称', 20, true),
+    rules: textRule('项目简称', 20),
   },
   {
     label: '项目类型',
@@ -156,16 +169,16 @@ export const option = createCrudOption([
     rules: textRule('业务部门', 50, true),
   },
   {
-    label: '承办部门',
+    label: '平台公司',
     prop: 'undertakeDeptName',
     search: true,
     searchPlaceholder: '请输入',
     searchOrder: 8,
     minWidth: 150,
-    rules: textRule('承办部门', 50, true),
+    rules: textRule('平台公司', 50, true),
   },
   {
-    label: '承办部门ID',
+    label: '平台公司ID',
     prop: 'undertakeDeptId',
     hide: true,
   },
@@ -179,6 +192,15 @@ export const option = createCrudOption([
     formatter: row => formatUserRealName(row, 'principal'),
     rules: textRule('项目负责人', 50, true),
   },
+  {
+    label: '资金使用风险',
+    prop: 'fundUseRisk',
+    slot: true,
+    minWidth: 150,
+    addDisplay: false,
+    editDisplay: false,
+    hide: false,
+  },
   {
     label: '项目负责人ID',
     prop: 'principalUserId',
@@ -293,6 +315,15 @@ export const option = createCrudOption([
     hide: true,
     minWidth: 130,
   },
+  {
+    label: '业务模式',
+    prop: 'businessMode',
+    type: 'select',
+    dicData: businessModeOptions,
+    hide: true,
+    minWidth: 120,
+    rules: [selectRule('业务模式')],
+  },
   {
     label: '项目规模（万元）',
     prop: 'projectScale',
@@ -311,6 +342,15 @@ export const option = createCrudOption([
     minWidth: 150,
     rules: [nonNegativeRule('预计利润')],
   },
+  {
+    label: '利润率（%）',
+    prop: 'profitRate',
+    type: 'number',
+    precision: 2,
+    hide: true,
+    minWidth: 120,
+    rules: [nonNegativeRule('利润率')],
+  },
   {
     label: '资金需求（万元）',
     prop: 'fundDemand',

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

@@ -4,6 +4,7 @@ import {
   createCrudOption,
   nonNegativeRule,
   textRule,
+  withSearchPlaceholders,
 } from './common';
 
 const listDicFormatter = res => {
@@ -15,6 +16,12 @@ const listDicFormatter = res => {
   return [];
 };
 
+const projectNameDicFormatter = res => {
+  const list = listDicFormatter(res);
+  // 过滤掉 projectName 为空的记录
+  return list.filter(item => item && item.projectName && String(item.projectName).trim());
+};
+
 const userDicFormatter = res =>
   listDicFormatter(res).map(user => ({
     ...user,
@@ -50,30 +57,25 @@ export const config = {
   detailAlignCenter: true,
   detailSections: [
     {
-      title: '申请信息',
+      title: '项目额度信息',
       fields: [
-        ['applicationNo', '申请单号', 1],
-        ['projectName', '项目', 1],
+        ['projectName', '项目名称', 1],
         ['projectCode', '项目编号', 1],
         ['undertakeDeptName', '承办部门', 1],
-        ['applyDeptName', '申请部门', 1],
-        ['applicantName', '申请人', 1],
-        ['approvalStatus', '审批状态', 1],
-        ['currentNode', '当前节点', 1],
-        ['currentProcessor', '当前处理人', 1],
-        ['validUntil', '申请有效期至', 1],
-        ['remark', '备注', 1],
-      ],
-    },
-    {
-      title: '额度信息',
-      fields: [
         ['projectFundLimit', '项目资金使用额度（万元）', 1],
         ['usedFundLimit', '已使用项目资金使用额度（万元）', 1],
         ['remainingFundLimit', '剩余项目资金使用额度（万元）', 1],
-        ['applyLimit', '申请临时额度（万元）', 1],
       ],
     },
+    {
+      title: '临时额度信息',
+      fields: [
+        ['applyLimit', '申请临时额度（万元）', 1],
+        ['validUntil', '申请有效期至', 1],
+        ['remark', '备注', 4],
+      ],
+      showAttachment: true,
+    },
   ],
   operations: [
     {
@@ -118,7 +120,10 @@ export const config = {
 
 export const option = {
   dialogCustomClass: 'temporary-credit-limit-dialog',
-  ...createCrudOption([
+  addTitle: '新增临时额度申请',
+  editTitle: '编辑临时额度申请',
+  viewTitle: '查看临时额度申请',
+  ...createCrudOption(withSearchPlaceholders([
     {
       label: '申请单号',
       prop: 'applicationNo',
@@ -129,6 +134,14 @@ export const option = {
       editDisplay: false,
       editDisabled: true,
     },
+    {
+      label: '',
+      prop: 'projectQuotaInfoTitle',
+      formslot: true,
+      span: 24,
+      hide: true,
+      labelWidth: 0,
+    },
     {
       label: '项目名称',
       prop: 'projectName',
@@ -137,7 +150,7 @@ export const option = {
       searchType: 'select',
       formslot: true,
       dicUrl: '/blade-transport/project-apply/list?current=1&size=9999',
-      dicFormatter: listDicFormatter,
+      dicFormatter: projectNameDicFormatter,
       props: {
         label: 'projectName',
         value: 'projectName',
@@ -158,6 +171,7 @@ export const option = {
       prop: 'projectCode',
       hide: true,
       disabled: true,
+      placeholder: '请输入',
       span: 6,
       minWidth: 150,
       rules: textRule('项目编号', 50),
@@ -167,6 +181,7 @@ export const option = {
       prop: 'undertakeDeptName',
       hide: true,
       disabled: true,
+      placeholder: '请输入',
       span: 6,
       minWidth: 150,
       rules: textRule('承办部门', 50, true),
@@ -176,6 +191,7 @@ export const option = {
       prop: 'projectFundLimit',
       hide: true,
       disabled: true,
+      placeholder: '请输入',
       span: 6,
       minWidth: 200,
       rules: [nonNegativeRule('项目资金使用额度')],
@@ -185,6 +201,7 @@ export const option = {
       prop: 'usedFundLimit',
       hide: true,
       disabled: true,
+      placeholder: '请输入',
       span: 6,
       minWidth: 220,
       value: 0,
@@ -195,11 +212,20 @@ export const option = {
       prop: 'remainingFundLimit',
       hide: true,
       disabled: true,
+      placeholder: '请输入',
       span: 6,
       minWidth: 230,
       value: 0,
       rules: [nonNegativeRule('剩余项目资金使用额度')],
     },
+    {
+      label: '',
+      prop: 'temporaryCreditInfoTitle',
+      formslot: true,
+      span: 24,
+      hide: true,
+      labelWidth: 0,
+    },
     {
       label: '申请临时额度（万元）',
       prop: 'applyLimit',
@@ -217,9 +243,31 @@ export const option = {
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
+      placeholder: '请选择',
       span: 6,
       minWidth: 140,
-      rules: [{ required: true, message: '请选择申请有效期至', trigger: 'change' }],
+      rules: [
+        { required: true, message: '请选择申请有效期至', trigger: 'change' },
+      ],
+    },
+    {
+      label: '备注',
+      prop: 'remark',
+      type: 'textarea',
+      span: 24,
+      minRows: 2,
+      hide: true,
+      placeholder: '请输入',
+      maxlength: 200,
+      showWordLimit: true,
+      rules: textRule('备注', 200),
+    },
+    {
+      label: '附件',
+      prop: 'attachmentsJson',
+      formslot: true,
+      span: 24,
+      hide: true,
     },
     {
       label: '申请部门',
@@ -284,26 +332,8 @@ export const option = {
       addDisplay: false,
       editDisplay: false,
     },
-    {
-      label: '备注',
-      prop: 'remark',
-      type: 'textarea',
-      span: 24,
-      minRows: 2,
-      hide: true,
-      maxlength: 200,
-      showWordLimit: true,
-      rules: textRule('备注', 200),
-    },
-    {
-      label: '附件',
-      prop: 'attachmentsJson',
-      formslot: true,
-      span: 24,
-      hide: true,
-    },
     ...auditColumns.map(column => ({ ...column, hide: true })),
-  ]),
+  ])),
   dialogWidth: '96%',
   menuFixed: 'right',
   menuWidth: 320,

src/option/business/transport-plan.js

@@ -23,6 +23,12 @@ const listDicFormatter = res => {
   return [];
 };
 
+const projectNameDicFormatter = res => {
+  const list = listDicFormatter(res);
+  // 过滤掉 projectName 为空的记录
+  return list.filter(item => item && item.projectName && String(item.projectName).trim());
+};
+
 const parseGoodsRows = value => {
   if (!value) return [];
   if (Array.isArray(value)) return value;
@@ -209,7 +215,7 @@ export const config = {
   statusProp: 'businessStatus',
   statusTextProp: 'businessStatusName',
   deleteStatus: ['draft', 'waiting_dispatch'],
-  editStatus: ['draft', 'waiting_dispatch'],
+  editStatus: ['draft', 'waiting_dispatch', 'dispatching'],
   detailButton: true,
   detailSections: [
     {
@@ -364,7 +370,7 @@ export const option = {
         span: 6,
         order: 400,
         dicUrl: '/blade-transport/project-apply/list?current=1&size=9999',
-        dicFormatter: listDicFormatter,
+        dicFormatter: projectNameDicFormatter,
         props: {
           label: 'projectName',
           value: 'projectName',

src/option/business/waybill-manage.js

@@ -19,6 +19,12 @@ const transportTypeDict = {
 
 const isEmpty = value => value === undefined || value === null || value === '';
 const normalizeNumericDisplayValue = value => (Number(value) === -1 ? '' : value);
+const formatMoneyDisplay = value => {
+  if (isEmpty(value) || Number(value) === -1) return '';
+  const number = Number(value);
+  if (!Number.isFinite(number)) return '';
+  return number.toFixed(2);
+};
 
 const parseJsonArray = value => {
   if (Array.isArray(value)) return value;
@@ -92,14 +98,32 @@ const getProcessConfigNodes = row => {
 
 const isAcceptProcessNode = node => node.key === 'accept' || node.name === '接单';
 
+const isTruthyFlag = value => {
+  if (value === true || value === 1) return true;
+  if (value === false || value === 0 || value === null || value === undefined || value === '') {
+    return false;
+  }
+  return ['true', '1', 'yes'].includes(String(value).trim().toLowerCase());
+};
+
 const requiresDriverAcceptConfirmation = row =>
-  getProcessConfigNodes(row).some(
-    node =>
-      isAcceptProcessNode(node) &&
-      node.enabled !== false &&
-      node.confirmMode === 'yes' &&
-      node.confirmDriver === true
-  );
+  getProcessConfigNodes(row).some(node => {
+    if (!isAcceptProcessNode(node) || node.enabled === false) return false;
+    if (node.confirmMode === 'no_confirm_accept') return false;
+    // 与后端一致：是否确认=是 即需接单（不强制依赖 confirmDriver）
+    return node.confirmMode === 'yes' || !node.confirmMode;
+  });
+
+const getDriverRejectReason = row => {
+  if (!row) return '';
+  const reason =
+    row.driverRejectReason ||
+    row.driverRefuseReason ||
+    row.acceptRejectReason ||
+    row.rejectReason ||
+    '';
+  return String(reason || '').trim();
+};
 
 const isDriverRejectedStatus = value => {
   if (value === null || value === undefined || typeof value === 'boolean') return false;
@@ -122,6 +146,7 @@ const isDriverRejectedStatus = value => {
 };
 
 const hasDriverRejectRecord = row => {
+  if (String(row.driverAcceptStatus || '').toLowerCase() === 'rejected') return true;
   const rejectRecordValues = [
     row.driverRejectTime,
     row.driverRejectedTime,
@@ -161,9 +186,16 @@ const hasDriverRejectRecord = row => {
 };
 
 const isDriverRejectedWaybill = row =>
-  requiresDriverAcceptConfirmation(row) && hasDriverRejectRecord(row);
+  (row.requireAccept === true ||
+    row.requireAccept === 1 ||
+    requiresDriverAcceptConfirmation(row)) &&
+  hasDriverRejectRecord(row);
 
 const hasDriverAcceptRecord = row => {
+  if (String(row.driverAcceptStatus || '').toLowerCase() === 'accepted') return true;
+  if (['rejected', 'pending'].includes(String(row.driverAcceptStatus || '').toLowerCase())) {
+    return false;
+  }
   const recordValues = [
     row.driverAcceptTime,
     row.driverAcceptedTime,
@@ -172,6 +204,7 @@ const hasDriverAcceptRecord = row => {
     row.driverAcceptedBy,
     row.acceptUserId,
     row.acceptUserName,
+    row.driverAcceptDriverId,
   ];
   if (recordValues.some(value => value !== null && value !== undefined && value !== '')) {
     return true;
@@ -315,10 +348,10 @@ const formatUnitPrice = row => {
   return billingUnit ? `${billingPrice}(${billingUnit})` : billingPrice;
 };
 
-const formatAmount = (row, props) => getFirstValue(row, props);
+const formatAmount = (row, props) => formatMoneyDisplay(getFirstValue(row, props));
 
-const sumAmount = list =>
-  list.reduce((sum, item) => {
+const sumAmount = (rows = []) =>
+  rows.reduce((sum, item) => {
     const value = getFirstValue(item, ['freightAmount', 'amount', 'totalAmount']);
     return isEmpty(value) ? sum : sum + Number(value || 0);
   }, 0);
@@ -337,7 +370,7 @@ const calculateFreightTotal = rows => {
     return sum + Number(item.unitPrice || 0) * Number(item.quantity || 0);
   }, 0);
   if (!hasAmountField) return '';
-  return Number.isFinite(total) ? Number(total.toFixed(2)).toString() : '';
+  return Number.isFinite(total) ? total.toFixed(2) : '';
 };
 
 const formatFreight = row => {
@@ -345,9 +378,9 @@ const formatFreight = row => {
   if (!isEmpty(value)) return value;
   const freight = parseJsonObject(row.freightJson);
   const freightValue = getFirstValue(freight, ['freightAmount', 'transportFee']);
-  if (!isEmpty(freightValue)) return freightValue;
+  if (!isEmpty(freightValue)) return formatMoneyDisplay(freightValue);
   const total = sumAmount(Array.isArray(freight.freightItems) ? freight.freightItems : []);
-  return total ? total : '';
+  return total ? formatMoneyDisplay(total) : '';
 };
 
 const formatOtherFeeTotal = row => {
@@ -364,10 +397,10 @@ const formatFreightTotal = row => {
   const otherFeeTotal = !isEmpty(otherFee) ? otherFee : formatOtherFeeTotal(row);
   if (!isEmpty(calculated)) {
     const total = Number(calculated || 0) + Number(otherFeeTotal || 0);
-    return Number.isFinite(total) ? Number(total.toFixed(2)).toString() : calculated;
+    return Number.isFinite(total) ? total.toFixed(2) : calculated;
   }
   const value = getFirstValue(freight, ['totalFreightAmount', 'totalFreight', 'totalAmount']);
-  if (!isEmpty(value)) return value;
+  if (!isEmpty(value)) return formatMoneyDisplay(value);
   return formatAmount(row, ['freightTotal', 'totalFreight', 'totalAmount']);
 };
 
@@ -377,6 +410,8 @@ export const config = {
   title: '运单管理',
   permission: 'waybill_manage',
   importUrl: '/blade-transport/waybill-manage/import-waybill-manage',
+  exportUrl: '/blade-transport/waybill-manage/export-waybill-manage',
+  exportName: '运单管理',
   defaultForm: {
     carrierType: '承运商',
     transportType: 'road',
@@ -423,29 +458,37 @@ export const config = {
   statusProp: 'businessStatus',
   statusTextProp: 'businessStatusName',
   formatStatus(row, prop, defaultText) {
-    if (
-      prop === 'businessStatus' &&
-      requiresDriverAcceptConfirmation(row) &&
-      isInProgressStatus(row, defaultText) &&
-      !hasDriverAcceptRecord(row)
-    ) {
+    if (prop !== 'businessStatus') return defaultText;
+    const status = String(row.businessStatus || '');
+    const terminalStatuses = ['draft', 'completed', 'cancelled', 'waiting_dispatch', 'dispatching'];
+    const needAccept =
+      row.requireAccept === true ||
+      row.requireAccept === 1 ||
+      requiresDriverAcceptConfirmation(row);
+    // 需司机接单且尚未接单 → 待执行（含库中仍为 running 的历史数据展示校正）
+    if (needAccept && !hasDriverAcceptRecord(row) && !terminalStatuses.includes(status)) {
       return '待执行';
     }
-    if (
-      prop === 'businessStatus' &&
-      row.businessStatus === 'pending' &&
-      !requiresDriverAcceptConfirmation(row)
-    ) {
-      return '进行中';
-    }
+    if (status === 'pending') return '待执行';
+    if (status === 'running' || status === 'processing') return '进行中';
     return defaultText;
   },
   canReassign(row) {
     return isDriverRejectedWaybill(row);
   },
+  getDriverRejectReason,
+  isDriverRejectedWaybill,
   canEdit(row) {
+    // 进行中的运单不允许编辑
+    if (isInProgressStatus(row, row.businessStatusName)) {
+      return false;
+    }
     return !isDriverRejectedWaybill(row);
   },
+  canCancel(row) {
+    // 进行中的运单不允许取消
+    return !isInProgressStatus(row, row.businessStatusName);
+  },
   deleteStatus: ['draft'],
   editStatus: ['draft', 'pending'],
 };
@@ -637,7 +680,7 @@ export const option = {
         viewDisplay: false,
       },
       {
-        label: '单价（计价单位）',
+        label: '单价',
         prop: 'unitPrice',
         formatter: row => formatUnitPrice(row),
         minWidth: 140,

src/option/settlement/receivable-payable-detail.js

@@ -67,9 +67,7 @@ export const feeDetailBaseColumns = [
 ];
 
 export const feeDetailTailColumns = [
-  { label: '原总金额', prop: 'originalAmountText', minWidth: 120 },
-  { label: '调整金额', prop: 'adjustAmountText', minWidth: 120 },
-  { label: '调整后总金额', prop: 'afterAmountText', minWidth: 140 },
+  { label: '结算金额', prop: 'originalAmountText', minWidth: 120 },
   { label: '备注', prop: 'remark', minWidth: 160 },
   { label: '最后录入人', prop: 'updateUserName', minWidth: 120 },
   { label: '最后录入时间', prop: 'updateTime', minWidth: 170 },

src/option/settlement/transportReconciliationForm.js

@@ -2,10 +2,8 @@ export const transportReconciliationFormFields = [
   { prop: 'reconciliationNo', label: '对账单号', readonly: true },
   { prop: 'reconciliationMode', label: '对账模式', type: 'mode' },
   { prop: 'formalSettlementNo', label: '正式结算单', type: 'formal' },
-  { prop: 'payerName', label: '付款方', readonly: true },
-  { prop: 'payeeName', label: '收款方', readonly: true },
+  { prop: 'customerName', label: '客户/承运商', readonly: true },
   { prop: 'projectName', label: '项目', readonly: true },
-  { prop: 'deptName', label: '所属组织', readonly: true },
   { prop: 'contractName', label: '合同名称', readonly: true },
   { prop: 'paidAmount', label: '已付合计', money: true, readonly: true },
   { prop: 'reconcilerName', label: '对账人', readonly: true },

src/option/settlement/transportReconciliationSearch.js

@@ -1,12 +1,12 @@
 export const reconciliationMatchStatusOptions = [
-  { label: '全部', value: '' },
+  { label: '全部', value: 'all' },
   { label: '未匹配', value: 'unmatched' },
   { label: '部分匹配', value: 'partial' },
   { label: '已匹配', value: 'matched' },
 ];
 
 export const reconciliationStatusOptions = [
-  { label: '全部', value: '' },
+  { label: '全部', value: 'all' },
   { label: '未完成', value: 'unfinished' },
   { label: '已完成', value: 'completed' },
 ];

src/option/settlement/transportReconciliationTable.js

@@ -18,7 +18,7 @@ export const transportReconciliationTableColumns = [
 export const internalColumns = [
   { prop: 'documentNo', label: '单据号', minWidth: 150 },
   { prop: 'waybillNo', label: '运单号', minWidth: 120 },
-  { prop: 'matchedExternalLineNo', label: '匹配外部账单行号', minWidth: 140 },
+  { prop: 'matchedExternalLineNo', label: '匹配外部账单行号', minWidth: 180 },
   { prop: 'vehicleNo', label: '车号', minWidth: 100 },
   { prop: 'departureAddress', label: '发货地址', minWidth: 180 },
   { prop: 'arrivalAddress', label: '到货地址', minWidth: 180 },
@@ -27,13 +27,10 @@ export const internalColumns = [
   { prop: 'transportType', label: '运输类型', minWidth: 120 },
   { prop: 'cargoName', label: '货物名称', minWidth: 120 },
   { prop: 'cargoType', label: '货物类型', minWidth: 120 },
-  { prop: 'specification', label: '规格', minWidth: 100 },
-  { prop: 'model', label: '型号', minWidth: 100 },
   { prop: 'transportQuantity', label: '运输总量', minWidth: 100, number: true },
-  { prop: 'mileage', label: '里程（KM）', minWidth: 100, number: true },
+  { prop: 'mileage', label: '里程（KM）', minWidth: 120, number: true },
   { prop: 'batchNo', label: '批次号', minWidth: 100 },
   { prop: 'unitPrice', label: '运输单价', minWidth: 110, money: true },
-  { prop: 'freightAmount', label: '运输费', minWidth: 110, money: true },
   { prop: 'settlementAmount', label: '结算金额', minWidth: 120, money: true },
   { prop: 'matchResult', label: '匹配结果', minWidth: 100 },
   { prop: 'updateResult', label: '账单更新结果', minWidth: 130 },
@@ -50,7 +47,7 @@ export const externalVehicleColumns = [
   { prop: 'cargoName', label: '货物名称', minWidth: 120 },
   { prop: 'cargoType', label: '货物类型', minWidth: 120 },
   { prop: 'transportQuantity', label: '运输总量', minWidth: 100, number: true },
-  { prop: 'mileage', label: '里程（KM）', minWidth: 100, number: true },
+  { prop: 'mileage', label: '里程（KM）', minWidth: 120, number: true },
   { prop: 'batchNo', label: '批次号', minWidth: 100 },
   { prop: 'unitPrice', label: '运输单价', minWidth: 110, money: true },
   { prop: 'freightAmount', label: '运费', minWidth: 110, money: true },
@@ -69,9 +66,9 @@ export const externalCargoColumns = [
   { prop: 'cargoType', label: '货物类型', minWidth: 120 },
   { prop: 'specification', label: '规格', minWidth: 100 },
   { prop: 'model', label: '型号', minWidth: 100 },
-  { prop: 'transportQuantity', label: '运输量', minWidth: 100, number: true },
+  { prop: 'transportQuantity', label: '运输总量', minWidth: 100, number: true },
   { prop: 'unitPrice', label: '运输单价', minWidth: 110, money: true },
-  { prop: 'mileage', label: '里程（KM）', minWidth: 100, number: true },
+  { prop: 'mileage', label: '里程（KM）', minWidth: 120, number: true },
   { prop: 'freightAmount', label: '运输费', minWidth: 110, money: true },
-  { prop: 'settlementAmount', label: '结算金额', minWidth: 120, money: true },
+  { prop: 'settlementAmount', label: '结算费用合计', minWidth: 130, money: true },
 ];

src/option/transportCapacity/driver.js

@@ -76,6 +76,11 @@ export const option = {
       prop: 'posts',
       minWidth: 150,
     },
+    {
+      label: '驾驶车辆',
+      prop: 'drivingVehicle',
+      minWidth: 130,
+    },
     {
       label: '所属组织',
       prop: 'organizationName',

src/option/transportCapacity/transport-vehicle.js

@@ -21,7 +21,7 @@ export const option = {
       label: '车牌号',
       prop: 'plateNo',
       search: true,
-      searchOrder: 6,
+      searchOrder: 7,
       slot: true,
       minWidth: 120,
     },
@@ -29,7 +29,7 @@ export const option = {
       label: '业务关系',
       prop: 'businessRelation',
       search: true,
-      searchOrder: 5,
+      searchOrder: 6,
       searchValue: '',
       type: 'select',
       dicData: [
@@ -50,11 +50,18 @@ export const option = {
       slot: true,
       minWidth: 150,
     },
+    {
+      label: '使用部门',
+      prop: 'useDepartment',
+      search: true,
+      searchOrder: 3,
+      minWidth: 140,
+    },
     {
       label: '车辆类型',
       prop: 'vehicleType',
       search: true,
-      searchOrder: 4,
+      searchOrder: 5,
       type: 'select',
       dicData: [
         { label: '全部', value: '' },
@@ -108,7 +115,7 @@ export const option = {
       label: '车辆状态',
       prop: 'status',
       search: true,
-      searchOrder: 3,
+      searchOrder: 4,
       type: 'select',
       slot: true,
       dicData: [

src/option/transportCapacity/vehicle-dispatch.js

@@ -0,0 +1,181 @@
+const approvalStatusOptions = [
+  { label: '草稿', value: 'draft' },
+  { label: '审批中', value: 'reviewing' },
+  { label: '已驳回', value: 'rejected' },
+  { label: '审批通过', value: 'approved' },
+];
+
+export const statusName = status =>
+  approvalStatusOptions.find(item => item.value === status)?.label || status || '-';
+
+export const option = {
+  height: 'auto',
+  calcHeight: 32,
+  dialogWidth: 1200,
+  labelPosition: 'right',
+  labelWidth: 'auto',
+  tip: false,
+  searchBtnText: '查询',
+  emptyBtnText: '重置',
+  saveBtnText: '提交',
+  updateBtnText: '提交',
+  searchShow: true,
+  searchMenuSpan: 24,
+  searchIndex: 4,
+  searchMenuPosition: 'right',
+  border: true,
+  index: true,
+  indexLabel: '序号',
+  indexWidth: 70,
+  addBtn: false,
+  editBtn: false,
+  delBtn: false,
+  viewBtn: false,
+  selection: false,
+  dialogClickModal: false,
+  menuFixed: 'right',
+  menuWidth: 320,
+  column: [
+    // ========== 表格列（顺序固定）==========
+    {
+      label: '申请单号',
+      prop: 'applicationNo',
+      search: true,
+      searchOrder: 5,
+      searchPlaceholder: '请输入',
+      minWidth: 180,
+      slot: true,
+      addDisplay: true,
+      editDisabled: true,
+      disabled: true,
+      placeholder: '保存后自动生成',
+    },
+    {
+      label: '车牌号',
+      prop: 'plateNo',
+      search: true,
+      searchOrder: 4,
+      searchPlaceholder: '请输入',
+      minWidth: 120,
+      formslot: true,
+      rules: [{ required: true, message: '请选择车牌号', trigger: 'blur' }],
+    },
+    {
+      label: '所属组织',
+      prop: 'organizationName',
+      search: true,
+      searchOrder: 3,
+      searchPlaceholder: '请输入',
+      minWidth: 140,
+      disabled: true,
+      placeholder: '选择车牌号后自动填充',
+      rules: [{ required: true, message: '请输入所属组织', trigger: 'blur' }],
+    },
+    {
+      label: '使用部门',
+      prop: 'useDepartment',
+      search: true,
+      searchOrder: 2,
+      searchPlaceholder: '请输入',
+      minWidth: 140,
+      formslot: true,
+      span: 12,
+      rules: [{ required: true, message: '请选择使用部门', trigger: 'blur' }],
+    },
+    {
+      label: '车辆类型',
+      prop: 'vehicleType',
+      minWidth: 110,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '审批状态',
+      prop: 'approvalStatus',
+      search: true,
+      searchOrder: 1,
+      type: 'select',
+      dicData: approvalStatusOptions,
+      slot: true,
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '当前节点',
+      prop: 'currentNode',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '当前处理人',
+      prop: 'currentProcessor',
+      minWidth: 130,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      minWidth: 170,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    // ========== 新增/编辑表单专用（不进表格）==========
+    {
+      label: '申请人',
+      prop: 'applicantName',
+      hide: true,
+      display: true,
+      addDisplay: true,
+      editDisplay: true,
+      viewDisplay: true,
+      disabled: true,
+      span: 12,
+    },
+    {
+      label: '申请时间',
+      prop: 'applyTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      hide: true,
+      display: true,
+      addDisplay: true,
+      editDisplay: true,
+      viewDisplay: true,
+      disabled: true,
+      span: 12,
+    },
+    {
+      label: '备注',
+      prop: 'remark',
+      type: 'textarea',
+      hide: true,
+      span: 24,
+      maxlength: 200,
+      showWordLimit: true,
+      rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
+    },
+    {
+      label: '附件',
+      prop: 'attachments',
+      hide: true,
+      span: 24,
+      minWidth: 100,
+      formslot: true,
+    },
+  ],
+};

src/option/vehicle/accident-record.js

@@ -70,14 +70,16 @@ export const option = {
     {
       label: '车牌号/船号',
       prop: 'vehicleNo',
+      type: 'select',
       slot: true,
       formslot: true,
       search: true,
+      searchType: 'input',
       minWidth: 140,
       span: 12,
-      placeholder: '输入车牌号/船号查询选择',
+      placeholder: '请选择车牌号/船号',
       rules: [
-        { required: true, message: '请输入车牌号/船号', trigger: 'blur' },
+        { required: true, message: '请选择车牌号/船号', trigger: 'change' },
         { max: 30, message: '最多 30 个字符', trigger: 'blur' },
       ],
     },

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

@@ -75,14 +75,16 @@ export const option = {
     {
       label: '车牌号/船号',
       prop: 'vehicleNo',
+      type: 'select',
       slot: true,
       formslot: true,
       search: true,
+      searchType: 'input',
       minWidth: 140,
       span: 12,
-      placeholder: '输入车牌号/船号查询选择',
+      placeholder: '请选择车牌号/船号',
       rules: [
-        { required: true, message: '请输入车牌号/船号', trigger: 'blur' },
+        { required: true, message: '请选择车牌号/船号', trigger: 'change' },
         { max: 30, message: '最多 30 个字符', trigger: 'blur' },
       ],
     },
@@ -105,6 +107,7 @@ export const option = {
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
+      slot: true,
       minWidth: 140,
       span: 12,
       placeholder: '请输入',
@@ -191,23 +194,12 @@ export const option = {
       formslot: true,
     },
     {
-      label: '检测评定开始日期',
-      prop: 'inspectionAssessmentDateStart',
-      type: 'date',
-      format: 'YYYY-MM-DD',
-      valueFormat: 'YYYY-MM-DD',
-      search: true,
-      hide: true,
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-    },
-    {
-      label: '检测评定结束日期',
-      prop: 'inspectionAssessmentDateEnd',
+      label: '检测评定日期',
+      prop: 'inspectionAssessmentDateRange',
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
+      searchRange: true,
       search: true,
       hide: true,
       addDisplay: false,

src/option/vehicle/equipment-ledger.js

@@ -54,9 +54,11 @@ export const option = {
     {
       label: '车牌号/船号',
       prop: 'vehicleNo',
+      type: 'select',
       slot: true,
       formslot: true,
       search: true,
+      searchType: 'input',
       searchOrder: 4,
       span: 12,
       order: 10,

src/option/vehicle/etc-record.js

@@ -49,14 +49,16 @@ export const option = {
     {
       label: '车牌号',
       prop: 'vehicleNo',
+      type: 'select',
       slot: true,
       formslot: true,
       search: true,
+      searchType: 'input',
       minWidth: 140,
       span: 12,
-      placeholder: '输入车牌号模糊查询选择',
+      placeholder: '请选择车牌号',
       rules: [
-        { required: true, message: '请输入车牌号', trigger: 'blur' },
+        { required: true, message: '请选择车牌号', trigger: 'change' },
         { max: 30, message: '最多 30 个字符', trigger: 'blur' },
       ],
     },

src/option/vehicle/insurance-record.js

@@ -78,17 +78,20 @@ export const option = {
       prop: 'policyFile',
       formslot: true,
       hide: true,
+      viewDisplay: false,
       span: 24,
     },
     {
       label: '车牌号/船号',
       prop: 'vehicleNo',
+      type: 'select',
       slot: true,
       formslot: true,
       search: true,
+      searchType: 'input',
       minWidth: 140,
       rules: [
-        { required: true, message: '请输入车牌号/船号', trigger: 'blur' },
+        { required: true, message: '请选择车牌号/船号', trigger: 'change' },
         { max: 50, message: '最多 50 个字符', trigger: 'blur' },
       ],
     },
@@ -108,6 +111,7 @@ export const option = {
       rules: [
         { required: true, message: '请输入保单号', trigger: 'blur' },
         { max: 80, message: '最多 80 个字符', trigger: 'blur' },
+        { pattern: /^[a-zA-Z0-9]+$/, message: '保单号只能输入数字、字母', trigger: 'blur' },
       ],
     },
     {

src/option/vehicle/mileage-record.js

@@ -40,13 +40,15 @@ export const option = {
     {
       label: '车牌号',
       prop: 'vehicleNo',
+      type: 'select',
       slot: true,
       formslot: true,
       search: true,
+      searchType: 'input',
       searchSpan: 6,
       minWidth: 130,
       rules: [
-        { required: true, message: '请输入车牌号', trigger: 'blur' },
+        { required: true, message: '请选择车牌号', trigger: 'change' },
         { max: 30, message: '最多 30 个字符', trigger: 'blur' },
       ],
     },

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

@@ -92,13 +92,15 @@ export const option = {
     {
       label: '车牌号/船号',
       prop: 'vehicleNo',
+      type: 'select',
       slot: true,
       formslot: true,
       search: true,
+      searchType: 'input',
       minWidth: 150,
-      placeholder: '输入车牌号/船号查询选择',
+      placeholder: '请选择车牌号/船号',
       rules: [
-        { required: true, message: '请输入车牌号/船号', trigger: 'blur' },
+        { required: true, message: '请选择车牌号/船号', trigger: 'change' },
         { max: 30, message: '最多 30 个字符', trigger: 'blur' },
       ],
     },

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

@@ -17,16 +17,6 @@ export const vehicleTypeDic = [
   { label: '船舶', value: '船舶' },
 ];
 
-export const expenseTypeDic = [
-  { label: '过路费', value: '过路费' },
-  { label: '停车费', value: '停车费' },
-  { label: '维修费', value: '维修费' },
-  { label: '保险费', value: '保险费' },
-  { label: '年检费', value: '年检费' },
-  { label: '装卸费', value: '装卸费' },
-  { label: '其他', value: '其他' },
-];
-
 export const option = {
   height: 'auto',
   calcHeight: 32,
@@ -68,14 +58,16 @@ export const option = {
     {
       label: '车牌号/船号',
       prop: 'vehicleNo',
+      type: 'select',
       slot: true,
       formslot: true,
       search: true,
+      searchType: 'input',
       minWidth: 150,
       span: 12,
-      placeholder: '输入车牌号/船号查询选择',
+      placeholder: '请选择车牌号/船号',
       rules: [
-        { required: true, message: '请输入车牌号/船号', trigger: 'blur' },
+        { required: true, message: '请选择车牌号/船号', trigger: 'change' },
         { max: 30, message: '最多 30 个字符', trigger: 'blur' },
       ],
     },
@@ -95,7 +87,7 @@ export const option = {
       label: '费用类型',
       prop: 'expenseType',
       type: 'select',
-      dicData: expenseTypeDic,
+      dicData: [],
       search: true,
       minWidth: 150,
       span: 12,

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

@@ -49,14 +49,16 @@ export const option = {
     {
       label: '车牌号',
       prop: 'vehicleNo',
+      type: 'select',
       slot: true,
       formslot: true,
       search: true,
+      searchType: 'input',
       minWidth: 130,
       span: 12,
-      placeholder: '输入车牌号查询选择',
+      placeholder: '请选择车牌号',
       rules: [
-        { required: true, message: '请输入车牌号', trigger: 'blur' },
+        { required: true, message: '请选择车牌号', trigger: 'change' },
         { max: 30, message: '最多 30 个字符', trigger: 'blur' },
       ],
     },

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

@@ -47,11 +47,13 @@ export const option = {
     {
       label: '车牌号/船号',
       prop: 'vehicleNo',
+      type: 'select',
       slot: true,
       formslot: true,
       search: true,
+      searchType: 'input',
       minWidth: 140,
-      placeholder: '输入车牌号/船号模糊查询选择',
+      placeholder: '请选择车牌号/船号',
       rules: [{ max: 30, message: '最多 30 个字符', trigger: 'blur' }],
     },
     {

src/option/vehicle/violation-record.js

@@ -70,14 +70,16 @@ export const option = {
     {
       label: '车牌号/船号',
       prop: 'vehicleNo',
+      type: 'select',
       slot: true,
       formslot: true,
       search: true,
+      searchType: 'input',
       minWidth: 140,
       span: 12,
-      placeholder: '输入车牌号/船号查询选择',
+      placeholder: '请选择车牌号/船号',
       rules: [
-        { required: true, message: '请输入车牌号/船号', trigger: 'blur' },
+        { required: true, message: '请选择车牌号/船号', trigger: 'change' },
         { max: 30, message: '最多 30 个字符', trigger: 'blur' },
       ],
     },
@@ -117,13 +119,13 @@ export const option = {
     {
       label: '日期',
       prop: 'violationTime',
-      type: 'datetime',
-      format: 'YYYY-MM-DD HH:mm:ss',
+      type: 'date',
+      format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      minWidth: 170,
+      minWidth: 140,
       span: 12,
       placeholder: '请选择',
-      rules: [{ required: true, message: '请选择时间', trigger: 'click' }],
+      rules: [{ required: true, message: '请选择日期', trigger: 'click' }],
     },
     {
       label: '地点',

src/permission.js

@@ -2,11 +2,35 @@ import router from './router/';
 import store from './store';
 import { tabKeyOf } from '@/router/tab';
 import { getToken } from '@/utils/auth';
+import {
+  isChunkLoadError,
+  reloadForChunkError,
+  setPendingRoutePath,
+} from '@/utils/chunk-reload';
+import { ElMessage } from 'element-plus';
 import NProgress from 'nprogress'; // progress bar
 import 'nprogress/nprogress.css'; // progress bar style
 NProgress.configure({ showSpinner: false });
 const lockPage = '/lock'; //锁屏页
+
+// 懒加载 chunk / CSS 失败时整页刷新，避免菜单点击后卡死
+router.onError(error => {
+  if (!isChunkLoadError(error)) return;
+  if (reloadForChunkError()) {
+    ElMessage.warning('页面资源加载失败，正在重新加载…');
+  }
+});
+
+window.addEventListener('unhandledrejection', event => {
+  if (!isChunkLoadError(event.reason)) return;
+  if (reloadForChunkError()) {
+    event.preventDefault();
+    ElMessage.warning('页面资源加载失败，正在重新加载…');
+  }
+});
+
 router.beforeEach((to, from, next) => {
+  setPendingRoutePath(to.fullPath);
   const meta = to.meta || {};
   const isMenu = meta.menu === undefined ? to.query.menu : meta.menu;
   store.commit('SET_IS_MENU', isMenu === undefined);

src/router/views/index.js

@@ -116,6 +116,33 @@ export default [
       },
     ],
   },
+  {
+    path: '/settlement/transport-reconciliation/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新增编辑运输对账单',
+        meta: {
+          keepAlive: false,
+          activeMenu: '/settlement/transport-reconciliation',
+        },
+        component: () => import('@/views/settlement/transport-reconciliation-form.vue'),
+      },
+    ],
+  },
+  {
+    path: '/business/voucher-manage/detail',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '执行凭证批次详情',
+        meta: { keepAlive: false, activeMenu: '/business/voucher-manage' },
+        component: () => import('@/views/business/voucher-manage-detail.vue'),
+      },
+    ],
+  },
   {
     path: '/business/contract-manage/form',
     component: Layout,
@@ -128,6 +155,18 @@ export default [
       },
     ],
   },
+  {
+    path: '/business/contract-manage/detail',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '合同详情',
+        meta: { keepAlive: false, activeMenu: '/business/contract-manage' },
+        component: () => import('@/views/business/contract-manage.vue'),
+      },
+    ],
+  },
   {
     path: '/business/project-apply/form',
     component: Layout,
@@ -152,6 +191,42 @@ export default [
       },
     ],
   },
+  {
+    path: '/business/waybill-manage/detail',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '运单管理详情',
+        meta: { keepAlive: false, activeMenu: '/business/waybill-manage' },
+        component: () => import('@/views/business/waybill-manage-detail.vue'),
+      },
+    ],
+  },
+  {
+    path: '/business/waybill-import',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '导入运单',
+        meta: { keepAlive: false, activeMenu: '/business/waybill-import' },
+        component: () => import('@/views/business/waybill-import.vue'),
+      },
+    ],
+  },
+  {
+    path: '/business/waybill-import/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新建导入运单',
+        meta: { keepAlive: false, activeMenu: '/business/waybill-import' },
+        component: () => import('@/views/business/waybill-import-form.vue'),
+      },
+    ],
+  },
   {
     path: '/business/loading-manage/form',
     component: Layout,
@@ -176,6 +251,30 @@ export default [
       },
     ],
   },
+  {
+    path: '/business/transport-plan/import',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '导入运输计划',
+        meta: { keepAlive: false, activeMenu: '/business/transport-plan' },
+        component: () => import('@/views/business/transport-plan-import.vue'),
+      },
+    ],
+  },
+  {
+    path: '/business/transport-plan-dispatch',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '计划调度',
+        meta: { keepAlive: false, activeMenu: '/business/transport-plan' },
+        component: () => import('@/views/business/transport-plan-dispatch.vue'),
+      },
+    ],
+  },
   {
     path: '/business/shipping-template/form',
     component: Layout,

src/styles/common.scss

@@ -149,3 +149,20 @@ a {
   top: 0;
   bottom: 0;
 }
+.map-picker-content {
+  display: flex;
+  gap: 12px;
+
+  > [class$='__map'],
+  > .address-map {
+    flex: 1 1 auto;
+    width: 100%;
+    min-width: 0;
+    box-sizing: border-box;
+
+    > .amap-container {
+      width: 100% !important;
+      height: 100% !important;
+    }
+  }
+}

src/styles/element-ui.scss

@@ -213,6 +213,17 @@
   gap: 8px;
 }
 
+// 全站弹窗标题统一带 4px 主色竖条（与 .dialog-section-title 保持一致）
+// :not(:empty) 避免无标题弹窗出现孤立竖条
+.el-dialog__title:not(:empty)::before {
+  content: '';
+  flex: none;
+  width: 4px;
+  height: 16px;
+  border-radius: 2px;
+  background-color: var(--el-color-primary);
+}
+
 .dialog-section-title::before {
   content: '';
   flex: none;
@@ -708,9 +719,9 @@
 .avue-crud .el-table__body-wrapper tr.el-table__row:nth-child(even) td.el-table__cell,
 .avue-crud .el-table__body-wrapper tr.el-table__row:nth-child(even) td.el-table-fixed-column--left,
 .avue-crud
-  .el-table__body-wrapper
-  tr.el-table__row:nth-child(even)
-  td.el-table-fixed-column--right {
+.el-table__body-wrapper
+tr.el-table__row:nth-child(even)
+td.el-table-fixed-column--right {
   background-color: #fafafa;
 }
 
@@ -1050,21 +1061,38 @@
 .el-form-item--label-right .el-form-item__label {
   align-items: center;
 }
+// ============ 必填星号 * 与 label 首行齐平（仅换行时生效） ============
+// label 为 inline-flex，星号 ::before 与文字是两个独立 flex 子项。
+// align-items: normal（= stretch）：单行时星号盒子 = 一行高，位置不变；
+// 折行后星号盒子被拉伸到 label 全高，但其内部按 line-height 从顶部排布 → 星号停在第一行。
+// height: auto 覆盖 Element Plus 写死的 32px，让 label 收缩到内容高；
+// align-self: center 再让收缩后的 label 在表单行内垂直居中（单行与输入框对齐）。
+.is-required .el-form-item__label {
+  height: auto;
+  align-self: center;
+  align-items: normal;
+}
 .el-form-item--default {
   margin-bottom: 14px;
 }
 
-// ============ 必填星号 * 与首行文字垂直居中 ============
-// Element Plus 默认 .el-form-item__label 为 inline-flex + align-items: flex-start，
-// 星号 :before 高度(1em) 与文字行盒(line-height) 不一致时，多行/折行 label 会偏上。
-// 让 :before 跟随 label 行高、以 inline-block 参与行内对齐即可修复，
-// 兼容单行(默认 32px)与多行(auto + 18px)两种 label 高度场景。
+// 配套：星号必须保持「高度 auto + 继承行高」，stretch 才会按首行排布；
+// 写死 height 或 line-height 与 height 相等时效果会退化成居中。
 // 注：客商档案(customer-archive)的 label 为 auto 高度 + padding 下沉方案，scoped 特异性更高会覆盖本规则。
 .el-form-item.is-required .el-form-item__label::before {
   display: inline-block;
+  height: auto;
   line-height: inherit;
   margin-right: 4px;
 }
+
+// ============ archive-form：label 与控件垂直居中（全站复用） ============
+// archive-form class 被 driver / vehicle / ship / credit-score-quantification / loading-manage 等
+// 多个页面复用，但「垂直居中」规则原本锁在 customer-archive.vue 的 scoped 样式里，
+// 其它页面拿不到 → 高控件行（证件上传 151px）label 贴顶。提升为全局统一生效。
+.archive-form .el-form-item {
+  align-items: center;
+}
 //.el-form-item {
 //  margin-bottom: 15px !important;
 //}

src/utils/chunk-reload.js

@@ -0,0 +1,38 @@
+/**
+ * 懒加载 chunk / CSS preload 失败后的整页恢复。
+ * 常见于：部署后旧 hash 失效、静态服务空闲断连、代理 CONNECTION_RESET。
+ */
+
+const RELOAD_FLAG = 'app:chunk-reload-ts';
+const RELOAD_COOLDOWN_MS = 10000;
+
+const CHUNK_ERROR_RE =
+  /Failed to fetch dynamically imported module|Importing a module script failed|Unable to preload CSS|error loading dynamically imported module|Loading CSS chunk|Loading chunk .+ failed|ChunkLoadError/i;
+
+/** 最近一次路由跳转目标，供 onError 时整页落到正确地址 */
+let pendingFullPath = '';
+
+export function setPendingRoutePath(fullPath = '') {
+  pendingFullPath = fullPath || '';
+}
+
+export function isChunkLoadError(error) {
+  if (!error) return false;
+  const message = error.message || String(error);
+  return CHUNK_ERROR_RE.test(message);
+}
+
+/**
+ * @returns {boolean} 是否已触发刷新（冷却期内返回 false，避免死循环）
+ */
+export function reloadForChunkError(targetPath) {
+  const now = Date.now();
+  const last = Number(sessionStorage.getItem(RELOAD_FLAG) || 0);
+  if (now - last < RELOAD_COOLDOWN_MS) {
+    return false;
+  }
+  sessionStorage.setItem(RELOAD_FLAG, String(now));
+  const path = targetPath || pendingFullPath || window.location.pathname + window.location.search + window.location.hash;
+  window.location.assign(path);
+  return true;
+}

src/views/base/common-address.vue

@@ -232,7 +232,10 @@
           搜索
         </el-button>
       </div>
-      <div ref="amap" class="common-address-page__map"></div>
+      <div class="map-picker-content">
+        <map-search-results :results="mapSearchResults" @select="selectMapSearchResult" />
+        <div ref="amap" class="common-address-page__map"></div>
+      </div>
       <div class="common-address-page__map-info">
         <span>{{ mapStatus }}</span>
         <span v-if="mapSelected.regionName">行政区划：{{ mapSelected.regionName }}</span>
@@ -298,6 +301,7 @@ export default {
       mapKeyword: '',
       mapStatus: '可搜索地址或点击地图选点',
       mapSelected: {},
+      mapSearchResults: [],
       amap: null,
       amapMarker: null,
       amapGeocoder: null,
@@ -1113,6 +1117,12 @@ export default {
           this.ensureAmapGeocoder()
             .then(() => this.runAmapGeocode('location', keyword))
             .then(result => {
+              this.mapSearchResults = (result.geocodes || []).map((item, index) => ({
+                id: item.id || index,
+                name: item.formattedAddress || keyword,
+                address: item.formattedAddress || keyword,
+                location: item.location,
+              }));
               const point = this.resolveMapPoint(result);
               if (!point) {
                 this.mapStatus = '未找到匹配地址';
@@ -1133,6 +1143,11 @@ export default {
           this.$message.error('高德地图组件加载失败，请稍后重试或重新打开弹窗');
         });
     },
+    selectMapSearchResult(item) {
+      if (item && item.location) {
+        this.pickMapPoint(item.location, item.address || item.name || '');
+      }
+    },
     pickMapPoint(lnglat, keyword) {
       const longitude = this.getPointLng(lnglat);
       const latitude = this.getPointLat(lnglat);

src/views/base/fee-item.vue

@@ -54,8 +54,8 @@
       <template #taxRate-form>
         <el-input
           v-model="form.taxRate"
-          inputmode="decimal"
-          maxlength="6"
+          inputmode="numeric"
+          maxlength="3"
           clearable
           placeholder="请输入税率"
           @input="handleTaxRateInput"
@@ -183,8 +183,8 @@ export default {
                 validator: (rule, value, callback) => {
                   const text = String(value ?? '').trim();
                   const rate = Number(text);
-                  if (!/^\d+(\.\d{1,2})?$/.test(text) || rate < 0 || rate > 100) {
-                    callback(new Error('税率必须是0到100之间且最多保留2位小数的数字'));
+                  if (!/^\d+$/.test(text) || rate < 0 || rate > 100) {
+                    callback(new Error('税率必须是0到100之间的整数'));
                     return;
                   }
                   callback();
@@ -364,7 +364,10 @@ export default {
       return option ? `${option.dictValue}/${option.dictKey}` : feeCategory;
     },
     formatTaxRate(value) {
-      return value === undefined || value === null || value === '' ? '' : `${value}%`;
+      const text = String(value ?? '').trim();
+      if (text === '') return '';
+      const rate = Number(text);
+      return Number.isFinite(rate) ? `${Math.trunc(Math.abs(rate))}%` : `${text}%`;
     },
     getFeeItemCodeSuffix(code, feeCategory) {
       const value = String(code || '').trim();
@@ -397,6 +400,11 @@ export default {
       const values = { ...row };
       values.feeCategory = String(values.feeCategory || '').trim();
       values.englishName = this.getFeeItemCodeSuffix(values.englishName, values.feeCategory);
+      const taxRateText = String(values.taxRate ?? '').trim();
+      const taxRate = Number(taxRateText);
+      if (taxRateText !== '' && Number.isFinite(taxRate)) {
+        values.taxRate = String(Math.trunc(Math.abs(taxRate)));
+      }
       return values;
     },
     validateUnique(row) {
@@ -497,12 +505,8 @@ export default {
       done();
     },
     handleTaxRateInput(value) {
-      let normalized = String(value || '').replace(/[^\d.]/g, '');
-      normalized = normalized.replace(/(\..*)\./g, '$1');
-      if (normalized.startsWith('.')) normalized = `0${normalized}`;
-      const [integerPart, decimalPart] = normalized.split('.');
-      normalized =
-        decimalPart === undefined ? integerPart : `${integerPart}.${decimalPart.slice(0, 2)}`;
+      let normalized = String(value ?? '').replace(/\D/g, '');
+      if (normalized.length > 1) normalized = normalized.replace(/^0+/, '') || '0';
       this.form.taxRate = normalized;
     },
     searchReset() {

src/views/base/insurance-ocr-template.vue

@@ -20,6 +20,16 @@
         批量删除
       </el-button>
       <div class="insurance-ocr-template-page__search">
+        <el-select
+          v-model="query.vehicleType"
+          clearable
+          placeholder="车船类型"
+          style="width: 140px"
+          @change="search"
+        >
+          <el-option label="车辆" value="车辆" />
+          <el-option label="船舶" value="船舶" />
+        </el-select>
         <el-input
           v-model="query.name"
           clearable
@@ -42,6 +52,7 @@
       <el-table-column type="selection" width="48" />
       <el-table-column type="index" label="序号" width="70" align="center" />
       <el-table-column prop="name" label="模板名称" min-width="220" show-overflow-tooltip />
+      <el-table-column prop="vehicleType" label="车船类型" min-width="110" />
       <el-table-column label="已配置字段" min-width="150">
         <template #default="{ row }">{{ getMappingCount(row.mappingConfig) }}</template>
       </el-table-column>
@@ -94,6 +105,12 @@
           <el-form-item label="模板名称" prop="name">
             <el-input v-model="form.name" maxlength="100" show-word-limit />
           </el-form-item>
+          <el-form-item label="车船类型" prop="vehicleType">
+            <el-radio-group v-model="form.vehicleType">
+              <el-radio label="车辆">车辆</el-radio>
+              <el-radio label="船舶">船舶</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item label="字段映射" required>
             <el-table :data="mappingRows" border class="insurance-ocr-template-page__mapping-table">
               <el-table-column prop="key" label="键名" width="180" align="center" />
@@ -165,8 +182,8 @@ export default {
       readonly: false,
       data: [],
       selectionList: [],
-      query: { name: '' },
-      form: { id: '', name: '' },
+      query: { name: '', vehicleType: '' },
+      form: { id: '', name: '', vehicleType: '车辆' },
       mappingRows: createMappingRows(),
       page: {
         pageSize: 10,
@@ -176,6 +193,7 @@ export default {
       },
       rules: {
         name: [{ required: true, message: '请输入模板名称', trigger: 'blur' }],
+        vehicleType: [{ required: true, message: '请选择车船类型', trigger: 'change' }],
       },
     };
   },
@@ -218,6 +236,7 @@ export default {
     },
     resetSearch() {
       this.query.name = '';
+      this.query.vehicleType = '';
       this.search();
     },
     currentChange(currentPage) {
@@ -235,18 +254,23 @@ export default {
     openDialog(row, readonly = false) {
       this.readonly = readonly;
       if (!row?.id) {
+        this.form = { id: '', name: '', vehicleType: '车辆' };
         this.dialogVisible = true;
         return;
       }
       getDetail(row.id).then(res => {
         const detail = res.data.data || {};
-        this.form = { id: detail.id, name: detail.name || '' };
+        this.form = {
+          id: detail.id,
+          name: detail.name || '',
+          vehicleType: detail.vehicleType || '车辆',
+        };
         this.mappingRows = createMappingRows(detail.mappingConfig);
         this.dialogVisible = true;
       });
     },
     resetForm() {
-      this.form = { id: '', name: '' };
+      this.form = { id: '', name: '', vehicleType: '车辆' };
       this.mappingRows = createMappingRows();
       this.readonly = false;
       this.submitLoading = false;
@@ -264,6 +288,7 @@ export default {
         submit({
           id: this.form.id || undefined,
           name: String(this.form.name || '').trim(),
+          vehicleType: this.form.vehicleType || '车辆',
           mappingConfig: JSON.stringify(
             this.mappingRows.map(item => ({ key: item.key, value: String(item.value || '').trim() }))
           ),
@@ -311,7 +336,7 @@ export default {
     align-items: center;
     gap: 8px;
     margin-left: auto;
-    width: 380px;
+    width: 520px;
   }
 
   &__mapping-table {

src/views/base/measurement-unit.vue

@@ -0,0 +1,255 @@
+<template>
+  <basic-container class="measurement-unit-page">
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model:page="page"
+      v-model="form"
+      ref="crud"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      @row-save="rowSave"
+      @row-update="rowUpdate"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button
+          v-if="hasPermission('measurement_unit_add')"
+          type="primary"
+          @click="$refs.crud.rowAdd()"
+        >
+          新增
+        </el-button>
+        <el-button
+          v-if="hasPermission('measurement_unit_delete')"
+          type="danger"
+          plain
+          :disabled="!selectionList.length"
+          @click="handleDelete"
+        >
+          批量删除
+        </el-button>
+      </template>
+      <template #dimension="{ row }">
+        {{ row.dimension || '-' }}
+      </template>
+      <template #status="{ row }">
+        <el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
+          {{ row.status === 1 ? '启用' : '停用' }}
+        </el-tag>
+      </template>
+      <template #menu="{ row, index }">
+        <el-link
+          v-if="hasPermission('measurement_unit_edit')"
+          type="primary"
+          @click="$refs.crud.rowEdit(row, index)"
+        >
+          编辑
+        </el-link>
+        <el-link
+          v-if="hasPermission('measurement_unit_status')"
+          type="primary"
+          @click="handleStatus(row)"
+        >
+          {{ row.status === 1 ? '停用' : '启用' }}
+        </el-link>
+        <el-link
+          v-if="hasPermission('measurement_unit_delete')"
+          type="danger"
+          @click="handleDelete(row.id)"
+        >
+          删除
+        </el-link>
+      </template>
+    </avue-crud>
+    <empty-pagination
+      :page="page"
+      @size-change="sizeChange"
+      @current-change="currentChange"
+      @load="onLoad(page, query)"
+    />
+  </basic-container>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { changeStatus, getDetail, getList, remove, submit } from '@/api/base/measurement-unit';
+import { createOption } from '@/option/base/measurement-unit';
+
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      loading: true,
+      data: [],
+      page: {
+        pageSize: 10,
+        pageSizes: [10, 20, 50, 100],
+        currentPage: 1,
+        total: 0,
+      },
+      selectionList: [],
+      option: createOption(),
+    };
+  },
+  computed: {
+    ...mapGetters(['permission', 'userInfo']),
+    permissionList() {
+      return {
+        addBtn: this.hasPermission('measurement_unit_add'),
+      };
+    },
+    ids() {
+      return this.selectionList.map(item => item.id).join(',');
+    },
+    isAdmin() {
+      return String(this.userInfo?.authority || '').includes('admin');
+    },
+  },
+  methods: {
+    hasPermission(code) {
+      return this.isAdmin || this.permission?.[code] === true;
+    },
+    normalizeRow(row) {
+      row.unitName = String(row.unitName || '').trim();
+      row.dimension = String(row.dimension || '').trim();
+      row.remark = String(row.remark || '').trim();
+      if (!row.status) row.status = 1;
+      return row;
+    },
+    rowSave(row, done, loading) {
+      submit(this.normalizeRow(row)).then(
+        () => {
+          this.onLoad(this.page, this.query);
+          this.$message.success('操作成功');
+          done();
+        },
+        () => loading()
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      submit(this.normalizeRow(row)).then(
+        () => {
+          this.onLoad(this.page, this.query);
+          this.$message.success('操作成功');
+          done();
+        },
+        () => loading()
+      );
+    },
+    handleDelete(ids = '') {
+      const targetIds = ids || this.ids;
+      if (!targetIds) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定删除所选数据，删除后不可恢复?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => remove(targetIds))
+        .then(() => {
+          this.onLoad(this.page, this.query);
+          this.$message.success('操作成功');
+          this.selectionList = [];
+        });
+    },
+    handleStatus(row) {
+      const nextStatus = row.status === 1 ? 2 : 1;
+      const actionName = nextStatus === 1 ? '启用' : '停用';
+      this.$confirm(`是否确认${actionName}该计量单位？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => changeStatus(row.id, nextStatus))
+        .then(() => {
+          this.onLoad(this.page, this.query);
+          this.$message.success('操作成功');
+        });
+    },
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data || {};
+          done();
+        });
+        return;
+      }
+      this.form.status = 1;
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+    },
+    searchChange(params, done) {
+      this.query = { ...params };
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page = this.page, params = this.query) {
+      this.loading = true;
+      return getList(page.currentPage, page.pageSize, params)
+        .then(res => {
+          const pageData = res.data.data || {};
+          this.data = pageData.records || [];
+          this.page.total = pageData.total || 0;
+          this.selectionList = [];
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.measurement-unit-page {
+  :deep(.avue-crud__menu) {
+    margin-bottom: 8px;
+  }
+
+  :deep(.avue-crud__search .el-form-item__label) {
+    min-width: 160px;
+    white-space: nowrap;
+  }
+
+  :deep(.avue-crud__menu-column) {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+  }
+
+  :deep(.avue-crud__menu .el-link) {
+    margin-right: 8px;
+  }
+}
+</style>

src/views/base/region.vue

@@ -42,13 +42,6 @@
         </section-card>
 
         <el-button-group>
-          <el-button
-            v-if="permission.region_add"
-            type="primary"
-            icon="el-icon-plus"
-            @click="addCountry"
-            >新增国家
-          </el-button>
           <el-button
             v-if="permission.region_add"
             type="primary"
@@ -181,19 +174,17 @@ export default {
         treeLoad: (node, resolve) => {
           const parentCode = node.level === 0 ? ROOT_PARENT_CODE : node.data.id;
           getLazyTree(parentCode, this.searchForm).then(res => {
-            resolve(
-              res.data.data.map(item => {
-                return {
-                  ...item,
-                  leaf: !item.hasChildren,
-                };
-              })
-            );
+            const treeData = this.normalizeTreeData(res.data.data);
+            if (node.level === 0) {
+              this.setDefaultExpandedKeys(treeData);
+            }
+            resolve(treeData);
           });
         },
         addBtn: false,
         menu: false,
         defaultExpandAll: false,
+        defaultExpandedKeys: [],
         size: 'default',
         props: {
           labelText: '标题',
@@ -260,6 +251,12 @@ export default {
             prop: 'regionLevel',
             type: 'radio',
             dicUrl: '/blade-system/dict/dictionary?code=region',
+            dicFormatter: response => {
+              const list = Array.isArray(response) ? response : response?.data;
+              return (Array.isArray(list) ? list : [])
+                .filter(item => Number(item.dictKey) !== 0)
+                .map(item => ({ ...item, dictKey: Number(item.dictKey) }));
+            },
             props: {
               label: 'dictValue',
               value: 'dictKey',
@@ -436,24 +433,31 @@ export default {
     },
   },
   methods: {
+    normalizeTreeData(data) {
+      return data.map(item => {
+        return {
+          ...item,
+          leaf: !item.hasChildren,
+        };
+      });
+    },
+    setDefaultExpandedKeys(treeData) {
+      const valueKey = this.treeOption.props.value;
+      this.treeOption.defaultExpandedKeys = treeData
+        .filter(item => item.hasChildren)
+        .map(item => item[valueKey]);
+    },
     initTree() {
       this.treeData = [];
       getLazyTree(this.topCode, this.searchForm).then(res => {
-        this.treeData = res.data.data.map(item => {
-          return {
-            ...item,
-            leaf: !item.hasChildren,
-          };
+        const treeData = this.normalizeTreeData(res.data.data);
+        this.treeData = treeData;
+        this.$nextTick(() => {
+          this.setDefaultExpandedKeys(treeData);
         });
       });
     },
-    hasSearchCriteria() {
-      return Object.values(this.searchForm).some(
-        value => value !== '' && value !== undefined && value !== null
-      );
-    },
     handleSearch() {
-      this.treeOption.defaultExpandAll = this.hasSearchCriteria();
       this.initTree();
       this.regionForm = {};
     },

src/views/business/common-route.vue

@@ -288,7 +288,10 @@
           搜索
         </el-button>
       </div>
-      <div ref="routeAmap" class="common-route-page__map"></div>
+      <div class="map-picker-content">
+        <map-search-results :results="routeMapSearchResults" @select="selectRouteMapSearchResult" />
+        <div ref="routeAmap" class="common-route-page__map"></div>
+      </div>
       <div class="common-route-page__map-info">
         <span>{{ routeMapStatus }}</span>
         <span v-if="routeMapSelected.regionName"
@@ -359,6 +362,7 @@ export default {
       routeMapKeyword: '',
       routeMapStatus: '可搜索地址或点击地图选点',
       routeMapSelected: {},
+      routeMapSearchResults: [],
       routeAmap: null,
       routeAmapMarker: null,
       routeAmapGeocoder: null,
@@ -612,6 +616,12 @@ export default {
         })
         .then(() => this.runAmapGeocode('location', keyword))
         .then(result => {
+          this.routeMapSearchResults = (result.geocodes || []).map((item, index) => ({
+            id: item.id || index,
+            name: item.formattedAddress || keyword,
+            address: item.formattedAddress || keyword,
+            location: item.location,
+          }));
           const point = this.resolveMapPoint(result);
           if (!point) {
             this.routeMapStatus = '未找到匹配地址';
@@ -628,6 +638,11 @@ export default {
           this.routeMapLoading = false;
         });
     },
+    selectRouteMapSearchResult(item) {
+      if (item && item.location) {
+        this.pickRouteMapPoint(item.location, item.address || item.name || '');
+      }
+    },
     pickRouteMapPoint(lnglat, keyword) {
       const longitude = this.getPointLng(lnglat);
       const latitude = this.getPointLat(lnglat);

src/views/business/components/billing-plan-editor.vue

@@ -116,8 +116,8 @@
           ><el-input
             v-else
             v-model="row.taxRate"
-            inputmode="decimal"
-            maxlength="6"
+            inputmode="numeric"
+            maxlength="3"
             clearable
             placeholder="请输入"
             @input="value => taxRateInput(row, value)"
@@ -229,32 +229,38 @@
           </div></template
         ></el-table-column
       >
-      <el-table-column label="保底计费重量" width="240"
+      <el-table-column width="240"
+        ><template #header
+          ><span class="billing-plan-editor__column-title"
+            >保底计费重量<el-tooltip content="实际计量值小于保底数值时按保底计费" placement="top"
+              ><el-icon class="billing-plan-editor__default-tip"><InfoFilled /></el-icon></el-tooltip></span></template
         ><template #default="{ row }"
           ><div v-if="readonly && usesRangeMinimum(row)" class="limit-list">
             <span v-for="(item, rangeIndex) in getRanges(row)" :key="rangeIndex">{{
-              displayValue(item.minimumBillingWeight)
+              rangeIndex === 0
+                ? displayValue(item.minimumBillingWeight || row.minimumBillingWeight)
+                : ''
             }}</span>
           </div>
           <span v-else-if="readonly">{{ displayValue(row.minimumBillingWeight) }}</span>
           <div v-else-if="usesRangeMinimum(row)" class="limit-list">
-            <el-input
-              v-for="(item, rangeIndex) in getRanges(row)"
-              :key="rangeIndex"
-              v-model="item.minimumBillingWeight"
-              :disabled="!canEditMinimum(row)"
-              :placeholder="canEditMinimum(row) ? '请输入保底计费重量' : '无需配置'"
-              @input="value => rangeMinimumInput(row, rangeIndex, value)"
-            />
+            <template v-for="(item, rangeIndex) in getRanges(row)" :key="rangeIndex">
+              <el-input
+                v-if="rangeIndex === 0"
+                v-model="item.minimumBillingWeight"
+                :disabled="!canEditMinimum(row)"
+                :placeholder="canEditMinimum(row) ? '请输入' : '无需配置'"
+                @input="value => rangeMinimumInput(row, rangeIndex, value)"
+              />
+              <div v-else class="limit-placeholder" />
+            </template>
           </div>
           <el-input
             v-else
             v-model="row.minimumBillingWeight"
             :disabled="!canEditMinimum(row)"
             :placeholder="
-              canEditMinimum(row)
-                ? '实际计量值小于保底数值时按保底计费'
-                : '仅按重量、按吨·公里可填写'
+              canEditMinimum(row) ? '请输入' : '仅按重量、按吨·公里可填写'
             "
             @input="value => decimalInput(row, 'minimumBillingWeight', value)" /></template
       ></el-table-column>
@@ -297,9 +303,6 @@
       <el-descriptions-item label="目的地">{{
         displayValue(matchForm.destination)
       }}</el-descriptions-item>
-      <el-descriptions-item label="运输方式">{{
-        transportModeLabel(matchForm.transportMode)
-      }}</el-descriptions-item>
       <el-descriptions-item label="货物类型">{{
         displayValue(matchForm.cargoType)
       }}</el-descriptions-item>
@@ -334,21 +337,6 @@
               @visible-change="v => v && ensureRegions()"
               @change="v => matchRegionChange('destination', v)" /></el-form-item
         ></el-col>
-        <el-col :span="12"
-          ><el-form-item label="运输方式"
-            ><el-select
-              v-model="matchForm.transportMode"
-              :loading="transportModeLoading"
-              :disabled="readonly"
-              placeholder="请选择运输方式"
-              clearable
-              filterable
-              ><el-option
-                v-for="item in transportModeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value" /></el-select></el-form-item
-        ></el-col>
         <el-col :span="12"
           ><el-form-item label="货物类型"
             ><el-cascader
@@ -560,30 +548,24 @@ export default {
       return next;
     },
     normalizeRanges(row) {
-      const ranges = Array.isArray(row.limitRanges)
-        ? row.limitRanges
-            .map(item => ({
-              lowerLimit: item?.lowerLimit ?? '',
-              upperLimit: item?.upperLimit ?? '',
-              unitPrice:
-                item?.unitPrice === undefined || item?.unitPrice === ''
-                  ? row.unitPrice ?? ''
-                  : item.unitPrice,
-              minimumBillingWeight:
-                item?.minimumBillingWeight === undefined || item?.minimumBillingWeight === ''
-                  ? this.usesRangeMinimum(row)
-                    ? row.minimumBillingWeight ?? ''
-                    : ''
-                  : item.minimumBillingWeight,
-            }))
-            .filter(
-              item =>
-                item.lowerLimit !== '' ||
-                item.upperLimit !== '' ||
-                item.unitPrice !== '' ||
-                item.minimumBillingWeight !== ''
-            )
-        : [];
+      const rawRanges = Array.isArray(row.limitRanges) ? row.limitRanges : [];
+      const ranges = rawRanges
+        .map((item, index) => ({
+          lowerLimit: item?.lowerLimit ?? '',
+          upperLimit: item?.upperLimit ?? '',
+          unitPrice:
+            item?.unitPrice === undefined || item?.unitPrice === ''
+              ? row.unitPrice ?? ''
+              : item.unitPrice,
+          minimumBillingWeight: this.resolveRangeMinimum(row, item, index),
+        }))
+        .filter(
+          item =>
+            item.lowerLimit !== '' ||
+            item.upperLimit !== '' ||
+            item.unitPrice !== '' ||
+            item.minimumBillingWeight !== ''
+        );
       if (
         !ranges.length &&
         (row.lowerLimit !== '' ||
@@ -598,9 +580,23 @@ export default {
           minimumBillingWeight: this.usesRangeMinimum(row) ? row.minimumBillingWeight ?? '' : '',
         });
       return ranges.length
-        ? ranges
+        ? ranges.map((item, index) => ({
+            ...item,
+            minimumBillingWeight: this.usesRangeMinimum(row)
+              ? index === 0
+                ? item.minimumBillingWeight
+                : ''
+              : '',
+          }))
         : [{ lowerLimit: '', upperLimit: '', unitPrice: '', minimumBillingWeight: '' }];
     },
+    resolveRangeMinimum(row, item, index) {
+      if (!this.usesRangeMinimum(row) || index !== 0) return '';
+      if (item?.minimumBillingWeight !== undefined && item?.minimumBillingWeight !== '') {
+        return item.minimumBillingWeight;
+      }
+      return row.minimumBillingWeight ?? '';
+    },
     syncLegacyLimit(row) {
       const first = row.limitRanges?.[0] || {};
       row.lowerLimit = first.lowerLimit ?? '';
@@ -678,23 +674,26 @@ export default {
       const feeItem = this.feeItemOptions(row).find(
         item => String(item.name || item.englishName || '') === String(value || '')
       );
-      row.taxRate = this.hasTaxRate(feeItem?.taxRate) ? String(feeItem.taxRate) : '';
+      row.taxRate = this.hasTaxRate(feeItem?.taxRate) ? this.normalizeTaxRate(feeItem.taxRate) : '';
     },
     fillRuleTaxRate(row) {
       if (this.hasTaxRate(row.taxRate) || !row.feeItem) return;
       const feeItem = this.feeItemOptions(row).find(
         item => String(item.name || item.englishName || '') === String(row.feeItem)
       );
-      if (this.hasTaxRate(feeItem?.taxRate)) row.taxRate = String(feeItem.taxRate);
+      if (this.hasTaxRate(feeItem?.taxRate)) row.taxRate = this.normalizeTaxRate(feeItem.taxRate);
     },
     hasTaxRate(value) {
       return value !== undefined && value !== null && String(value).trim() !== '';
     },
+    normalizeTaxRate(value) {
+      const rate = Number(String(value ?? '').trim());
+      return Number.isFinite(rate) ? String(Math.trunc(Math.abs(rate))) : '';
+    },
     taxRateInput(row, value) {
-      const text = String(value || '').replace(/[^\d.]/g, '');
-      const parts = text.split('.');
-      row.taxRate =
-        parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
+      let text = String(value ?? '').replace(/\D/g, '');
+      if (text.length > 1) text = text.replace(/^0+/, '') || '0';
+      row.taxRate = text;
     },
     billingTypes(row) {
       return this.typeMap[row.billingElement] || [];
@@ -800,11 +799,16 @@ export default {
       if (index === 0) row.unitPrice = target.value;
     },
     rangeMinimumInput(row, index, value) {
+      if (index !== 0) return;
       row.limitRanges = this.getRanges(row);
       const target = { value };
       this.decimalInput(target, 'value', value);
-      row.limitRanges[index].minimumBillingWeight = target.value;
-      if (index === 0) row.minimumBillingWeight = target.value;
+      row.limitRanges[0].minimumBillingWeight = target.value;
+      row.minimumBillingWeight = target.value;
+      row.limitRanges = row.limitRanges.map((item, rangeIndex) => ({
+        ...item,
+        minimumBillingWeight: rangeIndex === 0 ? target.value : '',
+      }));
     },
     addRule() {
       this.draft.rules.push(defaultRule());
@@ -845,8 +849,8 @@ export default {
         feeItemSet.add(feeItem);
         if (this.hasTaxRate(row.taxRate)) {
           const taxRate = Number(row.taxRate);
-          if (!/^\d+(\.\d{1,2})?$/.test(String(row.taxRate)) || taxRate < 0 || taxRate > 100) {
-            this.$message.warning(`第${i + 1}行税率必须在0到100之间且最多保留2位小数`);
+          if (!/^\d+$/.test(String(row.taxRate).trim()) || taxRate < 0 || taxRate > 100) {
+            this.$message.warning(`第${i + 1}行税率必须是0到100之间的整数`);
             return false;
           }
         }
@@ -926,15 +930,22 @@ export default {
         plan.transportModeLabel = transportMode?.label || plan.transportMode;
         plan.rules = plan.rules.map(rule => {
           const ranges = this.canEditLimit(rule) ? this.getRanges(rule) : [];
+          const normalizedRanges = ranges.map((item, rangeIndex) => ({
+            ...item,
+            minimumBillingWeight:
+              this.usesRangeMinimum(rule) && rangeIndex === 0 ? item.minimumBillingWeight || '' : '',
+          }));
           return {
             ...rule,
-            unitPrice: this.usesRangeUnitPrice(rule) ? ranges[0]?.unitPrice || '' : rule.unitPrice,
-            limitRanges: ranges,
-            lowerLimit: ranges[0]?.lowerLimit || '',
-            upperLimit: ranges[0]?.upperLimit || '',
+            unitPrice: this.usesRangeUnitPrice(rule)
+              ? normalizedRanges[0]?.unitPrice || ''
+              : rule.unitPrice,
+            limitRanges: normalizedRanges,
+            lowerLimit: normalizedRanges[0]?.lowerLimit || '',
+            upperLimit: normalizedRanges[0]?.upperLimit || '',
             minimumBillingWeight: this.canEditMinimum(rule)
               ? this.usesRangeMinimum(rule)
-                ? ranges[0]?.minimumBillingWeight || ''
+                ? normalizedRanges[0]?.minimumBillingWeight || ''
                 : rule.minimumBillingWeight
               : '',
           };
@@ -947,9 +958,6 @@ export default {
       this.matchIndex = index;
       this.matchForm = { ...defaultRule().matchCondition, ...(row.matchCondition || {}) };
       this.matchVisible = true;
-      this.ensureTransportModes().then(() => {
-        this.matchForm.transportMode = this.normalizeTransportMode(this.matchForm.transportMode);
-      });
       this.ensureRegions();
       this.ensureCargo().then(() => {
         const path = this.resolveCargoPath(this.matchForm);
@@ -974,21 +982,6 @@ export default {
         });
       return this.transportModeRequest;
     },
-    normalizeTransportMode(value) {
-      const transportMode = String(value || '').trim();
-      if (!transportMode) return '';
-      const option = this.transportModeOptions.find(item => {
-        const optionValue = String(item.value || '').trim();
-        const optionLabel = String(item.label || '').trim();
-        return (
-          optionValue === transportMode ||
-          optionLabel === transportMode ||
-          optionLabel.includes(transportMode) ||
-          transportMode.includes(optionLabel)
-        );
-      });
-      return option?.value || transportMode;
-    },
     ensureRegions() {
       if (this.regionOptions.length) return Promise.resolve(this.regionOptions);
       if (this.regionRequest) return this.regionRequest;
@@ -1211,6 +1204,11 @@ export default {
   cursor: pointer;
 }
 
+.billing-plan-editor__column-title {
+  display: inline-flex;
+  align-items: center;
+}
+
 .limit-list {
   display: flex;
   flex-direction: column;
@@ -1226,4 +1224,8 @@ export default {
 .limit-row .el-input {
   flex: 1;
 }
+
+.limit-placeholder {
+  height: 32px;
+}
 </style>

src/views/business/components/business-crud-page.vue

@@ -1883,6 +1883,12 @@
             <span>自动生成结算单</span>
             <el-radio-group v-model="settlementRuleForm.autoGenerate" :disabled="dialogReadonly">
               <el-radio :label="1">开启</el-radio>
+              <el-tooltip
+                content="开启时，系统根据配置规则归集运单，定时生成结算单"
+                placement="top"
+              >
+                <el-icon class="settlement-switch-tip"><QuestionFilled /></el-icon>
+              </el-tooltip>
               <el-radio :label="0">关闭</el-radio>
             </el-radio-group>
           </div>
@@ -1921,13 +1927,13 @@
             </el-form-item>
             <el-form-item
               v-if="showSettlementBillCycleType"
-              label="账单周期类型"
+              label="结算周期"
               required
               :error="settlementRuleErrors.billCycleType"
             >
               <el-select
                 v-model="settlementRuleForm.billCycleType"
-                placeholder="请选择账单周期类型"
+                placeholder="请选择结算周期"
                 :disabled="dialogReadonly"
                 @change="handleSettlementBillCycleTypeChange"
               >
@@ -1980,6 +1986,59 @@
               </el-select>
             </el-form-item>
           </el-form>
+          <div
+            v-if="settlementRuleEnabled && showSettlementCustomPeriods"
+            class="business-crud-page__custom-periods"
+          >
+            <el-table :data="settlementRuleForm.customPeriods || []" border>
+              <el-table-column type="index" label="序号" width="80" align="center" />
+              <el-table-column label="运单区间-开始日" min-width="180" align="center">
+                <template #default="{ row, $index }">
+                  <el-select
+                    :model-value="row.startDay"
+                    placeholder="请选择"
+                    clearable
+                    :disabled="dialogReadonly"
+                    @update:model-value="value => handleCustomPeriodStartDayChange($index, value)"
+                  >
+                    <el-option
+                      v-for="item in billCutoffDayOptions"
+                      :key="`start-${item.value}`"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="运单区间-结束日" min-width="200" align="center">
+                <template #default="{ row, $index }">
+                  <el-select
+                    :model-value="row.endDay"
+                    placeholder="请选择"
+                    clearable
+                    :disabled="dialogReadonly"
+                    @update:model-value="value => handleCustomPeriodEndDayChange($index, value)"
+                  >
+                    <el-option
+                      v-for="item in customPeriodEndDayOptions(row)"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="!dialogReadonly" label="操作" width="100" align="center">
+                <template #default="{ $index }">
+                  <el-link v-if="$index === 0" type="primary" @click="addCustomPeriodRow">添加</el-link>
+                  <el-link v-else type="danger" @click="removeCustomPeriodRow($index)">删除</el-link>
+                </template>
+              </el-table-column>
+              <template v-if="!dialogReadonly" #empty>
+                <el-link type="primary" @click="addCustomPeriodRow">添加</el-link>
+              </template>
+            </el-table>
+          </div>
         </div>
       </template>
 
@@ -2047,7 +2106,7 @@
               v-model="attachmentRows"
               :readonly="dialogReadonly"
               :file-types="attachmentFileTypes"
-              :max-size="500"
+              :max-size="50"
               :show-file-list="false"
               button-text="上传附件"
               @change="handleAttachmentChange"
@@ -3268,12 +3327,6 @@
       </template>
     </el-dialog>
 
-    <waybill-import-dialog
-      v-if="config.enableWaybillImport"
-      v-model="waybillImportBox"
-      @closed="refreshChange"
-    />
-
     <flow-design
       v-if="website.design.designMode"
       is-dialog
@@ -4271,7 +4324,7 @@
             <vehicle-attachment-upload
               v-model="dispatchItemAttachmentRows"
               :file-types="attachmentFileTypes"
-              :max-size="500"
+              :max-size="50"
               :show-file-list="false"
               button-text="上传附件"
               @change="handleDispatchItemAttachmentChange"
@@ -4971,7 +5024,10 @@
           搜索
         </el-button>
       </div>
-      <div ref="transportAmap" class="business-crud-page__map"></div>
+      <div class="map-picker-content">
+        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
+        <div ref="transportAmap" class="business-crud-page__map"></div>
+      </div>
       <div class="business-crud-page__map-info">
         <span>{{ transportMapStatus }}</span>
         <span v-if="transportMapSelected.regionName"
@@ -5271,7 +5327,6 @@ import { h, resolveComponent } from 'vue';
 import { mapGetters } from 'vuex';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
-import WaybillImportDialog from './waybill-import-dialog.vue';
 import BillingPlanEditor from './billing-plan-editor.vue';
 
 const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
@@ -5410,13 +5465,19 @@ const defaultBillingPlan = () => ({
 });
 
 const defaultSettlementRule = () => ({
-  autoGenerate: 1,
+  autoGenerate: '',
   billStartDate: '',
-  settlementType: '月结',
-  billCycleType: '固定截单日',
-  billCutoffDay: 25,
+  settlementType: '',
+  billCycleType: '',
+  billCutoffDay: '',
   cycleDays: '',
+  customPeriods: [],
 });
+const normalizeCustomPeriods = (periods = []) =>
+  (periods || []).map(item => ({
+    startDay: Number(item?.startDay) > 0 ? Number(item.startDay) : '',
+    endDay: Number(item?.endDay) > 0 ? Number(item.endDay) : '',
+  }));
 
 const defaultReconciliation = () => ({
   skipReconciliation: 1,
@@ -5507,11 +5568,10 @@ const defaultDispatchRow = () => ({
   remark: '',
 });
 
-const taskCarrierTypes = ['承运商', '自运', '网货平台'];
+const taskCarrierTypes = ['承运商', '自运'];
 
 export default {
   components: {
-    WaybillImportDialog,
     BillingPlanEditor,
     PageAvueForm,
     Rank,
@@ -5611,7 +5671,6 @@ export default {
         currentPage: 1,
         total: 0,
       },
-      waybillImportBox: false,
       transportPlanImportBox: false,
       transportPlanImportLoading: false,
       transportPlanImportFiles: [],
@@ -5744,6 +5803,7 @@ export default {
       transportMapKeyword: '',
       transportMapStatus: '可搜索地址或点击地图选点',
       transportMapSelected: {},
+      transportMapSearchResults: [],
       transportAmap: null,
       transportAmapMarker: null,
       transportAmapGeocoder: null,
@@ -5836,7 +5896,7 @@ export default {
         按数量: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'],
       },
       settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
-      billCycleTypeOptions: ['固定截单日', '自然月'],
+      billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
       reconciliationModeOptions: ['明细逐行核对', '按账单汇总核对', '跳过自动核对'],
       packageOptions,
       quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'],
@@ -6103,7 +6163,7 @@ export default {
       return this.taskCarrierTypes;
     },
     taskCarrierLabel() {
-      return this.form.carrierType === '网货平台' ? '承运方' : '承运商';
+      return '承运商';
     },
     taskCarrierValue: {
       get() {
@@ -6267,7 +6327,7 @@ export default {
       return this.isDispatchCarrierRequired(this.dispatchItemForm.carrierType);
     },
     dispatchCarrierLabel() {
-      return this.dispatchItemForm.carrierType === '网货平台' ? '承运方' : '承运商';
+      return '承运商';
     },
     dispatchCarrierSelection: {
       get() {
@@ -6447,6 +6507,11 @@ export default {
         this.showSettlementBillCycleType && this.settlementRuleForm.billCycleType === '固定截单日'
       );
     },
+    showSettlementCustomPeriods() {
+      return (
+        this.showSettlementBillCycleType && this.settlementRuleForm.billCycleType === '自定义多周期'
+      );
+    },
     showSettlementCycleDays() {
       return this.settlementRuleForm.settlementType === '固定天数周期结算';
     },
@@ -6873,7 +6938,7 @@ export default {
       const status = this.statusValue(row);
       return this.config.permission === 'transport_plan'
         ? ['waiting_dispatch', 'dispatching'].includes(status)
-        : ['pending', 'processing'].includes(status);
+        : ['pending', 'processing', 'running'].includes(status);
     },
     canComplete(row) {
       if (
@@ -6887,7 +6952,7 @@ export default {
       const status = this.statusValue(row);
       return this.config.permission === 'transport_plan'
         ? status === 'dispatching'
-        : status === 'processing';
+        : status === 'processing' || status === 'running';
     },
     canMaintainMileage(row) {
       return (
@@ -7024,7 +7089,7 @@ export default {
       if (!row) return '-';
       if (prop === 'businessStatus') return this.displayStatus(row, prop);
       if (prop === 'feeGenerationMode') {
-        return row[prop] === 'manual' ? '手动生成' : '系统生成';
+        return row[prop] === 'manual' ? '账单导入生成' : '系统生成';
       }
       const column = this.findColumn(this.option.column, prop);
       if (column?.formatter) return column.formatter(row, {}, row[prop]);
@@ -7114,7 +7179,9 @@ export default {
     waybillAmountWithCurrency(row = {}, prop) {
       const value = this.formatDetailValue(row, prop);
       if (value === '-') return { value: '-' };
-      return { value: `${this.waybillCurrencyRemark(row)}${value}` };
+      const number = Number(value);
+      const display = Number.isFinite(number) ? number.toFixed(2) : value;
+      return { value: `${this.waybillCurrencyRemark(row)}${display}` };
     },
     normalizeTransportPlanWaybillRow(row = {}, index = 0) {
       const status = row.businessStatus || row.status || row.waybillStatus || '';
@@ -7164,7 +7231,7 @@ export default {
         this.$message.info('当前运单暂无详情数据');
         return;
       }
-      this.$router.push({ path: '/business/waybill-manage', query: { detailId: row.id } });
+      this.$router.push({ path: '/business/waybill-manage/detail', query: { id: row.id } });
     },
     transportPlanWaybillIndex(index) {
       return (
@@ -7239,6 +7306,7 @@ export default {
         .then(res => {
           const detail = res?.data?.data || res?.data || row;
           this.detailRow = detail;
+          this.loadWaybillVoucherImages();
           this.ensureTransportPlanDetailTransportTypeName(detail);
           if (this.isWaybillDetailLayout && detail.contractId) {
             return getContractDetail(detail.contractId)
@@ -7301,7 +7369,8 @@ export default {
           if (!config?.id) return [];
           return getProcessConfigDetail(config.id, this.detailRow.id).then(detailRes => {
             const detail = detailRes?.data?.data || detailRes?.data || config;
-            this.waybillHasRelatedVoucher = Boolean(detail.hasRelatedVoucher);
+            this.waybillHasRelatedVoucher =
+              this.waybillHasRelatedVoucher || Boolean(detail.hasRelatedVoucher);
             return this.getProcessConfigEnabledNodes(detail);
           });
         })
@@ -7325,6 +7394,7 @@ export default {
       getProcessConfigVoucherImages(this.detailRow.id)
         .then(res => {
           this.waybillVoucherImages = extractRecords(res);
+          if (this.waybillVoucherImages.length) this.waybillHasRelatedVoucher = true;
           this.waybillVoucherImagesLoaded = true;
         })
         .finally(() => {
@@ -7562,23 +7632,32 @@ export default {
     isFixedBillCutoffSettlement(rule = this.settlementRuleForm) {
       return this.isMonthlySettlement(rule) && rule.billCycleType === '固定截单日';
     },
+    isCustomMultiPeriodSettlement(rule = this.settlementRuleForm) {
+      return this.isMonthlySettlement(rule) && rule.billCycleType === '自定义多周期';
+    },
     isFixedCycleSettlement(rule = this.settlementRuleForm) {
       return rule.settlementType === '固定天数周期结算';
     },
     handleSettlementTypeChange(value) {
       this.clearSettlementRuleError('settlementType');
       if (value === '月结') {
-        if (!this.settlementRuleForm.billCycleType) {
-          this.settlementRuleForm.billCycleType = '固定截单日';
-        }
         if (this.settlementRuleForm.billCycleType === '固定截单日') {
-          this.settlementRuleForm.billCutoffDay = this.settlementRuleForm.billCutoffDay || 25;
+          this.settlementRuleForm.customPeriods = [];
+        } else if (this.settlementRuleForm.billCycleType === '自定义多周期') {
+          this.settlementRuleForm.billCutoffDay = '';
+          this.settlementRuleForm.customPeriods = normalizeCustomPeriods(
+            this.settlementRuleForm.customPeriods || []
+          );
+        } else {
+          this.settlementRuleForm.billCutoffDay = '';
+          this.settlementRuleForm.customPeriods = [];
         }
         this.settlementRuleForm.cycleDays = '';
         return;
       }
       this.settlementRuleForm.billCycleType = '';
       this.settlementRuleForm.billCutoffDay = '';
+      this.settlementRuleForm.customPeriods = [];
       if (value !== '固定天数周期结算') {
         this.settlementRuleForm.cycleDays = '';
       }
@@ -7586,10 +7665,17 @@ export default {
     handleSettlementBillCycleTypeChange(value) {
       this.clearSettlementRuleError('billCycleType');
       if (value === '固定截单日') {
-        this.settlementRuleForm.billCutoffDay = this.settlementRuleForm.billCutoffDay || 25;
+        this.settlementRuleForm.customPeriods = [];
         return;
       }
       this.settlementRuleForm.billCutoffDay = '';
+      if (value === '自定义多周期') {
+        this.settlementRuleForm.customPeriods = normalizeCustomPeriods(
+          this.settlementRuleForm.customPeriods || []
+        );
+        return;
+      }
+      this.settlementRuleForm.customPeriods = [];
     },
     normalizeSettlementRule(rule = this.settlementRuleForm) {
       const nextRule = {
@@ -7599,14 +7685,94 @@ export default {
       if (!this.isMonthlySettlement(nextRule)) {
         nextRule.billCycleType = '';
         nextRule.billCutoffDay = '';
+        nextRule.customPeriods = [];
       } else if (!this.isFixedBillCutoffSettlement(nextRule)) {
         nextRule.billCutoffDay = '';
       }
+      if (this.isCustomMultiPeriodSettlement(nextRule)) {
+        nextRule.customPeriods = normalizeCustomPeriods(
+          Array.isArray(nextRule.customPeriods) ? nextRule.customPeriods : []
+        );
+      } else {
+        nextRule.customPeriods = [];
+      }
       if (!this.isFixedCycleSettlement(nextRule)) {
         nextRule.cycleDays = '';
       }
       return nextRule;
     },
+    customPeriodEndDayOptions(row) {
+      const startDay = Number(row?.startDay);
+      if (!Number.isFinite(startDay) || startDay < 1) return this.billCutoffDayOptions;
+      return Array.from({ length: 31 - startDay + 1 }, (_, index) => {
+        const value = startDay + index;
+        return { label: `${value}日`, value };
+      });
+    },
+    handleCustomPeriodStartDayChange(index, value) {
+      const periods = normalizeCustomPeriods(this.settlementRuleForm.customPeriods || []);
+      const row = periods[index];
+      if (!row) return;
+      row.startDay = value || '';
+      const startDay = Number(row.startDay);
+      const endDay = Number(row.endDay);
+      if (
+        Number.isFinite(startDay) &&
+        Number.isFinite(endDay) &&
+        (endDay < startDay || endDay > 31)
+      ) {
+        row.endDay = '';
+      }
+      this.settlementRuleForm.customPeriods = periods;
+    },
+    handleCustomPeriodEndDayChange(index, value) {
+      const periods = normalizeCustomPeriods(this.settlementRuleForm.customPeriods || []);
+      const row = periods[index];
+      if (!row) return;
+      row.endDay = value || '';
+      this.settlementRuleForm.customPeriods = periods;
+    },
+    addCustomPeriodRow() {
+      const periods = normalizeCustomPeriods(this.settlementRuleForm.customPeriods || []);
+      periods.push({ startDay: '', endDay: '' });
+      this.settlementRuleForm.customPeriods = periods;
+    },
+    removeCustomPeriodRow(index) {
+      if (index <= 0) return;
+      const periods = [...(this.settlementRuleForm.customPeriods || [])];
+      periods.splice(index, 1);
+      this.settlementRuleForm.customPeriods = normalizeCustomPeriods(periods);
+    },
+    validateCustomPeriods(periods = [], label = '') {
+      const rows = normalizeCustomPeriods(periods);
+      const prefix = label ? `${label}：` : '';
+      if (!rows.length) {
+        this.$message.warning(`${prefix}请至少配置一段自定义周期`);
+        return false;
+      }
+      for (let index = 0; index < rows.length; index += 1) {
+        const row = rows[index];
+        const startDay = Number(row.startDay);
+        const endDay = Number(row.endDay);
+        if (!Number.isFinite(startDay) || startDay < 1 || startDay > 31) {
+          this.$message.warning(`${prefix}请选择第${index + 1}行运单区间开始日`);
+          return false;
+        }
+        if (!Number.isFinite(endDay) || endDay < 1 || endDay > 31) {
+          this.$message.warning(`${prefix}请选择第${index + 1}行运单区间结束日`);
+          return false;
+        }
+        if (endDay < startDay) {
+          this.$message.warning(`${prefix}第${index + 1}行结束日不能早于开始日`);
+          return false;
+        }
+        if (index > 0 && startDay !== Number(rows[index - 1].endDay) + 1) {
+          this.$message.warning(`${prefix}自定义多周期区间必须连续，不允许重叠或存在日期缺口`);
+          return false;
+        }
+      }
+      return true;
+    },
     clearSettlementRuleError(field) {
       if (!this.settlementRuleErrors[field]) return;
       this.settlementRuleErrors = {
@@ -7628,8 +7794,8 @@ export default {
         return false;
       }
       if (this.isMonthlySettlement(rule) && this.isBillingFieldEmpty(rule.billCycleType)) {
-        this.settlementRuleErrors = { billCycleType: '请选择账单周期类型' };
-        this.$message.warning(`${label}${label ? '：' : ''}请选择账单周期类型`);
+        this.settlementRuleErrors = { billCycleType: '请选择结算周期' };
+        this.$message.warning(`${label}${label ? '：' : ''}请选择结算周期`);
         return false;
       }
       if (this.isFixedBillCutoffSettlement(rule)) {
@@ -7645,6 +7811,9 @@ export default {
           return false;
         }
       }
+      if (this.isCustomMultiPeriodSettlement(rule)) {
+        return this.validateCustomPeriods(rule.customPeriods, label);
+      }
       if (this.isFixedCycleSettlement(rule)) {
         const cycleDays = Number(rule.cycleDays);
         if (!Number.isInteger(cycleDays) || cycleDays < 1 || cycleDays > 365) {
@@ -8802,7 +8971,7 @@ export default {
       }
     },
     isTaskCarrierRequired(carrierType) {
-      return ['承运商', '网货平台'].includes(String(carrierType || '').trim());
+      return String(carrierType || '').trim() === '承运商';
     },
     resetWaybillCarrierContractState() {
       if (!this.isWaybillDetailLayout) return;
@@ -9276,7 +9445,7 @@ export default {
         ['vehicleNo', this.transportVehicleNoLabel],
       ];
       if (this.isTaskCarrierRequired(row.carrierType)) {
-        requiredFields.push(['carrierName', row.carrierType === '网货平台' ? '承运方' : '承运商']);
+        requiredFields.push(['carrierName', '承运商']);
       }
       if (this.isWaybillDetailLayout && row.carrierType === '承运商') {
         requiredFields.push(['carrierContractId', '承运商合同']);
@@ -10115,6 +10284,12 @@ export default {
           this.ensureTransportAmapGeocoder()
             .then(() => this.runAmapGeocode('location', keyword))
             .then(result => {
+              this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
+                id: item.id || index,
+                name: item.formattedAddress || keyword,
+                address: item.formattedAddress || keyword,
+                location: item.location,
+              }));
               const point = this.resolveMapPoint(result);
               if (!point) {
                 this.transportMapStatus = '未找到匹配地址';
@@ -10135,6 +10310,11 @@ export default {
           this.$message.error('高德地图组件加载失败，请稍后重试或重新打开弹窗');
         });
     },
+    selectTransportMapSearchResult(item) {
+      if (item && item.location) {
+        this.pickTransportMapPoint(item.location, item.address || item.name || '');
+      }
+    },
     pickTransportMapPoint(lnglat, keyword) {
       const longitude = this.getPointLng(lnglat);
       const latitude = this.getPointLat(lnglat);
@@ -11224,8 +11404,10 @@ export default {
         if (!this.canEditBillingLimit(row)) {
           continue;
         }
-        const key = row.billingElement || '';
-        groups[key] = groups[key] || [];
+        const feeItem = String(row.feeItem || '').trim();
+        const billingElement = String(row.billingElement || '').trim();
+        const key = JSON.stringify([feeItem, billingElement]);
+        groups[key] = groups[key] || { feeItem, billingElement, ranges: [] };
         const ranges = this.getBillingLimitRanges(row);
         for (const range of ranges) {
           const lower = Number(range.lowerLimit);
@@ -11243,14 +11425,14 @@ export default {
             this.$message.warning('计费要素下限不能大于上限');
             return false;
           }
-          groups[key].push({ lower, upper });
+          groups[key].ranges.push({ lower, upper });
         }
       }
       return this.validateBillingLimitRangeGroups(groups);
     },
     validateBillingLimitRangeGroups(groups) {
       const precision = 0.000001;
-      for (const [billingElement, ranges] of Object.entries(groups)) {
+      for (const { feeItem, billingElement, ranges } of Object.values(groups)) {
         if (ranges.length <= 1) continue;
         const sortedRanges = [...ranges].sort((prev, next) => {
           if (prev.lower !== next.lower) return prev.lower - next.lower;
@@ -11260,11 +11442,13 @@ export default {
           const prevRange = sortedRanges[index - 1];
           const currentRange = sortedRanges[index];
           if (currentRange.lower < prevRange.upper - precision) {
-            this.$message.warning(`${billingElement}的计费要素区间不能重叠`);
+            this.$message.warning(`费用项“${feeItem}”${billingElement}的计费要素区间不能重叠`);
             return false;
           }
           if (currentRange.lower > prevRange.upper + precision) {
-            this.$message.warning(`${billingElement}的计费要素区间必须连续，不能存在间隙`);
+            this.$message.warning(
+              `费用项“${feeItem}”${billingElement}的计费要素区间必须连续，不能存在间隙`
+            );
             return false;
           }
         }
@@ -11554,7 +11738,7 @@ export default {
     },
     handleImport() {
       if (this.config.enableWaybillImport) {
-        this.waybillImportBox = true;
+        this.$router.push({ path: '/business/waybill-import' });
         return;
       }
       if (this.config.enableTransportPlanImport) {
@@ -12680,7 +12864,7 @@ export default {
       this.loadDispatchCarrierOptions(this.dispatchRow);
     },
     isDispatchCarrierRequired(carrierType) {
-      return ['承运商', '网货平台'].includes(String(carrierType || '').trim());
+      return String(carrierType || '').trim() === '承运商';
     },
     getProjectCarrierOptions(project = {}) {
       const rows = this.parseJsonArray(project.carrierJson);
@@ -13067,7 +13251,7 @@ export default {
         ],
       ];
       if (this.isDispatchCarrierRequired(row.carrierType)) {
-        requiredFields.push(['carrierName', row.carrierType === '网货平台' ? '承运方' : '承运商']);
+        requiredFields.push(['carrierName', '承运商']);
       }
       if (row.carrierType === '承运商') {
         requiredFields.push(['carrierContractId', '承运商合同']);
@@ -14444,6 +14628,13 @@ export default {
     color: #303133;
   }
 
+  .settlement-switch-tip {
+    margin: 0 4px;
+    color: #a8abb2;
+    cursor: help;
+    font-size: 14px;
+  }
+
   &__module-form {
     width: 100%;
 

src/views/business/components/contract-attachment-section.vue

@@ -0,0 +1,596 @@
+<template>
+  <section
+    class="contract-manage-form__section contract-manage-form__section--panel contract-manage-form__section--attachment"
+  >
+    <div class="contract-manage-form__attachment-head">
+      <div class="dialog-section-title">{{ title }}</div>
+      <el-button type="primary" :disabled="!rows.length" @click="batchDownload">批量下载</el-button>
+    </div>
+    <el-table
+      :data="rows"
+      border
+      class="contract-manage-form__attachment-table"
+      @selection-change="selected = $event"
+    >
+      <el-table-column v-if="!readonly" type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="70" align="center" />
+      <el-table-column v-if="attachmentType" label="附件类型" min-width="160" align="center">
+        <template #default="{ row }">
+          <span v-if="readonly || isRowLocked(row)">{{ row.fileType || '-' }}</span>
+          <el-select
+            v-else
+            :model-value="row.fileType"
+            placeholder="请选择"
+            :teleported="false"
+            :fit-input-width="true"
+            @update:model-value="value => updateRowFileType(row, value)"
+          >
+            <el-option
+              v-for="item in contractAttachmentTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="文件名"
+        min-width="240"
+        align="left"
+        header-align="left"
+        show-overflow-tooltip
+      >
+        <template #default="{ row }">
+          <el-link type="primary" @click="preview?.(row, rows)">{{ attachmentName(row) }}</el-link>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="description" label="附件描述" min-width="220">
+        <template #default="{ row }">
+          <span v-if="readonly || isRowLocked(row)">{{ row.description || '-' }}</span>
+          <el-input
+            v-else
+            :model-value="row.description"
+            maxlength="200"
+            @update:model-value="value => updateRowDescription(row, value)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="文件大小" width="120" align="center">
+        <template #default="{ row }">{{ formatSize(row.size) }}</template>
+      </el-table-column>
+      <el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
+      <el-table-column prop="uploadTime" label="上传时间" width="180" align="center" sortable />
+      <el-table-column v-if="!readonly" label="操作" width="100" align="center" fixed="right">
+        <template #default="{ row, $index }">
+          <span v-if="isRowLocked(row)">-</span>
+          <el-link v-else type="danger" @click="remove($index)">删除</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div v-if="!readonly" class="contract-manage-form__attachment-upload">
+      <template v-if="useUploadDialog">
+        <el-button type="primary" plain @click="openUploadDialog">上传附件</el-button>
+        <span class="contract-manage-form__attachment-tip">
+          支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过50M
+        </span>
+      </template>
+      <vehicle-attachment-upload
+        v-else
+        :model-value="rows"
+        :file-types="attachmentFileTypes"
+        :max-size="50"
+        show-tip
+        tip="支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过50M"
+        :show-file-list="false"
+        button-text="上传附件"
+        @update:model-value="handleChange"
+        @change="handleChange"
+      />
+    </div>
+
+    <el-dialog
+      v-model="uploadDialogVisible"
+      title="附件上传"
+      width="560px"
+      append-to-body
+      destroy-on-close
+      :close-on-click-modal="false"
+      class="contract-attachment-upload-dialog"
+      @closed="resetUploadDialog"
+    >
+      <div class="contract-attachment-upload-dialog__body">
+        <div class="contract-attachment-upload-dialog__field">
+          <span class="contract-attachment-upload-dialog__label">附件位置</span>
+          <el-select :model-value="attachmentLocation" disabled style="width: 100%">
+            <el-option :label="attachmentLocation" :value="attachmentLocation" />
+          </el-select>
+        </div>
+        <div class="contract-attachment-upload-dialog__field">
+          <span class="contract-attachment-upload-dialog__label">附件类型</span>
+          <el-select v-model="uploadDialogType" placeholder="请选择附件类型" style="width: 100%">
+            <el-option
+              v-for="item in contractAttachmentTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </div>
+        <div class="contract-attachment-upload-dialog__uploader">
+          <el-upload
+            drag
+            multiple
+            :action="uploadAction"
+            :headers="uploadHeaders"
+            :accept="acceptText"
+            :show-file-list="true"
+            :before-upload="beforeUpload"
+            :on-success="handleDialogSuccess"
+            :on-error="handleDialogError"
+            :on-remove="handleDialogRemove"
+            :file-list="uploadDialogFileList"
+          >
+            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          </el-upload>
+        </div>
+      </div>
+      <template #footer>
+        <div class="contract-attachment-upload-dialog__footer">
+          <el-button type="primary" @click="confirmUploadDialog">确定</el-button>
+          <el-button type="primary" @click="uploadDialogVisible = false">取消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </section>
+</template>
+
+<script>
+import { UploadFilled } from '@element-plus/icons-vue';
+import { baseUrl } from '@/config/env';
+import { getUploadHeaders } from '@/utils/upload';
+import { downloadFileByUrl } from '@/utils/util';
+import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
+
+const CONTRACT_ATTACHMENT_TYPE_OTHER = '其它文件';
+export const defaultContractAttachmentTypeOptions = [
+  { label: '合同文件', value: '合同文件' },
+  { label: '双章归档文件', value: '双章归档文件' },
+  { label: '其它文件', value: CONTRACT_ATTACHMENT_TYPE_OTHER },
+];
+/** @deprecated 兼容旧引用，实际选项由业务字典 contract_attachment_type 动态加载 */
+export const contractAttachmentTypeOptions = defaultContractAttachmentTypeOptions;
+export const attachmentFileTypes = [
+  'pdf',
+  'bmp',
+  'jpeg',
+  'png',
+  'jpg',
+  'doc',
+  'docx',
+  'ppt',
+  'pptx',
+  'xlsx',
+  'xls',
+  'eml',
+  'msg',
+  'zip',
+];
+
+export const attachmentName = row => row?.originalName || row?.name || row?.fileName || '附件';
+export const attachmentUrl = row =>
+  row?.url || row?.link || row?.fileUrl || row?.downloadUrl || row?.domain || '';
+export const isAttachmentApproved = row =>
+  row?.approved === true ||
+  row?.approved === 1 ||
+  row?.approved === '1' ||
+  row?.approvalStatus === 'approved';
+
+const normalizeAttachmentTypeText = value => {
+  let text = String(value || '').split(/[?#]/)[0];
+  try {
+    text = decodeURIComponent(text);
+  } catch (error) {
+    // ignore decode error
+  }
+  return text
+    .replace(/\.[^.\\/]+$/, '')
+    .toLowerCase()
+    .replace(/[\s_\-—–·•()（）\[\]【】{}《》<>“”"'、，,。.]/g, '');
+};
+
+const attachmentTypeKeywords = fileType => {
+  if (fileType === '双章归档文件') return ['双章归档文件', '双章归档', '双章'];
+  if (fileType === '合同文件') return ['合同文件', '合同'];
+  return [fileType];
+};
+
+const resolveOtherAttachmentType = (options = []) => {
+  const list = options.length ? options : defaultContractAttachmentTypeOptions;
+  const matched = list.find(
+    item =>
+      String(item.value) === CONTRACT_ATTACHMENT_TYPE_OTHER ||
+      String(item.label).includes('其它') ||
+      String(item.label).includes('其他')
+  );
+  return matched?.value || list[list.length - 1]?.value || CONTRACT_ATTACHMENT_TYPE_OTHER;
+};
+
+export const resolveContractAttachmentType = (
+  row = {},
+  options = defaultContractAttachmentTypeOptions
+) => {
+  const list = options.length ? options : defaultContractAttachmentTypeOptions;
+  const values = list.map(item => item.value);
+  if (values.includes(row.fileType)) return row.fileType;
+  const fileName = normalizeAttachmentTypeText(attachmentName(row));
+  const otherType = resolveOtherAttachmentType(list);
+  if (!fileName) return otherType;
+  const matched = list
+    .filter(item => item.value !== otherType)
+    .flatMap(item =>
+      attachmentTypeKeywords(item.value).map(keyword => ({
+        value: item.value,
+        keyword: normalizeAttachmentTypeText(keyword),
+      }))
+    )
+    .filter(item => item.keyword)
+    .sort((a, b) => b.keyword.length - a.keyword.length)
+    .find(item => fileName.includes(item.keyword));
+  return matched?.value || otherType;
+};
+
+export const normalizeContractFileRows = (rows, options = defaultContractAttachmentTypeOptions) =>
+  (rows || []).map(row => ({
+    ...row,
+    fileType: resolveContractAttachmentType(row, options),
+    description: row.description || '',
+  }));
+
+const mapDictOptions = response => {
+  const data = response?.data?.data || response?.data || [];
+  const records = Array.isArray(data) ? data : data.records || [];
+  return records
+    .map(item => ({
+      label: item.dictValue,
+      value: item.dictKey,
+    }))
+    .filter(item => item.label && item.value);
+};
+
+export default {
+  name: 'ContractAttachmentSection',
+  components: { UploadFilled },
+  props: {
+    title: { type: String, required: true },
+    rows: { type: Array, default: () => [] },
+    description: Boolean,
+    attachmentType: Boolean,
+    readonly: Boolean,
+    lockApproved: Boolean,
+    markApprovedOnUpload: Boolean,
+    useUploadDialog: Boolean,
+    attachmentLocation: { type: String, default: '合同文件' },
+    preview: { type: Function, default: null },
+  },
+  emits: ['update:rows'],
+  data() {
+    return {
+      selected: [],
+      attachmentFileTypes,
+      contractAttachmentTypeOptions: [...defaultContractAttachmentTypeOptions],
+      uploadDialogVisible: false,
+      uploadDialogType: resolveOtherAttachmentType(defaultContractAttachmentTypeOptions),
+      uploadDialogFiles: [],
+      uploadDialogFileList: [],
+    };
+  },
+  computed: {
+    uploadAction() {
+      return `${baseUrl}/blade-resource/oss/endpoint/put-file`;
+    },
+    uploadHeaders() {
+      return getUploadHeaders();
+    },
+    acceptText() {
+      return this.attachmentFileTypes.map(item => `.${item}`).join(',');
+    },
+    defaultAttachmentType() {
+      return resolveOtherAttachmentType(this.contractAttachmentTypeOptions);
+    },
+  },
+  created() {
+    this.loadAttachmentTypeOptions();
+  },
+  methods: {
+    attachmentName,
+    loadAttachmentTypeOptions() {
+      return getBizDictionary({ code: 'contract_attachment_type' })
+        .then(res => {
+          const options = mapDictOptions(res);
+          if (options.length) {
+            this.contractAttachmentTypeOptions = options;
+            if (
+              !options.some(item => String(item.value) === String(this.uploadDialogType))
+            ) {
+              this.uploadDialogType = this.defaultAttachmentType;
+            }
+          }
+        })
+        .catch(() => {
+          // 字典加载失败时保留默认选项
+        });
+    },
+    isRowLocked(row) {
+      return this.lockApproved && isAttachmentApproved(row);
+    },
+    update(rows) {
+      this.$emit('update:rows', rows);
+    },
+    updateRowFileType(row, value) {
+      if (this.isRowLocked(row)) return;
+      row.fileType = value;
+      this.update([...this.rows]);
+    },
+    updateRowDescription(row, value) {
+      if (this.isRowLocked(row)) return;
+      row.description = value;
+      this.update([...this.rows]);
+    },
+    openUploadDialog() {
+      this.uploadDialogType = this.defaultAttachmentType;
+      this.uploadDialogFiles = [];
+      this.uploadDialogFileList = [];
+      this.uploadDialogVisible = true;
+    },
+    resetUploadDialog() {
+      this.uploadDialogFiles = [];
+      this.uploadDialogFileList = [];
+      this.uploadDialogType = this.defaultAttachmentType;
+    },
+    beforeUpload(file) {
+      const extension = String(file.name || '')
+        .split('.')
+        .pop()
+        ?.toLowerCase();
+      if (!this.attachmentFileTypes.includes(extension)) {
+        this.$message.warning('文件类型不符合上传要求');
+        return false;
+      }
+      if (file.size / 1024 / 1024 > 50) {
+        this.$message.warning('单文件大小不能超过 50MB');
+        return false;
+      }
+      return true;
+    },
+    normalizeUploadFile(file, response) {
+      const data = response?.data || file.response?.data || {};
+      const url = data.link || data.url || data.domain || file.url || '';
+      const originalName =
+        data.originalName || file.name || data.name || attachmentName({ url }) || '附件';
+      return {
+        uid: file.uid,
+        originalName,
+        name: originalName,
+        url,
+        link: data.link || url,
+        size: data.size || data.attachSize || file.size || '',
+      };
+    },
+    handleDialogSuccess(response, file, fileList) {
+      if (!response || response.success === false || (response.code && response.code !== 200)) {
+        this.$message.error(response?.msg || '上传失败');
+        this.uploadDialogFileList = (fileList || []).filter(item => item.uid !== file.uid);
+        return;
+      }
+      const normalized = this.normalizeUploadFile(file, response);
+      this.uploadDialogFileList = fileList || [];
+      this.uploadDialogFiles = [
+        ...this.uploadDialogFiles.filter(item => String(item.uid) !== String(file.uid)),
+        normalized,
+      ];
+      this.uploadDialogType = resolveContractAttachmentType(
+        {
+          ...normalized,
+          fileType: '',
+        },
+        this.contractAttachmentTypeOptions
+      );
+      this.$message.success('上传成功');
+    },
+    handleDialogError() {
+      this.$message.error('上传失败');
+    },
+    handleDialogRemove(file) {
+      this.uploadDialogFiles = this.uploadDialogFiles.filter(
+        item => String(item.uid) !== String(file.uid)
+      );
+      this.uploadDialogFileList = this.uploadDialogFileList.filter(
+        item => String(item.uid) !== String(file.uid)
+      );
+    },
+    confirmUploadDialog() {
+      if (!this.uploadDialogFiles.length) {
+        this.$message.warning('请先上传附件');
+        return;
+      }
+      if (!this.uploadDialogType) {
+        this.$message.warning('请选择附件类型');
+        return;
+      }
+      const uploadUserName = this.$store.getters.userInfo?.realName || '';
+      const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
+      const appended = this.uploadDialogFiles.map(row => ({
+        ...row,
+        fileType: this.uploadDialogType,
+        description: row.description || '',
+        uploadUserName: row.uploadUserName || uploadUserName,
+        uploadTime: row.uploadTime || uploadTime,
+        ...(this.markApprovedOnUpload ? { approved: true } : {}),
+      }));
+      this.update([...(this.rows || []), ...appended]);
+      this.uploadDialogVisible = false;
+    },
+    handleChange(rows) {
+      const uploadUserName = this.$store.getters.userInfo?.realName || '';
+      const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
+      const existingRows = this.rows || [];
+      this.update(
+        (rows || []).map(row => {
+          const fileUrl = attachmentUrl(row);
+          const existing = existingRows.find(item => {
+            const sameUid = row.uid && item.uid && String(row.uid) === String(item.uid);
+            const sameUrl = fileUrl && attachmentUrl(item) === fileUrl;
+            return sameUid || sameUrl;
+          });
+          if (existing && this.isRowLocked(existing)) return { ...existing };
+          const next = {
+            ...existing,
+            ...row,
+            description: row.description || existing?.description || '',
+            uploadUserName: existing?.uploadUserName || row.uploadUserName || uploadUserName,
+            uploadTime: existing?.uploadTime || row.uploadTime || uploadTime,
+            approved: existing?.approved || row.approved || false,
+          };
+          if (this.attachmentType) {
+            next.fileType = resolveContractAttachmentType(
+              {
+                ...next,
+                fileType: existing?.fileType || row.fileType,
+              },
+              this.contractAttachmentTypeOptions
+            );
+          }
+          if (this.markApprovedOnUpload && !existing) next.approved = true;
+          return next;
+        })
+      );
+    },
+    remove(index) {
+      const row = this.rows[index];
+      if (this.isRowLocked(row)) {
+        this.$message.warning('已审核通过的附件不允许删除');
+        return;
+      }
+      const rows = [...this.rows];
+      rows.splice(index, 1);
+      this.update(rows);
+    },
+    download(row) {
+      const url = attachmentUrl(row);
+      if (!url) {
+        this.$message.warning('附件地址为空，无法下载');
+        return;
+      }
+      downloadFileByUrl(url, attachmentName(row));
+    },
+    batchDownload() {
+      (this.selected.length ? this.selected : this.rows).forEach(this.download);
+    },
+    formatSize(size) {
+      const value = Number(size);
+      if (!value) return '';
+      if (value < 1024) return `${value}B`;
+      if (value < 1024 * 1024) return `${(value / 1024).toFixed(1)}KB`;
+      return `${(value / 1024 / 1024).toFixed(1)}MB`;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.contract-manage-form__section {
+  margin: 12px 0 0;
+  padding: 14px 16px 16px;
+  overflow: hidden;
+  background: #fff;
+  border-radius: 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+
+  .dialog-section-title {
+    margin-bottom: 20px;
+    color: #303133;
+    font-size: 16px;
+    font-weight: 600;
+
+    &::before {
+      display: inline-block;
+      width: 4px;
+      height: 16px;
+      margin-right: 8px;
+      vertical-align: -2px;
+      background: #409eff;
+      content: '';
+    }
+  }
+}
+
+.contract-manage-form__attachment-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 16px;
+
+  .dialog-section-title {
+    margin-bottom: 0;
+  }
+}
+
+.contract-manage-form__attachment-upload {
+  display: flex;
+  align-items: center;
+  margin-top: 12px;
+}
+
+.contract-manage-form__attachment-tip {
+  margin-left: 30px;
+  color: #909399;
+  font-size: 13px;
+  line-height: 1.4;
+}
+
+.contract-attachment-upload-dialog {
+  &__body {
+    padding: 4px 8px 0;
+  }
+
+  &__field {
+    display: flex;
+    align-items: center;
+    margin-bottom: 16px;
+  }
+
+  &__label {
+    flex: none;
+    width: 72px;
+    color: #606266;
+    text-align: right;
+    margin-right: 12px;
+  }
+
+  &__uploader {
+    margin-top: 8px;
+
+    :deep(.el-upload) {
+      width: 100%;
+    }
+
+    :deep(.el-upload-dragger) {
+      width: 100%;
+      height: 180px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+
+  &__footer {
+    display: flex;
+    justify-content: center;
+    gap: 12px;
+  }
+}
+</style>

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

@@ -144,7 +144,9 @@ export default {
         : [row.captainName, vehicle];
       return values.filter(Boolean).join(' / ') || '-';
     },
-    openWaybill(row) { this.$router.push({ path: '/business/waybill-manage', query: { detailId: row.id } }); },
+    openWaybill(row) {
+      this.$router.push({ path: '/business/waybill-manage/detail', query: { id: row.id } });
+    },
     openPlan(row) { this.$router.push({ path: '/business/transport-plan', query: { detailId: row.id } }); },
     waybillStatusName(value) { return ({ pending: '待执行', waiting: '待执行', running: '进行中', processing: '进行中', completed: '已完成', cancelled: '已取消' })[value] || value || '-'; },
     waybillStatusType(value) { return ({ pending: 'info', waiting: 'info', running: 'warning', processing: 'warning', completed: 'success', cancelled: 'danger' })[value] || 'info'; },

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

@@ -71,12 +71,12 @@
         <el-form :model="route" label-position="right" label-width="auto" class="dispatch-form">
           <el-row :gutter="16">
             <el-col :span="8">
-              <el-form-item label="运输方式" required class="transport-type-field"><el-input :model-value="route.transportType" readonly /></el-form-item>
+              <el-form-item label="运输方式" required class="transport-type-field"><el-input :model-value="route.transportType" disabled /></el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="16">
             <el-col :span="12">
-              <el-form-item label="发货地址" required><el-input :model-value="addressText(route.departureName, route.departureAddress)" readonly /></el-form-item>
+              <el-form-item label="发货地址" required><el-input :model-value="addressText(route.departureName, route.departureAddress)" disabled /></el-form-item>
             </el-col>
             <el-col :span="4"><el-form-item label="联系人"><el-input v-model="route.departureContact" placeholder="请输入" /></el-form-item></el-col>
             <el-col :span="4"><el-form-item label="联系方式"><el-input v-model="route.departurePhone" placeholder="请输入" /></el-form-item></el-col>
@@ -84,7 +84,7 @@
           </el-row>
           <el-row :gutter="16">
             <el-col :span="12">
-              <el-form-item label="收货地址" required><el-input :model-value="addressText(route.arrivalName, route.arrivalAddress)" readonly /></el-form-item>
+              <el-form-item label="收货地址" required><el-input :model-value="addressText(route.arrivalName, route.arrivalAddress)" disabled /></el-form-item>
             </el-col>
             <el-col :span="4"><el-form-item label="联系人"><el-input v-model="route.arrivalContact" placeholder="请输入" /></el-form-item></el-col>
             <el-col :span="4"><el-form-item label="联系方式"><el-input v-model="route.arrivalPhone" placeholder="请输入" /></el-form-item></el-col>
@@ -109,11 +109,12 @@
         </el-table>
 
         <template v-if="route.documentType === '运单'">
-          <el-form :model="route" label-position="right" label-width="auto" class="dispatch-form carrier-type-form"><el-form-item label="承运类型" required><el-radio-group v-model="route.carrierType" @change="value => handleCarrierTypeChange(route, value)"><el-radio-button label="承运商" /><el-radio-button label="自运" /><el-radio-button label="网货平台" /></el-radio-group></el-form-item></el-form>
+          <div class="goods-heading"><h3>任务信息</h3></div>
+          <el-form :model="route" label-position="right" label-width="auto" class="dispatch-form carrier-type-form"><el-form-item label="承运类型" required><el-radio-group v-model="route.carrierType" @change="value => handleCarrierTypeChange(route, value)"><el-radio-button label="承运商" /><el-radio-button label="自运" /></el-radio-group></el-form-item></el-form>
           <el-form :model="route" label-position="right" label-width="auto" class="dispatch-form carrier-form">
             <el-row :gutter="16">
               <template v-if="isRoad(route)">
-                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType === '承运商'"><el-select :model-value="route.carrierType === '承运商' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType === '承运商' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="司机" :required="route.carrierType !== '承运商'"><el-autocomplete :ref="element => setDriverInput(route.segmentNo, element)" v-model="route.driverName" :debounce="300" :fetch-suggestions="fetchDriverSuggestions" clearable placeholder="请输入司机" :loading="driverLoading" @select="item => handleDriverSuggestionSelect(route, item)" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item :label="route.carrierType === '承运商' ? '手机号' : '司机手机号'" :required="route.carrierType !== '承运商'"><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="车牌号" required><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
@@ -122,10 +123,10 @@
                 <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="押运人手机号"><el-input v-model="route.escortPhone" placeholder="请输入" /></el-form-item></el-col>
               </template>
               <template v-else>
-                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType === '承运商'"><el-select :model-value="route.carrierType === '承运商' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType === '承运商' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="船/航/班列号" required><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="船长"><el-input v-model="route.captainName" placeholder="请输入" /></el-form-item></el-col>
-                <el-col :span="6"><el-form-item label="联系电话" required><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="联系电话"><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="箱号"><el-input v-model="route.containerNo" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="舱位"><el-input v-model="route.cabinNo" placeholder="请输入" /></el-form-item></el-col>
               </template>
@@ -171,7 +172,7 @@
       <section class="pending-panel">
         <div class="pending-bar">
           <div class="pending-summary">
-            <strong>待提交 <em>{{ pending.length }}</em> 条 <span class="pending-summary-text">（{{ pendingSegmentSummary }}）</span></strong>
+            <strong>待提交 <em>{{ pendingBatchCount }}</em> 条 <span class="pending-summary-text">（{{ pendingSegmentSummary }}）</span></strong>
             <el-link type="primary" @click="pendingExpanded = !pendingExpanded">{{ pendingExpanded ? '收起待调度列表' : '展开待调度列表' }}</el-link>
           </div>
           <div class="pending-actions"><el-button @click="$emit('back')">取消</el-button><el-button type="primary" :loading="submitting" @click="submit">确认调度</el-button></div>
@@ -179,7 +180,7 @@
         <div v-show="pendingExpanded" class="pending-list">
           <template v-for="(items, segmentNo) in pendingGroups" :key="segmentNo">
             <h3>{{ segmentNo }}：{{ dispatchLocationName(items[0], 'departure') }} → {{ dispatchLocationName(items[0], 'arrival') }}</h3>
-            <el-table :data="items" border><el-table-column type="index" label="序号" width="70" /><el-table-column label="单据类型" prop="documentType" width="100" /><el-table-column label="货物" min-width="220"><template #default="{ row }">{{ row.cargoName }}{{ row.cargoType ? `，${row.cargoType}` : '' }}</template></el-table-column><el-table-column label="本次数量" width="150"><template #default="{ row }">{{ formatQuantity(row.quantity) }} {{ row.quantityUnit }}</template></el-table-column><el-table-column prop="carrierName" label="承运商" min-width="180" /><el-table-column prop="driverName" label="司机" width="130" /><el-table-column prop="vehicleNo" label="车牌" width="130" /><el-table-column label="操作" width="120" fixed="right"><template #default="{ row }"><div class="table-actions"><el-link type="primary" @click="editPending(row)">编辑</el-link><el-link type="danger" @click="removePending(row.id)">删除</el-link></div></template></el-table-column></el-table>
+            <el-table :data="items" border><el-table-column type="index" label="序号" width="70" /><el-table-column label="货物" min-width="220"><template #default="{ row }">{{ pendingGoodsText(row) }}</template></el-table-column><el-table-column label="本次数量" min-width="150"><template #default="{ row }">{{ pendingQuantityText(row) }}</template></el-table-column><el-table-column prop="carrierName" label="承运商" min-width="180" /><el-table-column prop="driverName" label="司机" width="130" /><el-table-column prop="vehicleNo" label="车牌" width="130" /><el-table-column label="操作" width="120" fixed="right"><template #default="{ row }"><div class="table-actions"><el-link type="primary" @click="editPending(row)">编辑</el-link><el-link type="danger" @click="removePendingBatch(row)">删除</el-link></div></template></el-table-column></el-table>
           </template>
           <el-empty v-if="!pending.length" description="暂无待提交调度条目" :image-size="60" />
         </div>
@@ -216,13 +217,28 @@ export default {
     goodsTypes() { return [...new Set((this.master?.goods || []).map(item => item.cargoType).filter(Boolean))].join('、') || '-'; },
     masterGoods() { return (this.master?.goods || []).map((item, sourceIndex) => ({ ...item, sourceIndex, label: [item.cargoName, item.cargoType].filter(Boolean).join(' / ') })); },
     dateRange() { return this.master?.planStartTime && this.master?.planEndTime ? `${String(this.master.planStartTime).slice(0, 10)} ~ ${String(this.master.planEndTime).slice(0, 10)}` : '-'; },
-    pendingGroups() { return this.pending.reduce((groups, item) => { (groups[item.segmentNo] ||= []).push(item); return groups; }, {}); },
+    pendingGroups() {
+      return this.pending.reduce((groups, item, index) => {
+        const segmentRows = (groups[item.segmentNo] ||= []);
+        const batchKey = item.batchNo || item.id || `${item.segmentNo}-${index}`;
+        let batch = segmentRows.find(row => row.batchKey === batchKey);
+        if (!batch) {
+          batch = { ...item, batchKey, items: [] };
+          segmentRows.push(batch);
+        }
+        batch.items.push(item);
+        return groups;
+      }, {});
+    },
+    pendingBatchCount() {
+      return Object.values(this.pendingGroups).reduce((count, rows) => count + rows.length, 0);
+    },
     pendingSegmentSummary() {
       return this.routes.map(route => {
-        const items = this.pending.filter(item => item.segmentNo === route.segmentNo);
-        if (!items.length) return `${route.segmentNo}：无`;
-        const documentSummary = items.reduce((result, item) => {
-          result[item.documentType] = (result[item.documentType] || 0) + 1;
+        const batches = this.pendingGroups[route.segmentNo] || [];
+        if (!batches.length) return `${route.segmentNo}：无`;
+        const documentSummary = batches.reduce((result, batch) => {
+          result[batch.documentType] = (result[batch.documentType] || 0) + 1;
           return result;
         }, {});
         return `${route.segmentNo}：${Object.entries(documentSummary).map(([type, count]) => `${type} x ${count}`).join('、')}`;
@@ -506,6 +522,26 @@ export default {
         return sum + this.quantityNumber(item.quantity);
       }, 0);
     },
+    validatePreviousSegmentCompletedQuantity(route, goods) {
+      const routeIndex = this.routes.indexOf(route);
+      if (routeIndex <= 0) return true;
+      const previousCompletedQuantity = this.quantityNumber(
+        this.routes[routeIndex - 1]?.arrivedQuantity
+      );
+      const currentDispatchQuantity = (goods || []).reduce(
+        (sum, item) => sum + this.quantityNumber(item.dispatchQuantity),
+        0
+      );
+      const dispatchTotal =
+        this.quantityNumber(route.dispatchedQuantity) +
+        this.pendingSegmentQuantity(route) +
+        currentDispatchQuantity;
+      if (dispatchTotal <= previousCompletedQuantity) return true;
+      this.$message.warning(
+        `${route.segmentNo}调度总量不能大于上一段已完成数量（${this.formatQuantity(previousCompletedQuantity)} ${this.quantityUnitLabel}）`
+      );
+      return false;
+    },
     pendingGoodsQuantity(route, row) {
       const goodsIndex = this.masterGoodsIndex(row);
       return this.pending.reduce((sum, item) => {
@@ -653,16 +689,17 @@ export default {
     },
     handleCarrierTypeChange(route, value) {
       route.carrierType = value;
+      route.carrierName = '';
+      route.carrierId = '';
+      route.carrierContractId = '';
       if (value === '承运商') {
         route.trailerVehicleNo = '';
         route.escortName = '';
         route.escortPhone = '';
       }
-      if (value !== '承运商') {
-        route.carrierContractId = '';
-        if (value === '网货平台') route.carrierName = '';
+      this.loadCarrierOptions().then(() => {
         if (value === '自运') this.applySelfOperatedCarrierDefaults(route);
-      }
+      });
     },
     handleCarrierContractChange(route, contractId) {
       const contract = this.carrierOptions.find(
@@ -671,7 +708,8 @@ export default {
             value => String(value || '') === String(contractId || '')
           )
       );
-      route.carrierContractId = route.carrierType === '承运商' ? contract?.contractId || '' : '';
+      route.carrierContractId = route.carrierType !== '自运' ? contract?.contractId || '' : '';
+      route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || '' : '';
       route.carrierName = contract?.carrierName || '';
     },
     carrierOptionValue(item = {}) {
@@ -697,7 +735,26 @@ export default {
     async loadCarrierOptions() {
       this.carrierLoading = true;
       try {
-        this.carrierOptions = unwrapRecords(await api.getCarriers(this.id));
+        this.carrierOptions = unwrapRecords(await api.getCarriers(this.id))
+          .map(item => ({
+            ...item,
+            contractId: item.contractId || item.carrierContractId || item.id || '',
+            carrierName:
+              item.partyB ||
+              item.partyBName ||
+              item.contractPartyB ||
+              item.customerContractPartyB ||
+              item.carrierName ||
+              '',
+            carrierId:
+              item.partyBId ||
+              item.partyBUserId ||
+              item.contractPartyBId ||
+              item.customerContractPartyBId ||
+              item.carrierId ||
+              '',
+          }))
+          .filter(item => item.carrierName);
       } finally {
         this.carrierLoading = false;
       }
@@ -798,14 +855,15 @@ export default {
       if (!goods.length) return this.$message.warning('请填写本次数量');
       if (!this.validateDispatchGoods(route, goods)) return;
       if (goods.some(item => Number(item.dispatchQuantity) > this.availableDispatchQuantity(route, item))) return this.$message.warning('本次数量不能超过剩余数量');
+      if (!this.validatePreviousSegmentCompletedQuantity(route, goods)) return;
       this.syncFreightItems(route);
       if (!this.validateFreightItems(route)) return;
       if (!this.validateRoutePhones(route)) return;
       if (route.documentType === '运单') {
         if (this.isRoad(route)) {
           if (route.carrierType === '承运商' && (!route.carrierContractId || !route.carrierName || !route.vehicleNo)) return this.$message.warning('请选择承运商并填写车牌号');
-          if (route.carrierType !== '承运商' && (!route.driverName || !route.driverPhone || !route.vehicleNo)) return this.$message.warning('请补全自运或网货平台的车辆与人员信息');
-        } else if (!route.vehicleNo || !route.driverPhone || (route.carrierType === '承运商' && (!route.carrierContractId || !route.carrierName))) {
+          if (route.carrierType !== '承运商' && (!route.driverName || !route.driverPhone || !route.vehicleNo)) return this.$message.warning('请补全自运的车辆与人员信息');
+        } else if (!route.vehicleNo || (route.carrierType === '承运商' && (!route.carrierContractId || !route.carrierName))) {
           return this.$message.warning('请补全非公路运输的承运信息');
         }
       }
@@ -829,35 +887,59 @@ export default {
       }
       this.$message.success('已加入调度清单');
     },
-    editPending(item) {
-      const route = this.routes.find(routeItem => routeItem.segmentNo === item.segmentNo);
+    pendingGoodsText(batch = {}) {
+      return (batch.items || [batch])
+        .map(item => [item.cargoName, item.cargoType].filter(Boolean).join('，'))
+        .join(' | ');
+    },
+    pendingQuantityText(batch = {}) {
+      return (batch.items || [batch])
+        .map(item => `${this.formatQuantity(item.quantity)} ${item.quantityUnit || ''}`.trim())
+        .join(' | ');
+    },
+    editPending(batch) {
+      const items = batch.items || [batch];
+      const first = items[0];
+      const route = this.routes.find(routeItem => routeItem.segmentNo === first.segmentNo);
       if (!route) return;
-      const itemSourceIndex = Number(item.sourceIndex);
-      const sourceIndex = Number.isInteger(itemSourceIndex) && itemSourceIndex >= 0
-        ? itemSourceIndex
-        : (this.master.goods || []).findIndex(goods => goods.cargoName === item.cargoName && goods.cargoType === item.cargoType);
-      let goods = route.goods.find(goodsItem => String(goodsItem.sourceIndex) === String(sourceIndex));
-      if (!goods && sourceIndex >= 0) {
-        goods = this.createGoodsRow(this.master.goods[sourceIndex], sourceIndex);
-        route.goods.push(goods);
-      }
-      if (goods) goods.dispatchQuantity = item.quantity;
-      Object.assign(route, item);
+      Object.assign(route, first);
+      const editedGoods = items.map(item => {
+        const itemSourceIndex = Number(item.sourceIndex);
+        const sourceIndex = Number.isInteger(itemSourceIndex) && itemSourceIndex >= 0
+          ? itemSourceIndex
+          : (this.master.goods || []).findIndex(goods => goods.cargoName === item.cargoName && goods.cargoType === item.cargoType);
+        let goods = route.goods.find(goodsItem => String(goodsItem.sourceIndex) === String(sourceIndex));
+        if (!goods && sourceIndex >= 0) {
+          goods = this.createGoodsRow(this.master.goods[sourceIndex], sourceIndex);
+          route.goods.push(goods);
+        }
+        if (goods) goods.dispatchQuantity = item.quantity;
+        return { goods, item };
+      });
       route.currency = this.normalizeCurrencyValue(
         this.master?.settlementCurrency || route.currency || 'RMB'
       );
       this.syncFreightItems(route);
-      const freightItem = this.freightItemsForGoods(route, goods);
-      if (freightItem) { freightItem.unitPrice = item.unitPrice || ''; freightItem.priceUnit = item.priceUnit || freightItem.priceUnit; }
-      this.removePending(item.id);
-      this.editingId = item.id;
+      editedGoods.forEach(({ goods, item }) => {
+        const freightItem = this.freightItemsForGoods(route, goods);
+        if (freightItem) {
+          freightItem.unitPrice = item.unitPrice || '';
+          freightItem.priceUnit = item.priceUnit || freightItem.priceUnit;
+        }
+      });
+      this.removePendingBatch(batch);
+      this.editingId = batch.batchKey;
       route.selected = true;
-      this.$nextTick(() => document.querySelector(`[data-segment="${item.segmentNo}"]`)?.scrollIntoView({ behavior: 'smooth', block: 'start' }));
+      this.$nextTick(() => document.querySelector(`[data-segment="${first.segmentNo}"]`)?.scrollIntoView({ behavior: 'smooth', block: 'start' }));
     },
     freightItemsForGoods(route, goods) {
       return (route.freightItems || []).find(item => String(item.sourceIndex) === String(goods?.sourceIndex)) || {};
     },
-    removePending(id) { this.pending = this.pending.filter(item => item.id !== id); if (this.editingId === id) this.editingId = null; },
+    removePendingBatch(batch = {}) {
+      const ids = new Set((batch.items || [batch]).map(item => item.id));
+      this.pending = this.pending.filter(item => !ids.has(item.id));
+      if (this.editingId === batch.batchKey) this.editingId = null;
+    },
     validateRoutePhones(route = {}) {
       const invalidPhone = [
         [route.departurePhone, '发货联系方式'],

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

@@ -132,7 +132,7 @@
       <div class="goods-heading">
         <h3>货物信息</h3>
         <div class="goods-toolbar">
-        <el-link type="primary" @click="cargoImportVisible = true">导入货物</el-link>
+        <!-- <el-link type="primary" @click="cargoImportVisible = true">导入货物</el-link> -->
         <el-link type="primary" @click="openCommonCargoDialog">常用货物</el-link>
         </div>
       </div>
@@ -228,9 +228,9 @@
       >
     </section>
     <section>
-      <h3>附件</h3>
-      <div class="master-editor__attachment">
-        <div class="master-editor__attachment-head">
+      <div class="section-head">
+        <h3>附件</h3>
+        <div class="section-head__actions">
           <el-button
             type="primary"
             :disabled="!attachmentRows.length"
@@ -239,6 +239,8 @@
             批量下载
           </el-button>
         </div>
+      </div>
+      <div class="master-editor__attachment">
         <el-table
           :data="attachmentRows"
           border
@@ -254,6 +256,17 @@
               </el-link>
             </template>
           </el-table-column>
+          <el-table-column label="附件描述" min-width="220" align="center">
+            <template #default="{ row }">
+              <el-input
+                v-model="row.description"
+                maxlength="200"
+                show-word-limit
+                placeholder="请输入附件描述"
+                @input="syncAttachmentsJson"
+              />
+            </template>
+          </el-table-column>
           <el-table-column label="文件大小" width="120" align="center">
             <template #default="{ row }">{{ formatFileSize(row.size) }}</template>
           </el-table-column>
@@ -270,7 +283,7 @@
           <vehicle-attachment-upload
             v-model="attachmentRows"
             :file-types="attachmentFileTypes"
-            :max-size="500"
+            :max-size="50"
             :show-file-list="false"
             button-text="上传附件"
             @change="handleAttachmentChange"
@@ -388,7 +401,10 @@
           >搜索</el-button
         >
       </div>
-      <div ref="addressMap" class="address-map" />
+      <div class="map-picker-content">
+        <map-search-results :results="mapSearchResults" @select="selectAddressMapSearchResult" />
+        <div ref="addressMap" class="address-map" />
+      </div>
       <div class="address-map-status">
         {{ mapStatus
         }}<span v-if="mapSelected.regionName">　行政区划：{{ mapSelected.regionName }}</span>
@@ -626,6 +642,7 @@ export default {
       mapKeyword: '',
       mapStatus: '可搜索地址或点击地图选点',
       mapSelected: {},
+      mapSearchResults: [],
       addressMapInstance: null,
       addressMapMarker: null,
       addressMapGeocoder: null,
@@ -1006,6 +1023,7 @@ export default {
         const first = this.contracts[0];
         this.form.contractId = first?.id;
         this.form.contractName = first?.contractName || '';
+        this.form.customerName = first?.partyA || '';
       }
     },
     async projectChange(projectId) {
@@ -1019,6 +1037,7 @@ export default {
     contractChange(contractId) {
       const contract = this.contracts.find(item => String(item.id) === String(contractId));
       this.form.contractName = contract?.contractName || '';
+      this.form.customerName = contract?.partyA || '';
     },
     addressModel(target) {
       if (target.startsWith('route-')) {
@@ -1266,12 +1285,24 @@ export default {
             )
         )
         .then(result => {
-          const point = result?.geocodes?.[0]?.location;
+          const geocodes = result?.geocodes || [];
+          this.mapSearchResults = geocodes.map((item, index) => ({
+            id: item.id || index,
+            name: item.formattedAddress || this.mapKeyword,
+            address: item.formattedAddress || this.mapKeyword,
+            location: item.location,
+          }));
+          const point = geocodes[0]?.location;
           if (!point) return this.$message.warning('地图搜索无匹配地址');
           this.pickAddressMap(point, this.mapKeyword);
         })
         .catch(() => this.$message.error('地图搜索失败'));
     },
+    selectAddressMapSearchResult(item) {
+      if (item && item.location) {
+        this.pickAddressMap(item.location, item.address || item.name || '');
+      }
+    },
     ensureAddressGeocoder() {
       if (this.addressMapGeocoder) return Promise.resolve(this.addressMapGeocoder);
       return new Promise(resolve =>
@@ -1939,12 +1970,6 @@ export default {
 .master-editor__attachment {
   width: 100%;
 }
-.master-editor__attachment-head {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  margin-bottom: 16px;
-}
 .master-editor__attachment-upload {
   display: flex;
   justify-content: flex-start;

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

@@ -223,7 +223,7 @@
         >
           <span>货物信息</span>
           <div v-if="!dialogReadonly" class="shipping-template-page__section-actions">
-            <el-link type="primary" @click="cargoImportBox = true">导入货物</el-link>
+            <!-- <el-link type="primary" @click="cargoImportBox = true">导入货物</el-link> -->
             <el-link type="primary" @click="openCommonCargoDialog">常用货物</el-link>
           </div>
         </div>
@@ -233,7 +233,10 @@
         <div class="shipping-template-page__cargo-wrap">
           <el-table :data="transportCargoRows" border empty-text="暂无货物信息">
             <el-table-column type="index" label="序号" width="70" align="center" />
-            <el-table-column label="货物类型" min-width="200" align="center">
+            <el-table-column min-width="200" align="center">
+              <template #header>
+                <span>货物类型<span class="goods-required-mark">*</span></span>
+              </template>
               <template #default="{ row }">
                 <el-cascader
                   v-model="row.cargoTypePath"
@@ -482,7 +485,7 @@
               v-model="attachmentRows"
               :readonly="dialogReadonly"
               :file-types="attachmentFileTypes"
-              :max-size="500"
+              :max-size="50"
               :show-file-list="false"
               button-text="上传附件"
               @change="handleAttachmentChange"
@@ -925,7 +928,13 @@
           @keyup.enter="searchTransportMapKeyword"
         /><el-button type="primary" @click="searchTransportMapKeyword">搜索</el-button>
       </div>
-      <div ref="transportMap" class="shipping-template-page__map" />
+      <div class="map-picker-content">
+        <map-search-results
+          :results="transportMapSearchResults"
+          @select="selectTransportMapSearchResult"
+        />
+        <div ref="transportMap" class="shipping-template-page__map" />
+      </div>
       <div class="shipping-template-page__map-info">{{ transportMapStatus }}</div>
       <template #footer
         ><el-button @click="transportMapBox = false">取消</el-button
@@ -946,12 +955,45 @@
       width="1200px"
       @opened="loadCommonCargoList"
     >
-      <el-form :model="commonCargoQuery" inline
-        ><el-form-item label="货物名称"
-          ><el-input v-model="commonCargoQuery.cargoName" clearable /></el-form-item
-        ><el-button type="primary" @click="handleCommonCargoSearch">查询</el-button
-        ><el-button @click="handleCommonCargoReset">重置</el-button></el-form
-      >
+      <div class="shipping-template-page__dialog-search">
+        <el-form :model="commonCargoQuery" label-position="right" label-width="100px">
+          <el-row :gutter="16">
+            <el-col :span="6">
+              <el-form-item label="货物名称">
+                <el-input v-model="commonCargoQuery.cargoName" clearable placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="货物类型">
+                <el-cascader
+                  v-model="commonCargoQuery.cargoTypePath"
+                  :options="cargoTypeOptions"
+                  :props="cargoTypeCascaderProps"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  :loading="cargoTypeLoading"
+                  @visible-change="visible => visible && ensureCargoTypeOptions()"
+                  @change="handleCommonCargoTypeChange"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="规格型号">
+                <el-input
+                  v-model="commonCargoQuery.specificationModel"
+                  clearable
+                  placeholder="请输入"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" class="shipping-template-page__dialog-search-actions">
+              <el-button type="primary" @click="handleCommonCargoSearch">查询</el-button>
+              <el-button @click="handleCommonCargoReset">重置</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
       <el-table
         :data="commonCargoRows"
         border
@@ -1001,35 +1043,6 @@
       >
     </el-dialog>
 
-    <el-dialog
-      title="导入货物"
-      v-model="cargoImportBox"
-      append-to-body
-      width="560px"
-      @closed="cargoImportRows = []"
-    >
-      <el-upload
-        action="#"
-        accept=".xls,.xlsx"
-        :auto-upload="false"
-        :show-file-list="false"
-        :disabled="cargoImportLoading"
-        :on-change="handleCargoImportFileChange"
-        ><el-button type="primary" :loading="cargoImportLoading">上传</el-button></el-upload
-      >
-      <el-link type="primary" @click="handleCargoImportTemplate">下载模板</el-link>
-      <template #footer
-        ><el-button @click="closeCargoImportDialog">关闭</el-button
-        ><el-button
-          type="primary"
-          :loading="cargoImportLoading"
-          :disabled="!cargoImportRows.length"
-          @click="confirmCargoImport"
-          >确定</el-button
-        ></template
-      >
-    </el-dialog>
-
     <el-dialog
       v-model="shippingTemplateProcessConfigBox"
       title="过程配置"
@@ -1066,7 +1079,7 @@
 </template>
 
 <script>
-import { exportBlob, importBlob } from '@/api/common';
+import { exportBlob } from '@/api/common';
 import { getList as getCommonAddressList } from '@/api/base/common-address';
 import { getList as getAirportMasterList } from '@/api/base/airport-master';
 import { getList as getCargoTypeList } from '@/api/base/cargo-type';
@@ -1244,6 +1257,7 @@ export default {
       dialogReadonly: false,
       crudDialogType: '',
       standaloneFormKey: '',
+      copyingRow: null,
       detailBox: false,
       detailLoading: false,
       detailRow: {},
@@ -1320,6 +1334,7 @@ export default {
       transportMapLoading: false,
       transportMapStatus: '可搜索地址或点击地图选点',
       transportMapSelected: {},
+      transportMapSearchResults: [],
       transportMapInstance: null,
       transportMapMarker: null,
       transportMapGeocoder: null,
@@ -1329,9 +1344,6 @@ export default {
       commonCargoRows: [],
       commonCargoSelected: [],
       commonCargoPage: { pageSize: 10, currentPage: 1, total: 0 },
-      cargoImportBox: false,
-      cargoImportLoading: false,
-      cargoImportRows: [],
       shippingTemplateProcessConfigBox: false,
       shippingTemplateProcessConfigLoading: false,
       shippingTemplateProcessConfigRows: [],
@@ -1416,7 +1428,7 @@ export default {
           String(item.value).toUpperCase() ===
           String(this.shippingTemplateFreight.currency || '').toUpperCase()
       );
-      return this.currencyName(option?.label || this.shippingTemplateFreight.currency);
+      return this.currencyUnit(option?.label || this.shippingTemplateFreight.currency);
     },
     roadFreightTotal() {
       const total = this.shippingTemplateFreight.freightItems.reduce(
@@ -1487,7 +1499,8 @@ export default {
       if (
         this.isStandaloneFormPage &&
         (to.query.mode !== from?.query?.mode ||
-          String(to.query.id || '') !== String(from?.query.id || ''))
+          String(to.query.id || '') !== String(from?.query.id || '') ||
+          to.query.copy !== from?.query?.copy)
       )
         this.$nextTick(() => this.initStandaloneFormPage());
     },
@@ -1597,13 +1610,21 @@ export default {
     },
     openBusinessForm(mode, row = {}) {
       if (this.isStandaloneBusinessPage) {
+        const query = {
+          mode,
+          ...(mode === 'edit' && row.id ? { id: row.id } : {}),
+          name: `${mode === 'edit' ? '编辑' : '新增'}${this.config.title}`,
+        };
+        // 如果是复制模式，添加标识
+        console.log('openBusinessForm, mode:', mode, 'copyingRow:', this.copyingRow);
+        if (mode === 'add' && this.copyingRow) {
+          query.copy = Date.now().toString();
+          console.log('添加 copy 参数:', query.copy);
+        }
+        console.log('最终的 query:', query);
         this.$router.push({
           path: '/business/shipping-template/form',
-          query: {
-            mode,
-            ...(mode === 'edit' && row.id ? { id: row.id } : {}),
-            name: `${mode === 'edit' ? '编辑' : '新增'}${this.config.title}`,
-          },
+          query,
         });
         return;
       }
@@ -1613,10 +1634,29 @@ export default {
       if (!this.isStandaloneFormPage) return;
       const mode = this.$route.query.mode;
       const id = this.$route.query.id || '';
-      const key = `${mode}:${id}`;
+      const copy = this.$route.query.copy || '';
+      const key = `${mode}:${id}:${copy}`;
+      console.log('initStandaloneFormPage 被调用, key:', key, 'standaloneFormKey:', this.standaloneFormKey);
       if (this.standaloneFormKey === key) return;
       this.standaloneFormKey = key;
+
+      // 检查是否是复制模式
+      if (mode === 'add' && copy) {
+        const copyData = sessionStorage.getItem('shipping-template-copy-data');
+        console.log('复制模式检测到，从 sessionStorage 读取数据:', copyData);
+        if (copyData) {
+          try {
+            this.copyingRow = JSON.parse(copyData);
+            console.log('解析后的 copyingRow:', this.copyingRow);
+            sessionStorage.removeItem('shipping-template-copy-data');
+          } catch (e) {
+            console.error('解析复制数据失败', e);
+          }
+        }
+      }
+
       if (mode === 'edit') this.form = { id };
+      console.log('调用 beforeOpen 前，copyingRow:', this.copyingRow);
       this.beforeOpen(() => {}, mode);
     },
     parseJsonArray(value) {
@@ -1741,9 +1781,37 @@ export default {
         .catch(() => loading?.());
     },
     beforeOpen(done, type) {
+      console.log('beforeOpen 被调用，type:', type, 'copyingRow:', this.copyingRow);
       this.crudDialogType = type;
       this.dialogReadonly = type === 'view';
       if (type === 'add') {
+        // 检查是否是复制模式
+        if (this.copyingRow) {
+          console.log('进入复制模式分支');
+          const copyData = { ...this.copyingRow };
+          this.copyingRow = null;
+          this.form = { ...(this.config.defaultForm || {}), ...copyData };
+          console.log('合并后的 form:', this.form);
+          // 删除模板编号，等待系统生成
+          delete this.form.templateCode;
+          this.applyFormDetail(this.form);
+          console.log('applyFormDetail 调用完成');
+          // 生成新的模板编号
+          if (typeof this.api.nextCode === 'function') {
+            this.api
+              .nextCode()
+              .then(res => {
+                this.form.templateCode = res?.data?.data || '';
+                console.log('生成的新模板编号:', this.form.templateCode);
+              })
+              .finally(() => done?.());
+          } else {
+            done?.();
+          }
+          return;
+        }
+        console.log('进入正常新增模式分支');
+        // 正常新增模式
         this.form = { ...(this.config.defaultForm || {}) };
         this.selectedProjectId = '';
         this.contractOptions = [];
@@ -1780,6 +1848,12 @@ export default {
         this.normalizeCargo(item)
       );
       if (!this.transportCargoRows.length) this.transportCargoRows = [defaultCargo()];
+      // 先加载货物类型树，保证已有货物类型可以回显为级联路径，然后再恢复路径。
+      this.ensureCargoTypeOptions()
+        .then(() => {
+          this.restoreCargoTypePaths();
+        })
+        .catch(() => {});
       this.attachmentRows = this.parseJsonArray(this.form.attachmentsJson);
       this.shippingTemplateFreight = {
         ...defaultFreight(),
@@ -1846,7 +1920,11 @@ export default {
         return false;
       }
       for (const [index, row] of this.transportCargoRows.entries()) {
-        if (!row.cargoType || !row.cargoName || !row.quantity || !row.quantityUnit) {
+        if (!String(row.cargoType || '').trim() && !this.cargoPath(row.cargoTypePath).length) {
+          this.$message.warning(`第${index + 1}行货物类型不能为空`);
+          return false;
+        }
+        if (!String(row.cargoName || '').trim() || !row.quantity || !row.quantityUnit) {
           this.$message.warning(`第${index + 1}行货物信息不完整`);
           return false;
         }
@@ -1919,11 +1997,42 @@ export default {
         });
     },
     handleCopy(row) {
-      if (typeof this.api.copy !== 'function') return;
-      this.api.copy(row.id).then(() => {
-        this.$message.success('复制成功');
-        this.onLoad(this.page, this.query);
-      });
+      this.api
+        .getDetail(row.id)
+        .then(res => {
+          const detail = res?.data?.data || {};
+          console.log('获取到的详情数据:', detail);
+          // 删除不需要复制的字段
+          delete detail.id;
+          delete detail.templateCode; // 系统自动生成
+          delete detail.createTime;
+          delete detail.createUser;
+          delete detail.createUserName;
+          delete detail.createDept;
+          delete detail.updateTime;
+          delete detail.updateUser;
+          delete detail.updateUserName;
+          delete detail.status;
+
+          console.log('处理后的数据:', detail);
+          console.log('isStandaloneBusinessPage:', this.isStandaloneBusinessPage);
+
+          // 存储到组件状态（用于判断是否是复制模式）
+          this.copyingRow = detail;
+          console.log('已存储到 copyingRow');
+
+          // 如果是独立表单页模式，同时存储到 sessionStorage
+          if (this.isStandaloneBusinessPage) {
+            sessionStorage.setItem('shipping-template-copy-data', JSON.stringify(detail));
+            console.log('已存储到 sessionStorage');
+          }
+
+          // 打开新增表单
+          this.openBusinessForm('add', {});
+        })
+        .catch(() => {
+          this.$message.error('获取数据失败');
+        });
     },
     handleCustomOperation(operation, row) {
       if (operation.action === 'createFromTemplate') {
@@ -2082,6 +2191,45 @@ export default {
         }[text.toUpperCase()] || text
       );
     },
+    currencyUnit(value) {
+      const text = String(value || '');
+      // 如果格式是 "CNY - 人民币"，提取货币代码部分
+      let code = text;
+      if (text.includes(' - ')) {
+        code = text.split(' - ')[0].trim();
+      }
+
+      const upperCode = code.toUpperCase();
+      const unitMap = {
+        CNY: '元',
+        RMB: '元',
+        USD: '美元',
+        EUR: '欧元',
+        JPY: '日元',
+        GBP: '英镑',
+      };
+
+      // 如果是已知的货币代码，返回对应的单位
+      if (unitMap[upperCode]) {
+        return unitMap[upperCode];
+      }
+
+      // 如果是中文货币名称，转换为单位
+      const nameMap = {
+        '人民币': '元',
+        '美元': '美元',
+        '欧元': '欧元',
+        '日元': '日元',
+        '英镑': '英镑',
+      };
+
+      if (nameMap[code]) {
+        return nameMap[code];
+      }
+
+      // 默认返回原值
+      return text;
+    },
     loadFeeUnitOptions() {
       getDictionary({ code: 'unit_fee' }).then(res => {
         this.feeUnitOptions = this.normalizeDictOptions(res?.data?.data || []);
@@ -2339,6 +2487,7 @@ export default {
         regionName: this.form[`${prefix}Name`],
         addressCode: this.form[`${prefix}AddressCode`],
       });
+      this.transportMapSearchResults = [];
       this.transportMapStatus = this.transportMapSelected.longitude
         ? '已加载当前选点，可重新选点'
         : '可搜索地址或点击地图选点';
@@ -2403,9 +2552,18 @@ export default {
         .then(() => this.ensureTransportMapGeocoder())
         .then(() => this.runTransportMapGeocode('location', keyword))
         .then(result => {
+          this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
+            id: item.id || index,
+            name: item.formattedAddress || keyword,
+            address: item.formattedAddress || keyword,
+            location: item.location,
+          }));
           const point = this.resolveTransportMapPoint(result);
           if (!point) throw new Error('未找到匹配地址');
-          return this.pickMapPoint(point, keyword);
+          return this.$nextTick().then(() => {
+            this.transportMapInstance?.resize();
+            return this.pickMapPoint(point, keyword);
+          });
         })
         .catch(() => {
           this.transportMapStatus = '地图搜索失败';
@@ -2415,6 +2573,11 @@ export default {
           this.transportMapLoading = false;
         });
     },
+    selectTransportMapSearchResult(item) {
+      if (item && item.location) {
+        this.pickMapPoint(item.location, item.address || item.name || '');
+      }
+    },
     pickMapPoint(point, keyword = '') {
       const longitude = this.getTransportMapPointLng(point);
       const latitude = this.getTransportMapPointLat(point);
@@ -2550,6 +2713,7 @@ export default {
         .then(res => {
           this.cargoTypeOptions = this.buildCargoTree(extractRecords(res));
           this.cargoTypeFlatOptions = this.flattenCargo(this.cargoTypeOptions);
+          this.restoreCargoTypePaths();
           return this.cargoTypeOptions;
         })
         .finally(() => {
@@ -2603,15 +2767,115 @@ export default {
     cargoPath(path) {
       return Array.isArray(path) ? path.slice(0, 2).map(String) : [];
     },
+    findCargoTypeOption(row = {}) {
+      const path = this.cargoPath(row.cargoTypePath);
+      if (path.length) {
+        const pathKey = path.join('/');
+        const pathMatch = this.cargoTypeFlatOptions.find(item => item.path?.join('/') === pathKey);
+        if (pathMatch) return pathMatch;
+      }
+
+      // 优先通过二级类型编码查找（最准确）
+      if (row.secondCargoTypeCode) {
+        const secondMatch = this.cargoTypeFlatOptions.find(
+          item => String(item.cargoCode || item.code || '').trim() === String(row.secondCargoTypeCode).trim()
+        );
+        if (secondMatch) {
+          console.log('通过 secondCargoTypeCode 找到货物类型:', secondMatch);
+          return secondMatch;
+        }
+      }
+
+      // 其他候选编码
+      const codeCandidates = [row.cargoTypeCode, row.firstCargoTypeCode]
+        .map(value => String(value || '').trim())
+        .filter(Boolean);
+      const nameCandidates = [
+        row.secondCargoTypeName,
+        row.cargoType,
+        row.goodsType,
+        row.firstCargoTypeName,
+      ]
+        .map(value => String(value || '').trim())
+        .filter(Boolean);
+
+      return (
+        this.cargoTypeFlatOptions.find(item =>
+          codeCandidates.some(
+            code => code === String(item.cargoCode || item.code || item.id || '').trim()
+          )
+        ) ||
+        this.cargoTypeFlatOptions.find(item =>
+          nameCandidates.some(name => name === String(item.cargoName || '').trim())
+        )
+      );
+    },
+    resolveCargoTypePath(row = {}) {
+      const matched = this.findCargoTypeOption(row);
+      return matched?.path ? this.cargoPath(matched.path) : [];
+    },
+    restoreCargoTypePaths() {
+      console.log('restoreCargoTypePaths 被调用');
+      console.log('transportCargoRows:', this.transportCargoRows);
+      console.log('cargoTypeFlatOptions 长度:', this.cargoTypeFlatOptions.length);
+      if (!this.transportCargoRows.length || !this.cargoTypeFlatOptions.length) return;
+      this.transportCargoRows.forEach((row, index) => {
+        console.log(`处理第 ${index + 1} 行货物:`, row);
+        const path = this.resolveCargoTypePath(row);
+        console.log(`解析出的 path:`, path);
+        if (!path.length) return;
+        const item = this.cargoTypeFlatOptions.find(
+          option => option.path?.join('/') === path.join('/')
+        );
+        console.log(`匹配到的 item:`, item);
+        row.cargoTypePath = path;
+        row.cargoType =
+          item?.cargoName ||
+          row.cargoType ||
+          row.secondCargoTypeName ||
+          row.firstCargoTypeName ||
+          '';
+        row.cargoTypeCode =
+          item?.cargoCode ||
+          row.cargoTypeCode ||
+          row.secondCargoTypeCode ||
+          row.firstCargoTypeCode ||
+          '';
+        console.log(`设置后的 row.cargoTypePath:`, row.cargoTypePath);
+      });
+    },
     normalizeCargo(row = {}) {
-      return {
+      console.log('normalizeCargo 输入:', row);
+      // 如果原始数据中有完整的 cargoTypePath 数组，直接使用
+      let cargoTypePath = [];
+      if (Array.isArray(row.cargoTypePath) && row.cargoTypePath.length > 0) {
+        cargoTypePath = this.cargoPath(row.cargoTypePath);
+        console.log('使用原始的 cargoTypePath:', cargoTypePath);
+      } else {
+        cargoTypePath = this.resolveCargoTypePath(row);
+        console.log('解析的 cargoTypePath:', cargoTypePath);
+      }
+      const cargoType = this.findCargoTypeOption({ ...row, cargoTypePath });
+      const result = {
         ...defaultCargo(),
         ...row,
-        cargoTypePath: this.cargoPath(row.cargoTypePath),
-        cargoType: row.cargoType || row.secondCargoTypeName || row.firstCargoTypeName || '',
-        cargoTypeCode: row.cargoTypeCode || row.secondCargoTypeCode || row.firstCargoTypeCode || '',
+        cargoTypePath,
+        cargoType:
+          cargoType?.cargoName ||
+          row.cargoType ||
+          row.secondCargoTypeName ||
+          row.firstCargoTypeName ||
+          '',
+        cargoTypeCode:
+          cargoType?.cargoCode ||
+          row.cargoTypeCode ||
+          row.secondCargoTypeCode ||
+          row.firstCargoTypeCode ||
+          '',
         cargoName: row.cargoName || row.goodsName || '',
       };
+      console.log('normalizeCargo 输出:', result);
+      return result;
     },
     handleCargoTypeChange(row, value) {
       const path = this.cargoPath(value);
@@ -2623,7 +2887,7 @@ export default {
         .filter(Boolean);
       row.cargoTypePath = path;
       row.cargoType = labels.at(-1) || '';
-      row.cargoTypeCode = item?.cargoCode || '';
+      row.cargoTypeCode = item?.cargoCode || item?.code || item?.id || '';
       row.cargoName = '';
     },
     fetchCargoSuggestions(query, callback, row) {
@@ -2637,8 +2901,49 @@ export default {
         )
         .catch(() => callback([]));
     },
-    selectCargoSuggestion(row, item) {
-      Object.assign(row, this.normalizeCargo(item));
+    async selectCargoSuggestion(row, item = {}) {
+      console.log('selectCargoSuggestion 被调用，item:', item);
+
+      const selectedCargo = {
+        ...row,
+        ...item,
+        cargoName: item.cargoName || item.name || item.label || item.value || row.cargoName || '',
+      };
+
+      // 确保货物类型树已加载
+      try {
+        await this.ensureCargoTypeOptions();
+        console.log('货物类型树已加载，共', this.cargoTypeFlatOptions.length, '个选项');
+      } catch (error) {
+        console.warn('货物类型树加载失败', error);
+        // 货物类型树加载失败时仍保留货物名称，提交时会给出货物类型必填提示。
+      }
+
+      // 从常用货物返回的数据中查找货物类型
+      const matchedCargoType = this.findCargoTypeOption(item);
+      console.log('匹配到的货物类型:', matchedCargoType);
+
+      if (matchedCargoType?.path?.length) {
+        // 找到匹配的货物类型，回填到当前行
+        const fullPath = matchedCargoType.path;
+        selectedCargo.cargoTypePath = this.cargoPath(fullPath);
+        selectedCargo.cargoType = matchedCargoType.cargoName || selectedCargo.cargoType;
+        selectedCargo.cargoTypeCode =
+          matchedCargoType.cargoCode || matchedCargoType.code || matchedCargoType.id || '';
+
+        console.log('货物名称选择后反选货物类型:', {
+          cargoName: selectedCargo.cargoName,
+          cargoType: selectedCargo.cargoType,
+          cargoTypePath: selectedCargo.cargoTypePath,
+          fullPath: fullPath,
+          matchedCargoType: matchedCargoType,
+        });
+      } else {
+        console.warn('未找到匹配的货物类型，item数据:', item);
+        console.warn('当前 cargoTypeFlatOptions 前5项:', this.cargoTypeFlatOptions.slice(0, 5));
+      }
+
+      Object.assign(row, this.normalizeCargo(selectedCargo));
       row.value = undefined;
       this.syncFreightItems();
     },
@@ -2786,13 +3091,16 @@ export default {
     },
     openCommonCargoDialog() {
       this.commonCargoSelected = [];
+      this.commonCargoQuery = {};
       this.commonCargoPage.currentPage = 1;
       this.commonCargoBox = true;
+      this.ensureCargoTypeOptions().catch(() => {});
     },
     loadCommonCargoList() {
       this.commonCargoLoading = true;
+      const { cargoTypePath, ...query } = this.commonCargoQuery || {};
       getCommonCargoList(this.commonCargoPage.currentPage, this.commonCargoPage.pageSize, {
-        ...this.normalizeSearch(this.commonCargoQuery),
+        ...this.normalizeSearch(query),
         allDept: 0,
       })
         .then(res => {
@@ -2812,6 +3120,29 @@ export default {
       this.commonCargoQuery = {};
       this.handleCommonCargoSearch();
     },
+    handleCommonCargoTypeChange(value) {
+      const path = this.cargoPath(value);
+      const firstCargoType = this.cargoTypeFlatOptions.find(
+        item => item.path?.join('/') === path.slice(0, 1).join('/')
+      );
+      const secondCargoType = this.cargoTypeFlatOptions.find(
+        item => item.path?.join('/') === path.join('/')
+      );
+      this.commonCargoQuery = {
+        ...this.commonCargoQuery,
+        cargoTypePath: path,
+        firstCargoTypeName: firstCargoType?.cargoName || '',
+        firstCargoTypeCode: firstCargoType?.cargoCode || '',
+        secondCargoTypeName: path.length > 1 ? secondCargoType?.cargoName || '' : '',
+        secondCargoTypeCode: path.length > 1 ? secondCargoType?.cargoCode || '' : '',
+      };
+      if (!path.length) {
+        delete this.commonCargoQuery.firstCargoTypeName;
+        delete this.commonCargoQuery.firstCargoTypeCode;
+        delete this.commonCargoQuery.secondCargoTypeName;
+        delete this.commonCargoQuery.secondCargoTypeCode;
+      }
+    },
     handleCommonCargoCurrentChange(page) {
       this.commonCargoPage.currentPage = page;
       this.loadCommonCargoList();
@@ -2823,54 +3154,16 @@ export default {
     handleCommonCargoSelectionChange(rows) {
       this.commonCargoSelected = rows || [];
     },
-    selectCommonCargoRow(row) {
+    async selectCommonCargoRow(row) {
+      await this.ensureCargoTypeOptions().catch(() => {});
       this.addCargoRow(-1, row);
       this.commonCargoBox = false;
     },
-    confirmCommonCargoSelection() {
+    async confirmCommonCargoSelection() {
+      await this.ensureCargoTypeOptions().catch(() => {});
       this.commonCargoSelected.forEach(row => this.addCargoRow(-1, row));
       this.commonCargoBox = false;
     },
-    handleCargoImportFileChange(file) {
-      const raw = file.raw;
-      if (!raw || !/\.(xls|xlsx)$/i.test(raw.name || ''))
-        return this.$message.warning('请上传 Excel 文件');
-      this.cargoImportLoading = true;
-      importBlob('/blade-transport/shipping-template/import-goods', raw)
-        .then(async res => {
-          const type = res.headers?.['content-type'] || res.data?.type || '';
-          if (type.includes('excel')) {
-            downloadXls(
-              res.data,
-              `发货模板货物导入失败明细${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
-            );
-            this.$message.warning('部分数据导入失败，已下载失败明细');
-            return;
-          }
-          const result = JSON.parse(await res.data.text());
-          if (result.code !== 200) throw new Error(result.msg);
-          this.cargoImportRows = result.data || [];
-        })
-        .catch(() => this.$message.error('货物导入失败，请检查文件格式'))
-        .finally(() => {
-          this.cargoImportLoading = false;
-        });
-    },
-    confirmCargoImport() {
-      this.cargoImportRows.forEach(row => this.addCargoRow(-1, row));
-      this.closeCargoImportDialog();
-    },
-    closeCargoImportDialog() {
-      if (!this.cargoImportLoading) {
-        this.cargoImportBox = false;
-        this.cargoImportRows = [];
-      }
-    },
-    handleCargoImportTemplate() {
-      exportBlob('/blade-transport/shipping-template/export-goods-template').then(res =>
-        downloadXls(res.data, '发货模板货物导入模板.xlsx')
-      );
-    },
     handleAttachmentChange(list) {
       const name = this.userInfo?.realName || this.userInfo?.userName || '';
       const time = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
@@ -3044,6 +3337,10 @@ export default {
   width: 100%;
   overflow-x: auto;
 }
+.goods-required-mark {
+  margin-left: 2px;
+  color: #f56c6c;
+}
 .shipping-template-page__cargo-total {
   display: flex;
   justify-content: flex-start;
@@ -3388,10 +3685,27 @@ export default {
   display: flex;
   gap: 8px;
 }
+.shipping-template-page__dialog-search {
+  margin-bottom: 8px;
+  padding: 12px 12px 4px;
+  background: #fff;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+}
+.shipping-template-page__dialog-search-actions {
+  display: flex;
+  justify-content: flex-end;
+}
 .shipping-template-page__map {
+  flex: 1 1 auto;
+  width: 100%;
+  min-width: 0;
   height: 480px;
   margin-top: 12px;
 }
+:deep(.shipping-template-page__map > .amap-container) {
+  width: 100% !important;
+  height: 100% !important;
+}
 .shipping-template-page__map-info {
   margin-top: 8px;
   color: #606266;

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

@@ -301,7 +301,7 @@
         >
           <span>货物信息</span>
           <div v-if="!dialogReadonly" class="transport-plan-page__section-actions">
-            <el-link type="primary" @click="cargoImportBox = true">导入货物</el-link>
+            <!-- <el-link type="primary" @click="cargoImportBox = true">导入货物</el-link> -->
             <el-link type="primary" @click="openCommonCargoDialog">常用货物</el-link>
           </div>
         </div>
@@ -316,6 +316,25 @@
             empty-text="暂无货物信息"
           >
             <el-table-column type="index" label="序号" width="70" align="center" fixed="left" />
+            <el-table-column min-width="220" align="center">
+              <template #header>
+                <span class="transport-plan-page__required-column">货物类型</span>
+              </template>
+              <template #default="{ row }">
+                <el-cascader
+                  v-model="row.cargoTypePath"
+                  :options="transportCargoTypeOptions"
+                  :props="transportCargoTypeCascaderProps"
+                  :placeholder="row.cargoType || '请选择'"
+                  clearable
+                  filterable
+                  :disabled="dialogReadonly"
+                  :filter-method="filterBillingCargoType"
+                  @visible-change="visible => visible && ensureBillingCargoTypeOptions()"
+                  @change="value => handleTransportCargoTypeChange(row, value)"
+                />
+              </template>
+            </el-table-column>
             <el-table-column label="货物名称" min-width="240" align="center">
               <template #default="{ row }">
                 <el-autocomplete
@@ -334,31 +353,11 @@
                   <template #default="{ item }">
                     <div class="transport-plan-page__cargo-autocomplete-item">
                       <span>{{ formatBillingCargoTypeLabel(item) }}</span>
-                      <small v-if="item.cargoCode">{{ item.cargoCode }}</small>
                     </div>
                   </template>
                 </el-autocomplete>
               </template>
             </el-table-column>
-            <el-table-column min-width="220" align="center">
-              <template #header>
-                <span class="transport-plan-page__required-column">货物类型</span>
-              </template>
-              <template #default="{ row }">
-                <el-cascader
-                  v-model="row.cargoTypePath"
-                  :options="transportCargoTypeOptions"
-                  :props="transportCargoTypeCascaderProps"
-                  :placeholder="row.cargoType || '请选择'"
-                  clearable
-                  filterable
-                  :disabled="dialogReadonly"
-                  :filter-method="filterBillingCargoType"
-                  @visible-change="visible => visible && ensureBillingCargoTypeOptions()"
-                  @change="value => handleTransportCargoTypeChange(row, value)"
-                />
-              </template>
-            </el-table-column>
             <el-table-column label="数量" min-width="120" align="center">
               <template #default="{ row }">
                 <el-input
@@ -526,7 +525,7 @@
               v-model="attachmentRows"
               :readonly="dialogReadonly"
               :file-types="attachmentFileTypes"
-              :max-size="500"
+              :max-size="50"
               :show-file-list="false"
               button-text="上传附件"
               @change="handleAttachmentChange"
@@ -681,10 +680,8 @@
                 <div class="transport-plan-page__transport-plan-detail-route-point">
                   <b class="is-start">起</b>
                   <div>
-                    <strong>{{
-                      detailRow.departureName || detailRow.departureAddress || '-'
-                    }}</strong>
-                    <p>{{ formatTransportPlanProvinceCityDistrict(detailRow.departureAddress) }}</p>
+                    <strong>{{ formatTransportPlanDetailRouteName('departure') }}</strong>
+                    <p>{{ detailRow.departureAddress || '-' }}</p>
                     <p>
                       {{
                         [detailRow.departureContact, detailRow.departurePhone]
@@ -698,8 +695,8 @@
                 <div class="transport-plan-page__transport-plan-detail-route-point">
                   <b class="is-end">终</b>
                   <div>
-                    <strong>{{ detailRow.arrivalName || detailRow.arrivalAddress || '-' }}</strong>
-                    <p>{{ formatTransportPlanProvinceCityDistrict(detailRow.arrivalAddress) }}</p>
+                    <strong>{{ formatTransportPlanDetailRouteName('arrival') }}</strong>
+                    <p>{{ detailRow.arrivalAddress || '-' }}</p>
                     <p>
                       {{
                         [detailRow.arrivalContact, detailRow.arrivalPhone]
@@ -1496,10 +1493,12 @@
                 v-model="dispatchItemForm.departureName"
                 :placeholder="dispatchStationNamePlaceholder"
                 :suffix-icon="dispatchStationMode ? Search : undefined"
+                disabled
               />
               <el-input
                 v-model="dispatchItemForm.departureAddress"
                 :placeholder="dispatchAddressDetailPlaceholder"
+                disabled
               >
                 <template v-if="!dispatchStationMode" #suffix>
                   <el-link
@@ -1511,9 +1510,9 @@
                 </template>
               </el-input>
               <span class="transport-plan-page__route-label">联系人</span>
-              <el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" />
+              <el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" disabled />
               <span class="transport-plan-page__route-label">联系方式</span>
-              <el-input v-model="dispatchItemForm.departurePhone" placeholder="请输入" />
+              <el-input v-model="dispatchItemForm.departurePhone" placeholder="请输入" disabled />
             </div>
           </el-form-item>
           <el-form-item label="收货地址" required>
@@ -1522,10 +1521,12 @@
                 v-model="dispatchItemForm.arrivalName"
                 :placeholder="dispatchStationNamePlaceholder"
                 :suffix-icon="dispatchStationMode ? Search : undefined"
+                disabled
               />
               <el-input
                 v-model="dispatchItemForm.arrivalAddress"
                 :placeholder="dispatchAddressDetailPlaceholder"
+                disabled
               >
                 <template v-if="!dispatchStationMode" #suffix>
                   <el-link
@@ -1537,9 +1538,9 @@
                 </template>
               </el-input>
               <span class="transport-plan-page__route-label">联系人</span>
-              <el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" />
+              <el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" disabled />
               <span class="transport-plan-page__route-label">联系方式</span>
-              <el-input v-model="dispatchItemForm.arrivalPhone" placeholder="请输入" />
+              <el-input v-model="dispatchItemForm.arrivalPhone" placeholder="请输入" disabled />
             </div>
           </el-form-item>
         </div>
@@ -1558,7 +1559,7 @@
           >
             <span>货物信息</span>
             <div class="transport-plan-page__section-actions">
-              <el-link type="primary" @click="cargoImportBox = true">导入货物</el-link>
+              <!-- <el-link type="primary" @click="cargoImportBox = true">导入货物</el-link> -->
               <el-link type="primary" @click="openCommonCargoDialog">常用货物</el-link>
             </div>
           </div>
@@ -2201,7 +2202,7 @@
             <vehicle-attachment-upload
               v-model="dispatchItemAttachmentRows"
               :file-types="attachmentFileTypes"
-              :max-size="500"
+              :max-size="50"
               :show-file-list="false"
               button-text="上传附件"
               @change="handleDispatchItemAttachmentChange"
@@ -2518,7 +2519,10 @@
           搜索
         </el-button>
       </div>
-      <div ref="transportAmap" class="transport-plan-page__map"></div>
+      <div class="map-picker-content">
+        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
+        <div ref="transportAmap" class="transport-plan-page__map"></div>
+      </div>
       <div class="transport-plan-page__map-info">
         <span>{{ transportMapStatus }}</span>
         <span v-if="transportMapSelected.regionName"
@@ -2689,7 +2693,10 @@ import { getList as getCargoTypeList } from '@/api/base/cargo-type';
 import { getList as getPortTerminalList } from '@/api/base/port-terminal';
 import { getList as getRailwayStationList } from '@/api/base/railway-station';
 import { getList as getCommonCargoList } from '@/api/business/common-cargo';
-import { getList as getContractList } from '@/api/business/contract-manage';
+import {
+  getDetail as getContractDetail,
+  getList as getContractList,
+} from '@/api/business/contract-manage';
 import {
   getDetail as getProjectDetail,
   getList as getProjectList,
@@ -2945,7 +2952,7 @@ const defaultDispatchRow = () => ({
   remark: '',
 });
 
-const taskCarrierTypes = ['承运商', '自运', '网货平台'];
+const taskCarrierTypes = ['承运商', '自运'];
 
 export default {
   components: {
@@ -3121,6 +3128,7 @@ export default {
       transportMapKeyword: '',
       transportMapStatus: '可搜索地址或点击地图选点',
       transportMapSelected: {},
+      transportMapSearchResults: [],
       transportAmap: null,
       transportAmapMarker: null,
       transportAmapGeocoder: null,
@@ -3446,7 +3454,7 @@ export default {
       return this.isDispatchCarrierRequired(this.dispatchItemForm.carrierType);
     },
     dispatchCarrierLabel() {
-      return this.dispatchItemForm.carrierType === '网货平台' ? '承运方' : '承运商';
+      return '承运商';
     },
     dispatchCarrierSelection: {
       get() {
@@ -3790,6 +3798,34 @@ export default {
       const cityMatch = text.match(/市/);
       return cityMatch ? text.slice(0, cityMatch.index + 1) : text;
     },
+    formatTransportPlanRoadCityDistrict(value) {
+      const text = String(value || '').trim();
+      if (!text) return '-';
+      const cityMatch = text.match(/市/);
+      if (!cityMatch) return this.formatTransportPlanProvinceCityDistrict(text);
+
+      const cityEnd = cityMatch.index + 1;
+      const cityWithProvince = text.slice(0, cityEnd);
+      const city =
+        cityWithProvince.match(/(?:省|自治区|特别行政区)([^省]+市)$/)?.[1] || cityWithProvince;
+      const districtText = text.slice(cityEnd);
+      const districtMatch = districtText.match(
+        /^(?:.*(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗))/
+      );
+      if (!districtMatch) return city;
+
+      const district = districtMatch[0];
+      return district ? `${city} ${district}` : city;
+    },
+    formatTransportPlanDetailRouteName(type) {
+      const nameProp = type === 'departure' ? 'departureName' : 'arrivalName';
+      const addressProp = type === 'departure' ? 'departureAddress' : 'arrivalAddress';
+      const name = this.detailRow[nameProp] || this.detailRow[addressProp];
+      const transportMode = this.resolveTransportMode(this.detailRow.transportType);
+      return transportMode === 'road'
+        ? this.formatTransportPlanRoadCityDistrict(name)
+        : name || '-';
+    },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
     },
@@ -3988,7 +4024,7 @@ export default {
         this.$message.info('当前运单暂无详情数据');
         return;
       }
-      this.$router.push({ path: '/business/waybill-manage', query: { detailId: row.id } });
+      this.$router.push({ path: '/business/waybill-manage/detail', query: { id: row.id } });
     },
     transportPlanWaybillIndex(index) {
       return (
@@ -4054,10 +4090,28 @@ export default {
       request
         .then(res => {
           const detail = res?.data?.data || res?.data || row;
-          this.detailRow = detail;
-          this.ensureTransportPlanDetailTransportTypeName(detail);
-          this.applyFormDetail(detail);
-          return null;
+          if (!detail.contractId) {
+            this.detailRow = detail;
+            this.ensureTransportPlanDetailTransportTypeName(detail);
+            this.applyFormDetail(detail);
+            return null;
+          }
+          return getContractDetail(detail.contractId)
+            .then(contractRes => {
+              const contract = contractRes?.data?.data || contractRes?.data || {};
+              this.detailRow = {
+                ...detail,
+                customerName:
+                  contract.partyA || contract.customerName || detail.customerName || '',
+              };
+              this.ensureTransportPlanDetailTransportTypeName(this.detailRow);
+              this.applyFormDetail(this.detailRow);
+            })
+            .catch(() => {
+              this.detailRow = detail;
+              this.ensureTransportPlanDetailTransportTypeName(detail);
+              this.applyFormDetail(detail);
+            });
         })
         .finally(() => {
           this.detailLoading = false;
@@ -4610,7 +4664,11 @@ export default {
       this.form.settlementCurrency =
         contract.settlementCurrency || contract.settlementCurrencyCode || contract.currency || '';
       this.form.customerName =
-        contract.customerName || contract.customerNames || this.form.customerName || '';
+        contract.partyA ||
+        contract.customerName ||
+        contract.customerNames ||
+        this.form.customerName ||
+        '';
       this.$refs.crud?.validateField?.('contractName');
     },
     loadDispatchContractCurrency(plan = {}) {
@@ -4794,10 +4852,7 @@ export default {
     fetchTaskCargoSuggestions(queryString, callback, path = []) {
       const keyword = String(queryString || '').trim();
       const normalizedPath = this.normalizeBillingCargoTypePath(path);
-      if (!keyword && !normalizedPath.length) {
-        callback([]);
-        return;
-      }
+      // 移除空查询时返回空数组的限制，允许点击时显示货物列表
       let loadingKey = '';
       this.ensureBillingCargoTypeOptions()
         .then(() => {
@@ -4829,11 +4884,42 @@ export default {
           if (loadingKey) this.setTaskCargoLoadingByKey(loadingKey, false);
         });
     },
-    handleTaskCargoRowSelect(row, item = {}) {
+    async handleTaskCargoRowSelect(row, item = {}) {
       const value = this.formatBillingCargoTypeLabel(item);
       row.cargoName = value;
       row.specification = item.specification || item.spec || row.specification || '';
       row.model = item.model || item.modelName || row.model || '';
+
+      // 确保货物类型树已加载
+      try {
+        await this.ensureBillingCargoTypeOptions();
+      } catch (error) {
+        console.warn('货物类型树加载失败', error);
+        this.syncTransportCargoJson();
+        return;
+      }
+
+      // 从常用货物返回的数据中查找货物类型并反选
+      const matchedCargoType = this.findBillingCargoTypeOption(item);
+
+      if (matchedCargoType?.path?.length) {
+        // 找到匹配的货物类型，回填到当前行
+        const fullPath = this.normalizeBillingCargoTypePath(matchedCargoType.path);
+        row.cargoTypePath = fullPath;
+        row.cargoType = matchedCargoType.cargoName || row.cargoType || '';
+        row.cargoTypeCode =
+          matchedCargoType.cargoCode || matchedCargoType.code || matchedCargoType.id || '';
+
+        console.log('货物名称选择后反选货物类型:', {
+          cargoName: row.cargoName,
+          cargoType: row.cargoType,
+          cargoTypePath: row.cargoTypePath,
+          matchedCargoType: matchedCargoType,
+        });
+      } else {
+        console.warn('未找到匹配的货物类型，item数据:', item);
+      }
+
       this.syncTransportCargoJson();
     },
     loadTaskQuantityUnitOptions() {
@@ -5505,6 +5591,12 @@ export default {
           this.ensureTransportAmapGeocoder()
             .then(() => this.runAmapGeocode('location', keyword))
             .then(result => {
+              this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
+                id: item.id || index,
+                name: item.formattedAddress || keyword,
+                address: item.formattedAddress || keyword,
+                location: item.location,
+              }));
               const point = this.resolveMapPoint(result);
               if (!point) {
                 this.transportMapStatus = '未找到匹配地址';
@@ -5525,6 +5617,11 @@ export default {
           this.$message.error('高德地图组件加载失败，请稍后重试或重新打开弹窗');
         });
     },
+    selectTransportMapSearchResult(item) {
+      if (item && item.location) {
+        this.pickTransportMapPoint(item.location, item.address || item.name || '');
+      }
+    },
     pickTransportMapPoint(lnglat, keyword) {
       const longitude = this.getPointLng(lnglat);
       const latitude = this.getPointLat(lnglat);
@@ -6113,6 +6210,49 @@ export default {
         null
       );
     },
+    findBillingCargoTypeOption(row = {}) {
+      const path = this.normalizeBillingCargoTypePath(row.cargoTypePath);
+      if (path.length) {
+        const pathKey = path.join('/');
+        const pathMatch = this.billingCargoTypeFlatOptions.find(item => item.path?.join('/') === pathKey);
+        if (pathMatch) return pathMatch;
+      }
+
+      // 优先通过二级类型编码查找（最准确）
+      if (row.secondCargoTypeCode) {
+        const secondMatch = this.billingCargoTypeFlatOptions.find(
+          item => String(item.cargoCode || item.code || '').trim() === String(row.secondCargoTypeCode).trim()
+        );
+        if (secondMatch) {
+          console.log('通过 secondCargoTypeCode 找到货物类型:', secondMatch);
+          return secondMatch;
+        }
+      }
+
+      // 其他候选编码
+      const codeCandidates = [row.cargoTypeCode, row.firstCargoTypeCode]
+        .map(value => String(value || '').trim())
+        .filter(Boolean);
+      const nameCandidates = [
+        row.secondCargoTypeName,
+        row.cargoType,
+        row.goodsType,
+        row.firstCargoTypeName,
+      ]
+        .map(value => String(value || '').trim())
+        .filter(Boolean);
+
+      return (
+        this.billingCargoTypeFlatOptions.find(item =>
+          codeCandidates.some(
+            code => code === String(item.cargoCode || item.code || item.id || '').trim()
+          )
+        ) ||
+        this.billingCargoTypeFlatOptions.find(item =>
+          nameCandidates.some(name => name === String(item.cargoName || '').trim())
+        )
+      );
+    },
     resolveCommonCargoTypePath(row = {}) {
       const path = this.normalizeBillingCargoTypePath(row.cargoTypePath);
       if (path.length) return path;
@@ -6246,8 +6386,7 @@ export default {
     },
     handleImport() {
       if (this.config.enableTransportPlanImport) {
-        this.transportPlanImportBox = true;
-        this.loadProjectOptions();
+        this.$router.push('/business/transport-plan/import');
         return;
       }
       this.$message.warning('运输计划导入接口未配置');
@@ -6637,33 +6776,13 @@ export default {
         this.$message.warning('运输计划数据异常，无法调度');
         return;
       }
-      this.dispatchRow = { ...row };
-      this.dispatchCarrierOptions = [];
-      this.dispatchCarrierContractOptions = [];
-      this.dispatchCarrierRequestId += 1;
-      this.dispatchBox = true;
-      this.dispatchLoading = true;
-      this.dispatchRows = [];
-      this.loadDispatchTransportTypeOptions();
-      const request =
-        this.api && typeof this.api.getDetail === 'function'
-          ? this.api.getDetail(row.id)
-          : Promise.resolve({ data: { data: row } });
-      request
-        .then(res => {
-          const detail = {
-            ...row,
-            ...(res?.data?.data || {}),
-          };
-          this.dispatchRow = detail;
-          this.dispatchRows = this.buildDispatchRows(detail);
-          return this.loadDispatchContractCurrency(detail).then(() => {
-            this.loadDispatchCarrierOptions(detail);
-          });
-        })
-        .finally(() => {
-          this.dispatchLoading = false;
-        });
+      // 跳转到独立的调度页面
+      this.$router.push({
+        path: '/business/transport-plan-dispatch',
+        query: {
+          planId: row.id,
+        },
+      });
     },
     loadDispatchTransportTypeOptions() {
       if (this.dispatchTransportTypeOptions.length || this.dispatchTransportTypeLoading) {
@@ -7296,22 +7415,19 @@ export default {
     },
     handleDispatchCarrierTypeChange(value) {
       const nextValue = value || '';
+      this.dispatchItemForm.carrierName = '';
+      this.dispatchItemForm.carrierId = '';
+      this.dispatchItemForm.carrierContractId = '';
       if (nextValue === '承运商') {
         this.dispatchItemForm.trailerVehicleNo = '';
         this.dispatchItemForm.escortName = '';
         this.dispatchItemForm.escortPhone = '';
-      } else {
-        this.dispatchItemForm.carrierContractId = '';
-        if (nextValue === '网货平台') {
-          this.dispatchItemForm.carrierId = '';
-          this.dispatchItemForm.carrierName = '';
-        }
       }
       this.dispatchItemForm.carrierType = nextValue;
       this.loadDispatchCarrierOptions(this.dispatchRow);
     },
     isDispatchCarrierRequired(carrierType) {
-      return ['承运商', '网货平台'].includes(String(carrierType || '').trim());
+      return String(carrierType || '').trim() === '承运商';
     },
     getProjectCarrierOptions(project = {}) {
       const rows = this.parseJsonArray(project.carrierJson);
@@ -7379,8 +7495,11 @@ export default {
         });
       return Promise.all([detailPromise, contractPromise])
         .then(([, carrierContracts]) => {
-          if (carrierTypeAtRequest === '承运商') {
-            this.dispatchCarrierOptions = carrierContracts || [];
+          if (carrierTypeAtRequest !== '自运') {
+            this.dispatchCarrierOptions = (carrierContracts || []).map(item => ({
+              ...item,
+              value: item.carrierContractId || item.id,
+            }));
             const current = this.dispatchCarrierOptions.find(
               item =>
                 String(item.carrierContractId) === String(this.dispatchItemForm.carrierContractId)
@@ -7408,19 +7527,37 @@ export default {
     },
     getWaybillCarrierContractOptions(contracts = []) {
       const counts = contracts.reduce((result, item) => {
-        const name = String(item.partyB || '').trim();
+        const name = String(
+          item.partyB ||
+            item.partyBName ||
+            item.contractPartyB ||
+            item.customerContractPartyB ||
+            ''
+        ).trim();
         if (name) result[name] = (result[name] || 0) + 1;
         return result;
       }, {});
       return contracts
         .map(contract => {
-          const carrierName = String(contract.partyB || '').trim();
+          const carrierName = String(
+            contract.partyB ||
+              contract.partyBName ||
+              contract.contractPartyB ||
+              contract.customerContractPartyB ||
+              ''
+          ).trim();
           if (!carrierName || !contract.id) return null;
           const identifier = contract.contractName || contract.contractNo || contract.id;
           return {
             id: contract.id,
             value: contract.id,
             carrierContractId: contract.id,
+            carrierId:
+              contract.partyBId ||
+              contract.partyBUserId ||
+              contract.contractPartyBId ||
+              contract.customerContractPartyBId ||
+              '',
             carrierName,
             fullName: carrierName,
             label: counts[carrierName] > 1 ? `${carrierName}（${identifier}）` : carrierName,
@@ -7464,9 +7601,9 @@ export default {
         const optionValue = this.dispatchIsCarrierMode ? item.carrierContractId : item.value;
         return String(optionValue || '') === String(value || '');
       });
-      if (this.dispatchIsCarrierMode) {
+      if (this.dispatchItemForm.carrierType !== '自运') {
         this.dispatchItemForm.carrierContractId = carrier?.carrierContractId || '';
-        this.dispatchItemForm.carrierId = '';
+        this.dispatchItemForm.carrierId = carrier?.carrierId || '';
         this.dispatchItemForm.carrierName = carrier?.carrierName || '';
         return;
       }
@@ -7730,7 +7867,7 @@ export default {
         ],
       ];
       if (this.isDispatchCarrierRequired(row.carrierType)) {
-        requiredFields.push(['carrierName', row.carrierType === '网货平台' ? '承运方' : '承运商']);
+        requiredFields.push(['carrierName', '承运商']);
       }
       if (row.carrierType === '承运商') {
         requiredFields.push(['carrierContractId', '承运商合同']);

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

@@ -1,10 +1,13 @@
 <template>
-  <el-dialog
+  <component
+    v-if="!createPage"
+    :is="standalone ? 'div' : 'el-dialog'"
     v-model="visible"
     title="导入运单"
     width="90%"
     append-to-body
     destroy-on-close
+    :class="{ 'waybill-import-page': standalone }"
     @closed="handleClosed"
   >
     <div class="waybill-import-toolbar">
@@ -42,7 +45,7 @@
         </div>
       </div>
       <div class="waybill-import-toolbar__actions">
-        <el-button type="primary" @click="openCreate">新建导入</el-button
+        <el-button type="primary" @click="handleCreate">新建导入</el-button
         ><el-button type="danger" plain :disabled="!selected.length" @click="removeBatches"
           >批量删除</el-button
         >
@@ -82,7 +85,11 @@
       >
         <template #default="{ row }"
           ><el-link type="primary" @click="openDetail(row)">查看</el-link
-          ><el-link type="primary" @click="editBatch(row)">编辑</el-link
+          ><el-link
+            v-if="row.importStatus === 'draft'"
+            type="primary"
+            @click="editBatch(row)"
+            >编辑</el-link
           ><el-link type="danger" @click="removeBatch(row)">删除</el-link></template
         >
       </el-table-column>
@@ -96,7 +103,7 @@
       @current-change="loadBatches"
       @size-change="loadBatches"
     />
-  </el-dialog>
+  </component>
 
   <el-dialog v-model="detailVisible" title="导入运单详情" width="90%" append-to-body>
     <el-form :inline="true" :model="detailQuery"
@@ -112,18 +119,22 @@
         label="运单批次号"
         min-width="140"
       /><el-table-column prop="originalNo" label="原始单号" min-width="130" /><el-table-column
+        prop="loadingIdentifier"
+        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
+      /><el-table-column prop="transportType" label="运输方式" width="110" /><el-table-column
+        prop="driverName"
+        label="司机/船长姓名"
+        min-width="120"
+      /><el-table-column
+        prop="driverPhone"
+        label="司机/船长手机号"
+        width="140"
+      /><el-table-column
         prop="departureAddress"
         label="发货地址"
         min-width="220"
@@ -141,11 +152,22 @@
         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="cargoName" label="货物名称" width="130" /><el-table-column
+        prop="cargoType"
+        label="货物类型"
+        width="120"
+      /><el-table-column prop="packageType" label="包装" width="100" /><el-table-column
+        prop="quantity"
+        label="数量"
+        width="90"
+      /><el-table-column prop="quantityUnit" label="数量单位" width="100" /><el-table-column
+        prop="specification"
+        label="规格"
+        width="120"
+      /><el-table-column prop="model" label="型号" width="120" /><el-table-column
+        prop="mileage"
+        label="里程(km)"
+        width="100"
       /><el-table-column prop="unitPrice" label="单价" width="90" /><el-table-column
         prop="freight"
         label="运费"
@@ -154,11 +176,31 @@
         prop="freightTotal"
         label="运费合计"
         width="100"
+      /><el-table-column
+        prop="actualStartDate"
+        label="实际发货时间"
+        width="160"
+        sortable
+      /><el-table-column
+        prop="actualEndDate"
+        label="实际完成时间"
+        width="160"
+        sortable
+      /><el-table-column
+        prop="planStartDate"
+        label="预计发货时间"
+        width="160"
+        sortable
+      /><el-table-column
+        prop="planEndDate"
+        label="预计完成时间"
+        width="160"
+        sortable
       /><el-table-column prop="remark" label="备注" min-width="160" /><el-table-column
-        label="操作"
-        width="80"
-        >-</el-table-column
-      ></el-table
+        prop="waybillIdentifier"
+        label="同一运单标识号"
+        min-width="140"
+      /><el-table-column label="操作" width="80">-</el-table-column></el-table
     >
     <el-pagination
       v-model:current-page="detailPage.current"
@@ -171,13 +213,14 @@
     />
   </el-dialog>
 
-  <el-dialog
+  <component
+    :is="createPage ? 'div' : 'el-dialog'"
     v-model="createVisible"
     title="新建导入"
     width="85%"
     append-to-body
     destroy-on-close
-    class="waybill-import-create"
+    :class="['waybill-import-create', { 'waybill-import-create--page': createPage }]"
   >
     <section class="waybill-import-create__form-panel">
       <el-form
@@ -234,9 +277,12 @@
           <el-col :span="6">
             <el-form-item label="承运类型" prop="carrierType">
               <el-select v-model="form.carrierType" @change="carrierTypeChange">
-                <el-option label="承运商" value="承运商" />
-                <el-option label="自运" value="自运" />
-                <el-option label="网货平台" value="网货平台" />
+                <el-option
+                  v-for="item in carrierTypeOptions"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -265,8 +311,12 @@
           <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-option
+                  v-for="item in importStatusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -305,8 +355,8 @@
           ><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
+      <div v-if="!createPage" class="waybill-import-create__form-actions">
+        <el-button @click="closeCreate">关闭</el-button
         ><el-button @click="saveDraft">保存草稿</el-button
         ><el-button type="primary" @click="confirmImport">确认导入</el-button>
       </div>
@@ -371,7 +421,8 @@
                 clearable
                 filterable
                 placeholder="请选择"
-                @change="value => handleEditorChange(column, row, value)" /><el-select
+                @change="value => handleEditorChange(column, row, value)"
+              /><el-select
                 v-else-if="column.editor === 'cargoName'"
                 v-model="row.cargoName"
                 clearable
@@ -390,20 +441,24 @@
                 type="date"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
-                placeholder="请选择" /><el-input
+                placeholder="请选择"
+              /><el-input
                 v-else-if="column.editor === 'textarea'"
                 v-model="row[column.prop]"
                 type="textarea"
                 :autosize="{ minRows: 1, maxRows: 3 }"
-                :placeholder="`请输入${column.label}`" /><el-input
+                :placeholder="`请输入${column.label}`"
+              /><el-input
                 v-else-if="column.editor === 'number'"
                 :model-value="row[column.prop]"
                 inputmode="decimal"
                 :placeholder="`请输入${column.label}`"
-                @input="value => updateEditorValue(column, row, value)" /><el-input
-                v-else
+                @input="value => updateEditorValue(column, row, value)"
+              /><el-input
+                v-else-if="column.editor"
                 v-model="row[column.prop]"
-                :placeholder="`请输入${column.label}`" /></template
+                :placeholder="`请输入${column.label}`"
+              /><span v-else>{{ formatCell(row, column) }}</span></template
             ><span v-else>{{ formatCell(row, column) }}</span></template
           ></el-table-column
         ><el-table-column label="操作" width="180" fixed="right"
@@ -419,12 +474,18 @@
         ></el-table
       >
     </section>
-  </el-dialog>
+    <div v-if="createPage" class="waybill-import-create__footer">
+      <el-button @click="closeCreate">取消</el-button>
+      <el-button type="primary" @click="confirmImport">确认导入</el-button>
+    </div>
+  </component>
 </template>
 
 <script setup>
-import { computed, reactive, ref } from 'vue';
+import { computed, onMounted, reactive, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import dayjs from 'dayjs';
 import { getList as getCargoTypeList } from '@/api/base/cargo-type';
 import { getList as getCommonCargoList } from '@/api/business/common-cargo';
 import { getList as getContractList } from '@/api/business/contract-manage';
@@ -434,19 +495,22 @@ import { getDictionary } from '@/api/system/dictbiz';
 import * as api from '@/api/business/waybill-manage';
 import { downloadXls } from '@/utils/util';
 
-const props = defineProps({ modelValue: Boolean });
+const props = defineProps({ modelValue: Boolean, standalone: Boolean, createPage: Boolean });
 const emit = defineEmits(['update:modelValue', 'closed']);
+const router = useRouter();
 const visible = computed({
   get: () => props.modelValue,
   set: value => emit('update:modelValue', value),
 });
 const handleClosed = () => emit('closed');
-const createVisible = ref(false),
+const createVisible = ref(props.createPage),
   detailVisible = ref(false),
   formRef = ref();
 const query = reactive({ batchNo: '', carrierId: '', createUser: '', createTimeRange: [] });
 const detailQuery = reactive({ vehicleNo: '', cargoName: '' });
 const createDefaultForm = () => ({
+  id: '',
+  batchNo: '',
   projectId: '',
   projectName: '',
   customerId: '',
@@ -464,6 +528,14 @@ const createDefaultForm = () => ({
   file: null,
 });
 const form = reactive(createDefaultForm());
+// 批量导入状态仅保留草稿与导入完成两种，与后端 importStatus 取值一致。
+const importStatusOptions = [
+  { label: '进行中', value: 'draft' },
+  { label: '导入完成', value: 'completed' },
+];
+// 编辑草稿时明细已入库，此时不再强制重新上传附件。
+const validateImportFile = (rule, value, callback) =>
+  form.file || rows.value.length ? callback() : callback(new Error('请上传明细表'));
 const rules = {
   projectId: [{ required: true, message: '请选择项目', trigger: 'change' }],
   customerName: [{ required: true, message: '请选择客户', trigger: 'change' }],
@@ -473,8 +545,10 @@ const rules = {
   carrierContractId: [{ required: true, message: '请选择承运商合同', trigger: 'change' }],
   status: [{ required: true, message: '请选择导入状态', trigger: 'change' }],
   importType: [{ required: true, message: '请选择导入类型', trigger: 'change' }],
-  file: [{ required: true, message: '请上传明细表', trigger: 'change' }],
+  file: [{ required: true, validator: validateImportFile, trigger: 'change' }],
 };
+// 保存草稿只落库批次与已解析的明细，仅校验后端建批次必填项，不校验附件与明细完整性。
+const draftRequiredFields = ['projectId', 'contractId', 'carrierType', 'importType'];
 const batches = ref([]),
   details = ref([]),
   rows = ref([]),
@@ -499,7 +573,14 @@ const duplicateRows = computed(() => rows.value.filter(row => row._duplicate));
 const previewRows = computed(() =>
   previewTab.value === 'duplicate' ? duplicateRows.value : rows.value
 );
+const carrierContractsLoaded = ref(false),
+  hasCarrierContracts = ref(null);
+const carrierTypes = ['承运商', '自运'];
 const isSelfOperated = computed(() => form.carrierType === '自运');
+// 项目下没有承运商合同时只允许自运，与运单管理的承运类型收窄规则一致。
+const carrierTypeOptions = computed(() =>
+  carrierContractsLoaded.value && hasCarrierContracts.value === false ? ['自运'] : carrierTypes
+);
 const carrierSelectionValue = computed(() =>
   isSelfOperated.value ? form.carrierName : form.carrierContractId
 );
@@ -516,46 +597,54 @@ const resetCreateForm = () => {
   contracts.value = [];
   carrierContracts.value = [];
   carrierOptions.value = [];
+  carrierContractsLoaded.value = false;
+  hasCarrierContracts.value = null;
 };
+// 运单批次号由系统自动生成，整批共用一个，明细表内只读展示。
 const detailColumns = [
-  { prop: 'batchNo', label: '运单批次号', editor: 'input', minWidth: 150 },
+  { prop: 'batchNo', label: '运单批次号', minWidth: 150 },
   { prop: 'originalNo', label: '原始单号', editor: 'input', minWidth: 150 },
+  { prop: 'loadingIdentifier', label: '配载标识号', editor: 'input', minWidth: 150 },
   { prop: 'vehicleNo', label: '车牌号/航班号/船号/班列号', editor: 'input', minWidth: 220 },
-  { prop: 'driverName', label: '司机/船长', editor: 'driver', minWidth: 170 },
   { prop: 'transportType', label: '运输方式', editor: 'transportType', minWidth: 150 },
-  { prop: 'cargoType', label: '货物类型', editor: 'cargoType', minWidth: 220 },
+  { prop: 'driverName', label: '司机/船长姓名', editor: 'driver', minWidth: 170 },
+  { prop: 'driverPhone', label: '司机/船长手机号', editor: 'input', minWidth: 150 },
+  { prop: 'departureAddress', label: '发货地址', editor: 'input', minWidth: 220 },
+  { prop: 'departureContact', label: '发货联系人', editor: 'input', minWidth: 120 },
+  { prop: 'departurePhone', label: '发货联系人电话', editor: 'input', minWidth: 150 },
+  { prop: 'arrivalAddress', label: '到货地址', editor: 'input', minWidth: 220 },
+  { prop: 'arrivalContact', label: '收货联系人', editor: 'input', minWidth: 120 },
+  { prop: 'arrivalPhone', label: '收货联系人电话', editor: 'input', minWidth: 150 },
   { prop: 'cargoName', label: '货物名称', editor: 'cargoName', minWidth: 220 },
-  { prop: 'quantity', label: '重量', editor: 'number', minWidth: 130 },
-  { prop: 'departureAddress', label: '发货地址', editor: 'textarea', minWidth: 260 },
-  { prop: 'departureContact', label: '发货联系人', editor: 'input', minWidth: 140 },
-  { prop: 'departurePhone', label: '发货联系人电话', editor: 'input', minWidth: 160 },
-  { prop: 'arrivalAddress', label: '到货地址', editor: 'textarea', minWidth: 260 },
-  { prop: 'arrivalContact', label: '收货联系人', editor: 'input', minWidth: 140 },
-  { prop: 'arrivalPhone', label: '收货联系人电话', editor: 'input', minWidth: 160 },
-  { prop: 'startDate', label: '开始时间', editor: 'date', minWidth: 150 },
-  { prop: 'endDate', label: '结束时间', editor: 'date', minWidth: 150 },
-  { prop: 'unitPrice', label: '单价', editor: 'number', minWidth: 130 },
-  { prop: 'freight', label: '运费', editor: 'number', minWidth: 130 },
-  { prop: 'otherFeeTotal', label: '其他费用合计', editor: 'number', minWidth: 150 },
-  { prop: 'freightTotal', label: '运费合计', editor: 'number', minWidth: 130 },
-  { prop: 'remark', label: '备注', editor: 'textarea', minWidth: 180 },
+  { prop: 'cargoType', label: '货物类型', editor: 'cargoType', minWidth: 220 },
+  { prop: 'packageType', label: '包装', editor: 'input', minWidth: 120 },
+  { prop: 'quantity', label: '数量', editor: 'number', minWidth: 130 },
+  { prop: 'quantityUnit', label: '数量单位', editor: 'input', minWidth: 120 },
+  { prop: 'specification', label: '规格', editor: 'input', minWidth: 150 },
+  { prop: 'model', label: '型号', editor: 'input', minWidth: 150 },
+  { prop: 'mileage', label: '里程(km)', editor: 'number', minWidth: 120 },
+  { prop: 'unitPrice', label: '单价', editor: 'number', minWidth: 120 },
+  { prop: 'freight', label: '运费', editor: 'number', minWidth: 120 },
+  { prop: 'otherFeeTotal', label: '其他费用合计', editor: 'number', minWidth: 140 },
+  { prop: 'freightTotal', label: '运费合计', editor: 'number', minWidth: 120 },
+  { prop: 'actualStartDate', label: '实际发货时间', editor: 'date', minWidth: 160 },
+  { prop: 'actualEndDate', label: '实际完成时间', editor: 'date', minWidth: 160 },
+  { prop: 'planStartDate', label: '预计发货时间', editor: 'date', minWidth: 160 },
+  { prop: 'planEndDate', label: '预计完成时间', editor: 'date', minWidth: 160 },
+  { prop: 'remark', label: '备注', editor: 'textarea', minWidth: 200 },
+  { prop: 'waybillIdentifier', label: '同一运单标识号', editor: 'input', minWidth: 150 },
 ];
 const requiredDetailFields = [
   { prop: 'vehicleNo', label: '车牌号/航班号/船号/班列号' },
-  { prop: 'driverName', label: '司机/船长' },
   { prop: 'transportType', label: '运输方式' },
+  { prop: 'departureAddress', label: '发货地址' },
+  { prop: 'arrivalAddress', 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: '运费' },
+  { prop: 'quantity', label: '数量' },
+  { prop: 'quantityUnit', label: '数量单位' },
+  { prop: 'actualStartDate', label: '实际发货时间' },
+  { prop: 'actualEndDate', label: '实际完成时间' },
 ];
 const projectQueryParams = { approvalStatuses: 'approved,change_approved' };
 const extractRecords = res => {
@@ -566,24 +655,49 @@ const extractRecords = res => {
   if (Array.isArray(data?.data?.records)) return data.data.records;
   return [];
 };
+// 批次号由后端按 PC + 导入日期 + 当日流水生成，已删除数据也计入流水，避免唯一索引冲突。
+const generateBatchNo = async () => {
+  const res = await api.getImportBatchNextCode();
+  return res?.data?.data || '';
+};
+// 承运商合同的承运商固定取合同乙方，与运单管理（waybill-manage-page）保持一致。
+const getCarrierContractPartyName = (contract = {}) =>
+  String(
+    contract.partyB ||
+      contract.partyBName ||
+      contract.contractPartyB ||
+      contract.customerContractPartyB ||
+      contract.secondParty ||
+      contract.secondPartyName ||
+      ''
+  ).trim();
 const buildCarrierContractOptions = contractRows => {
   const validContracts = contractRows.filter(
     item => String(item.contractCategory || '').trim() === '承运商合同'
   );
   const nameCounts = validContracts.reduce((result, item) => {
-    const name = String(item.partyB || '').trim();
+    const name = getCarrierContractPartyName(item);
     if (name) result[name] = (result[name] || 0) + 1;
     return result;
   }, {});
   return validContracts
     .map(contract => {
-      const carrierName = String(contract.partyB || '').trim();
+      const carrierName = getCarrierContractPartyName(contract);
       if (!contract.id || !carrierName) return null;
       const identifier = contract.contractName || contract.contractNo || contract.id;
       return {
-        id: contract.partyBId || contract.customerId || '',
+        id:
+          contract.partyBId ||
+          contract.partyBUserId ||
+          contract.contractPartyBId ||
+          contract.customerContractPartyBId ||
+          contract.secondPartyId ||
+          contract.secondPartyUserId ||
+          contract.carrierId ||
+          '',
         carrierContractId: contract.id,
         carrierName,
+        fullName: carrierName,
         label: nameCounts[carrierName] > 1 ? `${carrierName}（${identifier}）` : carrierName,
         value: contract.id,
       };
@@ -602,12 +716,16 @@ const syncCarrierOptions = () => {
     const customerContract = contracts.value.find(
       item => String(item.id) === String(form.contractId)
     );
-    const carrierName = String(customerContract?.partyB || '').trim();
+    const carrierName = getCarrierContractPartyName(customerContract || {});
     if (!carrierName) {
       carrierOptions.value = [];
       return;
     }
-    const carrierId = customerContract?.partyBId || customerContract?.customerId || '';
+    const carrierId =
+      customerContract?.partyBId ||
+      customerContract?.partyBUserId ||
+      customerContract?.customerId ||
+      '';
     carrierOptions.value = [{ id: carrierId, carrierName, label: carrierName, value: carrierName }];
     form.carrierId = carrierId;
     form.carrierIds = carrierId ? [carrierId] : [];
@@ -749,6 +867,16 @@ const loadBatches = async () => {
   batches.value = res.data?.data?.records || [];
   page.total = res.data?.data?.total || 0;
 };
+onMounted(() => {
+  if (props.standalone) loadBatches();
+  if (props.createPage) openCreate();
+});
+watch(
+  () => props.modelValue,
+  value => {
+    if (value) loadBatches();
+  }
+);
 const resetQuery = () => {
   Object.assign(query, { batchNo: '', carrierId: '', createUser: '', createTimeRange: [] });
   page.current = 1;
@@ -767,22 +895,50 @@ const loadDetails = async () => {
 const openCreate = async () => {
   resetCreateForm();
   createVisible.value = true;
-  const [projectRes, , optionRes] = await Promise.all([
+  const [projectRes, , optionRes, batchNo] = await Promise.all([
     getProjectList(1, 9999, projectQueryParams),
     loadEditorOptions(),
     api.getImportOptions?.(),
+    generateBatchNo(),
   ]);
+  form.batchNo = batchNo;
   projects.value = projectRes.data?.data?.records || [];
   const data = optionRes?.data?.data || {};
   queryCarriers.value = data.carriers || [];
   creators.value = data.creators || [];
   plans.value = data.plans || [];
 };
+const handleCreate = () => {
+  if (props.standalone) {
+    router.push({ path: '/business/waybill-import/form' });
+    return;
+  }
+  openCreate();
+};
+const closeCreate = () => {
+  if (props.createPage) {
+    router.push({ path: '/business/waybill-import' });
+    return;
+  }
+  createVisible.value = false;
+};
 const openDetail = row => {
   detailQuery.batchId = row.id;
   detailVisible.value = true;
   loadDetails();
 };
+// 草稿明细已落库为草稿运单，编辑时回填到明细表，避免重新上传附件。
+const loadBatchRows = async batchId => {
+  if (!batchId) return;
+  const res = await api.getImportDetails({ batchId, current: 1, size: 9999 });
+  rows.value = extractRecords(res).map(({ id, ...item }, index) => ({
+    ...item,
+    _key: `${id || 'row'}-${index}`,
+    batchNo: item.batchNo || form.batchNo,
+  }));
+  rowSelection.value = [];
+  previewTab.value = 'all';
+};
 const editBatch = async row => {
   await openCreate();
   const snapshot = { ...row };
@@ -790,6 +946,9 @@ const editBatch = async row => {
   Object.assign(form, snapshot, {
     projectId: snapshot.projectId || '',
     projectName: snapshot.projectName || form.projectName,
+    // 列表返回的是 importStatus，表单沿用 status 字段提交给后端。
+    status: snapshot.importStatus || 'completed',
+    file: null,
   });
   const contract = contracts.value.find(item => String(item.id) === String(snapshot.contractId));
   form.contractId = contract?.id || '';
@@ -799,6 +958,7 @@ const editBatch = async row => {
   const carrierValue =
     form.carrierType === '自运' ? snapshot.carrierName : snapshot.carrierContractId;
   if (carrierValue) carrierChange(carrierValue);
+  await loadBatchRows(snapshot.id);
 };
 const removeBatches = () =>
   api.removeImportBatches(selected.value.map(item => item.id).join(',')).then(loadBatches);
@@ -814,6 +974,8 @@ const projectChange = async id => {
   contracts.value = [];
   carrierContracts.value = [];
   carrierOptions.value = [];
+  carrierContractsLoaded.value = false;
+  hasCarrierContracts.value = null;
   clearCarrier();
   if (!id) return;
   const [customerContractRes, carrierContractRes] = await Promise.all([
@@ -833,12 +995,14 @@ const projectChange = async id => {
     contract => String(contract.contractCategory || '').trim() === '客户合同'
   );
   carrierContracts.value = buildCarrierContractOptions(extractRecords(carrierContractRes));
+  carrierContractsLoaded.value = true;
+  hasCarrierContracts.value = carrierContracts.value.length > 0;
+  if (!carrierContracts.value.length) form.carrierType = '自运';
   if (contracts.value.length) {
     form.contractId = contracts.value[0].id;
     contractChange(form.contractId);
-  } else {
-    syncCarrierOptions();
   }
+  syncCarrierOptions();
 };
 const contractChange = id => {
   const item = contracts.value.find(row => String(row.id) === String(id));
@@ -860,6 +1024,12 @@ const carrierChange = value => {
   if (!isSelfOperated.value) form.carrierContractId = item.carrierContractId || '';
 };
 const fileChange = async (file, list) => {
+  if (file.raw?.size > 50 * 1024 * 1024) {
+    ElMessage.warning('单个文件大小不能超过50M');
+    files.value = [];
+    form.file = null;
+    return;
+  }
   files.value = list.slice(-1);
   form.file = file.raw;
   const XLSX = await import('xlsx');
@@ -873,25 +1043,35 @@ const fileChange = async (file, list) => {
     );
   const keyMap = {
     originalNo: ['原始单号'],
+    loadingIdentifier: ['配载标识号'],
     vehicleNo: ['车牌号/航班号/船号/班列号'],
-    driverName: ['司机/船长'],
-    transportType: ['运输类型', '运输方式'],
-    cargoName: ['货物名称'],
-    cargoType: ['货物类型'],
-    quantity: ['重量'],
+    transportType: ['运输方式', '运输类型'],
+    driverName: ['司机/船长姓名', '司机/船长'],
+    driverPhone: ['司机/船长手机号'],
     departureAddress: ['发货地址'],
     departureContact: ['发货联系人'],
     departurePhone: ['发货联系人电话'],
     arrivalAddress: ['到货地址'],
-    arrivalContact: ['到货联系人', '收货联系人'],
+    arrivalContact: ['收货联系人', '到货联系人'],
     arrivalPhone: ['收货联系人电话'],
-    startDate: ['开始时间'],
-    endDate: ['结束时间'],
+    cargoName: ['货物名称'],
+    cargoType: ['货物类型'],
+    packageType: ['包装'],
+    quantity: ['数量', '重量'],
+    quantityUnit: ['数量单位'],
+    specification: ['规格'],
+    model: ['型号'],
+    mileage: ['里程(km)', '里程'],
     unitPrice: ['单价'],
     freight: ['运费'],
     otherFeeTotal: ['其他费用合计'],
     freightTotal: ['运费合计'],
+    actualStartDate: ['实际发货时间', '开始时间'],
+    actualEndDate: ['实际完成时间', '结束时间'],
+    planStartDate: ['预计发货时间'],
+    planEndDate: ['预计完成时间'],
     remark: ['备注'],
+    waybillIdentifier: ['同一运单标识号'],
   };
   const normalizeImportDate = value => {
     if (value instanceof Date && !Number.isNaN(value.getTime())) {
@@ -902,29 +1082,106 @@ const fileChange = async (file, list) => {
     return text.slice(0, 10);
   };
   const count = new Map();
-  rows.value = source.map((item, index) => {
-    const row = { _key: `${Date.now()}-${index}`, batchNo: '', ...item };
+  // 先解析数据，但不填充到 rows.value
+  const parsedRows = source.map((item, index) => {
+    const row = { _key: `${Date.now()}-${index}`, ...item, batchNo: form.batchNo };
     Object.entries(keyMap).forEach(([key, labels]) => {
       row[key] =
         labels.map(label => item[label]).find(value => String(value ?? '').trim()) ??
         item[key] ??
         '';
     });
-    row.startDate = normalizeImportDate(row.startDate);
-    row.endDate = normalizeImportDate(row.endDate);
+    row.actualStartDate = normalizeImportDate(row.actualStartDate);
+    row.actualEndDate = normalizeImportDate(row.actualEndDate);
+    row.planStartDate = normalizeImportDate(row.planStartDate);
+    row.planEndDate = normalizeImportDate(row.planEndDate);
     const duplicateKey = JSON.stringify(Object.keys(keyMap).map(key => row[key]));
     count.set(duplicateKey, (count.get(duplicateKey) || 0) + 1);
     row._duplicateKey = duplicateKey;
     return row;
   });
-  rows.value.forEach(row => {
+  parsedRows.forEach(row => {
     row._duplicate = count.get(row._duplicateKey) > 1;
   });
+
+  // 调用后端校验接口，校验通过才填充表格
+  const isValid = await performValidation(parsedRows);
+
+  if (isValid) {
+    // 校验通过，填充表格数据
+    rows.value = parsedRows;
+  } else {
+    // 校验失败，清空数据
+    rows.value = [];
+    files.value = [];
+    form.file = null;
+  }
 };
 const fileRemove = () => {
   files.value = [];
   form.file = null;
 };
+
+const performValidation = async (parsedRows) => {
+  if (!parsedRows || !parsedRows.length) return false;
+
+  try {
+    // 构建校验请求参数
+    const payload = {
+      ...form,
+      rows: parsedRows.map(row => {
+        const { _key, _duplicate, _duplicateKey, _editing, _editSnapshot, ...data } = row;
+        return data;
+      })
+    };
+
+    // 调用后端校验接口
+    const response = await api.validateImport(payload);
+
+    // 检查响应类型
+    const blob = response.data || response;
+
+    // 如果是 Blob，需要检查其 MIME 类型
+    if (blob instanceof Blob) {
+      // Excel 文件的 MIME 类型
+      if (blob.type.includes('application/vnd.ms-excel') ||
+          blob.type.includes('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')) {
+        // 校验失败，下载错误明细
+        const url = window.URL.createObjectURL(blob);
+        const link = document.createElement('a');
+        link.href = url;
+        link.download = `运单导入失败明细_${dayjs().format('YYYYMMDDHHmmss')}.xlsx`;
+        link.click();
+        window.URL.revokeObjectURL(url);
+        ElMessage.warning('数据校验失败，已自动下载错误明细表，请修正后重新上传');
+        return false;
+      } else if (blob.type.includes('application/json')) {
+        // 可能是 JSON 响应被当作 Blob，需要解析
+        const text = await blob.text();
+        const json = JSON.parse(text);
+        if (json.success) {
+          ElMessage.success('数据校验通过');
+          return true;
+        } else {
+          ElMessage.error(json.msg || '校验失败');
+          return false;
+        }
+      } else {
+        // 其他类型，默认认为是校验通过
+        ElMessage.success('数据校验通过');
+        return true;
+      }
+    } else {
+      // 不是 Blob，直接判断
+      ElMessage.success('数据校验通过');
+      return true;
+    }
+  } catch (error) {
+    console.error('校验失败:', error);
+    ElMessage.error('校验接口调用失败');
+    return false;
+  }
+};
 const formatCell = (row, column) => row[column.prop] || '';
 const updateEditorValue = (column, row, value) => {
   if (column.editor === 'number') {
@@ -1014,8 +1271,7 @@ const removeSelectedRows = () => {
   rows.value = rows.value.filter(row => !keys.has(row._key));
   rowSelection.value = [];
 };
-const firstNotEmpty = (...values) =>
-  values.find(value => String(value ?? '').trim()) ?? '';
+const firstNotEmpty = (...values) => values.find(value => String(value ?? '').trim()) ?? '';
 const normalizeOptionalImportNumber = (value, emptySentinels = []) => {
   if (!String(value ?? '').trim()) return null;
   return emptySentinels.some(sentinel => Number(value) === sentinel) ? null : value;
@@ -1029,6 +1285,9 @@ const normalizeImportRow = row => ({
   otherFeeTotal: normalizeOptionalImportNumber(
     firstNotEmpty(row.otherFeeTotal, row['其他费用合计'])
   ),
+  unitPrice: normalizeOptionalImportNumber(firstNotEmpty(row.unitPrice, row['单价'])),
+  freight: normalizeOptionalImportNumber(firstNotEmpty(row.freight, row['运费'])),
+  freightTotal: normalizeOptionalImportNumber(firstNotEmpty(row.freightTotal, row['运费合计'])),
   transportType: firstNotEmpty(
     row.transportType,
     row['运输类型'],
@@ -1037,9 +1296,25 @@ const normalizeImportRow = row => ({
     row['*运输方式']
   ),
 });
-const buildImportPayload = () => ({ ...form, rows: rows.value.map(normalizeImportRow) });
-const saveDraft = () => api.saveImportDraft(buildImportPayload());
+const buildImportPayload = (status = form.status) => {
+  const { file, ...batch } = form;
+  return { ...batch, status, rows: rows.value.map(normalizeImportRow) };
+};
+// 独立页面下返回批次列表路由，弹窗形态下关闭新建面板并刷新列表。
+const backToList = () => {
+  closeCreate();
+  if (!props.createPage) loadBatches();
+};
+// 保存草稿：批次与已解析明细一并入库，成功后返回批次列表。
+const saveDraft = async () => {
+  await formRef.value?.validateField(draftRequiredFields);
+  await api.saveImportDraft(buildImportPayload('draft'));
+  ElMessage.success('保存草稿成功');
+  backToList();
+};
 const confirmImport = async () => {
+  // 导入状态选择草稿时不生成正式运单，等同于保存草稿。
+  if (form.status === 'draft') return saveDraft();
   await formRef.value?.validate();
   if (!validateImportRows()) return;
   const count = rows.value.filter(row => row._duplicate).length;
@@ -1048,8 +1323,7 @@ const confirmImport = async () => {
     await ElMessageBox.confirm('确认后将同时生成运单、应收应付明细、计结算单，是否继续？', '提示');
   await api.confirmImport(buildImportPayload());
   ElMessage.success('导入成功');
-  createVisible.value = false;
-  loadBatches();
+  backToList();
 };
 </script>
 
@@ -1079,6 +1353,12 @@ const confirmImport = async () => {
   }
 }
 
+.waybill-import-page {
+  min-height: calc(100vh - 120px);
+  padding: 12px 24px 24px;
+  background: #fff;
+}
+
 .waybill-import-create {
   &__form-panel,
   &__detail-panel {
@@ -1112,5 +1392,41 @@ const confirmImport = async () => {
   :deep(.el-table .el-date-editor) {
     width: 100%;
   }
+
+  &__footer {
+    position: fixed;
+    z-index: 20;
+    right: 0;
+    bottom: 0;
+    left: 230px;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    min-height: 64px;
+    box-sizing: border-box;
+    padding: 12px 24px;
+    background: #fff;
+    border-top: 1px solid #eff1f7;
+    box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.06);
+
+    // 统一 12px 间距，与全站底部操作栏（去 gap，由相邻按钮 margin 提供）一致
+    .el-button + .el-button {
+      margin-left: 12px;
+    }
+  }
+
+  &--page {
+    min-height: calc(100vh - 120px);
+    padding: 12px 24px 96px;
+    background: #fff;
+  }
+}
+
+:global(.avue--collapse .waybill-import-create__footer) {
+  left: 60px;
+}
+
+:global(.avue-layout--horizontal .waybill-import-create__footer) {
+  left: 0;
 }
 </style>

src/views/business/contract-manage-change.vue

@@ -1,48 +1,203 @@
 <template>
   <basic-container class="contract-change-page">
+    <div class="archive-page-form__title">{{ pageTitle }}</div>
     <el-form ref="formRef" :model="form" :rules="rules" label-position="right" label-width="auto" class="contract-change-form">
       <section class="change-section contract-basic-section">
         <div class="dialog-section-title">基本信息</div>
         <div class="contract-basic-section__grid">
-          <el-form-item label="变更类型" class="contract-basic-section__change-type"><el-radio-group v-model="form.changeType"><el-radio label="合同信息变更" /><el-radio label="终止合同" /></el-radio-group></el-form-item>
-          <el-form-item label="合同编号"><el-input v-model="form.contractNo" disabled /></el-form-item>
-          <el-form-item label="合同名称" prop="contractName"><el-input v-model="form.contractName" /></el-form-item>
-          <el-form-item label="合同类型"><el-select v-model="form.contractCategory" disabled><el-option label="客户合同" value="客户合同" /><el-option label="承运商合同" value="承运商合同" /></el-select></el-form-item>
-          <el-form-item label="甲方"><el-input v-model="form.partyA" disabled /></el-form-item>
-          <el-form-item label="乙方"><el-input v-model="form.partyB" disabled /></el-form-item>
-          <el-form-item label="所属项目"><el-input v-model="form.projectName" disabled /></el-form-item>
+          <el-form-item label="变更类型" class="contract-basic-section__change-type">
+            <el-radio-group v-model="form.changeType">
+              <el-radio label="合同信息变更" />
+              <el-radio label="终止合同" />
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="签约类型" prop="signType">
+            <el-select v-model="form.signType" placeholder="请选择签约类型" clearable>
+              <el-option
+                v-for="item in signTypeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="合同编号">
+            <el-input v-model="form.contractNo" disabled />
+          </el-form-item>
+          <el-form-item label="合同名称" prop="contractName">
+            <el-input
+              v-model="form.contractName"
+              maxlength="100"
+              show-word-limit
+              placeholder="请输入合同名称"
+            />
+          </el-form-item>
+          <el-form-item label="合同类型">
+            <el-select v-model="form.contractCategory" disabled>
+              <el-option
+                v-for="item in contractCategoryOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="项目">
+            <el-input v-model="form.projectName" disabled />
+          </el-form-item>
+          <el-form-item label="所属组织">
+            <el-input v-model="form.organizationName" disabled />
+          </el-form-item>
+          <el-form-item label="甲方">
+            <el-input v-model="form.partyA" disabled />
+          </el-form-item>
+          <el-form-item label="乙方">
+            <el-input v-model="form.partyB" disabled />
+          </el-form-item>
+          <el-form-item label="签订日期">
+            <el-date-picker
+              v-model="form.signDate"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              disabled
+            />
+          </el-form-item>
           <el-form-item label="合同期限">
             <div class="contract-basic-section__date-range">
-              <el-date-picker v-model="period[0]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="YYYY-MM-DD" />
+              <el-date-picker
+                v-model="period[0]"
+                type="date"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                placeholder="YYYY-MM-DD"
+              />
               <span>至</span>
-              <el-date-picker v-model="period[1]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="YYYY-MM-DD" />
+              <el-date-picker
+                v-model="period[1]"
+                type="date"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                placeholder="YYYY-MM-DD"
+              />
             </div>
           </el-form-item>
-          <el-form-item label="所属组织"><el-input v-model="form.organizationName" disabled /></el-form-item>
-          <el-form-item label="签订日期"><el-date-picker v-model="form.signDate" type="date" value-format="YYYY-MM-DD" disabled /></el-form-item>
-          <el-form-item label="合同格式"><el-select v-model="form.contractFormat"><el-option label="电子合同" value="电子合同" /><el-option label="纸质合同" value="纸质合同" /></el-select></el-form-item>
-          <el-form-item label="结算方式"><el-input v-model="form.settlementMode" /></el-form-item>
-          <el-form-item label="是否需要加盖法人章"><el-select v-model="form.legalSealFlag"><el-option label="是" :value="1" /><el-option label="否" :value="0" /></el-select></el-form-item>
-          <el-form-item label="一式（份）"><el-input v-model="form.copyCount" inputmode="numeric" maxlength="9" placeholder="请输入" @input="value => positiveIntegerInput('copyCount', value)" /></el-form-item>
-          <el-form-item label="回款账期"><el-input v-model="form.paymentDays" inputmode="numeric" maxlength="9" placeholder="请输入" @input="value => positiveIntegerInput('paymentDays', value)" /></el-form-item>
+          <el-form-item label="回款账期">
+            <el-input
+              v-model="form.paymentDays"
+              placeholder="请输入"
+              @input="value => positiveIntegerInput('paymentDays', value)"
+            >
+              <template #suffix>天</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="合同金额">
+            <el-input-number
+              v-model="form.contractAmount"
+              :min="0"
+              :precision="2"
+              :controls="false"
+              placeholder="请输入"
+            />
+          </el-form-item>
+          <el-form-item label="是否范本">
+            <el-select v-model="form.templateFlag" placeholder="请选择">
+              <el-option label="否" :value="0" />
+              <el-option label="是" :value="1" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="原件合同编号">
+            <el-input v-model="form.originalContractNo" maxlength="100" placeholder="请输入" />
+          </el-form-item>
+          <el-form-item label="是否电子章">
+            <el-select v-model="form.electronicSealFlag" placeholder="请选择">
+              <el-option label="否" :value="0" />
+              <el-option label="是" :value="1" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="开票周期">
+            <el-input
+              v-model="form.invoiceCycle"
+              placeholder="请输入"
+              @input="value => positiveIntegerInput('invoiceCycle', value)"
+            >
+              <template #suffix>天</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="结算币种" prop="settlementCurrency">
+            <el-select v-model="form.settlementCurrency" placeholder="请选择结算币种" clearable>
+              <el-option
+                v-for="item in settlementCurrencyOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="合同格式">
+            <el-select v-model="form.contractFormat" placeholder="请选择合同格式" clearable>
+              <el-option
+                v-for="item in contractFormatOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="一式">
+            <el-input
+              v-model="form.copyCount"
+              placeholder="请输入"
+              @input="value => positiveIntegerInput('copyCount', value)"
+            >
+              <template #suffix>份</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="是否需要加盖法人章">
+            <el-select v-model="form.legalSealFlag" placeholder="请选择">
+              <el-option label="否" :value="0" />
+              <el-option label="是" :value="1" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="结算方式">
+            <el-select v-model="form.settlementMode" placeholder="请选择结算方式" clearable>
+              <el-option
+                v-for="item in settlementModeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="经办人">
+            <el-input v-model="form.handlerUserName" disabled />
+          </el-form-item>
         </div>
-        <el-form-item label="备注" class="contract-basic-section__remark"><el-input v-model="form.remark" type="textarea" :rows="2" maxlength="2000" show-word-limit placeholder="请输入备注" /></el-form-item>
+        <el-form-item label="备注" class="contract-basic-section__remark">
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            :rows="2"
+            maxlength="200"
+            show-word-limit
+            placeholder="请输入备注"
+          />
+        </el-form-item>
       </section>
 
-      <section class="change-section">
-        <div class="dialog-section-title">合同文件</div>
-        <div class="attachment-head">
-          <el-button type="primary" :disabled="!contractFileRows.length" @click="handleContractFileBatchDownload">批量下载</el-button>
-        </div>
-        <el-table :data="contractFileRows" border class="change-table" @selection-change="selectedContractFiles = $event"><el-table-column type="selection" width="55" /><el-table-column type="index" label="序号" width="70" /><el-table-column label="文件名" min-width="240"><template #default="{ row }"><el-link type="primary" @click="previewAttachment(row, contractFileRows)">{{ row.originalName || row.name }}</el-link></template></el-table-column><el-table-column label="文件大小" width="120"><template #default="{ row }">{{ formatFileSize(row.size) }}</template></el-table-column><el-table-column prop="uploadUserName" label="上传人" width="140" /><el-table-column prop="uploadTime" label="上传时间" width="170" /><el-table-column label="操作" width="100"><template #default="{ $index }"><el-link type="danger" @click="removeContractFile($index)">删除</el-link></template></el-table-column></el-table>
-        <div class="attachment-upload">
-          <vehicle-attachment-upload v-model="contractFileRows" :readonly="false" :file-types="attachmentFileTypes" :max-size="500" :show-file-list="false" button-text="上传附件" @change="handleContractFileChange" />
-        </div>
-      </section>
+      <contract-attachment-section
+        title="合同文件"
+        description
+        attachment-type
+        use-upload-dialog
+        :rows="contractFileRows"
+        :preview="previewAttachment"
+        @update:rows="contractFileRows = $event"
+      />
 
       <section class="change-section">
         <div class="section-head"><div class="dialog-section-title">计费信息</div><el-button type="primary" plain @click="addPlan">添加</el-button></div>
-        <el-radio-group v-model="feeGenerationMode"><el-radio label="system">系统生成</el-radio><el-radio label="manual">手动生成</el-radio></el-radio-group>
+        <el-radio-group v-model="feeGenerationMode"><el-radio label="system">系统生成</el-radio><el-radio label="manual">账单导入生成</el-radio></el-radio-group>
         <el-table :data="plans" border class="change-table"><el-table-column type="index" label="序号" width="70" /><el-table-column prop="planName" label="方案名称" min-width="220" /><el-table-column label="默认方案" min-width="120"><template #default="{ row }">{{ row.defaultPlan ? '是' : '否' }}</template></el-table-column><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column label="操作" width="180"><template #default="{ row, $index }"><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template></el-table-column></el-table>
       </section>
 
@@ -52,18 +207,39 @@
           <el-tab-pane label="预结算配置" name="pre" />
           <el-tab-pane label="正式结算配置" name="formal" />
         </el-tabs>
-        <div class="settlement-switch"><span>自动生成结算单</span><el-radio-group v-model="settlementRule.autoGenerate"><el-radio :label="1">开启</el-radio><el-radio :label="0">关闭</el-radio></el-radio-group></div>
+        <div class="settlement-switch">
+          <span>自动生成结算单</span>
+          <el-radio-group v-model="settlementRule.autoGenerate">
+            <el-radio :label="1">开启</el-radio>
+            <el-tooltip content="开启时，系统根据配置规则归集运单，定时生成结算单" placement="top">
+              <el-icon class="settlement-switch-tip"><QuestionFilled /></el-icon>
+            </el-tooltip>
+            <el-radio :label="0">关闭</el-radio>
+          </el-radio-group>
+        </div>
         <el-form v-if="settlementRule.autoGenerate === 1" :model="settlementRule" label-position="right" label-width="auto" class="settlement-form">
           <el-form-item label="账单起始日期" required><el-date-picker v-model="settlementRule.billStartDate" type="date" placeholder="请选择账单起始日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" /></el-form-item>
           <el-form-item label="结算类型" required><el-select v-model="settlementRule.settlementType" placeholder="请选择结算类型" @change="handleSettlementTypeChange"><el-option v-for="item in settlementTypeOptions" :key="item" :label="item" :value="item" /></el-select></el-form-item>
-          <el-form-item v-if="showSettlementBillCycleType" label="账单周期类型" required><el-select v-model="settlementRule.billCycleType" placeholder="请选择账单周期类型" @change="handleCycleTypeChange"><el-option v-for="item in billCycleTypeOptions" :key="item" :label="item" :value="item" /></el-select></el-form-item>
+          <el-form-item v-if="showSettlementBillCycleType" label="结算周期" required><el-select v-model="settlementRule.billCycleType" placeholder="请选择结算周期" @change="handleCycleTypeChange"><el-option v-for="item in billCycleTypeOptions" :key="item" :label="item" :value="item" /></el-select></el-form-item>
           <el-form-item v-if="showSettlementBillCutoffDay" label="账单截单日" required><el-select v-model="settlementRule.billCutoffDay" placeholder="请选择账单截单日"><el-option v-for="item in billCutoffDayOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item>
           <el-form-item v-if="showSettlementCycleDays" label="周期天数" required><el-select v-model="settlementRule.cycleDays" placeholder="请选择周期天数"><el-option v-for="item in cycleDayOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item>
         </el-form>
+        <el-table v-if="settlementRule.autoGenerate === 1 && showSettlementCustomPeriods" :data="settlementRule.customPeriods || []" border class="change-table custom-periods-table">
+          <el-table-column type="index" label="序号" width="70" />
+          <el-table-column label="运单区间-开始日" min-width="180"><template #default="{ row, $index }"><el-select :model-value="row.startDay" placeholder="请选择" clearable @update:model-value="value => handleCustomPeriodStartDayChange($index, value)"><el-option v-for="item in billCutoffDayOptions" :key="`start-${item.value}`" :label="item.label" :value="item.value" /></el-select></template></el-table-column>
+          <el-table-column label="运单区间-结束日" min-width="200"><template #default="{ row, $index }"><el-select :model-value="row.endDay" placeholder="请选择" clearable @update:model-value="value => handleCustomPeriodEndDayChange($index, value)"><el-option v-for="item in customPeriodEndDayOptions(row)" :key="item.value" :label="item.label" :value="item.value" /></el-select></template></el-table-column>
+          <el-table-column label="操作" width="100"><template #default="{ $index }"><el-link v-if="$index === 0" type="primary" @click="addCustomPeriodRow">添加</el-link><el-link v-else type="danger" @click="removeCustomPeriodRow($index)">删除</el-link></template></el-table-column>
+          <template #empty><el-link type="primary" @click="addCustomPeriodRow">添加</el-link></template>
+        </el-table>
       </section>
 
       <section class="change-section">
-        <div class="dialog-section-title">付款比例设置</div>
+        <div class="dialog-section-title">
+          付款比例设置
+          <el-tooltip content="非必填；配置付款比例时，合计必须等于100%。" placement="top">
+            <el-icon style="margin-left: 4px; color: #909399; cursor: pointer"><el-icon-question-filled /></el-icon>
+          </el-tooltip>
+        </div>
         <el-table :data="paymentRatioRows" border class="change-table">
           <el-table-column type="index" label="序号" width="70" />
           <el-table-column prop="paymentTerm" label="付款笔数" min-width="180" />
@@ -76,26 +252,41 @@
 
       <billing-plan-editor v-model="planDialogVisible" :value="planEditor" :index="planEditorIndex" @save="savePlan" />
 
-      <section class="change-section attachment-section">
-        <div class="section-head"><div class="dialog-section-title">其它附件</div><el-button type="primary" plain>批量下载</el-button></div>
-        <el-table :data="attachments" border class="change-table"><el-table-column type="index" label="序号" width="70" /><el-table-column label="文件名" min-width="240"><template #default="{ row }"><el-link type="primary" @click="previewAttachment(row, attachments)">{{ row.originalName || row.name }}</el-link></template></el-table-column><el-table-column prop="description" label="附件描述" min-width="240" /><el-table-column prop="size" label="文件大小" width="120" /><el-table-column prop="userName" label="上传人" width="140" /><el-table-column prop="uploadTime" label="上传时间" width="180" /><el-table-column label="操作" width="100"><template #default="{ $index }"><el-link type="danger" @click="attachments.splice($index, 1)">删除</el-link></template></el-table-column></el-table>
-        <el-upload action="#" :auto-upload="false" multiple :show-file-list="false" @change="handleAttachment"><el-button plain>上传附件</el-button></el-upload>
-      </section>
+      <contract-attachment-section
+        title="其它附件"
+        description
+        attachment-type
+        use-upload-dialog
+        attachment-location="其它附件"
+        :rows="attachments"
+        :preview="previewAttachment"
+        @update:rows="attachments = $event"
+      />
 
       <section class="change-section change-reason-section">
-        <div class="dialog-section-title">变更内容</div>
-        <el-form-item prop="changeContent"><el-input v-model="form.changeContent" type="textarea" :rows="3" maxlength="2000" show-word-limit placeholder="请输入变更内容" /></el-form-item>
         <div class="dialog-section-title">变更原因</div>
-        <el-form-item prop="changeReason"><el-input v-model="form.changeReason" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="请输入变更原因" /></el-form-item>
-        <div class="dialog-section-title">变更材料</div>
-        <el-table :data="changeMaterials" border class="change-table">
-          <el-table-column type="index" label="序号" width="70" />
-          <el-table-column label="文件名" min-width="240"><template #default="{ row }">{{ row.originalName || row.name }}</template></el-table-column>
-          <el-table-column label="文件大小" width="120"><template #default="{ row }">{{ formatFileSize(row.size) }}</template></el-table-column>
-          <el-table-column label="操作" width="100"><template #default="{ $index }"><el-link type="danger" @click="changeMaterials.splice($index, 1)">删除</el-link></template></el-table-column>
-        </el-table>
-        <div class="attachment-upload"><vehicle-attachment-upload v-model="changeMaterials" :readonly="false" :file-types="attachmentFileTypes" :max-size="500" :show-file-list="false" button-text="上传变更材料" /></div>
+        <el-form-item prop="changeReason" class="change-reason-section__input">
+          <el-input
+            v-model="form.changeReason"
+            type="textarea"
+            :rows="3"
+            maxlength="500"
+            show-word-limit
+            placeholder="请输入变更原因"
+          />
+        </el-form-item>
       </section>
+
+      <contract-attachment-section
+        title="变更材料"
+        description
+        attachment-type
+        use-upload-dialog
+        attachment-location="变更材料"
+        :rows="changeMaterials"
+        :preview="previewAttachment"
+        @update:rows="changeMaterials = $event"
+      />
       <div class="page-footer">
         <el-button @click="$router.back()">取消</el-button>
         <el-button type="primary" @click="submit">提交</el-button>
@@ -112,6 +303,15 @@
 <script>
 import * as api from '@/api/business/contract-manage';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
+import ContractAttachmentSection, {
+  normalizeContractFileRows,
+} from './components/contract-attachment-section.vue';
+import { getDictionary as getSystemDictionary } from '@/api/system/dict';
+import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
+import {
+  contractCategoryOptions as defaultContractCategoryOptions,
+  signTypeOptions as defaultSignTypeOptions,
+} from '@/option/business/common';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import { fallbackPlugin, imagePlugin, officePlugin, pdfPlugin, textPlugin } from '@open-file-viewer/core';
@@ -125,31 +325,294 @@ const viewerPlugins = [
   textPlugin(),
   fallbackPlugin(),
 ];
+const defaultSettlementModeOptions = [
+  { label: '现结', value: '现结' },
+  { label: '日结', value: '日结' },
+  { label: '周结', value: '周结' },
+  { label: '月结', value: '月结' },
+  { label: '按固定天数周期', value: '按固定天数周期' },
+];
+const defaultContractFormatOptions = [
+  { label: '电子合同', value: '电子合同' },
+  { label: '纸质合同', value: '纸质合同' },
+];
 const normalizeOptionalPositiveInteger = value => {
   if (value === undefined || value === null || value === '') return null;
   const number = Number(value);
   return Number.isInteger(number) && number > 0 ? number : null;
 };
+const normalizeOptionalAmount = value => {
+  if (value === undefined || value === null || value === '') return null;
+  const number = Number(value);
+  return Number.isFinite(number) && number >= 0 ? Number(number.toFixed(2)) : null;
+};
+
+
+const normalizeCustomPeriods = (periods = []) =>
+  (periods || []).map(item => ({
+    startDay: Number(item?.startDay) > 0 ? Number(item.startDay) : '',
+    endDay: Number(item?.endDay) > 0 ? Number(item.endDay) : '',
+  }));
 
 export default {
-  components: { BillingPlanEditor, ElImageViewer, OpenFileViewer },
-  data() { return { form: {}, period: [], plans: [], attachments: [], contractFiles: [], contractFileRows: [], selectedContractFiles: [], paymentRatioRows: [], settlementConfigTab: 'pre', changeMaterials: [], imagePreviewVisible: false, imagePreviewUrls: [], imagePreviewIndex: 0, documentPreviewVisible: false, previewFile: {}, viewerPlugins, viewerToolbar: { zoom: true, rotate: true, download: true, fullscreen: true }, feeGenerationMode: 'system', settlementRule: { autoGenerate: 1, settlementType: '月结', billCycleType: '固定截单日', billCutoffDay: 25, cycleDays: '' }, preSettlementConfig: {}, formalSettlementConfig: {}, settlementTypeOptions: ['月结','日结','周结','半月结','固定天数周期结算'], billCycleTypeOptions: ['固定截单日','自然月'], billCutoffDayOptions: Array.from({ length: 31 }, (_, index) => ({ label: `${index + 1}日`, value: index + 1 })), cycleDayOptions: [7,15,30,60].map(value => ({ label: `${value}天`, value })), planDialogVisible: false, planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] }, planEditorIndex: -1, billingElements: ['按重量','按体积','按车辆','按里程','按吨·公里','固定金额（整单一口价）','按数量'], attachmentFileTypes: ['pdf','bmp','jpeg','png','jpg','doc','docx','ppt','pptx','xlsx','xls','eml','msg','zip'], rules: { contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }], changeReason: [{ required: true, message: '请输入变更原因', trigger: 'blur' }] } }; },
-  computed: { showSettlementBillCycleType() { return this.settlementRule.settlementType === '月结'; }, showSettlementBillCutoffDay() { return this.showSettlementBillCycleType && this.settlementRule.billCycleType === '固定截单日'; }, showSettlementCycleDays() { return this.settlementRule.settlementType === '固定天数周期结算'; } },
-  mounted() { this.load(); },
-  watch: { settlementConfigTab(tab, oldTab) { if (tab === oldTab) return; if (oldTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; this.settlementRule = { ...(tab === 'pre' ? this.preSettlementConfig : this.formalSettlementConfig) }; } },
+  components: { BillingPlanEditor, ContractAttachmentSection, ElImageViewer, OpenFileViewer },
+  data() {
+    return {
+      form: {},
+      period: [],
+      plans: [],
+      attachments: [],
+      contractFiles: [],
+      contractFileRows: [],
+      paymentRatioRows: [],
+      settlementConfigTab: 'pre',
+      changeMaterials: [],
+      imagePreviewVisible: false,
+      imagePreviewUrls: [],
+      imagePreviewIndex: 0,
+      documentPreviewVisible: false,
+      previewFile: {},
+      viewerPlugins,
+      viewerToolbar: { zoom: true, rotate: true, download: true, fullscreen: true },
+      feeGenerationMode: 'system',
+      settlementRule: {
+        autoGenerate: '',
+        billStartDate: '',
+        settlementType: '',
+        billCycleType: '',
+        billCutoffDay: '',
+        cycleDays: '',
+        customPeriods: [],
+      },
+      preSettlementConfig: {},
+      formalSettlementConfig: {},
+      settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
+      billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
+      billCutoffDayOptions: Array.from({ length: 31 }, (_, index) => ({
+        label: `${index + 1}日`,
+        value: index + 1,
+      })),
+      cycleDayOptions: [7, 15, 30, 60].map(value => ({ label: `${value}天`, value })),
+      signTypeOptions: defaultSignTypeOptions,
+      contractCategoryDictOptions: [],
+      settlementCurrencyOptions: [],
+      settlementModeDictOptions: [],
+      contractFormatDictOptions: [],
+      planDialogVisible: false,
+      planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
+      planEditorIndex: -1,
+      billingElements: [
+        '按重量',
+        '按体积',
+        '按车辆',
+        '按里程',
+        '按吨·公里',
+        '固定金额（整单一口价）',
+        '按数量',
+      ],
+      rules: {
+        contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }],
+        changeReason: [{ max: 500, message: '变更原因不能超过500个字符', trigger: 'blur' }],
+      },
+    };
+  },
+  computed: {
+    pageTitle() {
+      return this.$route.query.name || '合同变更';
+    },
+    contractCategoryOptions() {
+      return this.contractCategoryDictOptions.length
+        ? this.contractCategoryDictOptions
+        : defaultContractCategoryOptions;
+    },
+    settlementModeOptions() {
+      return this.settlementModeDictOptions.length
+        ? this.settlementModeDictOptions
+        : defaultSettlementModeOptions;
+    },
+    contractFormatOptions() {
+      return this.contractFormatDictOptions.length
+        ? this.contractFormatDictOptions
+        : defaultContractFormatOptions;
+    },
+    showSettlementBillCycleType() {
+      return this.settlementRule.settlementType === '月结';
+    },
+    showSettlementBillCutoffDay() {
+      return this.showSettlementBillCycleType && this.settlementRule.billCycleType === '固定截单日';
+    },
+    showSettlementCustomPeriods() {
+      return this.showSettlementBillCycleType && this.settlementRule.billCycleType === '自定义多周期';
+    },
+    showSettlementCycleDays() {
+      return this.settlementRule.settlementType === '固定天数周期结算';
+    },
+  },
+  mounted() {
+    this.loadDictionaries();
+    this.load();
+  },
+  watch: {
+    settlementConfigTab(tab, oldTab) {
+      if (tab === oldTab) return;
+      if (oldTab === 'pre') this.preSettlementConfig = { ...this.settlementRule };
+      else this.formalSettlementConfig = { ...this.settlementRule };
+      this.settlementRule = {
+        ...(tab === 'pre' ? this.preSettlementConfig : this.formalSettlementConfig),
+      };
+    },
+  },
   methods: {
-    async load() { const id = this.$route.query.id; if (!id) return; const res = await api.getDetail(id); const data = res.data?.data || res.data || {}; this.form = { ...data, changeContent: '', changeReason: '', changeAttachmentsJson: '', copyCount: normalizeOptionalPositiveInteger(data.copyCount), paymentDays: normalizeOptionalPositiveInteger(data.paymentDays), changeType: '合同信息变更' }; this.changeMaterials = []; this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : []; this.plans = this.parse(data.billingPlanJson); this.attachments = this.parse(data.attachmentsJson); this.contractFileRows = this.parse(data.contractFileJson); const rules = this.parseObject(data.settlementRuleJson); const pre = this.parseObject(data.preSettlementConfigJson); const formal = this.parseObject(data.formalSettlementConfigJson); const legacy = Object.keys(rules).some(key => !['preSettlementConfig', 'formalSettlementConfig'].includes(key)) ? rules : {}; this.preSettlementConfig = rules.preSettlementConfig || (Object.keys(pre).length ? pre : legacy); this.formalSettlementConfig = rules.formalSettlementConfig || (Object.keys(formal).length ? formal : legacy); this.settlementRule = { ...this.preSettlementConfig }; this.feeGenerationMode = data.feeGenerationMode || (Number(data.billingEnabled) === 0 ? 'manual' : 'system'); this.paymentRatioRows = this.parse(data.paymentRatioJson); },
-    parse(value) { try { const result = JSON.parse(value || '[]'); return Array.isArray(result) ? result : []; } catch { return []; } },
-    parseObject(value) { try { return { autoGenerate: 1, settlementType: '月结', billCycleType: '固定截单日', billCutoffDay: 25, cycleDays: 15, ...(JSON.parse(value || '{}') || {}) }; } catch { return { autoGenerate: 1, settlementType: '月结', billCycleType: '固定截单日', billCutoffDay: 25, cycleDays: 15 }; } },
-    positiveIntegerInput(prop, value) { this.form[prop] = String(value ?? '').replace(/\D/g, '').replace(/^0+/, ''); },
+    loadDictionaries() {
+      Promise.all([
+        getSystemDictionary({ code: 'currency_type' }),
+        getBizDictionary({ code: 'settle_method' }),
+        getBizDictionary({ code: 'contractFormat' }),
+        getBizDictionary({ code: 'contractCategory' }),
+      ]).then(([currencyRes, methodRes, formatRes, categoryRes]) => {
+        const records = response => {
+          const data = response?.data?.data || response?.data || [];
+          return Array.isArray(data) ? data : data.records || [];
+        };
+        this.settlementCurrencyOptions = records(currencyRes).map(item => ({
+          label: item.dictValue,
+          value: item.dictKey,
+        }));
+        this.settlementModeDictOptions = records(methodRes).map(item => ({
+          label: item.dictValue,
+          value: item.dictKey,
+        }));
+        this.contractFormatDictOptions = records(formatRes).map(item => ({
+          label: item.dictValue,
+          value: item.dictKey,
+        }));
+        this.contractCategoryDictOptions = records(categoryRes).map(item => ({
+          label: item.dictValue,
+          value: item.dictKey,
+        }));
+      });
+    },
+    async load() {
+      const id = this.$route.query.id;
+      if (!id) return;
+      const res = await api.getDetail(id);
+      const data = res.data?.data || res.data || {};
+      this.form = {
+        ...data,
+        changeContent: '',
+        changeReason: '',
+        changeAttachmentsJson: '',
+        copyCount: normalizeOptionalPositiveInteger(data.copyCount),
+        invoiceCycle: normalizeOptionalPositiveInteger(data.invoiceCycle),
+        paymentDays: normalizeOptionalPositiveInteger(data.paymentDays),
+        contractAmount: normalizeOptionalAmount(data.contractAmount),
+        templateFlag: data.templateFlag ?? 0,
+        electronicSealFlag: data.electronicSealFlag ?? 0,
+        archiveStatus: data.archiveStatus || '未归档',
+        changeType: '合同信息变更',
+      };
+      this.changeMaterials = [];
+      this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : [];
+      this.plans = this.parse(data.billingPlanJson);
+      this.attachments = this.mergeChangeAttachments(
+        this.parse(data.attachmentsJson),
+        this.parse(data.changeAttachmentsJson)
+      );
+      this.contractFileRows = normalizeContractFileRows(this.parse(data.contractFileJson));
+      const rules = this.parseObject(data.settlementRuleJson);
+      const pre = this.parseObject(data.preSettlementConfigJson);
+      const formal = this.parseObject(data.formalSettlementConfigJson);
+      const legacy = Object.keys(rules).some(
+        key => !['preSettlementConfig', 'formalSettlementConfig'].includes(key)
+      )
+        ? rules
+        : {};
+      const normalizeRule = rule => {
+        const next = {
+          autoGenerate: '',
+          billStartDate: '',
+          settlementType: '',
+          billCycleType: '',
+          billCutoffDay: '',
+          cycleDays: '',
+          customPeriods: [],
+          ...(rule || {}),
+        };
+        if (next.settlementType === '月结' && next.billCycleType === '自定义多周期') {
+          next.customPeriods = normalizeCustomPeriods(
+            Array.isArray(next.customPeriods) ? next.customPeriods : []
+          );
+        } else {
+          next.customPeriods = [];
+        }
+        return next;
+      };
+      this.preSettlementConfig = normalizeRule(
+        rules.preSettlementConfig || (Object.keys(pre).length ? pre : legacy)
+      );
+      this.formalSettlementConfig = normalizeRule(
+        rules.formalSettlementConfig || (Object.keys(formal).length ? formal : legacy)
+      );
+      this.settlementRule = { ...this.preSettlementConfig };
+      this.feeGenerationMode =
+        data.feeGenerationMode || (Number(data.billingEnabled) === 0 ? 'manual' : 'system');
+      this.paymentRatioRows = this.parse(data.paymentRatioJson);
+    },
+    parse(value) {
+      try {
+        const result = JSON.parse(value || '[]');
+        return Array.isArray(result) ? result : [];
+      } catch {
+        return [];
+      }
+    },
+    // 审核通过后上一次的变更材料归集到「其它附件」，按文件地址/文件名去重，避免重复展示
+    mergeChangeAttachments(attachments = [], changeAttachments = []) {
+      const key = item => this.attachmentUrl(item) || this.attachmentName(item);
+      const exists = new Set(attachments.map(key));
+      const merged = changeAttachments
+        .filter(item => !exists.has(key(item)))
+        .map(item => ({
+          ...item,
+          size: /^\d+$/.test(String(item.size ?? '')) ? this.formatFileSize(item.size) : item.size,
+        }));
+      return [...attachments, ...merged];
+    },
+    parseObject(value) {
+      try {
+        return {
+          autoGenerate: '',
+          billStartDate: '',
+          settlementType: '',
+          billCycleType: '',
+          billCutoffDay: '',
+          cycleDays: '',
+          customPeriods: [],
+          ...(JSON.parse(value || '{}') || {}),
+        };
+      } catch {
+        return {
+          autoGenerate: '',
+          billStartDate: '',
+          settlementType: '',
+          billCycleType: '',
+          billCutoffDay: '',
+          cycleDays: '',
+          customPeriods: [],
+        };
+      }
+    },
+    positiveIntegerInput(prop, value) {
+      this.form[prop] = String(value ?? '')
+        .replace(/\D/g, '')
+        .replace(/^0+/, '');
+    },
     addPlan() { this.planEditorIndex = -1; this.planEditor = { planName: `计费方案${this.plans.length + 1}`, defaultPlan: !this.plans.length, remark: '', rules: [{}] }; this.planDialogVisible = true; },
     editPlan(row, index) { this.planEditorIndex = index; this.planEditor = JSON.parse(JSON.stringify(row)); this.planDialogVisible = true; },
     toggleDefaultPlan(value) { if (value) this.plans.forEach(item => { item.defaultPlan = false; }); },
     savePlan(value, index) { if (index < 0) this.plans.push(value); else this.plans.splice(index, 1, value); if (value.defaultPlan) this.plans.forEach((item, current) => { if (current !== (index < 0 ? this.plans.length - 1 : index)) item.defaultPlan = false; }); },
-    handleSettlementTypeChange(value) { if (value !== '月结') { this.settlementRule.billCycleType = ''; this.settlementRule.billCutoffDay = ''; } else if (!this.settlementRule.billCycleType) this.settlementRule.billCycleType = '固定截单日'; if (value !== '固定天数周期结算') this.settlementRule.cycleDays = ''; },
-    handleCycleTypeChange(value) { if (value === '固定截单日' && !this.settlementRule.billCutoffDay) this.settlementRule.billCutoffDay = 25; if (value !== '固定截单日') this.settlementRule.billCutoffDay = ''; },
-    handleAttachment(event) { const raw = event.raw; if (raw) this.attachments.push({ name: raw.name, size: `${Math.ceil(raw.size / 1024)}KB`, uploadTime: this.$dayjs().format('YYYY-MM-DD HH:mm:ss') }); },
-    handleContractFileChange(list) { this.contractFileRows = (list || []).map(item => ({ ...item, uploadTime: item.uploadTime || this.$dayjs().format('YYYY-MM-DD HH:mm:ss') })); },
+    handleSettlementTypeChange(value) { if (value !== '月结') { this.settlementRule.billCycleType = ''; this.settlementRule.billCutoffDay = ''; this.settlementRule.customPeriods = []; } else if (this.settlementRule.billCycleType === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; if (value !== '固定天数周期结算') this.settlementRule.cycleDays = ''; },
+    handleCycleTypeChange(value) { if (value !== '固定截单日') this.settlementRule.billCutoffDay = ''; if (value === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; },
     attachmentUrl(row = {}) { return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || ''; },
     attachmentName(row = {}) { return row.originalName || row.name || row.fileName || '附件'; },
     attachmentExtension(row = {}) { const source = String(this.attachmentName(row) || this.attachmentUrl(row)).split('?')[0]; const index = source.lastIndexOf('.'); return index > -1 ? source.slice(index + 1).toLowerCase() : ''; },
@@ -157,11 +620,16 @@ export default {
     previewAttachment(row, rows = this.attachments) { const url = this.attachmentUrl(row); if (!url) { this.$message.warning('附件地址为空，无法预览'); return; } if (this.isAttachmentImage(row)) { this.imagePreviewUrls = (rows || []).filter(item => this.isAttachmentImage(item) && this.attachmentUrl(item)).map(item => this.attachmentUrl(item)); this.imagePreviewIndex = Math.max(this.imagePreviewUrls.indexOf(url), 0); this.imagePreviewVisible = true; return; } this.previewFile = { name: this.attachmentName(row), url, mimeType: row.mimeType || row.contentType || '' }; this.documentPreviewVisible = true; },
     handlePreviewUnsupported() { this.$message.warning('当前文件暂不支持在线预览'); },
     handlePreviewError() { this.$message.error('附件预览失败'); },
-    removeContractFile(index) { this.contractFileRows.splice(index, 1); },
-    handleContractFileBatchDownload() { (this.selectedContractFiles.length ? this.selectedContractFiles : this.contractFileRows).forEach(row => { if (row.url) window.open(row.url, '_blank'); }); },
     formatFileSize(value) { const size = Number(value || 0); return size > 1024 * 1024 ? `${(size / 1024 / 1024).toFixed(2)}MB` : `${Math.max(1, Math.ceil(size / 1024))}KB`; },
     addPaymentRatioRow() { this.paymentRatioRows.push({ paymentTerm: `第${this.paymentRatioRows.length + 1}笔`, ratioLimit: '', remark: '' }); },
-    async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, copyCount: normalizeOptionalPositiveInteger(this.form.copyCount), paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays), startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeContent, changeReason: this.form.changeReason, changeAttachmentsJson: JSON.stringify(this.changeMaterials) }); this.$message.success('变更已提交'); this.$router.back(); },
+    customPeriodEndDayOptions(row) { const startDay = Number(row?.startDay); if (!Number.isFinite(startDay) || startDay < 1) return this.billCutoffDayOptions; return Array.from({ length: 31 - startDay + 1 }, (_, index) => ({ label: `${startDay + index}日`, value: startDay + index })); },
+    handleCustomPeriodStartDayChange(index, value) { const periods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); const row = periods[index]; if (!row) return; row.startDay = value || ''; const startDay = Number(row.startDay); const endDay = Number(row.endDay); if (Number.isFinite(startDay) && Number.isFinite(endDay) && (endDay < startDay || endDay > 31)) row.endDay = ''; this.settlementRule.customPeriods = periods; },
+    handleCustomPeriodEndDayChange(index, value) { const periods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); const row = periods[index]; if (!row) return; row.endDay = value || ''; this.settlementRule.customPeriods = periods; },
+    addCustomPeriodRow() { const periods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); periods.push({ startDay: '', endDay: '' }); this.settlementRule.customPeriods = periods; },
+    removeCustomPeriodRow(index) { if (index <= 0) return; const periods = [...(this.settlementRule.customPeriods || [])]; periods.splice(index, 1); this.settlementRule.customPeriods = normalizeCustomPeriods(periods); },
+    validateCustomPeriods(periods = [], label) { const rows = normalizeCustomPeriods(periods); if (!rows.length) { this.$message.warning(`${label}：请至少配置一段自定义周期`); return false; } for (let index = 0; index < rows.length; index += 1) { const row = rows[index]; const startDay = Number(row.startDay); const endDay = Number(row.endDay); if (!Number.isFinite(startDay) || startDay < 1 || startDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间开始日`); return false; } if (!Number.isFinite(endDay) || endDay < 1 || endDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间结束日`); return false; } if (endDay < startDay) { this.$message.warning(`${label}：第${index + 1}行结束日不能早于开始日`); return false; } if (index > 0 && startDay !== Number(rows[index - 1].endDay) + 1) { this.$message.warning(`${label}：自定义多周期区间必须连续，不允许重叠或存在日期缺口`); return false; } } return true; },
+    validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日期和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
+    async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; if (!this.validateSettlementRule(this.preSettlementConfig, '预结算配置') || !this.validateSettlementRule(this.formalSettlementConfig, '正式结算配置')) return; const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB', copyCount: normalizeOptionalPositiveInteger(this.form.copyCount), invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle), paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays), contractAmount: normalizeOptionalAmount(this.form.contractAmount), startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeContent, changeReason: this.form.changeReason, changeAttachmentsJson: JSON.stringify(this.changeMaterials) }); this.$message.success('变更已提交'); this.$router.back(); },
   },
 };
 </script>
@@ -191,13 +659,27 @@ export default {
 .change-table { margin: 16px 0; }
 .ratio-tip { margin-bottom: 8px; color: #f56c6c; }
 .unit { margin-left: 8px; }
-.attachment-head { display: flex; align-items: center; justify-content: flex-end; margin-bottom: 12px; }
 .attachment-upload { display: flex; justify-content: flex-start; margin-top: 12px; }
 .attachment-upload .vehicle-attachment-upload { width: auto; }
 .attachment-upload .el-upload { display: inline-flex; }
 .settlement-switch { display: flex; align-items: center; gap: 12px; margin-bottom: 16px; }
+// 问号提示图标紧靠「开启」一侧：清掉开启 radio 自带的右间距，图标与「关闭」之间留大间距
+.settlement-switch :deep(.el-radio:first-child) { margin-right: 0; }
+.settlement-switch-tip { margin: 0 32px 0 8px; color: #a8abb2; cursor: help; font-size: 14px; }
 .settlement-form { display: grid; grid-template-columns: repeat(3, minmax(240px, 1fr)); gap: 8px 28px; }
 .change-reason-section { margin: 20px 0; }
+.change-reason-section__input {
+  width: 100%;
+  :deep(.el-textarea__inner) {
+    border-color: #f56c6c;
+    box-shadow: 0 0 0 1px #f56c6c inset;
+  }
+  :deep(.el-textarea__inner:hover),
+  :deep(.el-textarea__inner:focus) {
+    border-color: #f56c6c;
+    box-shadow: 0 0 0 1px #f56c6c inset;
+  }
+}
 .page-footer {
   position: fixed;
   right: 0;

src/views/business/master-order.vue

@@ -262,7 +262,7 @@ export default {
         result.unshift({ text: '调度', run: () => this.goDispatch(row.id) });
       if (row.businessStatus !== 'draft')
         result.unshift({ text: '详情', run: () => this.goDetail(row.id) });
-      if (['dispatching', 'completed'].includes(row.businessStatus))
+      if (row.businessStatus === 'dispatching')
         result.push({
           text: '关闭调度',
           run: () =>

src/views/business/process-config.vue

@@ -227,7 +227,7 @@
                       <el-radio-group
                         v-model="row.confirmMode"
                         :disabled="dialogReadonly || !row.enabled"
-                        @change="syncNodeFields"
+                        @change="handleAcceptConfirmChange(row)"
                       >
                         <el-radio label="yes">是</el-radio>
                         <el-radio label="no_confirm_accept">无需确认接单</el-radio>
@@ -235,12 +235,7 @@
                     </div>
                     <div class="process-config-form__require-line">
                       <span class="process-config-form__require-label">确认接单人</span>
-                      <el-checkbox
-                        v-model="row.confirmDriver"
-                        :disabled="dialogReadonly || !row.enabled || row.confirmMode !== 'yes'"
-                        @change="syncNodeFields"
-                        >司机</el-checkbox
-                      >
+                      <el-checkbox v-model="row.confirmDriver" :disabled="true">司机</el-checkbox>
                     </div>
                   </template>
 
@@ -551,10 +546,19 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
     },
+    handleAcceptConfirmChange(row) {
+      row.confirmDriver = row.confirmMode === 'yes';
+      this.syncNodeFields();
+    },
     handleReturnConfirmChange(row) {
       row.confirmInternal = row.confirmMode === 'yes';
       this.syncNodeFields();
     },
+    enforceAcceptDriver(node) {
+      if (!node || (node.key !== 'accept' && node.name !== '接单')) return node;
+      node.confirmDriver = node.confirmMode === 'yes';
+      return node;
+    },
     initDeptOptions() {
       getDeptTree(this.userInfo.tenantId).then(res => {
         const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
@@ -610,7 +614,7 @@ export default {
       return 'warning';
     },
     canEdit(row) {
-      return this.hasPermission('process_config_edit') && !row.readonly;
+      return this.hasPermission('process_config_edit') && !row.readonly && !row.hasRelatedWaybill;
     },
     canDelete(row) {
       return (
@@ -626,7 +630,7 @@ export default {
       return this.hasPermission('process_config_disable') && !row.readonly && row.status === 1;
     },
     cloneNode(template) {
-      return {
+      const node = {
         enabled: false,
         punch: true,
         location: true,
@@ -641,10 +645,16 @@ export default {
         supportVoucher: false,
         voucherOptions: [],
         confirmMode: 'yes',
-        confirmDriver: false,
+        confirmDriver: true,
         confirmInternal: false,
         ...template,
       };
+      if ((node.key === 'accept' || node.name === '接单') && node.confirmMode === 'yes') {
+        node.confirmDriver = true;
+      } else if ((node.key === 'accept' || node.name === '接单') && node.confirmMode !== 'yes') {
+        node.confirmDriver = false;
+      }
+      return node;
     },
     resetNodeRows() {
       this.nodeRows = NODE_TEMPLATES.map(item => this.cloneNode(item));
@@ -769,20 +779,28 @@ export default {
       this.syncNodeFields();
     },
     syncNodeFields() {
+      this.nodeRows.forEach(item => this.enforceAcceptDriver(item));
       const enabledNodes = this.nodeRows.filter(item => item.enabled);
       this.form.includedNodes = enabledNodes.map(item => item.name).join(',');
       this.form.nodeConfigJson = JSON.stringify(
         this.nodeRows.map(item => ({
           key: item.key,
           name: item.name,
+          type: item.type,
           enabled: item.enabled,
           confirmMode: item.confirmMode,
           confirmDriver: item.confirmDriver,
           confirmInternal: item.confirmInternal,
           punch: item.punch,
           location: item.location,
-          uploadCargo: item.uploadCargo,
-          cargoTypes: item.uploadCargo ? item.cargoTypes : [],
+          // 在途不支持货量；其它节点按配置
+          uploadCargo: item.type === 'transit' || item.key === 'transit' ? false : item.uploadCargo,
+          cargoTypes:
+            item.type === 'transit' || item.key === 'transit'
+              ? []
+              : item.uploadCargo
+                ? item.cargoTypes
+                : [],
           frequencyDays: item.frequencyDays,
           timeStart: item.timeStart,
           timeEnd: item.timeEnd,
@@ -935,7 +953,7 @@ export default {
       );
     },
     openConfig(row, readonly = false) {
-      this.dialogReadonly = readonly;
+      this.dialogReadonly = readonly || !!(row && row.hasRelatedWaybill);
       if (!row || !row.id) {
         this.form = {
           configName: '',
@@ -952,6 +970,7 @@ export default {
       }
       api.getDetail(row.id).then(res => {
         const detail = res.data.data || {};
+        this.dialogReadonly = readonly || !!detail.hasRelatedWaybill;
         this.form = {
           ...detail,
           defaultFinishDays:
@@ -969,6 +988,10 @@ export default {
     },
     submitConfig(mode) {
       if (this.submitting) return;
+      if (this.form.id && this.form.hasRelatedWaybill) {
+        this.$message.warning('该项目已有运单，过程配置不可修改');
+        return;
+      }
       this.syncNodeFields();
       const submitRow = this.normalizeRow({
         ...this.form,

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

@@ -50,11 +50,19 @@
         </el-tag>
       </template>
 
+      <template #projectQuotaInfoTitle-form>
+        <div class="dialog-section-title">项目额度信息</div>
+      </template>
+
+      <template #temporaryCreditInfoTitle-form>
+        <div class="dialog-section-title">临时额度信息</div>
+      </template>
+
       <template #projectName-form>
         <el-select
           v-model="selectedProjectId"
           class="temporary-credit-limit-page__field"
-          placeholder="请选择项目"
+          placeholder="请选择"
           filterable
           clearable
           :loading="projectLoading"
@@ -75,7 +83,7 @@
         <el-input
           v-model="form.applyLimit"
           class="temporary-credit-limit-page__field"
-          placeholder="请输入申请临时额度"
+          placeholder="请输入"
           :disabled="dialogReadonly"
           @input="handleAmountInput"
         />
@@ -117,10 +125,10 @@
               v-model="attachmentRows"
               :readonly="dialogReadonly"
               :file-types="attachmentFileTypes"
-              :max-size="500"
+              :max-size="50"
               :show-file-list="false"
               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>
@@ -128,22 +136,19 @@
       </template>
 
       <template #menu-form-before>
-        <el-button
-          v-if="!dialogReadonly"
-          type="primary"
-          plain
-          :loading="draftLoading"
-          @click="saveDraft"
-        >
-          保存
-        </el-button>
+        <template v-if="!dialogReadonly">
+          <el-button @click="closeFormDialog">取消</el-button>
+          <el-button type="primary" plain :loading="draftLoading" @click="saveDraft">
+            保存
+          </el-button>
+        </template>
       </template>
 
       <template #menu="{ row }">
         <el-link
           v-if="hasPermission(`${config.permission}_view`)"
           type="primary"
-          @click="$refs.crud.rowView(row)"
+          @click="openDetail(row)"
         >
           查看
         </el-link>
@@ -162,6 +167,74 @@
       </template>
     </avue-crud>
 
+    <el-dialog
+      v-model="detailVisible"
+      title="查看临时额度申请"
+      append-to-body
+      destroy-on-close
+      width="96%"
+      class="temporary-credit-limit-dialog temporary-credit-limit-detail-dialog"
+    >
+      <div v-loading="detailLoading" class="business-crud-page__detail-content">
+        <section
+          v-for="section in detailSections"
+          :key="section.title"
+          class="temporary-credit-limit-detail-dialog__section"
+        >
+          <div class="dialog-section-title">{{ section.title }}</div>
+          <el-descriptions :column="4" class="temporary-credit-limit-detail-dialog__descriptions">
+            <el-descriptions-item
+              v-for="field in section.fields"
+              :key="field[0]"
+              :label="field[1]"
+              :span="field[2] || 1"
+            >
+              {{ formatDetailValue(field[0]) }}
+            </el-descriptions-item>
+          </el-descriptions>
+          <div
+            v-if="section.showAttachment"
+            class="temporary-credit-limit-detail-dialog__attachment"
+          >
+            <div class="temporary-credit-limit-page__attachment-head">
+              <span class="temporary-credit-limit-detail-dialog__attachment-label">附件</span>
+              <el-button type="primary" :disabled="!attachmentRows.length" @click="batchDownload">
+                批量下载
+              </el-button>
+            </div>
+            <el-table :data="attachmentRows" empty-text="暂无附件">
+              <el-table-column type="index" label="序号" width="70" align="center" />
+              <el-table-column label="文件名" min-width="240" show-overflow-tooltip>
+                <template #default="{ row }">
+                  <el-link type="primary" @click="previewAttachment(row)">
+                    {{ attachmentName(row) }}
+                  </el-link>
+                </template>
+              </el-table-column>
+              <el-table-column label="文件大小" width="120" align="center">
+                <template #default="{ row }">{{ formatFileSize(row.size) }}</template>
+              </el-table-column>
+              <el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
+              <el-table-column
+                prop="uploadTime"
+                label="上传时间"
+                :width="config.detailAttachmentUploadTimeWidth || 180"
+                align="center"
+              />
+              <el-table-column label="操作" width="100" align="center" fixed="right">
+                <template #default="{ row }">
+                  <el-link type="primary" @click="downloadAttachment(row)">下载</el-link>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </section>
+      </div>
+      <template #footer>
+        <el-button @click="detailVisible = false">关闭</el-button>
+      </template>
+    </el-dialog>
+
     <empty-pagination
       :page="page"
       @size-change="sizeChange"
@@ -311,6 +384,9 @@ export default {
         zoom: true,
       },
       attachmentFileTypes,
+      detailVisible: false,
+      detailLoading: false,
+      detailRow: {},
       flowBox: false,
       flowUrl: '',
       processInstanceId: '',
@@ -321,6 +397,9 @@ export default {
     permissionList() {
       return { addBtn: this.canCreate };
     },
+    detailSections() {
+      return this.config.detailSections || [];
+    },
     isAdmin() {
       const authority = this.userInfo?.authority;
       return Array.isArray(authority)
@@ -339,14 +418,54 @@ export default {
   },
   methods: {
     buildTableOption() {
+      const columns = (option.column || []).map(column => ({ ...column }));
+      const sectionTitleProps = ['projectQuotaInfoTitle', 'temporaryCreditInfoTitle'];
+      const formGroups = [];
+      let current = [];
+      columns.forEach(col => {
+        if (sectionTitleProps.includes(col.prop)) {
+          if (current.length) formGroups.push(current);
+          current = [col];
+          return;
+        }
+        if (!current.length) return;
+        // 列表/搜索专用字段不进入表单分组白卡
+        if (col.addDisplay === false && col.editDisplay === false) return;
+        current.push(col);
+      });
+      if (current.length) formGroups.push(current);
+
+      const formSectionProps = new Set();
+      formGroups.forEach(group => {
+        group.forEach(col => {
+          if (col.prop) formSectionProps.add(col.prop);
+        });
+      });
+
+      // 表单字段全部进 group 拆白卡；Avue 会额外生成空的主列 group，由样式隐藏去掉顶部白横条
       return {
         ...option,
         addBtn: false,
         viewBtn: false,
         editBtn: false,
         delBtn: false,
+        // 隐藏 Avue 默认取消按钮，改由 menu-form-before 按「取消、保存、提交」顺序自定义
+        cancelBtn: false,
         menuWidth: 320,
-        column: (option.column || []).map(column => ({ ...column })),
+        column: columns.map(col => {
+          if (!formSectionProps.has(col.prop)) return col;
+          return {
+            ...col,
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+          };
+        }),
+        group: formGroups.map(group => ({
+          label: '',
+          arrow: false,
+          column: group,
+        })),
       };
     },
     hasPermission(code) {
@@ -449,6 +568,32 @@ export default {
         .then(res => this.applyDetail(res.data?.data || {}))
         .finally(done);
     },
+    openDetail(row) {
+      this.detailVisible = true;
+      this.detailLoading = true;
+      this.detailRow = { ...row };
+      this.attachmentRows = [];
+      this.selectedAttachments = [];
+      this.api
+        .getDetail(row.id)
+        .then(res => {
+          const detail = res.data?.data || {};
+          this.detailRow = { ...detail };
+          this.attachmentRows = this.parseJsonArray(detail.attachmentsJson);
+        })
+        .finally(() => {
+          this.detailLoading = false;
+        });
+    },
+    formatDetailValue(prop) {
+      const row = this.detailRow || {};
+      if (prop === 'approvalStatus') {
+        return this.displayStatus(row, 'approvalStatus');
+      }
+      const value = row[prop];
+      if (value === undefined || value === null || value === '') return '-';
+      return value;
+    },
     applyDetail(detail) {
       this.form = { ...detail };
       this.selectedProjectId = detail.projectId || '';
@@ -457,9 +602,10 @@ export default {
       this.syncCurrentProjectOption();
     },
     normalizeForm(row = this.form) {
+      const { projectQuotaInfoTitle, temporaryCreditInfoTitle, ...payload } = row || {};
       return {
-        ...row,
-        applyLimit: row.applyLimit === '' ? '' : Number(row.applyLimit),
+        ...payload,
+        applyLimit: payload.applyLimit === '' ? '' : Number(payload.applyLimit),
         attachmentsJson: JSON.stringify(this.attachmentRows),
       };
     },
@@ -490,13 +636,20 @@ export default {
         .saveDraft(this.normalizeForm())
         .then(() => {
           this.$message.success('保存成功');
-          this.$refs.crud?.closeDialog();
+          this.closeFormDialog();
           this.onLoad(this.page, this.query);
         })
         .finally(() => {
           this.draftLoading = false;
         });
     },
+    closeFormDialog() {
+      if (typeof this.$refs.crud?.closeDialog === 'function') {
+        this.$refs.crud.closeDialog();
+        return;
+      }
+      this.$refs.crud?.$refs?.dialogForm?.hide?.();
+    },
     rowDel(row) {
       this.removeRows([row]);
     },
@@ -822,7 +975,6 @@ export default {
   .el-form-item__label {
     height: auto !important;
     line-height: 18px;
-    padding-top: 7px; // 视觉补偿：让单行 label 仍接近 input 中线
   }
 
   // 强制必填星号垂直居中于行盒，与第一行汉字字符中心同基线（关键）
@@ -830,15 +982,257 @@ export default {
     display: inline-block;
     line-height: 18px;
     height: 18px;
-    vertical-align: middle; // 关键：相对 baseline 上移，与汉字字符中心对齐
+    vertical-align: middle;
     margin-right: 4px;
   }
+
+  // 「项目额度信息 / 临时额度信息」小标题：对齐项目管理「项目基本信息」样式
+  .avue-form__group:has(.dialog-section-title) {
+    .dialog-section-title {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      width: 100%;
+      padding: 14px 16px 4px;
+      margin-bottom: 0;
+      color: #303133;
+      font-size: 15px;
+      font-weight: 500;
+    }
+
+    .avue-form__group--flex:has(.dialog-section-title),
+    .el-form-item:has(.dialog-section-title) {
+      margin-bottom: 0;
+    }
+
+    .el-form-item:has(.dialog-section-title) .el-form-item__content {
+      margin-left: 0 !important;
+    }
+  }
+
+  // 分组白卡：Avue 实际结构为 .avue-form > .el-form > .el-row > .avue-group
+  .avue-form {
+    background: transparent !important;
+    box-shadow: none !important;
+    padding: 0 !important;
+    margin: 0 !important;
+    border-radius: 0 !important;
+    min-height: 0 !important;
+  }
+
+  .avue-form > .el-form > .el-row {
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+  }
+
+  // 无分区标题的空分组（Avue 主列残留）隐藏，去掉顶部白横条
+  .avue-form > .el-form > .el-row > .avue-group:not(:has(.dialog-section-title)) {
+    display: none !important;
+    height: 0 !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    overflow: hidden !important;
+    border: none !important;
+  }
+
+  // 有分区标题的分组渲染为独立白卡
+  .avue-form > .el-form > .el-row > .avue-group:has(.dialog-section-title) {
+    background: #fff;
+    border-radius: 6px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.06);
+    margin-bottom: 12px;
+    padding: 0 0 4px;
+    overflow: hidden;
+  }
+
+  .avue-form > .el-form > .el-row > .avue-group:has(.dialog-section-title):last-child {
+    margin-bottom: 0;
+  }
+
+  .avue-group .el-collapse {
+    border: none !important;
+  }
+
+  .avue-group .el-collapse-item__header {
+    display: none !important;
+    height: 0 !important;
+    min-height: 0 !important;
+    line-height: 0 !important;
+    padding: 0 !important;
+    border: none !important;
+    overflow: hidden;
+  }
+
+  .avue-group .avue-group__header {
+    display: none !important;
+    height: 0 !important;
+    min-height: 0 !important;
+    padding: 0 !important;
+    margin: 0 !important;
+    border: none !important;
+  }
+
+  .avue-group .el-collapse-item__wrap {
+    border: none !important;
+  }
+
+  .avue-group .el-collapse-item__content {
+    padding: 0 !important;
+  }
+
+  // 卡片视觉由外层 avue-group 承担，内层去白底，避免叠卡/顶条
+  .avue-group .avue-form__group {
+    display: flex !important;
+    background: transparent !important;
+    box-shadow: none !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    border-radius: 0 !important;
+  }
 }
 
 .temporary-credit-limit-dialog .business-crud-page__detail-content .el-descriptions__label {
   width: 180px !important;
 }
+
+// 新增/编辑/查看：高度随内容自适应，超出时再滚动；去掉强制全屏导致的底部大片空白
+.temporary-credit-limit-dialog.el-dialog {
+  margin-top: 20px !important;
+  margin-bottom: 20px !important;
+  height: auto !important;
+  max-height: calc(100vh - 40px) !important;
+  display: flex;
+  flex-direction: column;
+}
+
+.temporary-credit-limit-dialog .el-dialog__header {
+  flex: none;
+}
+
+.temporary-credit-limit-dialog .el-dialog__body {
+  flex: 0 1 auto;
+  min-height: 0;
+  max-height: calc(100vh - 140px) !important;
+  display: block;
+  overflow-y: auto;
+}
+
+// 覆盖全局 .el-dialog .avue-form 白底内边距，避免顶部出现白横条
+.temporary-credit-limit-dialog:not(.temporary-credit-limit-detail-dialog) .avue-form {
+  background: transparent !important;
+  box-shadow: none !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  border-radius: 0 !important;
+}
+
+.temporary-credit-limit-dialog:not(.temporary-credit-limit-detail-dialog) .avue-dialog__footer,
+.temporary-credit-limit-detail-dialog .el-dialog__footer {
+  position: sticky;
+  bottom: 0;
+  z-index: 5;
+  flex: none;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 12px;
+  margin-top: 0 !important;
+  padding: 12px 20px !important;
+  background: #fff;
+  border-top: 1px solid var(--el-border-color-lighter, #ebeef5) !important;
+  border-radius: 0;
+  box-shadow: none;
+
+  .el-button + .el-button {
+    margin-left: 0;
+  }
+}
+
+.temporary-credit-limit-detail-dialog {
+  .business-crud-page__detail-content {
+    flex: 1 1 auto;
+    min-height: 0;
+    overflow: auto;
+    padding: 0;
+  }
+
+  &__section {
+    margin-bottom: 12px;
+    padding: 0 0 4px;
+    background: #fff;
+    border-radius: 6px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.06);
+    overflow: hidden;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  &__descriptions {
+    padding: 0 16px 8px;
+
+    // 取消 Descriptions 表格边框样式，改为纯文本描述列表
+    .el-descriptions__body {
+      background: transparent;
+    }
+
+    .el-descriptions__table {
+      border-collapse: separate;
+      border-spacing: 0;
+    }
+
+    .el-descriptions__cell {
+      border: none !important;
+      background: transparent !important;
+      padding: 8px 12px 8px 0;
+      vertical-align: top;
+    }
+
+    .el-descriptions__label {
+      color: #606266;
+      font-weight: 400;
+      white-space: normal;
+      line-height: 18px;
+    }
+
+    .el-descriptions__content {
+      color: #303133;
+      line-height: 18px;
+    }
+  }
+
+  .dialog-section-title {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    width: 100%;
+    padding: 14px 16px 4px;
+    margin-bottom: 0;
+    color: #303133;
+    font-size: 15px;
+    font-weight: 500;
+  }
+
+  &__attachment {
+    padding: 8px 16px 16px;
+  }
+
+  &__attachment-label {
+    color: #606266;
+    font-size: 14px;
+  }
+
+  .temporary-credit-limit-page__attachment-head {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 12px;
+  }
+}
+
 .el-form-item--default .el-form-item__label {
   height: auto !important;
 }
+
 </style>

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

@@ -0,0 +1,717 @@
+<template>
+  <basic-container class="transport-plan-dispatch-page">
+    <div v-loading="loading" class="transport-plan-dispatch-page__shell">
+      <!-- 顶部信息区 -->
+      <div class="transport-plan-dispatch-page__top">
+        <div class="transport-plan-dispatch-page__heading">
+          <div class="transport-plan-dispatch-page__heading-title">
+            <el-button icon="el-icon-arrow-left" text @click="handleBack">返回</el-button>
+            <span class="transport-plan-dispatch-page__heading-name">计划调度</span>
+            <span class="transport-plan-dispatch-page__heading-no">
+              {{ planData.planNo || planData.loadingNo || '-' }}
+            </span>
+            <el-tag :type="getStatusTagType(planData.businessStatus)" effect="light" class="status-text">
+              {{ planData.businessStatusName || '-' }}
+            </el-tag>
+            <el-tag type="primary" effect="light">
+              {{ planData.transportTypeName || '公路整车' }}
+            </el-tag>
+          </div>
+        </div>
+
+        <div class="transport-plan-dispatch-page__summary">
+          <section-card title="基本信息" class="transport-plan-dispatch-page__summary-card">
+            <div class="transport-plan-dispatch-page__summary-grid">
+              <div class="transport-plan-dispatch-page__summary-item">
+                <div class="transport-plan-dispatch-page__summary-label">客户</div>
+                <div class="transport-plan-dispatch-page__summary-value">
+                  {{ planData.customerName || '-' }}
+                </div>
+              </div>
+              <div class="transport-plan-dispatch-page__summary-item">
+                <div class="transport-plan-dispatch-page__summary-label">项目</div>
+                <div class="transport-plan-dispatch-page__summary-value">
+                  {{ planData.projectName || '-' }}
+                </div>
+              </div>
+              <div class="transport-plan-dispatch-page__summary-item">
+                <div class="transport-plan-dispatch-page__summary-label">合同编号</div>
+                <div class="transport-plan-dispatch-page__summary-value">
+                  {{ planData.contractNo || '-' }}
+                </div>
+              </div>
+              <div class="transport-plan-dispatch-page__summary-item">
+                <div class="transport-plan-dispatch-page__summary-label">计划执行时间</div>
+                <div class="transport-plan-dispatch-page__summary-value">
+                  {{ formatDateRange(planData.planStartDate, planData.planEndDate) }}
+                </div>
+              </div>
+              <div class="transport-plan-dispatch-page__summary-item is-wide">
+                <div class="transport-plan-dispatch-page__summary-label">货物信息</div>
+                <div class="transport-plan-dispatch-page__summary-value">
+                  {{ planData.goodsInfo || formatGoodsInfo(planData) }}
+                </div>
+              </div>
+              <div class="transport-plan-dispatch-page__summary-item">
+                <div class="transport-plan-dispatch-page__summary-label">附件</div>
+                <div class="transport-plan-dispatch-page__summary-value">
+                  <template v-if="attachmentList.length">
+                    <el-link
+                      v-for="(item, index) in attachmentList"
+                      :key="index"
+                      type="primary"
+                      :href="item.url"
+                      :underline="false"
+                      target="_blank"
+                      class="transport-plan-dispatch-page__attachment-link"
+                    >
+                      {{ item.name || item.originalName || '附件' }}
+                    </el-link>
+                  </template>
+                  <span v-else>-</span>
+                </div>
+              </div>
+            </div>
+          </section-card>
+
+          <section-card title="收发货路线" class="transport-plan-dispatch-page__route-card">
+            <div class="transport-plan-dispatch-page__route">
+              <div class="transport-plan-dispatch-page__route-item">
+                <span class="transport-plan-dispatch-page__route-badge is-start">起</span>
+                <div class="transport-plan-dispatch-page__route-body">
+                  <div class="transport-plan-dispatch-page__route-title">
+                    {{ planData.departureName || '-' }}
+                  </div>
+                  <div class="transport-plan-dispatch-page__route-address">
+                    {{ formatAddress(planData.departureAddress) }}
+                  </div>
+                  <div class="transport-plan-dispatch-page__route-contact">
+                    {{ formatContact(planData.departureContact, planData.departurePhone) }}
+                  </div>
+                </div>
+              </div>
+              <div class="transport-plan-dispatch-page__route-vehicle">
+                <el-icon><Van /></el-icon>
+              </div>
+              <div class="transport-plan-dispatch-page__route-item">
+                <span class="transport-plan-dispatch-page__route-badge is-end">终</span>
+                <div class="transport-plan-dispatch-page__route-body">
+                  <div class="transport-plan-dispatch-page__route-title">
+                    {{ planData.arrivalName || '-' }}
+                  </div>
+                  <div class="transport-plan-dispatch-page__route-address">
+                    {{ formatAddress(planData.arrivalAddress) }}
+                  </div>
+                  <div class="transport-plan-dispatch-page__route-contact">
+                    {{ formatContact(planData.arrivalContact, planData.arrivalPhone) }}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </section-card>
+        </div>
+      </div>
+
+      <!-- 调度列表 -->
+      <section-card class="transport-plan-dispatch-page__list-card">
+        <template #title>
+          <span>待调度列表</span>
+          <span class="transport-plan-dispatch-page__list-summary">
+            {{ summaryText }}
+          </span>
+        </template>
+        <template #extra>
+          <el-button type="primary" :disabled="!canAddDispatch" @click="handleAdd">
+            新增
+          </el-button>
+        </template>
+        <el-table
+          :data="dispatchList"
+          border
+          height="100%"
+          row-key="id"
+          class="transport-plan-dispatch-page__table"
+        >
+          <el-table-column type="index" label="序号" width="70" align="center" fixed="left" />
+          <el-table-column label="运输方式" min-width="180" align="center" show-overflow-tooltip>
+            <template #default="{ row }">
+              {{ row.transportTypeName || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="carrierType" label="承运类型" min-width="150" align="center" show-overflow-tooltip />
+          <el-table-column prop="carrierName" label="承运商" min-width="150" align="center" show-overflow-tooltip />
+          <el-table-column prop="driverName" label="司机" min-width="260" align="center" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span>{{ formatDriver(row) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="vehicleNo" label="车牌号" min-width="150" align="center" show-overflow-tooltip />
+          <el-table-column prop="cargoType" label="货物类型" min-width="170" align="center" show-overflow-tooltip />
+          <el-table-column prop="cargoInfo" label="货物信息" min-width="280" align="center" show-overflow-tooltip>
+            <template #default="{ row }">
+              {{ row.cargoInfo || formatCargoInfo(row) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="发货地址" min-width="220" align="center" show-overflow-tooltip>
+            <template #default="{ row }">
+              {{ formatAddress(row.departureAddress) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="收货地址" min-width="220" align="center" show-overflow-tooltip>
+            <template #default="{ row }">
+              {{ formatAddress(row.arrivalAddress) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="quantity" label="数量" min-width="120" align="center">
+            <template #default="{ row }">
+              {{ row.quantity ? `${row.quantity}${row.quantityUnit || '吨'}` : '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="unitPrice" label="单价" min-width="120" align="center" />
+          <el-table-column prop="freight" label="运费" min-width="120" align="center" />
+          <el-table-column prop="otherFeeTotal" label="其他费用" min-width="120" align="center" />
+          <el-table-column prop="freightTotal" label="运费合计" min-width="120" align="center" />
+          <el-table-column label="操作" width="100" align="center" fixed="right">
+            <template #default="{ row, $index }">
+              <div class="transport-plan-dispatch-page__actions">
+                <el-link type="primary" @click="handleEdit(row, $index)">编辑</el-link>
+                <el-link type="danger" @click="handleDelete($index)">删除</el-link>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </section-card>
+
+      <!-- 底部按钮 -->
+      <div class="transport-plan-dispatch-page__footer">
+        <el-button @click="handleBack">关闭</el-button>
+        <el-button type="primary" :loading="saving" @click="handleSubmit">
+          确认生成
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 调度明细编辑弹窗 - 将使用原组件的弹窗 -->
+    <transport-plan-page
+      v-if="transportPlanPageVisible"
+      ref="transportPlanPageRef"
+      :api="api"
+      :config="config"
+      :crud-option="option"
+      style="display: none"
+    />
+  </basic-container>
+</template>
+
+<script>
+import { Van } from '@element-plus/icons-vue';
+import { getDetail, dispatch } from '@/api/business/transport-plan';
+import SectionCard from '@/components/section-card/main.vue';
+import TransportPlanPage from './components/transport-plan-page.vue';
+import * as api from '@/api/business/transport-plan';
+import { config, option } from '@/option/business/transport-plan';
+
+const TRANSPORT_PLAN_QUANTITY_UNIT = '吨';
+
+export default {
+  name: 'TransportPlanDispatch',
+  components: {
+    Van,
+    SectionCard,
+    TransportPlanPage,
+  },
+  data() {
+    return {
+      loading: false,
+      saving: false,
+      planData: {},
+      dispatchList: [],
+      attachmentList: [],
+      transportPlanPageVisible: false,
+      api,
+      config,
+      option,
+    };
+  },
+  computed: {
+    planId() {
+      return this.$route.query.planId;
+    },
+    summaryText() {
+      const goodsList = this.parseGoodsList(this.planData.goodsJson);
+      if (!goodsList.length) {
+        const total = Number(this.planData.totalQuantity || 0);
+        const dispatched = this.calculateDispatchedQuantity();
+        const remaining = Math.max(total - dispatched, 0);
+        return `共${total}吨 | 已调度 ${dispatched.toFixed(2)}吨，剩余${remaining.toFixed(2)}吨`;
+      }
+
+      const summary = {};
+      goodsList.forEach(goods => {
+        const unit = goods.quantityUnit || TRANSPORT_PLAN_QUANTITY_UNIT;
+        if (!summary[unit]) {
+          summary[unit] = { total: 0, dispatched: 0 };
+        }
+        summary[unit].total += Number(goods.quantity || 0);
+      });
+
+      this.dispatchList.forEach(item => {
+        const unit = item.quantityUnit || TRANSPORT_PLAN_QUANTITY_UNIT;
+        if (!summary[unit]) {
+          summary[unit] = { total: 0, dispatched: 0 };
+        }
+        summary[unit].dispatched += Number(item.quantity || 0);
+      });
+
+      const parts = Object.entries(summary).map(([unit, data]) => {
+        const remaining = Math.max(data.total - data.dispatched, 0);
+        return `${data.total}${unit} | 已调度 ${data.dispatched.toFixed(2)}${unit}，剩余${remaining.toFixed(
+          2
+        )}${unit}`;
+      });
+
+      return parts.join(' | ');
+    },
+    canAddDispatch() {
+      const goodsList = this.parseGoodsList(this.planData.goodsJson);
+      if (!goodsList.length) {
+        const total = Number(this.planData.totalQuantity || 0);
+        const dispatched = this.calculateDispatchedQuantity();
+        return dispatched < total;
+      }
+
+      return goodsList.some(goods => {
+        const unit = goods.quantityUnit || TRANSPORT_PLAN_QUANTITY_UNIT;
+        const totalQty = Number(goods.quantity || 0);
+        const dispatchedQty = this.dispatchList
+          .filter(item => item.quantityUnit === unit)
+          .reduce((sum, item) => sum + Number(item.quantity || 0), 0);
+        return dispatchedQty < totalQty;
+      });
+    },
+  },
+  created() {
+    this.loadPlanData();
+  },
+  mounted() {
+    // 初始化 transport-plan-page 组件用于打开弹窗
+    this.transportPlanPageVisible = true;
+  },
+  methods: {
+    loadPlanData() {
+      if (!this.planId) {
+        this.$message.error('缺少计划ID参数');
+        this.handleBack();
+        return;
+      }
+
+      this.loading = true;
+      getDetail(this.planId)
+        .then(res => {
+          if (res.data?.success) {
+            this.planData = res.data.data || {};
+            this.attachmentList = this.parseAttachments(this.planData.attachmentsJson);
+            this.dispatchList = this.parseDispatchList(this.planData);
+          } else {
+            this.$message.error(res.data?.msg || '加载数据失败');
+          }
+        })
+        .catch(err => {
+          console.error('加载计划数据失败:', err);
+          this.$message.error('加载数据失败');
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    parseAttachments(json) {
+      try {
+        const data = JSON.parse(json || '[]');
+        return Array.isArray(data) ? data : [];
+      } catch {
+        return [];
+      }
+    },
+    parseDispatchList(planData) {
+      try {
+        const sources = [
+          planData.waybillList,
+          planData.dispatchRows,
+          planData.dispatchRecordList,
+          planData.dispatchList,
+        ];
+        for (const source of sources) {
+          if (Array.isArray(source) && source.length) {
+            return source.map((item, index) => ({
+              ...item,
+              id: item.id || `temp-${index}`,
+            }));
+          }
+        }
+        return [];
+      } catch {
+        return [];
+      }
+    },
+    parseGoodsList(json) {
+      try {
+        const data = JSON.parse(json || '[]');
+        return Array.isArray(data) ? data : [];
+      } catch {
+        return [];
+      }
+    },
+    calculateDispatchedQuantity() {
+      return this.dispatchList.reduce((sum, item) => sum + Number(item.quantity || 0), 0);
+    },
+    getStatusTagType(status) {
+      const statusMap = {
+        0: 'info',
+        1: 'warning',
+        2: 'success',
+        3: 'danger',
+      };
+      return statusMap[status] || 'info';
+    },
+    formatDateRange(startDate, endDate) {
+      const dates = [startDate, endDate].filter(Boolean);
+      return dates.length ? dates.join(' ~ ') : '-';
+    },
+    formatAddress(address) {
+      if (!address) return '-';
+      const match = address.match(/^(.*?省)?(.*?市)?(.*?区|.*?县)?/);
+      return match ? match[0] || address : address;
+    },
+    formatContact(contact, phone) {
+      const parts = [contact, phone].filter(Boolean);
+      return parts.length ? parts.join(' / ') : '-';
+    },
+    formatDriver(row) {
+      const parts = [row.driverName, row.driverPhone].filter(Boolean);
+      return parts.length ? parts.join(' / ') : '-';
+    },
+    formatGoodsInfo(data) {
+      const goodsList = this.parseGoodsList(data.goodsJson);
+      if (!goodsList.length) {
+        return data.cargoName || '-';
+      }
+      return goodsList
+        .map(goods => {
+          const parts = [goods.cargoName || goods.goodsName];
+          if (goods.quantity) {
+            parts.push(`${goods.quantity}${goods.quantityUnit || TRANSPORT_PLAN_QUANTITY_UNIT}`);
+          }
+          return parts.join(' ');
+        })
+        .join('；');
+    },
+    formatCargoInfo(row) {
+      const parts = [row.cargoName];
+      if (row.specification) parts.push(row.specification);
+      if (row.model) parts.push(row.model);
+      return parts.filter(Boolean).join(' / ') || '-';
+    },
+    handleBack() {
+      this.$router.back();
+    },
+    handleAdd() {
+      if (!this.canAddDispatch) {
+        this.$message.warning('待调度列表货物总量已达到计划总量，不能新增调度明细');
+        return;
+      }
+
+      // 调用 transport-plan-page 组件的方法打开弹窗
+      this.$nextTick(() => {
+        const component = this.$refs.transportPlanPageRef;
+        if (component) {
+          // 设置调度数据
+          component.dispatchRow = this.planData;
+          component.dispatchRows = [...this.dispatchList];
+          // 打开新增弹窗
+          component.openDispatchItemDialog(-1);
+        }
+      });
+    },
+    handleEdit(row, index) {
+      // 调用 transport-plan-page 组件的方法打开弹窗
+      this.$nextTick(() => {
+        const component = this.$refs.transportPlanPageRef;
+        if (component) {
+          // 设置调度数据
+          component.dispatchRow = this.planData;
+          component.dispatchRows = [...this.dispatchList];
+          // 打开编辑弹窗
+          component.openDispatchItemDialog(index, row);
+        }
+      });
+    },
+    handleDelete(index) {
+      this.$confirm('确定删除该调度明细?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.dispatchList.splice(index, 1);
+        this.$message.success('删除成功');
+      });
+    },
+    handleSubmit() {
+      if (!this.dispatchList.length) {
+        this.$message.warning('请先添加调度明细');
+        return;
+      }
+
+      for (const [index, row] of this.dispatchList.entries()) {
+        if (!row.carrierName) {
+          this.$message.warning(`第${index + 1}条调度明细缺少承运商信息`);
+          return;
+        }
+        if (!row.driverName) {
+          this.$message.warning(`第${index + 1}条调度明细缺少司机信息`);
+          return;
+        }
+        if (!row.vehicleNo) {
+          this.$message.warning(`第${index + 1}条调度明细缺少车牌号`);
+          return;
+        }
+      }
+
+      this.$confirm(
+        `请确认调度信息，将生成 <span style="color: #409eff; font-size: 20px; padding: 0 4px;">${this.dispatchList.length}</span> 条运单，是否继续？`,
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          dangerouslyUseHTMLString: true,
+        }
+      ).then(() => {
+        this.submitDispatch();
+      });
+    },
+    submitDispatch() {
+      this.saving = true;
+      const payload = {
+        id: this.planId,
+        mode: 'submit',
+        waybills: this.dispatchList.map(row => ({
+          ...row,
+          taskEntryMode: row.taskEntryMode || 'simple',
+          taskRemark: row.remark || '',
+          estimatedStartTime: row.estimatedStartTime || this.planData.planStartDate || '',
+          estimatedEndTime: row.estimatedEndTime || this.planData.planEndDate || '',
+          goodsJson:
+            row.goodsJson ||
+            JSON.stringify([
+              {
+                cargoName: row.cargoName,
+                cargoType: row.cargoType,
+                quantity: row.quantity,
+                quantityUnit: row.quantityUnit,
+                specification: row.specification,
+                model: row.model,
+                packageType: row.packageType,
+                brand: row.brand,
+              },
+            ]),
+        })),
+      };
+
+      dispatch(payload)
+        .then(res => {
+          if (res.data?.success) {
+            this.$message.success('调度成功，运单已生成');
+            this.handleBack();
+          } else {
+            this.$message.error(res.data?.msg || '调度失败');
+          }
+        })
+        .catch(err => {
+          console.error('调度失败:', err);
+          this.$message.error('调度失败');
+        })
+        .finally(() => {
+          this.saving = false;
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.transport-plan-dispatch-page {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  &__shell {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    height: 100%;
+  }
+
+  &__top {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+  }
+
+  &__heading {
+    padding: 16px;
+    background: #fff;
+    border-radius: 4px;
+
+    &-title {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+      font-size: 18px;
+      font-weight: 600;
+    }
+
+    &-name {
+      font-size: 18px;
+    }
+
+    &-no {
+      font-size: 14px;
+      color: #606266;
+    }
+  }
+
+  &__summary {
+    display: flex;
+    gap: 16px;
+
+    &-card {
+      flex: 1;
+    }
+
+    &-grid {
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      gap: 16px;
+    }
+
+    &-item {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+
+      &.is-wide {
+        grid-column: 1 / -1;
+      }
+    }
+
+    &-label {
+      font-size: 14px;
+      color: #909399;
+    }
+
+    &-value {
+      font-size: 14px;
+      color: #303133;
+    }
+  }
+
+  &__route-card {
+    flex: 1;
+  }
+
+  &__route {
+    display: flex;
+    align-items: center;
+    gap: 24px;
+
+    &-item {
+      flex: 1;
+      display: flex;
+      gap: 12px;
+    }
+
+    &-badge {
+      width: 32px;
+      height: 32px;
+      border-radius: 50%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: #fff;
+      font-size: 14px;
+      flex-shrink: 0;
+
+      &.is-start {
+        background: #67c23a;
+      }
+
+      &.is-end {
+        background: #409eff;
+      }
+    }
+
+    &-body {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      gap: 4px;
+    }
+
+    &-title {
+      font-size: 16px;
+      font-weight: 600;
+    }
+
+    &-address,
+    &-contact {
+      font-size: 14px;
+      color: #606266;
+    }
+
+    &-vehicle {
+      font-size: 24px;
+      color: #909399;
+    }
+  }
+
+  &__list-card {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+
+  &__list-summary {
+    margin-left: 12px;
+    font-size: 14px;
+    color: #606266;
+    font-weight: normal;
+  }
+
+  &__table {
+    flex: 1;
+  }
+
+  &__actions {
+    display: flex;
+    gap: 8px;
+    justify-content: center;
+  }
+
+  &__footer {
+    display: flex;
+    justify-content: flex-end;
+    gap: 12px;
+    padding: 16px;
+    background: #fff;
+    border-radius: 4px;
+  }
+
+  &__attachment-link {
+    margin-right: 12px;
+  }
+}
+
+.status-text {
+  font-size: 12px;
+}
+</style>

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

@@ -0,0 +1,732 @@
+<template>
+  <basic-container class="transport-plan-import-page">
+    <div class="transport-plan-import-page__form-wrapper">
+      <div class="transport-plan-import-page__title">导入运输计划</div>
+
+      <el-form
+        ref="importFormRef"
+        :model="form"
+        :rules="rules"
+        label-position="right"
+        label-width="auto"
+        class="transport-plan-import-page__form"
+      >
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="项目" prop="projectId" required>
+            <el-select
+              v-model="form.projectId"
+              placeholder="模糊查询后选择"
+              filterable
+              clearable
+              :loading="projectLoading"
+              @visible-change="visible => visible && loadProjectOptions()"
+              @change="handleProjectChange"
+            >
+              <el-option
+                v-for="item in projectOptions"
+                :key="item.id"
+                :label="item.projectName"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="客户" prop="customerName" required>
+            <el-input v-model="form.customerName" disabled placeholder="选择项目后带出" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="客户合同" prop="contractId" required>
+            <el-select
+              v-model="form.contractId"
+              placeholder="选择项目后选择"
+              filterable
+              clearable
+              :loading="contractLoading"
+              :disabled="!form.projectId"
+              @change="handleContractChange"
+            >
+              <el-option
+                v-for="item in contractOptions"
+                :key="item.id"
+                :label="item.contractName"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item
+        label="计划明细表"
+        prop="file"
+        required
+        class="transport-plan-import-page__file-item"
+      >
+        <el-upload
+          action="#"
+          accept=".xls,.xlsx"
+          :auto-upload="false"
+          :limit="1"
+          :file-list="files"
+          :on-change="handleFileChange"
+          :on-remove="handleFileRemove"
+        >
+          <el-button type="primary">添加附件</el-button>
+        </el-upload>
+        <span class="transport-plan-import-page__file-tip">
+          请上传计划明细表，仅支持 Excel 格式
+        </span>
+        <el-link type="primary" @click="handleTemplateDownload">下载模板</el-link>
+      </el-form-item>
+    </el-form>
+    </div>
+
+    <section v-if="rows.length" class="transport-plan-import-page__preview">
+      <div class="transport-plan-import-page__preview-head">
+        <div class="dialog-section-title">数据明细</div>
+        <el-button type="danger" plain :disabled="!selection.length" @click="removeSelectedRows">
+          批量删除
+        </el-button>
+      </div>
+      <el-tabs v-model="activeTab" type="border-card" class="transport-plan-import-page__tabs">
+        <el-tab-pane :label="`计划单数（${rows.length}）`" name="all" />
+        <el-tab-pane :label="`疑似重复(${duplicateCount})`" name="duplicate" />
+      </el-tabs>
+      <div class="transport-plan-import-page__table">
+        <el-table
+          :data="visibleRows"
+          border
+          row-key="_key"
+          empty-text="暂无明细数据"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="52" fixed="left" />
+          <el-table-column type="index" label="序号" width="70" fixed="left" />
+          <el-table-column label="计划单号" min-width="150">
+            <template #default>待生成</template>
+          </el-table-column>
+          <el-table-column
+            v-for="column in previewColumns"
+            :key="column.prop"
+            :label="column.label"
+            :min-width="column.width"
+          >
+            <template #default="{ row }">
+              <el-select
+                v-if="isEditingRow(row) && column.prop === 'quantityUnit'"
+                v-model="row[column.prop]"
+              >
+                <el-option
+                  v-for="item in quantityUnitOptions"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+              <el-input
+                v-else-if="isEditingRow(row)"
+                v-model="row[column.prop]"
+                :maxlength="column.prop === 'remark' ? 200 : undefined"
+                :show-word-limit="column.prop === 'remark'"
+              />
+              <span v-else>{{ row[column.prop] || '-' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="170" fixed="right">
+            <template #default="{ row }">
+              <div class="transport-plan-import-page__actions">
+                <template v-if="isEditingRow(row)">
+                  <el-link type="primary" @click="saveRow">保存</el-link>
+                  <el-link type="primary" @click="cancelEditRow(row)">取消</el-link>
+                </template>
+                <template v-else>
+                  <el-link type="primary" @click="editRow(row)">编辑</el-link>
+                  <el-link type="danger" @click="removeRow(row)">删除</el-link>
+                </template>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </section>
+
+    <div class="transport-plan-import-page__footer">
+      <el-button :disabled="loading" @click="handleCancel">取消</el-button>
+      <el-button type="primary" :loading="loading" @click="handleSubmit">提交</el-button>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import { exportBlob } from '@/api/common';
+import { getList as getContractList } from '@/api/business/contract-manage';
+import { getList as getProjectList } from '@/api/business/project-apply';
+import { importTransportPlan, validateTransportPlan } from '@/api/business/transport-plan';
+import { config } from '@/option/business/transport-plan';
+import { downloadXls } from '@/utils/util';
+import dayjs from 'dayjs';
+
+const importColumns = [
+  ['计划名称', 'planName'],
+  ['运输类型', 'transportType'],
+  ['发货地址', 'departureAddress'],
+  ['发货联系人', 'departureContact'],
+  ['发货联系人电话', 'departurePhone'],
+  ['到货地址', 'arrivalAddress'],
+  ['收货联系人', 'arrivalContact'],
+  ['收货联系人电话', 'arrivalPhone'],
+  ['货物名称', 'cargoName'],
+  ['货物类型', 'cargoType'],
+  ['数量', 'quantity'],
+  ['计量单位', 'quantityUnit'],
+  ['包装', 'packageType'],
+  ['规格', 'specification'],
+  ['型号', 'model'],
+  ['里程(km)', 'mileage'],
+  ['计划开始时间', 'planStartDate'],
+  ['计划结束时间', 'planEndDate'],
+  ['备注', 'remark'],
+  ['同一计划标识号', 'planGroupId'],
+];
+
+const previewColumns = [
+  { label: '计划名称', prop: 'planName', width: 180 },
+  { label: '运输类型', prop: 'transportType', width: 120 },
+  { label: '发货地址', prop: 'departureAddress', width: 260 },
+  { label: '发货联系人', prop: 'departureContact', width: 120 },
+  { label: '发货联系人电话', prop: 'departurePhone', width: 140 },
+  { label: '到货地址', prop: 'arrivalAddress', width: 260 },
+  { label: '收货联系人', prop: 'arrivalContact', width: 120 },
+  { label: '收货联系人电话', prop: 'arrivalPhone', width: 140 },
+  { label: '货物名称', prop: 'cargoName', width: 140 },
+  { label: '货物类型', prop: 'cargoType', width: 120 },
+  { label: '数量', prop: 'quantity', width: 100 },
+  { label: '计量单位', prop: 'quantityUnit', width: 110 },
+  { label: '包装', prop: 'packageType', width: 100 },
+  { label: '规格', prop: 'specification', width: 120 },
+  { label: '型号', prop: 'model', width: 120 },
+  { label: '里程(km)', prop: 'mileage', width: 120 },
+  { label: '计划开始时间', prop: 'planStartDate', width: 140 },
+  { label: '计划结束时间', prop: 'planEndDate', width: 140 },
+  { label: '备注', prop: 'remark', width: 180 },
+  { label: '同一计划标识号', prop: 'planGroupId', width: 150 },
+];
+
+const extractRecords = res => {
+  const data = res?.data?.data || res?.data || res;
+  if (Array.isArray(data)) return data;
+  if (Array.isArray(data?.records)) return data.records;
+  if (Array.isArray(data?.data)) return data.data;
+  if (Array.isArray(data?.data?.records)) return data.data.records;
+  return [];
+};
+
+const defaultForm = () => ({
+  projectId: '',
+  projectName: '',
+  customerName: '',
+  contractId: '',
+  contractName: '',
+  file: null,
+});
+
+export default {
+  name: 'TransportPlanImport',
+  data() {
+    return {
+      form: defaultForm(),
+      rules: {
+        projectId: [{ required: true, message: '请选择项目', trigger: 'change' }],
+        customerName: [{ required: true, message: '请选择项目后带出客户', trigger: 'change' }],
+        contractId: [{ required: true, message: '请选择项目后带出客户合同', trigger: 'change' }],
+        file: [{ required: true, message: '请上传计划明细表', trigger: 'change' }],
+      },
+      projectOptions: [],
+      projectLoading: false,
+      contractOptions: [],
+      contractLoading: false,
+      files: [],
+      sourceFile: null,
+      rows: [],
+      selection: [],
+      activeTab: 'all',
+      editingKey: '',
+      editSnapshot: null,
+      loading: false,
+      previewColumns,
+      quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'],
+    };
+  },
+  computed: {
+    duplicateCount() {
+      return this.rows.filter(row => row._duplicate).length;
+    },
+    visibleRows() {
+      return this.activeTab === 'duplicate' ? this.rows.filter(row => row._duplicate) : this.rows;
+    },
+  },
+  created() {
+    this.loadProjectOptions();
+  },
+  methods: {
+    loadProjectOptions() {
+      if (this.projectLoading) return;
+      this.projectLoading = true;
+      getProjectList(1, 9999, config.projectQueryParams || {})
+        .then(res => {
+          this.projectOptions = extractRecords(res);
+        })
+        .finally(() => {
+          this.projectLoading = false;
+        });
+    },
+    handleProjectChange(projectId) {
+      const project = this.projectOptions.find(item => String(item.id) === String(projectId));
+      this.form.customerName =
+        project?.customerName || project?.customerNames || project?.customer || '';
+      this.form.projectName = project?.projectName || '';
+      this.form.contractId = '';
+      this.form.contractName = '';
+      this.contractOptions = [];
+      if (!projectId) return;
+      this.contractLoading = true;
+      getContractList(1, 9999, {
+        projectId,
+        projectName: project?.projectName,
+        ...(config.contractQueryParams || {}),
+      })
+        .then(res => {
+          this.contractOptions = extractRecords(res);
+          const contract = this.contractOptions[0];
+          this.form.customerName =
+            this.form.customerName || contract?.customerName || contract?.partyA || '';
+          this.form.contractId = contract?.id || '';
+          this.form.contractName = contract?.contractName || '';
+        })
+        .finally(() => {
+          this.contractLoading = false;
+        });
+    },
+    handleContractChange(contractId) {
+      const contract = this.contractOptions.find(item => String(item.id) === String(contractId));
+      this.form.contractName = contract?.contractName || '';
+      this.form.customerName =
+        contract?.customerName || contract?.partyA || this.form.customerName || '';
+    },
+    async handleFileChange(file, fileList) {
+      if (!/\.(xls|xlsx)$/i.test(file.name || '')) {
+        this.$message.error('请上传 .xls 或 .xlsx 格式文件');
+        this.files = [];
+        this.form.file = null;
+        return;
+      }
+      try {
+        const XLSX = await import('xlsx');
+        const workbook = XLSX.read(await file.raw.arrayBuffer(), {
+          type: 'array',
+          cellDates: false,
+        });
+        const worksheet = workbook.Sheets[workbook.SheetNames[0]];
+        const values = XLSX.utils.sheet_to_json(worksheet, {
+          header: 1,
+          defval: '',
+          raw: false,
+          blankrows: false,
+        });
+        const headers = values[0] || [];
+        const headerMap = headers.reduce((result, label, index) => {
+          const normalized = String(label || '')
+            .replace(/^\*/, '')
+            .trim();
+          if (normalized) result[normalized] = index;
+          return result;
+        }, {});
+        const rows = values.slice(1).reduce((result, cells, index) => {
+          const row = { _key: `${Date.now()}-${index}-${Math.random().toString(36).slice(2)}` };
+          importColumns.forEach(([label, prop]) => {
+            row[prop] = String(cells[headerMap[label]] ?? '').trim();
+          });
+          if (importColumns.some(([, prop]) => row[prop])) result.push(row);
+          return result;
+        }, []);
+        if (!rows.length) {
+          this.$message.warning('未读取到计划明细数据');
+          this.handleFileRemove();
+          return;
+        }
+        this.files = fileList.slice(-1);
+        this.sourceFile = file.raw;
+        this.form.file = file.raw;
+        this.rows = rows;
+        this.markDuplicates();
+        this.$refs.importFormRef?.validateField('file');
+        this.$message.success(`已读取${rows.length}条计划明细`);
+
+        // 调用后端校验接口
+        await this.performValidation();
+      } catch (error) {
+        this.handleFileRemove();
+        this.$message.error('计划明细表读取失败，请检查文件格式');
+      }
+    },
+    handleFileRemove() {
+      this.files = [];
+      this.sourceFile = null;
+      this.form.file = null;
+      this.rows = [];
+      this.selection = [];
+      this.editingKey = '';
+      this.editSnapshot = null;
+    },
+    async performValidation() {
+      if (!this.rows.length || !this.form.file) return;
+
+      try {
+        // 校验表单必填项
+        await this.$refs.importFormRef?.validate();
+
+        const response = await validateTransportPlan({
+          file: this.form.file,
+          projectId: this.form.projectId,
+          projectName: this.form.projectName,
+          customerName: this.form.customerName,
+          contractId: this.form.contractId,
+          contractName: this.form.contractName,
+        });
+
+        // 检查响应类型
+        const blob = response.data || response;
+
+        // 如果是 Blob，需要检查其 MIME 类型
+        if (blob instanceof Blob) {
+          // Excel 文件的 MIME 类型
+          if (blob.type.includes('application/vnd.ms-excel') ||
+              blob.type.includes('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')) {
+            // 校验失败，下载错误明细
+            const url = window.URL.createObjectURL(blob);
+            const link = document.createElement('a');
+            link.href = url;
+            link.download = `运输计划导入失败明细_${dayjs().format('YYYYMMDDHHmmss')}.xlsx`;
+            link.click();
+            window.URL.revokeObjectURL(url);
+            this.$message.warning('数据校验失败，已自动下载错误明细表，请修正后重新上传');
+          } else if (blob.type.includes('application/json')) {
+            // 可能是 JSON 响应被当作 Blob，需要解析
+            const text = await blob.text();
+            const json = JSON.parse(text);
+            if (json.success) {
+              this.$message.success('数据校验通过');
+            } else {
+              this.$message.error(json.msg || '校验失败');
+            }
+          } else {
+            // 其他类型，默认认为是校验通过
+            this.$message.success('数据校验通过');
+          }
+        } else {
+          // 不是 Blob，直接判断
+          this.$message.success('数据校验通过');
+        }
+      } catch (error) {
+        console.error('校验失败:', error);
+        // 表单校验失败时不提示错误，让表单自己显示错误信息
+        if (error && error.message && !error.message.includes('validate')) {
+          this.$message.error('校验接口调用失败');
+        }
+      }
+    },
+    duplicateKey(row) {
+      return importColumns.map(([, prop]) => String(row[prop] || '').trim()).join('\u0001');
+    },
+    markDuplicates() {
+      const countMap = this.rows.reduce((result, row) => {
+        const key = this.duplicateKey(row);
+        result[key] = (result[key] || 0) + 1;
+        return result;
+      }, {});
+      this.rows.forEach(row => {
+        row._duplicate = countMap[this.duplicateKey(row)] > 1;
+      });
+    },
+    handleSelectionChange(rows) {
+      this.selection = rows;
+    },
+    isEditingRow(row) {
+      return this.editingKey === row._key;
+    },
+    editRow(row) {
+      if (this.editingKey && this.editingKey !== row._key) {
+        this.$message.warning('请先保存或取消当前编辑');
+        return;
+      }
+      this.editingKey = row._key;
+      this.editSnapshot = { ...row };
+    },
+    saveRow() {
+      this.editingKey = '';
+      this.editSnapshot = null;
+      this.markDuplicates();
+    },
+    cancelEditRow(row) {
+      Object.assign(row, this.editSnapshot || {});
+      this.editingKey = '';
+      this.editSnapshot = null;
+      this.markDuplicates();
+    },
+    removeRow(row) {
+      this.rows = this.rows.filter(item => item._key !== row._key);
+      this.selection = this.selection.filter(item => item._key !== row._key);
+      this.markDuplicates();
+    },
+    removeSelectedRows() {
+      const selectedKeys = new Set(this.selection.map(row => row._key));
+      this.rows = this.rows.filter(row => !selectedKeys.has(row._key));
+      this.selection = [];
+      this.markDuplicates();
+    },
+    validateRows() {
+      if (!this.rows.length) {
+        this.$message.warning('请保留至少一条计划明细');
+        return false;
+      }
+      const requiredFields = [
+        ['planName', '计划名称'],
+        ['transportType', '运输类型'],
+        ['departureAddress', '发货地址'],
+        ['arrivalAddress', '到货地址'],
+        ['cargoType', '货物类型'],
+      ];
+      const isValidDate = value => {
+        const match = String(value || '').match(/^(\d{4})-(\d{2})-(\d{2})$/);
+        if (!match) return false;
+        const [, year, month, day] = match;
+        const date = new Date(Number(year), Number(month) - 1, Number(day));
+        return (
+          date.getFullYear() === Number(year) &&
+          date.getMonth() === Number(month) - 1 &&
+          date.getDate() === Number(day)
+        );
+      };
+      for (const [index, row] of this.rows.entries()) {
+        const emptyField = requiredFields.find(([prop]) => !String(row[prop] || '').trim());
+        if (emptyField) {
+          this.$message.warning(`第${index + 1}行${emptyField[1]}不能为空`);
+          return false;
+        }
+        if (row.planStartDate && !isValidDate(row.planStartDate)) {
+          this.$message.warning(`第${index + 1}行计划开始时间格式必须为 YYYY-MM-DD`);
+          return false;
+        }
+        if (row.planEndDate && !isValidDate(row.planEndDate)) {
+          this.$message.warning(`第${index + 1}行计划结束时间格式必须为 YYYY-MM-DD`);
+          return false;
+        }
+        if (row.planStartDate && row.planEndDate && row.planEndDate < row.planStartDate) {
+          this.$message.warning(`第${index + 1}行计划结束时间不能早于计划开始时间`);
+          return false;
+        }
+        if (
+          row.quantity !== '' &&
+          (!Number.isFinite(Number(row.quantity)) || Number(row.quantity) < 0)
+        ) {
+          this.$message.warning(`第${index + 1}行数量必须为非负数`);
+          return false;
+        }
+        if (
+          row.mileage !== '' &&
+          (!Number.isFinite(Number(row.mileage)) || Number(row.mileage) < 0)
+        ) {
+          this.$message.warning(`第${index + 1}行里程必须为非负数`);
+          return false;
+        }
+        if (String(row.remark || '').length > 200) {
+          this.$message.warning(`第${index + 1}行备注不能超过200个字`);
+          return false;
+        }
+      }
+      return true;
+    },
+    async buildImportFile() {
+      const XLSX = await import('xlsx');
+      const requiredLabels = [
+        '计划名称',
+        '运输类型',
+        '发货地址',
+        '到货地址',
+        '货物类型',
+      ];
+      const values = [
+        importColumns.map(([label]) => (requiredLabels.includes(label) ? `*${label}` : label)),
+        ...this.rows.map(row => importColumns.map(([, prop]) => String(row[prop] ?? ''))),
+      ];
+      const workbook = XLSX.utils.book_new();
+      XLSX.utils.book_append_sheet(workbook, XLSX.utils.aoa_to_sheet(values), '运输计划导入模板');
+      const binary = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
+      const fileName = (this.sourceFile?.name || '运输计划导入模板.xlsx').replace(
+        /\.xls$/i,
+        '.xlsx'
+      );
+      return new File([binary], fileName, {
+        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      });
+    },
+    handleTemplateDownload() {
+      exportBlob(config.transportPlanTemplateUrl, {}, { feedback: true }).then(res => {
+        downloadXls(res.data, '运输计划导入模板.xlsx');
+      });
+    },
+    async handleSubmit() {
+      const valid = await this.$refs.importFormRef?.validate().catch(() => false);
+      if (!valid || this.loading || !this.validateRows()) return;
+      this.loading = true;
+      try {
+        const file = await this.buildImportFile();
+        const res = await importTransportPlan({ ...this.form, file });
+        const contentType = res.headers?.['content-type'] || res.data?.type || '';
+        if (
+          contentType.includes('application/vnd.ms-excel') ||
+          contentType.includes('spreadsheetml')
+        ) {
+          downloadXls(
+            res.data,
+            `运输计划导入失败明细${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
+          );
+          this.$message.warning('部分数据导入失败，已下载失败明细');
+        } else {
+          const text = await res.data.text();
+          const result = text ? JSON.parse(text) : {};
+          if (result.code !== 200) throw new Error(result.msg || '导入失败');
+          this.$message.success('导入完成');
+        }
+        this.$router.push('/business/transport-plan');
+      } catch (error) {
+        this.$message.error(error.message || '导入失败');
+      } finally {
+        this.loading = false;
+      }
+    },
+    handleCancel() {
+      this.$router.push('/business/transport-plan');
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.transport-plan-import-page {
+  min-height: calc(100vh - 112px);
+
+  &__form-wrapper {
+    background: #ffffff;
+    border-radius: 8px;
+    margin-bottom: 16px;
+  }
+
+  &__title {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 18px 24px;
+    border-bottom: 1px solid #eff1f7;
+    color: #303133;
+    font-size: 18px;
+    font-weight: 600;
+
+    &::before {
+      width: 4px;
+      height: 18px;
+      background: #409eff;
+      content: '';
+    }
+  }
+
+  &__form {
+    padding: 24px 24px 4px;
+
+    .el-select,
+    .el-input {
+      width: 100%;
+    }
+
+    :deep(.el-form-item) {
+      margin-bottom: 16px;
+    }
+  }
+
+  &__file-item {
+    margin-top: 12px;
+
+    :deep(.el-form-item__content) {
+      gap: 16px;
+    }
+  }
+
+  &__file-tip {
+    color: #606266;
+  }
+
+  &__preview {
+    margin: 8px 24px 0;
+    padding-top: 16px;
+    border-top: 1px solid #eff1f7;
+  }
+
+  &__preview-head {
+    display: flex;
+    align-items: center;
+    gap: 24px;
+    margin-bottom: 12px;
+
+    .dialog-section-title {
+      margin-bottom: 0;
+    }
+  }
+
+  &__tabs {
+    margin-bottom: 12px;
+  }
+
+  &__table {
+    overflow-x: auto;
+
+    :deep(.el-table) {
+      min-width: 2400px;
+    }
+
+    :deep(.el-table__cell) {
+      border-color: #eff1f7;
+    }
+
+    :deep(.el-table__row:nth-child(even) td) {
+      background: #fafafa;
+    }
+  }
+
+  &__actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+  }
+
+  &__footer {
+    position: fixed;
+    right: 0;
+    left: 230px;
+    bottom: 0;
+    z-index: 10;
+    display: flex;
+    justify-content: flex-end;
+    gap: 12px;
+    padding: 12px 24px;
+    border-top: 1px solid #eff1f7;
+    background: #fff;
+    box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.06);
+  }
+}
+
+:global(.avue--collapse .transport-plan-import-page__footer) {
+  left: 60px;
+}
+</style>

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

@@ -0,0 +1,141 @@
+<template>
+  <basic-container class="voucher-folder-page">
+    <section class="voucher-folder-page__search">
+      <el-form :model="query" label-position="right" label-width="160px">
+        <div class="voucher-folder-page__search-grid">
+          <el-form-item label="车牌号"><el-input v-model="query.plateNo" clearable placeholder="请输入" /></el-form-item>
+          <el-form-item label="是否关联运单">
+            <el-select v-model="query.matched" clearable placeholder="全部"><el-option label="是" :value="1" /><el-option label="否" :value="0" /></el-select>
+          </el-form-item>
+          <div class="voucher-folder-page__search-actions"><el-button type="primary" @click="search">查询</el-button><el-button @click="reset">重置</el-button></div>
+        </div>
+      </el-form>
+    </section>
+    <section class="voucher-folder-page__table-wrap">
+      <div class="voucher-folder-page__title">{{ voucher.voucherBatchNo || '执行凭证详情' }}</div>
+      <el-table v-loading="loading" :data="rows" border class="voucher-folder-page__table">
+        <el-table-column type="index" label="序号" width="70" />
+        <el-table-column prop="voucherNo" label="执行凭证号" min-width="220"><template #default="{ row }"><el-link type="primary" @click="openViewer(row)">{{ row.voucherNo }}</el-link></template></el-table-column>
+        <el-table-column prop="plateNo" label="车牌号" min-width="150" />
+        <el-table-column prop="folderName" label="文件夹名称" min-width="160" />
+        <el-table-column prop="matched" label="是否关联运单" width="130"><template #default="{ row }">{{ row.matched === 1 ? '是' : '否' }}</template></el-table-column>
+        <el-table-column prop="processStatus" label="处理状态" width="130" />
+        <el-table-column prop="createTime" label="创建时间" min-width="180" />
+        <el-table-column prop="updateTime" label="更新时间" min-width="180" />
+        <el-table-column label="操作" width="220" fixed="right"><template #default="{ row }"><div class="voucher-folder-page__actions"><el-link v-if="isSuperAdmin && row.matched !== 1" type="primary" @click="openReplace(row)">单个上传</el-link><el-link type="primary" @click="openViewer(row)">查看</el-link><el-link type="danger" @click="removeFolder(row)">删除</el-link></div></template></el-table-column>
+      </el-table>
+      <div class="voucher-folder-page__pagination"><el-pagination v-model:current-page="page.current" v-model:page-size="page.size" :total="page.total" :page-sizes="[10, 20, 50]" layout="total, prev, pager, next, sizes" @current-change="load" @size-change="load" /></div>
+    </section>
+  </basic-container>
+
+  <el-dialog v-model="viewerVisible" title="执行凭证详情" width="960px" destroy-on-close>
+    <div v-loading="viewerLoading" class="voucher-folder-page__viewer"><div class="voucher-folder-page__viewer-info"><span>执行凭证号：{{ viewer.voucherNo || '-' }}</span><span>文件夹名称：{{ viewer.folderName || '-' }}</span><span>是否关联运单：{{ viewer.matched === 1 ? '是' : '否' }}</span><span>配载单号：<el-link v-if="viewer.loadingNo" type="primary" @click="goToLoading(viewer.loadingNo)">{{ viewer.loadingNo }}</el-link><template v-else>-</template></span></div><div v-if="viewerFiles.length" class="voucher-folder-page__images"><el-image v-for="(file, index) in viewerFiles" :key="file.id || file.url || index" :src="file.url" :preview-src-list="viewerFiles.map(item => item.url).filter(Boolean)" :initial-index="index" fit="cover" /></div><el-empty v-else description="暂无凭证文件" /></div>
+  </el-dialog>
+
+  <el-dialog v-model="replaceVisible" title="重新上传" width="680px" destroy-on-close>
+    <div class="voucher-folder-page__replace"><el-upload action="#" :auto-upload="false" :limit="1" accept=".jpg,.jpeg,.png,.bmp,.webp,.zip" :on-change="selectReplace" :on-remove="clearReplace"><el-button type="primary">选择文件</el-button></el-upload><el-progress v-if="replacing" class="voucher-folder-page__replace-progress" :percentage="replaceProgress" :status="replaceProgressStatus" :text-inside="false" /><p>{{ replaceProgress >= 100 ? '文件上传完成，正在处理凭证...' : '重新上传替换当前未匹配的凭证，支持图片或压缩包，大小不超过50M' }}</p></div>
+    <template #footer><el-button @click="replaceVisible = false">关闭</el-button><el-button type="primary" :loading="replacing" @click="confirmReplace">确认</el-button></template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { computed, onMounted, reactive, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useStore } from 'vuex';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import md5 from 'js-md5';
+import * as api from '@/api/business/voucher-manage';
+
+const route = useRoute();
+const router = useRouter();
+const store = useStore();
+const voucherId = route.query.id;
+const isSuperAdmin = computed(() => {
+  const authority = store.getters.userInfo?.authority;
+  return Array.isArray(authority)
+    ? authority.includes('admin')
+    : String(authority || '').includes('admin');
+});
+const loading = ref(false), rows = ref([]), voucher = ref({ voucherBatchNo: route.query.batchNo || '' });
+const page = reactive({ current: 1, size: 10, total: 0 });
+const query = reactive({ plateNo: '', matched: undefined });
+const viewerVisible = ref(false), viewerLoading = ref(false), viewer = ref({}), viewerFiles = ref([]);
+const replaceVisible = ref(false), replacing = ref(false), replaceRow = ref(), replaceFile = ref(), replaceProgress = ref(0), replaceProgressStatus = ref('');
+const load = async () => {
+  loading.value = true;
+  try {
+    const res = await api.getFolderPage(voucherId, page.current, page.size, query);
+    const data = res.data?.data || {};
+    rows.value = data.records || [];
+    page.total = data.total || 0;
+    if (!voucher.value.voucherBatchNo && rows.value[0]) voucher.value = { voucherBatchNo: rows.value[0].voucherBatchNo };
+  } finally { loading.value = false; }
+};
+const search = () => { page.current = 1; load(); };
+const reset = () => { query.plateNo = ''; query.matched = undefined; search(); };
+const openViewer = async row => {
+  viewerVisible.value = true; viewerLoading.value = true; viewer.value = row; viewerFiles.value = [];
+  try { const res = await api.getFolderDetail(voucherId, row.plateNo); viewer.value = res.data?.data || row; viewerFiles.value = viewer.value.files || []; } catch (error) { ElMessage.error(error.message || '获取凭证详情失败'); } finally { viewerLoading.value = false; }
+};
+const openReplace = row => { replaceRow.value = row; replaceFile.value = undefined; replaceProgress.value = 0; replaceProgressStatus.value = ''; replaceVisible.value = true; };
+const selectReplace = upload => { replaceFile.value = upload.raw; };
+const clearReplace = () => { replaceFile.value = undefined; replaceProgress.value = 0; replaceProgressStatus.value = ''; };
+const uploadReplaceFile = async file => {
+  const chunkSize = 2 * 1024 * 1024;
+  const digest = md5.base64(await file.arrayBuffer());
+  const taskRes = await api.createFileTask({
+    md5: digest,
+    attachmentName: file.name,
+    size: file.size,
+    chunkSize,
+    chunkTotal: Math.ceil(file.size / chunkSize),
+    force: true,
+    businessType: 'voucher-replace',
+    businessId: `${voucherId}:${replaceRow.value.plateNo}`,
+  });
+  const task = taskRes.data?.data;
+  if (!task?.id || !task.objectKey) throw new Error('创建分片上传任务失败');
+  replaceProgress.value = 0;
+  for (let partNumber = 1; partNumber <= task.chunkTotal; partNumber += 1) {
+    const urlRes = await api.getPartUploadUrl(task.id, partNumber);
+    const part = file.slice((partNumber - 1) * chunkSize, Math.min(partNumber * chunkSize, file.size));
+    const response = await fetch(urlRes.data?.data, { method: 'PUT', body: part });
+    if (!response.ok) throw new Error(`分片${partNumber}上传失败`);
+    const etag = String(response.headers.get('etag') || '').replaceAll('"', '');
+    if (!etag) throw new Error('未获取到分片 ETag');
+    await api.updateFileTask({ id: task.id, partNumber, etag });
+    replaceProgress.value = Math.round((partNumber / task.chunkTotal) * 100);
+  }
+  const completedRes = await api.getFileTask(task.id);
+  const completedTask = completedRes.data?.data;
+  if (!completedTask || completedTask.status !== 'completed') throw new Error('文件分片合并未完成');
+  return completedTask;
+};
+const confirmReplace = async () => {
+  if (!replaceFile.value) return ElMessage.warning('请选择凭证文件');
+  if (replaceFile.value.size > 50 * 1024 * 1024) return ElMessage.warning('凭证文件大小不能超过50M');
+  replacing.value = true;
+  replaceProgress.value = 0;
+  replaceProgressStatus.value = '';
+  try {
+    const task = await uploadReplaceFile(replaceFile.value);
+    await api.replaceFolderByObject(voucherId, replaceRow.value.plateNo, {
+      objectKey: task.objectKey,
+      fileName: task.attachmentName || replaceFile.value.name,
+      size: replaceFile.value.size,
+      contentType: replaceFile.value.type,
+    });
+    ElMessage.success('上传成功，已重新匹配运单');
+    replaceVisible.value = false;
+    await load();
+  } catch (error) { replaceProgressStatus.value = 'exception'; ElMessage.error(error.message || '上传失败'); } finally { replacing.value = false; }
+};
+const removeFolder = row => ElMessageBox.confirm(`确认删除车牌”${row.plateNo}”的凭证吗？`, '提示', { type: 'warning' }).then(async () => { await api.removeFolder(voucherId, row.plateNo); ElMessage.success('删除成功'); load(); });
+const goToLoading = loadingNo => { router.push({ path: '/business/loading-manage', query: { loadingNo } }); };
+onMounted(() => { if (!voucherId) { ElMessage.error('缺少凭证批次参数'); router.back(); return; } load(); });
+</script>
+
+<style scoped lang="scss">
+.voucher-folder-page { &__search { padding: 12px 12px 4px; margin-bottom: 8px; background: #fff; box-shadow: 0 2px 8px rgba(0,0,0,.04); } &__search-grid { display: grid; grid-template-columns: 360px 360px 1fr; gap: 8px 24px; } &__search-actions { display: flex; justify-content: flex-end; gap: 8px; } &__table-wrap { padding: 12px; background: #fff; } &__title { padding-bottom: 12px; color: #303133; font-size: 16px; font-weight: 600; } &__actions { display: flex; flex-wrap: wrap; gap: 8px; } &__pagination { display: flex; justify-content: flex-end; padding-top: 12px; } &__viewer { min-height: 360px; } &__viewer-info { display: flex; gap: 28px; padding-bottom: 20px; color: #303133; } &__images { display: grid; grid-template-columns: repeat(5, 140px); gap: 20px; } &__images :deep(.el-image) { width: 140px; height: 100px; border: 6px solid #cfcfcf; cursor: zoom-in; } &__replace { padding: 20px 28px 42px; } &__replace p { margin: 28px 0 0; color: #303133; font-size: 16px; } :deep(.el-table) { --el-table-border-color: #eff1f7; } :deep(.el-table__body tr:nth-child(even)>td) { background: #fafafa; } }
+@media (max-width: 900px) { .voucher-folder-page__search-grid { grid-template-columns: 1fr 1fr; } .voucher-folder-page__search-actions { grid-column: 1 / -1; } }
+</style>

src/views/business/voucher-manage.vue

@@ -22,13 +22,13 @@
             ><el-input v-model="query.waybillBatchNo" clearable placeholder="请输入"
           /></el-form-item>
           <template v-if="searchExpanded">
-            <el-form-item label="上传来源"
+            <el-form-item v-if="!isCarrier" label="上传来源"
               ><el-select v-model="query.uploadSource" clearable placeholder="全部"
                 ><el-option label="内部" value="内部" /><el-option
                   label="承运商"
                   value="承运商" /></el-select
             ></el-form-item>
-            <el-form-item label="承运商"
+            <el-form-item v-if="!isCarrier" label="承运商"
               ><el-input v-model="query.carrierName" clearable placeholder="请输入"
             /></el-form-item>
             <el-form-item label="创建日期"
@@ -77,7 +77,8 @@
           min-width="200"
           show-overflow-tooltip
         />
-        <el-table-column prop="uploadSource" label="上传来源" width="100" /><el-table-column
+        <el-table-column v-if="!isCarrier" prop="uploadSource" label="上传来源" width="100" /><el-table-column
+          v-if="!isCarrier"
           prop="carrierName"
           label="承运商名称"
           min-width="160"
@@ -89,9 +90,9 @@
           width="100"
         /><el-table-column
           prop="relatedWaybillCount"
-          label="已关联运单"
-          width="115"
-        /><el-table-column prop="unRelatedWaybillCount" label="未关联运单" width="115" />
+          label="凭证已关联数量"
+          width="125"
+        /><el-table-column prop="unRelatedWaybillCount" label="凭证未关联数量" width="125" />
         <el-table-column prop="createTime" label="创建时间" min-width="170" />
         <el-table-column
           prop="auditStatus"
@@ -99,13 +100,28 @@
           width="120"
           fixed="right"
           align="center"
-        /><el-table-column label="操作" width="160" fixed="right" align="left"
+          ><template #default="{ row }"
+            ><span class="voucher-manage-page__audit-status"
+              ><span>{{ row.auditStatus }}</span
+              ><el-tooltip
+                v-if="row.auditStatus === '审核驳回' && hasRejectReason(row)"
+                :content="row.rejectReason"
+                placement="top"
+              ><el-icon class="voucher-manage-page__audit-reject-icon"><WarnTriangleFilled /></el-icon
+              ></el-tooltip></span></template
+        ></el-table-column><el-table-column label="操作" width="320" fixed="right" align="center"
           ><template #default="{ row }"
             ><div class="voucher-manage-page__actions">
               <el-link
-                v-if="row.processStatus === '处理完成' && row.auditStatus === '待审核'"
+                v-if="!isCarrier && row.processStatus === '处理完成' && row.auditStatus === '待审核' && hasPermission('vouchermanage_audit')"
                 type="primary"
-                >流程</el-link
+                @click="handleAuditPass(row)"
+                >审核通过</el-link
+              ><el-link
+                v-if="!isCarrier && row.processStatus === '处理完成' && row.auditStatus === '待审核' && hasPermission('vouchermanage_audit')"
+                type="warning"
+                @click="handleAuditReject(row)"
+                >审核驳回</el-link
               ><el-link v-if="row.processStatus === '处理完成'" type="primary" @click="view(row)"
                 >查看</el-link
               ><el-link
@@ -114,9 +130,19 @@
                 @click="download(row)"
                 >下载</el-link
               ><el-link
-                v-if="row.processStatus !== '处理完成' || row.auditStatus === '待审核'"
+                v-if="row.auditStatus === '审核驳回'"
                 type="primary"
-                @click="openUpload(row)"
+                @click="openUpload(row, 'reupload')"
+                >重新上传</el-link
+              ><el-link
+                v-if="row.auditStatus === '审核驳回'"
+                type="primary"
+                @click="openBatchDialog(row)"
+                >更换运单批次</el-link
+              ><el-link
+                v-if="(row.processStatus !== '处理完成' || row.auditStatus === '待审核') && row.auditStatus !== '审核驳回'"
+                type="primary"
+                @click="openBatchDialog(row)"
                 >更换运单批次</el-link
               ><el-link
                 v-if="row.processStatus === '上传中' || row.auditStatus === '审核驳回'"
@@ -142,68 +168,65 @@
     </section>
   </basic-container>
 
-  <el-dialog v-model="detailVisible" width="960px" destroy-on-close>
-    <template #header>
-      <div class="voucher-manage-page__dialog-title">凭证详情</div>
-    </template>
-    <el-descriptions v-loading="detailLoading" :column="2" border class="voucher-manage-page__detail-desc">
-      <el-descriptions-item label="项目名称">
-        {{ detailValue(detailRow.projectName) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="凭证批次号">
-        {{ detailValue(detailRow.voucherBatchNo) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="运单批次号" :span="2">
-        {{ detailValue(detailRow.waybillBatchNo) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="文件名称" :span="2">
-        <el-link v-if="detailRow.fileUrl" type="primary" @click="download(detailRow)">
-          {{ detailValue(detailRow.fileName) }}
-        </el-link>
-        <template v-else>{{ detailValue(detailRow.fileName) }}</template>
-      </el-descriptions-item>
-      <el-descriptions-item label="上传来源">
-        {{ detailValue(detailRow.uploadSource) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="承运商名称">
-        {{ detailValue(detailRow.carrierName) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="处理状态">
-        {{ detailValue(detailRow.processStatus) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="审核状态">
-        {{ detailValue(detailRow.auditStatus) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="凭证数量">
-        {{ detailValue(detailRow.voucherCount) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="已关联运单">
-        {{ detailValue(detailRow.relatedWaybillCount) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="未关联运单">
-        {{ detailValue(detailRow.unRelatedWaybillCount) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="创建人">
-        {{ detailValue(detailRow.createUserName) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="创建时间">
-        {{ detailValue(detailRow.createTime) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="更新人">
-        {{ detailValue(detailRow.updateUserName) }}
-      </el-descriptions-item>
-      <el-descriptions-item label="更新时间">
-        {{ detailValue(detailRow.updateTime) }}
-      </el-descriptions-item>
-    </el-descriptions>
-    <template #footer>
-      <el-button type="primary" @click="detailVisible = false">关闭</el-button>
-    </template>
+  <el-dialog
+    v-model="detailVisible"
+    title="执行凭证详情"
+    width="92%"
+    top="5vh"
+    class="voucher-detail-dialog"
+    destroy-on-close
+  >
+    <div v-loading="detailLoading" class="voucher-manage-page__detail">
+      <div class="voucher-manage-page__detail-summary">
+        <div class="voucher-manage-page__detail-field">
+          <span class="voucher-manage-page__detail-label">执行凭证号</span>
+          <span class="voucher-manage-page__detail-value">{{ detailVoucherNo }}</span>
+        </div>
+        <div class="voucher-manage-page__detail-field">
+          <span class="voucher-manage-page__detail-label">文件夹名称</span>
+          <span class="voucher-manage-page__detail-value">{{ detailFolderName }}</span>
+        </div>
+        <div class="voucher-manage-page__detail-field">
+          <span class="voucher-manage-page__detail-label">是否关联运单</span>
+          <span class="voucher-manage-page__detail-value">{{ detailRelatedWaybill }}</span>
+        </div>
+        <div class="voucher-manage-page__detail-field">
+          <span class="voucher-manage-page__detail-label">配载单号</span>
+          <el-link
+            v-if="detailLoadingNo !== '-'"
+            class="voucher-manage-page__detail-value voucher-manage-page__detail-link"
+            type="primary"
+          >
+            {{ detailLoadingNo }}
+          </el-link>
+          <span v-else class="voucher-manage-page__detail-value">-</span>
+        </div>
+      </div>
+      <div v-if="detailImages.length" class="voucher-manage-page__detail-images">
+        <el-image
+          v-for="(image, index) in detailImages"
+          :key="image.url || index"
+          class="voucher-manage-page__detail-image"
+          :src="image.url"
+          :preview-src-list="detailImageUrls"
+          :initial-index="index"
+          fit="cover"
+          preview-teleported
+        />
+      </div>
+      <div v-if="detailOtherFiles.length" class="voucher-manage-page__detail-files">
+        <div v-for="file in detailOtherFiles" :key="file.id || file.url || file.name" class="voucher-manage-page__detail-file">
+          <span class="voucher-manage-page__detail-file-name">{{ file.name }}</span>
+          <el-link v-if="file.url" type="primary" @click="openDetailFile(file)">查看</el-link>
+        </div>
+      </div>
+      <el-empty v-if="!detailImages.length && !detailOtherFiles.length" description="暂无凭证文件" :image-size="80" />
+    </div>
   </el-dialog>
 
   <el-dialog
     v-model="uploadVisible"
-    :title="editing.id ? '更换运单批次' : '批量导入凭证'"
+    :title="editing.id ? (uploadMode === 'reupload' ? '重新上传' : '更换运单批次') : '批量导入凭证'"
     width="1200px"
     destroy-on-close
     :before-close="beforeUploadDialogClose"
@@ -217,7 +240,7 @@
         label-width="auto"
         class="voucher-manage-page__upload-form"
       >
-        <el-form-item label="项目名称" prop="projectId"
+        <el-form-item v-if="!isCarrier" label="项目名称" prop="projectId"
         ><el-select
           v-model="editing.projectId"
           class="voucher-manage-page__project-select"
@@ -231,7 +254,7 @@
           :label="item.projectName"
           :value="item.id" /></el-select
         ></el-form-item>
-        <el-form-item label="执行凭证" prop="fileUrl"
+        <el-form-item label="执行凭证" required
         ><el-upload
           action="#"
           accept=".zip,.7z"
@@ -246,7 +269,7 @@
         >上传</el-button
         ><template #tip
         ><span class="voucher-manage-page__upload-tip"
-        >支持 zip、7z 格式，采用分片上传，上传中断后可在“上传进度”继续上传。</span
+        >请上传车辆的执行凭证压缩包，支持zip、7z格式。 上传附件大于50M时为超大附件，确认提交后可在“批量补录->上传任务”中查看上传进度。</span
         ></template
         ></el-upload
         ><el-progress
@@ -256,7 +279,7 @@
           class="voucher-manage-page__upload-progress"
         /></el-form-item>
         <el-form-item label="关联运输批次" prop="waybillImportBatchIds"
-        ><el-button type="primary" @click="openBatchDialog">选择</el-button></el-form-item
+        ><el-button type="primary" @click="openBatchDialog()">选择</el-button></el-form-item
         >
       </el-form>
     </section-card>
@@ -314,7 +337,11 @@
               placeholder="请输入" /></el-form-item></el-col
         ><el-col :span="12"
           ><el-form-item label="运单数"
-            ><el-input-number v-model="batchQuery.waybillCount" :min="0" /></el-form-item></el-col
+            ><el-input
+              v-model="batchQuery.waybillCount"
+              clearable
+              placeholder="请输入"
+              @input="handleWaybillCountInput" /></el-form-item></el-col
       ></el-row>
       <div class="voucher-manage-page__search-actions">
         <el-button type="primary" @click="loadBatches">查询</el-button
@@ -325,8 +352,9 @@
       ref="batchTableRef"
       :data="batchRows"
       border
-      @selection-change="batchSelection = $event"
-      ><el-table-column type="selection" width="56" /><el-table-column
+      highlight-current-row
+      @current-change="batchSelection = $event ? [$event] : []"
+      ><el-table-column
         type="index"
         label="序号"
         width="80" /><el-table-column
@@ -337,7 +365,13 @@
         label="创建时间"
         min-width="180" /><el-table-column label="运单数" width="120"
         ><template #default="{ row }">{{ row.waybillCount ?? '-' }}</template></el-table-column
-      ><el-table-column prop="createUserName" label="创建人" min-width="140"
+      ><el-table-column prop="createUserName" label="创建人" min-width="140" /><el-table-column
+        label="操作"
+        width="100"
+        align="center"
+        ><template #default="{ row }"
+          ><el-link type="primary" @click="selectBatch(row)">选择</el-link></template
+        ></el-table-column
     /></el-table>
     <div class="voucher-manage-page__pagination">
       <el-pagination
@@ -352,7 +386,7 @@
     </div>
     <template #footer
       ><el-button @click="batchVisible = false">取消</el-button
-      ><el-button type="primary" @click="confirmBatches">确认</el-button></template
+      ><el-button type="primary" :loading="batchSaving" @click="confirmBatches">确认</el-button></template
     >
   </el-dialog>
 
@@ -458,13 +492,46 @@
 </template>
 
 <script setup>
-import { computed, reactive, ref, watch } from 'vue';
+import { computed, reactive, ref, watch, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { useStore } from 'vuex';
 import md5 from 'js-md5';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import { WarnTriangleFilled } from '@element-plus/icons-vue';
 import { getList as getProjectList } from '@/api/business/project-apply';
 import * as api from '@/api/business/voucher-manage';
 import SectionCard from '@/components/section-card/main.vue';
 
+const router = useRouter();
+const store = useStore();
+
+// 权限判断
+const permission = computed(() => store.getters.permission);
+const userInfo = computed(() => store.getters.userInfo);
+const isAdmin = computed(() => userInfo.value?.authority?.includes('admin'));
+const hasPermission = code => {
+  if (isAdmin.value) return true;
+  return permission.value?.[code] === true;
+};
+const hasRejectReason = row => {
+  const reason = row?.rejectReason;
+  return typeof reason === 'string'
+    ? reason.trim().length > 0
+    : reason !== undefined && reason !== null;
+};
+
+// 判断当前用户是否为承运商（顶级组织是否为"外部组织"）
+const isCarrier = ref(false);
+const checkIfCarrier = () => {
+  const userInfoData = userInfo.value || {};
+  const topDeptName = userInfoData.top_dept_name || userInfoData.topDeptName || '';
+  isCarrier.value = topDeptName === '外部组织';
+};
+
+onMounted(() => {
+  checkIfCarrier();
+});
+
 const loading = ref(false),
   rows = ref([]),
   createRange = ref([]),
@@ -474,6 +541,9 @@ const loading = ref(false),
   detailRow = ref({}),
   uploadVisible = ref(false),
   batchVisible = ref(false),
+  batchDialogMode = ref('upload'),
+  batchTarget = ref(),
+  batchSaving = ref(false),
   progressVisible = ref(false),
   uploadFormRef = ref(),
   uploading = ref(false),
@@ -488,7 +558,8 @@ const loading = ref(false),
   cancelledTaskIds = ref(new Set()),
   uploadCancelled = ref(false),
   activeUploadTaskId = ref(),
-  selectedVoucherFile = ref();
+  selectedVoucherFile = ref(),
+  uploadMode = ref('');
 const query = reactive({
   voucherBatchNo: '',
   auditStatus: '',
@@ -560,9 +631,10 @@ const loadProjects = async () => {
 const changeProject = projectId => {
   editing.projectName = projectOptions.value.find(item => item.id === projectId)?.projectName || '';
 };
-const openUpload = async row => {
+const openUpload = async (row, mode = '') => {
   await loadProjects();
   selectedVoucherFile.value = undefined;
+  uploadMode.value = mode;
   Object.assign(editing, {
     id: row?.id || '',
     voucherBatchNo: row?.voucherBatchNo || '',
@@ -573,6 +645,7 @@ const openUpload = async row => {
     fileTaskId: row?.fileTaskId || '',
     waybillImportBatchIds: [],
   });
+  if (mode === 'reupload') Object.assign(editing, { fileName: '', fileUrl: '', fileTaskId: '' });
   uploadPercent.value = 0;
   selectedBatches.value = [];
   uploadVisible.value = true;
@@ -812,9 +885,18 @@ watch(uploadVisible, visible => {
   // 兜底处理：右上角、遮罩、Esc 直接修改 v-model 时仍必须停止上传。
   if (!visible && !closingUploadDialog.value) void stopCurrentUpload(editing.fileTaskId);
 });
-const openBatchDialog = async () => {
+const openBatchDialog = async row => {
+  // 按钮 @click 会传入 MouseEvent，不能把事件对象当成凭证行。
+  const voucher = row instanceof Event ? undefined : row;
+  batchDialogMode.value = voucher?.id ? 'change' : 'upload';
+  batchTarget.value = voucher?.id ? voucher : undefined;
+  batchSelection.value = [];
   batchVisible.value = true;
   await loadBatches();
+  if (voucher?.waybillBatchNo) {
+    const currentBatch = batchRows.value.find(item => item.batchNo === voucher.waybillBatchNo);
+    if (currentBatch) batchSelection.value = [currentBatch];
+  }
 };
 const loadBatches = async () => {
   const res = await api.getWaybillBatches(batchPage.current, batchPage.size, {
@@ -828,13 +910,71 @@ const loadBatches = async () => {
   batchRows.value = data.records || [];
   batchPage.total = data.total || 0;
 };
+const handleWaybillCountInput = value => {
+  // 只允许输入正整数
+  const filtered = value.replace(/[^\d]/g, '');
+  if (filtered !== value) {
+    batchQuery.waybillCount = filtered;
+  }
+  // 移除前导零
+  if (filtered.length > 1 && filtered.startsWith('0')) {
+    batchQuery.waybillCount = filtered.replace(/^0+/, '');
+  }
+};
 const resetBatchQuery = () => {
   Object.assign(batchQuery, { batchNo: '', createUser: '', waybillCount: undefined });
   batchCreateRange.value = [];
   batchPage.current = 1;
   loadBatches();
 };
-const confirmBatches = () => {
+const updateWaybillBatch = async (target, selected) => {
+  if (!target?.id) {
+    ElMessage.error('缺少凭证批次信息');
+    return false;
+  }
+  if (!selected?.batchNo) {
+    ElMessage.warning('请选择运单批次');
+    return false;
+  }
+  batchSaving.value = true;
+  try {
+    await api.changeWaybillBatch({
+      voucherId: target.id,
+      waybillImportBatchIds: [selected.id],
+    });
+    target.waybillBatchNo = selected.batchNo;
+    batchVisible.value = false;
+    ElMessage.success('运单批次更换成功，已提交重新匹配任务');
+    await load();
+    return true;
+  } catch (error) {
+    ElMessage.error(error.message || '运单批次更换失败');
+    return false;
+  } finally {
+    batchSaving.value = false;
+  }
+};
+const selectBatch = async row => {
+  if (batchDialogMode.value === 'change') {
+    batchSelection.value = [row];
+    await updateWaybillBatch(batchTarget.value, row);
+    return;
+  }
+  const batches = new Map();
+  selectedBatches.value.forEach(item => {
+    if (!batches.has(item.batchNo)) batches.set(item.batchNo, item);
+  });
+  if (!batches.has(row.batchNo)) batches.set(row.batchNo, row);
+  selectedBatches.value = [...batches.values()];
+  editing.waybillImportBatchIds = selectedBatches.value.map(item => item.id);
+  batchVisible.value = false;
+};
+const confirmBatches = async () => {
+  if (batchDialogMode.value === 'change') {
+    const selected = batchSelection.value[0];
+    await updateWaybillBatch(batchTarget.value, selected);
+    return;
+  }
   const batches = new Map();
   batchSelection.value.forEach(item => {
     if (!batches.has(item.batchNo)) batches.set(item.batchNo, item);
@@ -935,24 +1075,218 @@ const removeRow = row =>
   });
 const detailValue = value =>
   value === undefined || value === null || value === '' ? '-' : value;
-const view = async row => {
-  detailVisible.value = true;
-  detailLoading.value = true;
-  detailRow.value = { ...row };
-  try {
-    const res = await api.getDetail(row.id);
-    detailRow.value = res.data?.data || row;
-  } catch (error) {
-    ElMessage.error(error.message || '获取凭证详情失败');
-  } finally {
-    detailLoading.value = false;
+const firstDetailValue = (row, keys) => {
+  for (const key of keys) {
+    const value = row?.[key];
+    if (value !== undefined && value !== null && value !== '') return value;
   }
+  return undefined;
+};
+const detailVoucherNo = computed(() =>
+  detailValue(
+    firstDetailValue(detailRow.value, ['voucherNo', 'executeVoucherNo', 'voucherBatchNo'])
+  )
+);
+const detailFolderName = computed(() =>
+  detailValue(
+    firstDetailValue(detailRow.value, [
+      'folderName',
+      'directoryName',
+      'sourceFolderName',
+      'voucherFolderName',
+      'folder',
+      'fileName',
+    ])
+  )
+);
+const detailRelatedWaybill = computed(() => {
+  const value = firstDetailValue(detailRow.value, [
+    'isRelatedWaybill',
+    'isRelateWaybill',
+    'isRelationWaybill',
+    'relatedWaybill',
+    'relatedWaybillFlag',
+    'hasRelatedWaybill',
+  ]);
+  if (typeof value === 'boolean') return value ? '是' : '否';
+  if (typeof value === 'number') return value > 0 ? '是' : '否';
+  if (typeof value === 'string' && value.trim()) {
+    if (['1', 'true', 'yes', '是'].includes(value.trim().toLowerCase())) return '是';
+    if (['0', 'false', 'no', '否'].includes(value.trim().toLowerCase())) return '否';
+    return value;
+  }
+  const count = firstDetailValue(detailRow.value, ['relatedWaybillCount', 'waybillCount']);
+  if (count !== undefined && count !== null && count !== '') {
+    return Number(count) > 0 ? '是' : '否';
+  }
+  return firstDetailValue(detailRow.value, ['waybillBatchNo', 'waybillNo']) ? '是' : '-';
+});
+const detailLoadingNo = computed(() =>
+  detailValue(
+    firstDetailValue(detailRow.value, [
+      'loadingNo',
+      'loadingCode',
+      'loadBatchNo',
+      'loadingBatchNo',
+      'stowageNo',
+      'stowageCode',
+      'stowageBatchNo',
+      'shipmentNo',
+      'waybillBatchNo',
+      'waybillNo',
+    ])
+  )
+);
+const imageFieldKeys = [
+  'voucherImages',
+  'voucherImageList',
+  'executeVoucherImages',
+  'executeVoucherImageList',
+  'voucherImgList',
+  'voucherImageUrls',
+  'imageList',
+  'imgList',
+  'imageUrls',
+  'images',
+  'pictureList',
+  'pictures',
+  'photoList',
+  'attachments',
+  'attachmentList',
+  'fileList',
+];
+const fileFieldKeys = ['voucherFiles', 'files', 'fileDetails', 'fileList'];
+const toDetailImageItems = value => {
+  if (Array.isArray(value)) return value.flatMap(item => toDetailImageItems(item));
+  if (typeof value === 'string') {
+    const text = value.trim();
+    if (!text) return [];
+    try {
+      return toDetailImageItems(JSON.parse(text));
+    } catch {
+      return text.split(/[,\n;]/).map(item => item.trim()).filter(Boolean);
+    }
+  }
+  if (value && typeof value === 'object') {
+    const nested = value.records || value.list || value.items || value.data || value.urls;
+    if (nested !== undefined) return toDetailImageItems(nested);
+  }
+  return value && typeof value === 'object' ? [value] : [];
+};
+const normalizeDetailImage = item => {
+  if (typeof item === 'string') return { url: item, name: item.split('/').pop() };
+  const url =
+    item?.url ||
+    item?.link ||
+    item?.fileUrl ||
+    item?.downloadUrl ||
+    item?.domain ||
+    item?.src ||
+    item?.imageUrl ||
+    item?.path;
+  return url ? { url: String(url), name: item.name || item.fileName || '' } : null;
+};
+const normalizeDetailFile = item => {
+  if (typeof item === 'string') {
+    return { name: item.split('/').pop() || item, url: item, fileType: '' };
+  }
+  const url = item?.url || item?.link || item?.fileUrl || item?.downloadUrl || item?.domain || item?.src;
+  const name = item?.fileName || item?.name || item?.entryName || item?.imageName || '-';
+  return {
+    ...item,
+    id: item?.id,
+    name,
+    url: url ? String(url) : '',
+    fileType: item?.fileType || '',
+    contentType: item?.contentType || '',
+  };
+};
+const isDetailImage = file =>
+  file.fileType === 'image' ||
+  String(file.contentType || '').startsWith('image/') ||
+  /\.(jpe?g|png|bmp|webp|gif)$/i.test(file.name || '');
+const detailFiles = computed(() => {
+  for (const key of fileFieldKeys) {
+    const value = detailRow.value?.[key];
+    if (value === undefined || value === null || value === '') continue;
+    const files = toDetailImageItems(value).map(normalizeDetailFile).filter(Boolean);
+    if (files.length) return files;
+  }
+  return [];
+});
+const detailImages = computed(() => {
+  if (detailFiles.value.length) return detailFiles.value.filter(file => isDetailImage(file));
+  for (const key of imageFieldKeys) {
+    const value = detailRow.value?.[key];
+    if (value === undefined || value === null || value === '') continue;
+    const images = toDetailImageItems(value).map(normalizeDetailImage).filter(Boolean);
+    if (images.length) return images;
+  }
+  const singleImage = normalizeDetailImage(detailRow.value?.voucherImage || detailRow.value?.image);
+  return singleImage ? [singleImage] : [];
+});
+const detailOtherFiles = computed(() =>
+  detailFiles.value.filter(file => !isDetailImage(file))
+);
+const detailImageUrls = computed(() => detailImages.value.map(image => image.url));
+const openDetailFile = file => {
+  if (file?.url) window.open(file.url, '_blank');
+};
+const view = async row => {
+  router.push({
+    path: '/business/voucher-manage/detail',
+    query: { id: row.id, batchNo: row.voucherBatchNo },
+  });
 };
 const download = row => window.open(row.fileUrl, '_blank');
+const handleAuditPass = row =>
+  ElMessageBox.confirm(`确认审核通过凭证批次"${row.voucherBatchNo}"吗？`, '提示', {
+    type: 'warning',
+  }).then(async () => {
+    await api.auditPass(row.id);
+    ElMessage.success('审核通过');
+    load();
+  });
+const handleAuditReject = row =>
+  ElMessageBox.prompt('请输入驳回原因（可选）', '审核驳回', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    inputPattern: /.*/,
+  }).then(async ({ value }) => {
+    await api.auditReject(row.id, value || '');
+    ElMessage.success('审核驳回');
+    load();
+  });
 load();
 </script>
 
 <style lang="scss" scoped>
+:global(.voucher-detail-dialog.el-dialog) {
+  max-width: 996px;
+  border: 1px solid #dcdfe6;
+  border-radius: 0;
+  overflow: hidden;
+}
+
+:global(.voucher-detail-dialog .el-dialog__header) {
+  padding: 20px 24px;
+  margin-right: 0;
+  //background: #f5f5f5;
+  border-bottom: 1px solid #dcdfe6;
+}
+
+:global(.voucher-detail-dialog .el-dialog__headerbtn) {
+  top: 20px;
+  right: 24px;
+}
+
+:global(.voucher-detail-dialog .el-dialog__body) {
+  max-height: calc(100vh - 130px);
+  padding: 0;
+  overflow-y: auto;
+  background: #fff;
+}
+
 .voucher-manage-page {
   &__search {
     padding: 12px 12px 4px;
@@ -986,24 +1320,19 @@ load();
     padding: 0;
     min-height: auto;
   }
-  &__dialog-title {
-    display: flex;
+  &__audit-status {
+    display: inline-flex;
     align-items: center;
-    gap: 8px;
-    color: #303133;
-    font-size: 18px;
-    font-weight: 600;
-
-    &::before {
-      width: 4px;
-      height: 18px;
-      background: #409eff;
-      content: '';
-    }
+  }
+  &__audit-reject-icon {
+    margin-left: 4px;
+    color: #f56c6c;
+    cursor: help;
   }
   &__actions {
     display: flex;
     flex-wrap: wrap;
+    justify-content: center;
     gap: 2px 12px;
   }
   &__pagination {
@@ -1025,6 +1354,20 @@ load();
     margin-left: 16px;
     color: #606266;
   }
+  &__upload-progress {
+    margin-top: 12px;
+    :deep(.el-progress__text) {
+      font-size: 14px;
+      font-weight: 500;
+    }
+    :deep(.el-progress-bar__outer) {
+      background: #eff1f7;
+      border-radius: 6px;
+    }
+    :deep(.el-progress-bar__inner) {
+      border-radius: 6px;
+    }
+  }
   &__progress-cell {
     display: flex;
     align-items: center;
@@ -1076,16 +1419,108 @@ load();
   :deep(.el-table__body tr:nth-child(even) > td) {
     background: #fafafa;
   }
-  &__detail-desc {
-    :deep(.el-descriptions__table) {
-      table-layout: fixed;
-      th, td {
-        width: 50%;
-      }
-      .el-descriptions__label,
-      .el-descriptions__content {
-        width: 50%;
-      }
+  &__detail {
+    min-height: 420px;
+    padding: 40px 46px 68px;
+    box-sizing: border-box;
+  }
+  &__detail-summary {
+    display: grid;
+    grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
+    column-gap: 56px;
+    row-gap: 16px;
+    margin-bottom: 32px;
+  }
+  &__detail-field {
+    display: grid;
+    grid-template-columns: 140px minmax(0, 1fr);
+    column-gap: 16px;
+    align-items: center;
+    min-height: 24px;
+    font-size: 14px;
+    line-height: 24px;
+  }
+  &__detail-label,
+  &__detail-value {
+    color: #303133;
+    white-space: nowrap;
+  }
+  &__detail-value {
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  &__detail-link {
+    justify-self: start;
+    font-size: inherit;
+    line-height: inherit;
+  }
+  &__detail-images {
+    display: grid;
+    grid-template-columns: repeat(5, 140px);
+    gap: 32px;
+    justify-content: start;
+  }
+  &__detail-image {
+    width: 140px;
+    height: 100px;
+    box-sizing: border-box;
+    overflow: hidden;
+    cursor: zoom-in;
+    background: #fff;
+    border: 6px solid #cfcfcf;
+
+    :deep(.el-image__inner) {
+      display: block;
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+  }
+  &__detail-files {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    margin-top: 24px;
+    padding-top: 16px;
+    border-top: 1px solid #eff1f7;
+  }
+  &__detail-file {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 16px;
+    min-height: 28px;
+  }
+  &__detail-file-name {
+    min-width: 0;
+    overflow: hidden;
+    color: #303133;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+@media (max-width: 900px) {
+  .voucher-manage-page {
+    &__detail-images {
+      grid-template-columns: repeat(4, 140px);
+    }
+  }
+}
+
+@media (max-width: 680px) {
+  .voucher-manage-page {
+    &__detail {
+      padding: 28px 24px 40px;
+    }
+    &__detail-summary {
+      grid-template-columns: 1fr;
+      row-gap: 12px;
+    }
+    &__detail-images {
+      grid-template-columns: repeat(2, minmax(0, 140px));
+      gap: 20px;
     }
   }
 }

src/views/business/waybill-import-form.vue

@@ -0,0 +1,38 @@
+<template>
+  <basic-container class="waybill-import-form-page-container">
+    <div class="waybill-import-form-page-title">新建导入</div>
+    <waybill-import-dialog create-page />
+  </basic-container>
+</template>
+
+<script setup>
+import WaybillImportDialog from './components/waybill-import-dialog.vue';
+</script>
+
+<style scoped lang="scss">
+.waybill-import-form-page-container {
+  :deep(.basic-container__card > .el-card__body) {
+    padding: 0;
+  }
+}
+
+.waybill-import-form-page-title {
+  position: relative;
+  padding: 16px 24px 12px 36px;
+  border-bottom: 1px solid #eff1f7;
+  color: #303133;
+  font-size: 18px;
+  font-weight: 600;
+
+  &::before {
+    position: absolute;
+    top: 16px;
+    left: 24px;
+    width: 4px;
+    height: 22px;
+    border-radius: 2px;
+    background: #409eff;
+    content: '';
+  }
+}
+</style>

src/views/business/waybill-import.vue

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

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

@@ -0,0 +1,23 @@
+<template>
+  <waybill-manage-page
+    :api="api"
+    :config="config"
+    :crud-option="option"
+    :detail-id="$route.query.id"
+    :menu-width="250"
+    standalone-detail-page
+  />
+</template>
+
+<script>
+import WaybillManagePage from './components/waybill-manage-page.vue';
+import * as api from '@/api/business/waybill-manage';
+import { config, option } from '@/option/business/waybill-manage';
+
+export default {
+  components: { WaybillManagePage },
+  data() {
+    return { api, config, option };
+  },
+};
+</script>

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

@@ -497,6 +497,7 @@ const emptyLine = () => ({
   localId: ++localId,
   goodsCategory: '',
   goodsName: '',
+  taxClassificationCode: '',
   unit: '吨',
   quantity: 0,
   unitPriceNoTax: 0,
@@ -724,9 +725,11 @@ export default {
       const item = this.findInvoiceItem(line);
       if (item) {
         line.taxRate = Number(item.defaultTaxRate || 0);
+        line.taxClassificationCode = item.taxClassificationCode || '';
       } else if (clearInvalid) {
         line.goodsName = '';
         line.taxRate = 0;
+        line.taxClassificationCode = '';
       }
       this.recalculateLine(line);
     },
@@ -734,6 +737,7 @@ export default {
       const names = this.invoiceItemNames(line.goodsCategory);
       if (!names.some(item => item.shortName === line.goodsName)) line.goodsName = '';
       line.taxRate = 0;
+      line.taxClassificationCode = this.findInvoiceItem(line)?.taxClassificationCode || '';
       if (names.length === 1) {
         line.goodsName = names[0].shortName;
         this.handleGoodsNameChange(line);
@@ -743,9 +747,11 @@ export default {
       const item = this.findInvoiceItem(line);
       if (!item) {
         line.taxRate = 0;
+        line.taxClassificationCode = '';
         return;
       }
       line.taxRate = Number(item.defaultTaxRate || 0);
+      line.taxClassificationCode = item.taxClassificationCode || '';
       this.recalculateLine(line);
     },
     validateSettlements(rule, value, callback) {
@@ -953,7 +959,10 @@ export default {
       this.receiverInvoiceOptions = Array.isArray(invoiceInfos) ? invoiceInfos : [];
       this.contactOptions = data.contacts || [];
       const invoiceInfoEmails = [
-        ...this.receiverInvoiceOptions.flatMap(item => this.parseEmails(item.email)),
+        ...this.receiverInvoiceOptions.flatMap(item => [
+          ...this.parseEmails(item.email),
+          ...(item.contacts || []).flatMap(contact => this.parseEmails(contact.email)),
+        ]),
       ];
       this.departmentEmailOptions = invoiceInfoEmails.filter(Boolean).reduce((emails, email) => {
         if (!emails.some(item => item.toLowerCase() === email.toLowerCase())) emails.push(email);
@@ -989,14 +998,19 @@ export default {
     handleReceiverChange(id) {
       const info = this.receiverInvoiceOptions.find(item => String(item.id) === String(id));
       if (!info) return;
+      const invoiceContact = (info.contacts || []).find(item => item.contactName || item.email) || {};
       Object.assign(this.form, {
         receiverName: info.invoiceTitle,
         taxpayerNo: info.taxNo,
         bankName: info.bankName,
         bankAccount: info.bankAccount,
         registeredAddress: info.registeredAddress,
-        email: info.email || '',
+        email: invoiceContact.email || '',
       });
+      if (invoiceContact.contactName) {
+        this.form.contactName = invoiceContact.contactName;
+        this.form.contactPhone = invoiceContact.contactPhone || '';
+      }
       this.handleInvoiceTypeChange();
     },
     handleContactChange(name) {
@@ -1055,8 +1069,8 @@ export default {
         return;
       }
       this.$router.push({
-        path: '/business/waybill-manage',
-        query: { detailId: waybillId },
+        path: '/business/waybill-manage/detail',
+        query: { id: waybillId },
       });
     },
     restoreDetailSelection() {
@@ -1133,6 +1147,7 @@ export default {
           lines: sheet.lines.map(line => ({
             goodsCategory: line.goodsCategory,
             goodsName: line.goodsName,
+            taxClassificationCode: line.taxClassificationCode,
             unit: line.unit,
             quantity: line.quantity,
             unitPriceNoTax: line.unitPriceNoTax,

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

@@ -447,9 +447,6 @@
                 </template>
               </el-table-column>
             </el-table>
-            <div class="payment-form-page__reference-confirm">
-              <el-button type="primary" :disabled="!formalSelection.length" @click="confirmFormalSelection">确定</el-button>
-            </div>
             <div class="payment-form-page__reference-pagination">
               <el-pagination
                 v-model:current-page="formalPage.current"
@@ -486,12 +483,21 @@
                 @size-change="handlePreSizeChange"
               />
             </div>
-            <div class="payment-form-page__reference-confirm">
-              <el-button type="primary" :disabled="!preSelection.length" @click="confirmPreSelection">确定</el-button>
-            </div>
           </el-tab-pane>
         </el-tabs></div
-    ></el-dialog>
+      >
+      <template v-if="form.paymentType !== 'project_advance'" #footer>
+        <div class="payment-form-page__reference-footer">
+          <el-button @click="referenceVisible = false">取消</el-button>
+          <el-button
+            type="primary"
+            :disabled="!referenceSelection.length"
+            @click="confirmReferenceSelection"
+            >确定</el-button
+          >
+        </div>
+      </template>
+    </el-dialog>
     <el-dialog v-model="billDialogVisible" title="选择汇票" width="80%" append-to-body>
       <div class="payment-form-page__reference-search">
         <el-form :model="billQuery" label-position="right" label-width="160px" @submit.prevent>
@@ -798,6 +804,9 @@ export default {
       const amount = this.form.settlementAmount;
       return Number(amount || 0);
     },
+    referenceSelection() {
+      return (this.referenceTab === 'formal' ? this.formalSelection : this.preSelection) || [];
+    },
     referenceLabel() {
       if (this.referenceRows.length) {
         return this.referenceRows
@@ -1403,6 +1412,14 @@ export default {
     attachmentFileName(file) {
       return String(file?.originalName || file?.name || file?.fileName || '').trim();
     },
+    normalizedAttachmentFileName(file) {
+      let fileName = this.attachmentFileName(file) || this.attachmentFileUrl(file);
+      fileName = String(fileName || '').split(/[?#]/)[0];
+      try {
+        fileName = decodeURIComponent(fileName);
+      } catch {}
+      return fileName.toLocaleLowerCase();
+    },
     attachmentFileUrl(file) {
       return (
         file?.url ||
@@ -1469,27 +1486,30 @@ export default {
       this.$message.error('附件预览失败');
     },
     attachmentMatchesMaterial(file, material) {
-      const fileName = this.attachmentFileName(file).toLocaleLowerCase();
+      const fileName = this.normalizedAttachmentFileName(file);
       return (
         Boolean(this.attachmentFileUrl(file)) &&
         (file.attachmentType === MATERIAL_TYPE_MAP[material.key] ||
           material.keywords.some(keyword => fileName.includes(keyword.toLocaleLowerCase())))
       );
     },
-    resolveAttachmentTypeByFileName(file) {
-      let fileName = this.attachmentFileName(file) || this.attachmentFileUrl(file);
-      fileName = String(fileName || '').split(/[?#]/)[0].toLocaleLowerCase();
-      try {
-        fileName = decodeURIComponent(fileName);
-      } catch {}
-      const material = [...Object.values(ATTACHMENT_MATERIALS)]
-        .sort(
-          (a, b) =>
-            Math.max(...b.keywords.map(String.length)) - Math.max(...a.keywords.map(String.length))
+    matchAttachmentMaterialByFileName(file, materials = Object.values(ATTACHMENT_MATERIALS)) {
+      const fileName = this.normalizedAttachmentFileName(file);
+      if (!fileName) return null;
+      const matched = (materials || [])
+        .flatMap(material =>
+          material.keywords.map(keyword => ({
+            material,
+            keyword: String(keyword).toLocaleLowerCase(),
+          }))
         )
-        .find(item =>
-          item.keywords.some(keyword => fileName.includes(String(keyword).toLocaleLowerCase()))
-        );
+        .filter(item => item.keyword)
+        .sort((a, b) => b.keyword.length - a.keyword.length)
+        .find(item => fileName.includes(item.keyword));
+      return matched?.material || null;
+    },
+    resolveAttachmentTypeByFileName(file) {
+      const material = this.matchAttachmentMaterialByFileName(file);
       return material ? MATERIAL_TYPE_MAP[material.key] : 'other';
     },
     hasAttachmentMaterial(material) {
@@ -1505,12 +1525,11 @@ export default {
       return hasUploadedAttachment;
     },
     resolveAttachmentMaterial(file, materials = Object.values(ATTACHMENT_MATERIALS)) {
-      return [...materials]
-        .sort(
-          (a, b) =>
-            Math.max(...b.keywords.map(String.length)) - Math.max(...a.keywords.map(String.length))
-        )
-        .find(material => this.attachmentMatchesMaterial(file, material));
+      if (!this.attachmentFileUrl(file)) return null;
+      const typeMatched = (materials || []).find(
+        material => file.attachmentType === MATERIAL_TYPE_MAP[material.key]
+      );
+      return typeMatched || this.matchAttachmentMaterialByFileName(file, materials);
     },
     mergeAutomaticAttachments(files, materials, sourceName, defaultMaterial = null) {
       const existingUrls = new Set(
@@ -2095,6 +2114,10 @@ export default {
       ]);
       if (this.billPayment) this.loadBillOptions();
     },
+    confirmReferenceSelection() {
+      if (this.referenceTab === 'formal') return this.confirmFormalSelection();
+      return this.confirmPreSelection();
+    },
     async confirmFormalSelection() {
       const rows = this.formalSelection || [];
       if (!rows.length) return;
@@ -2366,7 +2389,8 @@ export default {
   white-space: nowrap;
 }
 .payment-form-page__reference-search-actions,
-.payment-form-page__reference-pagination {
+.payment-form-page__reference-pagination,
+.payment-form-page__reference-footer {
   display: flex;
   justify-content: flex-end;
 }

src/views/payment/payment-application.vue

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

src/views/settlement/components/transport-reconciliation-table-panel.vue

@@ -104,8 +104,6 @@ export default {
     },
     rowActions(row) {
       const actions = [{ type: 'view', label: '查看' }];
-      if (this.hasPermission('transport_reconciliation_edit') && this.isEditable(row))
-        actions.push({ type: 'edit', label: '编辑' });
       if (this.hasPermission('transport_reconciliation_delete') && this.isEditable(row))
         actions.push({ type: 'delete', label: '删除', danger: true });
       if (this.hasPermission('transport_reconciliation_complete') && this.isEditable(row))

src/views/settlement/formal-settlement-form.vue

@@ -1,12 +1,13 @@
 <template>
   <basic-container class="formal-settlement-form-page">
     <div class="formal-settlement-form-page__title">{{ pageTitle }}</div>
+    <!-- 新增来源明细可直接调整：计费试算走独立接口，调整结果先暂存，保存正式结算单时再落库。 -->
     <formal-settlement-editor
       v-model="editorVisible"
       page-mode
       :record-id="recordId"
       :readonly="readonly"
-      :initial-data="transferPayload"
+      :initial-data="editorInitialData"
     />
   </basic-container>
 </template>
@@ -34,6 +35,14 @@ export default {
     pageTitle() {
       return this.readonly ? '查看正式结算' : this.recordId ? '编辑正式结算' : '新增正式结算';
     },
+    editorInitialData() {
+      const settlementType = this.$route.query.settlementType;
+      if (!this.transferPayload && !settlementType) return null;
+      return {
+        ...(this.transferPayload || {}),
+        ...(settlementType ? { settlementType } : {}),
+      };
+    },
   },
   watch: {
     editorVisible(value) {

src/views/settlement/formal-settlement.vue

@@ -169,8 +169,8 @@
 <script>
 import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
-import * as XLSX from 'xlsx';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
+import { downloadFile } from '@/utils/util';
 import * as api from '@/api/settlement/formalSettlement';
 import * as paymentApi from '@/api/payment/paymentApplication';
 import {
@@ -299,7 +299,11 @@ export default {
     openCreate() {
       this.$router.push({
         path: '/settlement/formal-settlement/form',
-        query: { mode: 'add', name: '新增正式结算' },
+        query: {
+          mode: 'add',
+          name: '新增正式结算',
+          settlementType: this.activeSettlementType,
+        },
       });
     },
     openEdit(row) {
@@ -503,31 +507,10 @@ export default {
       win.document.close();
     },
     async handleExport() {
-      const response = await api.getList(1, 100000, this.buildQueryParams());
-      const data = this.unwrapData(response);
-      const rows = (data.records || []).map(item => ({
-        结算单号: item.formalSettlementNo,
-        预结算单号: item.preSettlementNos,
-        来源: item.sourceType,
-        付款方: item.payerName,
-        收款方: item.payeeName,
-        项目名称: item.projectName,
-        所属组织: item.deptName,
-        合同编号: item.contractNo,
-        合同名称: item.contractName,
-        原币结算金额: item.settlementAmount,
-        本位币结算金额: item.localSettlementAmount,
-        结算汇率: item.exchangeRate,
-        发票状态: this.invoiceName(item.invoiceStatus, item.settlementType),
-        收付款状态: this.paymentName(item.paymentStatus),
-        审核状态: item.approvalStatusName,
-        金蝶单据号: item.kingdeeBillNo,
-        创建人: item.createUserName,
-        创建时间: item.createTime,
-      }));
-      const workbook = XLSX.utils.book_new();
-      XLSX.utils.book_append_sheet(workbook, XLSX.utils.json_to_sheet(rows), '正式结算单');
-      XLSX.writeFile(workbook, `正式结算单${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
+      const params = this.buildQueryParams();
+      if (this.selection.length) params.ids = this.selection.map(item => item.id).join(',');
+      const { data } = await api.exportList(params);
+      downloadFile(data, `正式结算单${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
     },
     buildQueryParams() {
       // 所属组织级联返回 id 路径，转成组织名称传给后端（用副本，避免污染搜索框回显）
@@ -577,9 +560,7 @@ export default {
       return `${Number(value || 0).toFixed(2)} ${currency || 'RMB'}`;
     },
     paymentRemaining(row) {
-      const remaining =
-        row?.remainingPayableAmount ??
-        Number(row?.settlementAmount || 0) - Number(row?.appliedPaymentAmount || 0);
+      const remaining = Number(row?.settlementAmount || 0) - Number(row?.paidAmount || 0);
       return Math.max(0, Number(remaining || 0));
     },
   },

src/views/settlement/pre-settlement-form.vue

@@ -1,12 +1,12 @@
 <template>
   <basic-container class="pre-settlement-form-page">
     <div class="pre-settlement-form-page__title">{{ pageTitle }}</div>
+    <!-- 新增来源明细可直接调整：计费试算走独立接口，调整结果先暂存，保存预结算单时再落库。 -->
     <pre-settlement-editor
       v-model="editorVisible"
       page-mode
       :record-id="recordId"
       :initial-data="transferPayload"
-      :defer-save="Boolean(transferPayload)"
       @success="handleSuccess"
     />
   </basic-container>

src/views/settlement/pre-settlement.vue

@@ -622,7 +622,9 @@ export default {
       )}</div></div><h2>结算合计</h2><table><thead><tr><th>序号</th><th>费用类型</th><th>费用项</th><th>原金额</th><th>调整金额</th><th>结算金额</th></tr></thead><tbody>${summaryRows}</tbody></table><div class="actions"><button onclick="window.print()">打印 / 另存为 PDF</button></div></body></html>`;
     },
     async handleExport() {
-      const { data } = await exportList(this.buildQuery());
+      const params = this.buildQuery();
+      if (this.selection.length) params.ids = this.selection.map(item => item.id).join(',');
+      const { data } = await exportList(params);
       downloadFile(data, `预结算单${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
     },
     openFlow(row) {

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

@@ -145,7 +145,9 @@
                   :align="column.align || 'center'"
                   show-overflow-tooltip
                 >
-                  <template #default="{ row }">{{ formatDetailCell(row, column.prop) }}</template>
+                  <template #default="{ row }">
+                    {{ formatFeeDetailCell(row, column.prop) }}
+                  </template>
                 </el-table-column>
               </el-table>
             </el-tab-pane>
@@ -228,11 +230,6 @@
         <div
           class="settlement-detail-page__detail-panel-body settlement-detail-page__adjust-panel-body"
         >
-          <div v-if="isPayable" class="settlement-detail-page__adjust-toolbar">
-            <el-button type="primary" :disabled="adjustDialog.loading" @click="addAdjustFee">
-              新增费用
-            </el-button>
-          </div>
           <el-table v-loading="adjustDialog.loading" :data="adjustRows" border>
             <el-table-column type="index" label="序号" width="64" align="center" />
             <el-table-column label="来源" width="110" align="center">
@@ -403,12 +400,14 @@
                   maxlength="300"
                   placeholder="请输入调整原因"
                 />
-                <span v-else-if="column.prop === 'adjustAmountText'">
-                  {{ fixedTwoDecimals(row.adjustAmount) }}
-                </span>
-                <span v-else-if="column.prop === 'afterAmountText'">
-                  {{ fixedTwoDecimals(row.afterAmount) }}
+                <span v-else-if="column.prop === 'originalAmountText'">
+                  {{
+                    Number(row.adjustAmount || 0) !== 0
+                      ? fixedTwoDecimals(row.afterAmount)
+                      : fixedTwoDecimals(row.originalAmount)
+                  }}
                 </span>
+
                 <span v-else>{{ formatDetailCell(row, column.prop) }}</span>
               </template>
             </el-table-column>
@@ -1139,13 +1138,27 @@ export default {
       return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
     },
     feeDetailColumns() {
-      return [...feeDetailBaseColumns, ...this.dynamicFeeColumns, ...feeDetailTailColumns];
+      const baseColumns = feeDetailBaseColumns.filter(column => column.prop !== 'freightAmount');
+      const hasAdjustment = this.feeRows.some(row => Number(row.adjustAmount || 0) !== 0);
+      const tailColumns = feeDetailTailColumns.map(col =>
+        col.prop === 'originalAmountText' && hasAdjustment
+          ? { ...col, label: '调整后金额' }
+          : col
+      );
+      return [...baseColumns, ...this.dynamicFeeColumns, ...tailColumns];
     },
     displayTableColumns() {
       const columns = this.tableColumns.filter(
         column => this.settlementType !== 'receivable' || column.prop !== 'preSettlementNo'
       );
       const totalIndex = columns.findIndex(column => column.prop === 'totalAmountText');
+      const otherFeeColumn = {
+        label: '其他费用',
+        prop: 'tableOtherFeeAmount',
+        feeSummaryType: 'other',
+        minWidth: 130,
+        align: 'right',
+      };
       const dynamicColumns = this.isPayable
         ? [
             {
@@ -1155,22 +1168,19 @@ export default {
               minWidth: 130,
               align: 'right',
             },
-            {
-              label: '其他费用',
-              prop: 'tableOtherFeeAmount',
-              feeSummaryType: 'other',
+            otherFeeColumn,
+          ]
+        : [
+            ...this.tableFeeItemNames.map((name, index) => ({
+              label: name,
+              prop: `tableFeeItem${index}`,
+              feeItemName: name,
+              dynamic: true,
               minWidth: 130,
               align: 'right',
-            },
-          ]
-        : this.tableFeeItemNames.map((name, index) => ({
-            label: name,
-            prop: `tableFeeItem${index}`,
-            feeItemName: name,
-            dynamic: true,
-            minWidth: 130,
-            align: 'right',
-          }));
+            })),
+            otherFeeColumn,
+          ];
       if (totalIndex < 0) return [...columns, ...dynamicColumns];
       columns.splice(totalIndex, 0, ...dynamicColumns);
       return columns;
@@ -1179,14 +1189,15 @@ export default {
       return [...generatePreviewColumns, ...this.dynamicFeeColumns, ...feeDetailTailColumns];
     },
     adjustFeeColumns() {
+      const baseColumns = feeDetailBaseColumns.filter(column => column.prop !== 'freightAmount');
       const tailColumns = feeDetailTailColumns.filter(column => column.prop !== 'remark');
-      const afterAmountIndex = tailColumns.findIndex(column => column.prop === 'afterAmountText');
+      const afterAmountIndex = tailColumns.findIndex(column => column.prop === 'originalAmountText');
       tailColumns.splice(afterAmountIndex + 1, 0, {
         label: '调整原因',
         prop: 'changeReason',
         minWidth: 220,
       });
-      return [...feeDetailBaseColumns, ...this.adjustDynamicFeeColumns, ...tailColumns];
+      return [...baseColumns, ...this.adjustDynamicFeeColumns, ...tailColumns];
     },
     transportCargoTypeOptions() {
       return this.cargoTypeOptions.filter(item => item.children?.length);
@@ -1693,8 +1704,8 @@ export default {
         return;
       }
       this.$router.push({
-        path: '/business/waybill-manage',
-        query: { detailId: row.waybillId },
+        path: '/business/waybill-manage/detail',
+        query: { id: row.waybillId },
       });
     },
     async openDetailDialog(row) {
@@ -1741,6 +1752,7 @@ export default {
             freightAmount: Number(item.freightAmount || 0),
             originalAmount: Number(item.originalAmount || 0),
             feeItems,
+            changeReason: '',
             dataSource:
               item.dataSource || (item.billingFactor === '手工调整' ? '手动录入' : '自动生成'),
             manualFee:
@@ -1758,39 +1770,6 @@ export default {
         this.adjustDialog.loading = false;
       }
     },
-    addAdjustFee() {
-      if (!this.isPayable) return;
-      const feeItems = this.adjustDynamicFeeColumns.reduce((items, column) => {
-        items[column.feeItemName] = 0;
-        return items;
-      }, {});
-      this.adjustRows.push({
-        dataSource: '手动录入',
-        cargoName: '',
-        cargoType: '',
-        cargoTypePath: [],
-        specification: '',
-        model: '',
-        billingFactor: '',
-        billingType: '',
-        transportQuantity: '',
-        priceUnit: '',
-        unitPrice: '',
-        mileage: null,
-        freightAmount: '',
-        originalAmount: 0,
-        originalAmountText: '-',
-        adjustAmount: 0,
-        afterAmount: 0,
-        feeItems,
-        manualFee: true,
-        remark: '',
-        changeReason: '',
-        calculating: false,
-        adjustCalculateTimer: null,
-        adjustCalculateVersion: 0,
-      });
-    },
     feeSourceLabel(value) {
       return ['手动录入', '手动添加', '手工录入'].includes(value) ? '手动录入' : '自动生成';
     },
@@ -1908,6 +1887,11 @@ export default {
       try {
         await api.adjustFee({
           detailId: this.adjustDialog.row.id,
+          adjustReason: [
+            ...new Set(
+              this.adjustRows.map(row => String(row.changeReason || '').trim()).filter(Boolean)
+            ),
+          ].join('；'),
           rows: this.adjustRows.map(row => ({
             id: row.id,
             cargoName: String(row.cargoName || '').trim(),
@@ -2622,6 +2606,22 @@ export default {
       }
       return this.formatCell(row?.[prop]);
     },
+    formatFeeDetailCell(row, prop) {
+      if (prop !== 'originalAmountText') return this.formatDetailCell(row, prop);
+
+      const adjustAmount = Number(row?.adjustAmount || 0);
+      if (adjustAmount === 0) return this.formatDetailCell(row, prop);
+
+      const adjustedAmount = Number(
+        row?.afterAmount ?? row?.adjustedAmount ?? row?.settlementAmount
+      );
+      if (Number.isFinite(adjustedAmount)) return this.fixedTwoDecimals(adjustedAmount);
+
+      const originalAmount = Number(row?.originalAmount ?? row?.originalAmountText);
+      return Number.isFinite(originalAmount)
+        ? this.fixedTwoDecimals(originalAmount + adjustAmount)
+        : this.formatCell(row?.afterAmountText);
+    },
     formatCell(value) {
       return value === null || value === undefined || value === '' ? '-' : value;
     },
@@ -2768,14 +2768,6 @@ export default {
   }
 }
 
-.settlement-detail-page__adjust-toolbar {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  margin-bottom: 12px;
-  background: transparent;
-}
-
 .settlement-detail-page__adjust-control {
   width: 100%;
 }

src/views/settlement/transport-reconciliation-form.vue

@@ -0,0 +1,107 @@
+<template>
+  <basic-container class="transport-reconciliation-form-page">
+    <div class="transport-reconciliation-form-page__title">{{ pageTitle }}</div>
+    <transport-reconciliation-editor
+      v-model="editorVisible"
+      page-mode
+      :record-id="recordId"
+      :settlement-type="settlementType"
+      @success="handleSuccess"
+    />
+  </basic-container>
+</template>
+
+<script>
+import TransportReconciliationEditor from './components/transport-reconciliation-editor.vue';
+
+export default {
+  name: 'TransportReconciliationForm',
+  components: { TransportReconciliationEditor },
+  data() {
+    return {
+      editorVisible: true,
+      savedRecordId: '',
+    };
+  },
+  computed: {
+    recordId() {
+      return this.$route.query.id || '';
+    },
+    settlementType() {
+      return this.$route.query.settlementType || 'payable';
+    },
+    pageTitle() {
+      return this.recordId || this.savedRecordId ? '编辑运输对账单' : '新增运输对账单';
+    },
+  },
+  watch: {
+    editorVisible(value) {
+      if (!value) this.goBack();
+    },
+  },
+  created() {
+    this.syncTagTitle();
+  },
+  methods: {
+    handleSuccess(recordId) {
+      this.savedRecordId = recordId || this.savedRecordId;
+      this.syncTagTitle();
+    },
+    goBack() {
+      this.$router.push('/settlement/transport-reconciliation');
+    },
+    syncTagTitle() {
+      this.$nextTick(() => {
+        this.$store.commit('SET_TAG', {
+          fullPath: this.$route.fullPath,
+          name: this.pageTitle,
+        });
+        this.$router.$avueRouter.setTitle(this.pageTitle);
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.transport-reconciliation-form-page {
+  min-height: 100%;
+  padding-bottom: 72px;
+  background: #f5f6fa;
+
+  &__title {
+    display: flex;
+    align-items: center;
+    min-height: 24px;
+    margin-bottom: 16px;
+    font-size: 18px;
+    font-weight: 600;
+
+    &::before {
+      width: 4px;
+      height: 20px;
+      margin-right: 8px;
+      background: #409eff;
+      content: '';
+    }
+  }
+}
+
+:deep(.transport-reconciliation-form-page.basic-container .basic-container__card > .el-card__body) {
+  padding: 0;
+}
+
+:deep(.transport-reconciliation-form-page.basic-container .basic-container__card) {
+  border: 0;
+  background: transparent;
+  box-shadow: none;
+}
+
+:global(.avue--collapse) .reconciliation-editor__page-actions {
+  left: 60px;
+}
+
+:global(.avue-layout--horizontal) .reconciliation-editor__page-actions {
+  left: 0;
+}
+</style>

src/views/settlement/transport-reconciliation.vue

@@ -93,7 +93,7 @@
 <script>
 import { ArrowDown, ArrowUp, Refresh } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
-import * as XLSX from 'xlsx';
+import { downloadFile } from '@/utils/util';
 import * as api from '@/api/settlement/transportReconciliation';
 import { transportReconciliationSearchFields } from '@/option/settlement/transportReconciliationSearch';
 import { transportReconciliationTableColumns } from '@/option/settlement/transportReconciliationTable';
@@ -109,8 +109,8 @@ const emptyQuery = () => ({
   contractNo: '',
   payerName: '',
   payeeName: '',
-  matchStatus: '',
-  reconciliationStatus: '',
+  matchStatus: 'all',
+  reconciliationStatus: 'all',
 });
 
 export default {
@@ -153,7 +153,7 @@ export default {
       try {
         const response = await api.getList(this.page.current, this.page.size, {
           // 所属组织级联返回 id 路径，转成组织名称传给后端（用副本，避免污染搜索框回显）
-          ...this.normalizeOrganizationSearch({ ...this.query }, 'deptName'),
+          ...this.buildSearchParams(),
           settlementType: this.settlementType,
         });
         const data = response?.data?.data || response?.data || response || {};
@@ -183,10 +183,15 @@ export default {
       this.page.size = size;
       this.loadTable();
     },
+    buildSearchParams() {
+      const params = this.normalizeOrganizationSearch({ ...this.query }, 'deptName');
+      if (params.matchStatus === 'all') params.matchStatus = '';
+      if (params.reconciliationStatus === 'all') params.reconciliationStatus = '';
+      return params;
+    },
     handleAction({ type, row }) {
       const map = {
         view: this.openView,
-        edit: this.openEdit,
         delete: this.handleDelete,
         complete: this.handleComplete,
       };
@@ -194,10 +199,10 @@ export default {
       if (fn) fn(row);
     },
     openCreate() {
-      this.editor = { visible: true, id: null, readonly: false };
-    },
-    openEdit(row) {
-      this.editor = { visible: true, id: row.id, readonly: false };
+      this.$router.push({
+        path: '/settlement/transport-reconciliation/form',
+        query: { mode: 'add', settlementType: this.settlementType, name: '新增运输对账单' },
+      });
     },
     openView(row) {
       this.editor = { visible: true, id: row.id, readonly: true };
@@ -217,30 +222,13 @@ export default {
       this.loadTable();
     },
     async handleExport() {
-      const response = await api.getList(1, 100000, {
-        ...this.query,
+      const params = {
+        ...this.buildSearchParams(),
         settlementType: this.settlementType,
-      });
-      const data = response?.data?.data || response?.data || response || {};
-      const exportRows = (data.records || []).map(item => ({
-        对账单号: item.reconciliationNo,
-        付款方: item.payerName,
-        收款方: item.payeeName,
-        项目名称: item.projectName,
-        所属组织: item.deptName,
-        合同编号: item.contractNo,
-        合同名称: item.contractName,
-        结算金额: Number(item.settlementAmount || 0).toFixed(2),
-        对账模式: item.reconciliationModeName,
-        账单总数: item.externalBillCount,
-        匹配数: item.matchedCount,
-        对账状态: item.reconciliationStatusName,
-        创建人: item.createUserName,
-        创建时间: item.createTime,
-      }));
-      const workbook = XLSX.utils.book_new();
-      XLSX.utils.book_append_sheet(workbook, XLSX.utils.json_to_sheet(exportRows), '运输对账');
-      XLSX.writeFile(workbook, `运输对账${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
+      };
+      if (this.selection.length) params.ids = this.selection.map(item => item.id).join(',');
+      const { data } = await api.exportList(params);
+      downloadFile(data, `运输对账${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
     },
     isEditable(row) {
       return row.reconciliationStatus === 'unfinished';

src/views/system/dept.vue

@@ -42,12 +42,6 @@
       <template #deptCategory="{ row }">
         <el-tag>{{ getDeptCategoryLabel(row.deptCategory) }}</el-tag>
       </template>
-      <template #leaderId="{ row }">
-        {{ getLeaderValue(row.leaderId, 'realName') }}
-      </template>
-      <template #leaderPhone="{ row }">
-        {{ getLeaderValue(row.leaderId, 'phone') }}
-      </template>
       <template #status="{ row }">
         <el-tag :type="Number(row.status) === 1 ? 'success' : 'info'" class="status-text">
           {{ Number(row.status) === 1 ? '启用' : '停用' }}
@@ -174,6 +168,7 @@ export default {
         searchIndex: 4,
         searchMenuPosition: 'right',
         tree: true,
+        rowKey: 'id',
         border: true,
         index: true,
         selection: true,
@@ -183,6 +178,8 @@ export default {
         dialogClickModal: false,
         labelPosition: 'right',
         labelWidth: 'auto',
+        // 禁用 Avue 列状态持久化，避免增列后表头/单元格错位
+        columnState: false,
         column: [
           {
             label: '组织名称',
@@ -206,22 +203,32 @@ export default {
             maxlength: 30,
             showWordLimit: true,
             rules: [
-              {
-                required: true,
-                message: '请输入组织编码',
-                trigger: 'blur',
-              },
               {
                 validator: (rule, value, callback) => {
                   const deptCode = String(value || '').trim();
+                  // 组织编码非必填，为空直接通过
+                  if (!deptCode) {
+                    callback();
+                    return;
+                  }
                   if (deptCode.length > 30) {
                     callback(new Error('组织编码不能超过30个字符'));
                     return;
                   }
-                  if (!this.parentDeptCode) {
+                  const parentId = this.normalizeParentId(this.form?.parentId);
+                  if (!parentId) {
                     callback(new Error('请先选择上级组织'));
                     return;
                   }
+                  if (!this.parentDept || String(this.parentDept.id) !== String(parentId)) {
+                    this.loadParentDeptCode(parentId);
+                    callback(new Error('正在加载上级组织编码，请稍后重试'));
+                    return;
+                  }
+                  if (!this.parentDeptCode) {
+                    callback(new Error('上级组织未配置组织编码，请先完善上级组织编码'));
+                    return;
+                  }
                   const pattern = new RegExp(`^${escapeRegExp(this.parentDeptCode)}-\\d+$`);
                   if (!pattern.test(deptCode)) {
                     callback(new Error(`组织编码格式应为：${this.parentDeptCode}-分段数字`));
@@ -239,6 +246,18 @@ export default {
             minWidth: 140,
             order: 60,
           },
+          {
+            label: '助记码',
+            prop: 'mnemonicCode',
+            minWidth: 120,
+            order: 50,
+          },
+          {
+            label: '拼音助记码',
+            prop: 'pinyinMnemonic',
+            minWidth: 140,
+            order: 45,
+          },
           {
             label: '组织类型',
             type: 'select',
@@ -268,29 +287,40 @@ export default {
             label: '负责人',
             prop: 'leaderId',
             minWidth: 120,
-            slot: true,
             addDisplay: false,
             editDisplay: false,
+            viewDisplay: false,
+            formatter: row => this.getLeaderValue(row.leaderId, 'realName'),
           },
           {
             label: '联系电话',
             prop: 'leaderPhone',
             minWidth: 140,
-            slot: true,
             addDisplay: false,
             editDisplay: false,
+            viewDisplay: false,
+            formatter: row => this.getLeaderValue(row.leaderId, 'phone'),
           },
           {
-            label: '助记码',
-            prop: 'mnemonicCode',
-            minWidth: 120,
-            order: 40,
-          },
-          {
-            label: '拼音助记码',
-            prop: 'pinyinMnemonic',
-            minWidth: 140,
-            order: 50,
+            label: '是否平台公司',
+            prop: 'isPlatformCompany',
+            type: 'select',
+            dicData: [
+              { label: '否', value: 0 },
+              { label: '是', value: 1 },
+            ],
+            dataType: 'number',
+            value: 0,
+            width: 120,
+            order: 35,
+            formatter: row => (Number(row.isPlatformCompany) === 1 ? '是' : '否'),
+            rules: [
+              {
+                required: true,
+                message: '请选择是否平台公司',
+                trigger: 'change',
+              },
+            ],
           },
           {
             label: '排序',
@@ -314,6 +344,7 @@ export default {
             slot: true,
             addDisplay: false,
             editDisplay: false,
+            viewDisplay: false,
           },
           {
             label: '上级组织',
@@ -372,6 +403,20 @@ export default {
     };
   },
   created() {
+    // 清除可能错乱的表格列顺序/列状态缓存，避免新增列后表头/单元格错位
+    try {
+      const path = this.$route?.path || '/system/dept';
+      Object.keys(localStorage).forEach(key => {
+        if (
+          (key.startsWith('tms:table-column-order:') && key.includes(path)) ||
+          (key.startsWith('AVUE_COLUMN_STATE:') && key.includes('dept'))
+        ) {
+          localStorage.removeItem(key);
+        }
+      });
+    } catch (error) {
+      // ignore storage errors
+    }
     this.loadLeaderOptions();
   },
   computed: {
@@ -400,16 +445,47 @@ export default {
       });
     },
     handleParentChange(parentId) {
-      this.loadParentDeptCode(parentId);
+      // Avue tree 选择时可能先触发空值 change，避免把已加载的上级编码清掉
+      const normalizedId = this.normalizeParentId(parentId);
+      if (!normalizedId && this.form?.parentId) {
+        return;
+      }
+      this.loadParentDeptCode(normalizedId || this.form?.parentId);
+    },
+    normalizeParentId(parentId) {
+      if (Array.isArray(parentId)) {
+        parentId = parentId[0];
+      }
+      if (parentId && typeof parentId === 'object') {
+        parentId = parentId.value ?? parentId.id ?? parentId.key;
+      }
+      if (!parentId || String(parentId) === '0') {
+        return '';
+      }
+      return parentId;
     },
     loadParentDeptCode(parentId) {
-      this.parentDeptCode = '';
-      this.parentDept = null;
-      if (!parentId || String(parentId) === '0') return;
-      getDept(parentId).then(res => {
+      const normalizedId = this.normalizeParentId(parentId);
+      if (!normalizedId) {
+        this.parentDeptCode = '';
+        this.parentDept = null;
+        return;
+      }
+      getDept(normalizedId).then(res => {
+        // 防止异步乱序：仅采纳当前表单上级对应的结果
+        if (
+          this.form?.parentId &&
+          String(this.form.parentId) !== '0' &&
+          String(this.form.parentId) !== String(normalizedId)
+        ) {
+          return;
+        }
         this.parentDept = res.data.data || null;
         this.parentDeptCode = this.parentDept?.deptCode || '';
         this.updateDeptCategoryOptions();
+        this.$nextTick(() => {
+          this.$refs.crud?.clearValidate?.('deptCode');
+        });
       });
     },
     updateDeptCategoryOptions() {
@@ -496,6 +572,10 @@ export default {
     loadLeaderOptions(tenantId) {
       getLeaderList(tenantId).then(res => {
         this.leaderOptions = res.data.data || [];
+        // formatter 依赖负责人字典，异步返回后触发表格重绘
+        if (Array.isArray(this.data) && this.data.length) {
+          this.data = [...this.data];
+        }
       });
     },
     getDeptCategoryLabel(deptCategory) {
@@ -510,7 +590,16 @@ export default {
       return categoryMap[Number(deptCategory)] || '-';
     },
     getLeaderValue(leaderId, field) {
-      const values = func.split(leaderId);
+      // func.split 空值时返回 ''，需兼容为数组，避免表格 formatter 渲染崩溃导致列错位
+      const splitResult = func.split(leaderId);
+      const values = Array.isArray(splitResult)
+        ? splitResult
+        : String(splitResult || '')
+            .split(',')
+            .filter(Boolean);
+      if (!values.length) {
+        return '-';
+      }
       const result = values
         .map(id => this.leaderOptions.find(item => String(item.id) === String(id))?.[field])
         .filter(Boolean);
@@ -660,6 +749,9 @@ export default {
     beforeOpen(done, type) {
       if (type === 'add') {
         this.form.tenantId = this.form.tenantId || this.userInfo.tenantId || website.tenantId;
+        if (this.form.isPlatformCompany === undefined || this.form.isPlatformCompany === null) {
+          this.form.isPlatformCompany = 0;
+        }
         this.initData(this.form.tenantId);
         this.loadParentDeptCode(this.form.parentId);
       }
@@ -676,7 +768,8 @@ export default {
           }
           this.loadParentDeptCode(this.form.parentId);
           if (this.form.hasOwnProperty('leaderId')) {
-            this.form.leaderId = func.split(this.form.leaderId);
+            const splitResult = func.split(this.form.leaderId);
+            this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
           }
         });
       }

src/views/system/user.vue

@@ -443,18 +443,22 @@ export default {
   },
   computed: {
     ...mapGetters(['userInfo', 'permission']),
-    // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级
+    // 所属组织级联配置：checkStrictly 为 false 时只能选择最后一级（叶子节点）
     deptCascaderProps() {
       return {
         label: 'title',
         value: 'id',
         children: 'children',
-        emitPath: true,
-        checkStrictly: true,
+        emitPath: false,
+        checkStrictly: false,
         expandTrigger: 'click',
+        leaf: (data, node) => {
+          // 判断是否为叶子节点：没有 children 或 children 为空数组
+          return !data.children || data.children.length === 0;
+        },
       };
     },
-    // 所属组织为单选级联：form.deptId 仍为数组（提交时 join），此处与 id 路径双向转换
+    // 所属组织为单选级联：form.deptId 为数组（提交时 join），级联返回单个 id 值
     deptCascaderValue: {
       get() {
         const ids = Array.isArray(this.form.deptId)
@@ -463,13 +467,10 @@ export default {
             ? [this.form.deptId]
             : [];
         const id = ids.find(item => item !== undefined && item !== null && item !== '');
-        return id === undefined ? [] : this.findDeptPath(id) || [id];
+        return id === undefined ? '' : id;
       },
-      set(path) {
-        const value = Array.isArray(path)
-          ? path.filter(item => item !== undefined && item !== null && item !== '')
-          : [];
-        this.form.deptId = value.length ? [value.at(-1)] : [];
+      set(value) {
+        this.form.deptId = value ? [value] : [];
         this.$refs.userFormRef?.validateField('deptId');
       },
     },