Compare commits
160 Commits
2bd9d8c047
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 6212d68a77 | |||
| ce1ce02551 | |||
| 3a8442e522 | |||
| ac87208ba9 | |||
| 815810f841 | |||
| 4e04cdbc5b | |||
| 57368f0179 | |||
| 7078de6385 | |||
| 4af9afda61 | |||
| 50ab33f369 | |||
| bcbc45bb03 | |||
| ff9fb9168b | |||
| 986feff7b7 | |||
| 3e7110ca8c | |||
| b4e12a671f | |||
| 5bb072223f | |||
| 3d6e297147 | |||
| 82fbb99593 | |||
| 17c482e21a | |||
| 2684624979 | |||
| 84d9e098ba | |||
| c1c4fa18c9 | |||
| 6a87066097 | |||
| 79aa4f9fae | |||
| f1e2313e4c | |||
| acbc9d3322 | |||
| dbeb174ae2 | |||
| 764c0f4581 | |||
| 2131e99ec4 | |||
| 6e5b15f203 | |||
| fbfd5cde89 | |||
| 1a9cd55d66 | |||
| 38e53e01af | |||
| 6ff672211f | |||
| 1bbc97758d | |||
| c1813e308f | |||
| 716ce43862 | |||
| 14c6ad0a31 | |||
| 1972115173 | |||
| 006dc95bf0 | |||
| d187da68d2 | |||
| 70bb94a2e6 | |||
| f78e61b433 | |||
| 508d73fc0d | |||
| e73e1da877 | |||
| 4d5b99da82 | |||
| f3021d4bae | |||
| 7eb6cce2db | |||
| be2888d428 | |||
| 06f6950434 | |||
| 09f1af9a0a | |||
| 6d4961f404 | |||
| cba2ad3b3b | |||
| a7315b4491 | |||
| 0d070d4b34 | |||
| 6a6d10dc79 | |||
| 3bac9b6472 | |||
| 96f2fa0eb5 | |||
| e789f1647a | |||
| c63c7c3e33 | |||
| 23b23dc8e5 | |||
| a0a3d53927 | |||
| 42e4925fd6 | |||
| 024e77801e | |||
| 397490a165 | |||
| 9e14f31604 | |||
| 40925cb21f | |||
| 6f0f1842cb | |||
| 685a37b2df | |||
| b83e3c358d | |||
| 94da08e7a7 | |||
| 008ec7a6a8 | |||
| 429b5548dd | |||
| 6d4434f5c9 | |||
| 4ffceb0413 | |||
| 6eff4b7383 | |||
| a8986690bb | |||
| 87ec01c8dd | |||
| f25e38d67e | |||
| 8a0db99572 | |||
| 9c2a2ee6e6 | |||
| 252df72f87 | |||
| 80a15fc626 | |||
| f858eb2bcd | |||
| a9b4ab069b | |||
| 449e4e1884 | |||
| dea760ea1c | |||
| 9b9e652afd | |||
| 2451efdfcb | |||
| a75ac1cfa4 | |||
| 3a08e12c65 | |||
| a10eea247f | |||
| 4fb8c74b5c | |||
| 0a77fd2014 | |||
| 16af750030 | |||
| a3ff00eaaf | |||
| d901d484fd | |||
| b6fed6892a | |||
| d7ac4e4045 | |||
| f7eea88945 | |||
| 9a4e0f7c03 | |||
| 99d6284a58 | |||
| 17bbde81b2 | |||
| 3482d03905 | |||
| b446e34c94 | |||
| 704c3093d7 | |||
| 36cc9c751c | |||
| e98aa61cd2 | |||
| cec4c323a7 | |||
| 58abe5ebdf | |||
| fc70aeb2af | |||
| 9342e674c5 | |||
| a176608019 | |||
| 3a262216c7 | |||
| c9f673342a | |||
| 2acdcb08a9 | |||
| 2c08d0c362 | |||
| b36aefc7c4 | |||
| 7f70052afd | |||
| 84c46b9312 | |||
| 88c5f58548 | |||
| 1cf8abb162 | |||
| 201ca245a7 | |||
| bfb8659cd8 | |||
| ae45e88df9 | |||
| 9d512ebad4 | |||
| 5dc3c2d2c5 | |||
| 70ebe31103 | |||
| c3f05a342e | |||
| dca137df8d | |||
| 8b1ac09592 | |||
| 35a43cce7a | |||
| 808a52ae25 | |||
| 899a8c1c2b | |||
| dc5a2235eb | |||
| 3da2d428f3 | |||
| cb98355715 | |||
| 335e45c3f1 | |||
| 325e708ef1 | |||
| 112acbbf34 | |||
| d58f73ab50 | |||
| fdd17c5878 | |||
| 8bf0c31dcd | |||
| bb97c00a6a | |||
| f21e3d56d9 | |||
| cf39d63396 | |||
| 5033dc9e43 | |||
| 3cb365253b | |||
| 665503f43e | |||
| 4340c9fc59 | |||
| 7c12163966 | |||
| d6b6be0e9b | |||
| 55583551b5 | |||
| 9c783c802d | |||
| 495e6a073c | |||
| 1ebd4d0fa3 | |||
| 6a0ea777da | |||
| 1625fb292d | |||
| e309987199 | |||
| f3c29ef2bf |
@@ -38,3 +38,115 @@
|
|||||||
- 根因:用户截图反馈 customer-archive 的"准入类型/审批状态/状态"列文字比其它列小/错位。`.el-tag` 默认 `font-size: var(--el-tag-font-size)`(12px)且 `height` 固定,即便 `.status-text` 去掉了背景边框,字号和盒模型仍与单元格普通文本不一致。
|
- 根因:用户截图反馈 customer-archive 的"准入类型/审批状态/状态"列文字比其它列小/错位。`.el-tag` 默认 `font-size: var(--el-tag-font-size)`(12px)且 `height` 固定,即便 `.status-text` 去掉了背景边框,字号和盒模型仍与单元格普通文本不一致。
|
||||||
- 修复:在 `src/styles/element-ui.scss` 的 `.el-tag.status-text` 全局规则追加 `font-size: inherit !important; height: auto !important; vertical-align: baseline; line-height: inherit;`,强制继承父级字号与行高,高度随内容自适应,基线对齐与普通 inline 文本一致。
|
- 修复:在 `src/styles/element-ui.scss` 的 `.el-tag.status-text` 全局规则追加 `font-size: inherit !important; height: auto !important; vertical-align: baseline; line-height: inherit;`,强制继承父级字号与行高,高度随内容自适应,基线对齐与普通 inline 文本一致。
|
||||||
- 结论:所有使用 `.status-text` 的状态列(customer-archive 准入类型/审批状态/状态、transport-plan 调度状态、waybill 运单状态、payment 审批状态、启用停用等)自动与相邻普通文字列的字体字号/行高/基线完全统一,无需逐页修改。
|
- 结论:所有使用 `.status-text` 的状态列(customer-archive 准入类型/审批状态/状态、transport-plan 调度状态、waybill 运单状态、payment 审批状态、启用停用等)自动与相邻普通文字列的字体字号/行高/基线完全统一,无需逐页修改。
|
||||||
|
|
||||||
|
## 临时额度详情弹窗长 label 折成两行
|
||||||
|
- 需求:用户截图反馈 `temporary-credit-limit` 详情弹窗中,"已使用项目资金使用额度(万元)" 和 "剩余项目资金使用额度(万元)" label 被折成三行,希望只折两行。
|
||||||
|
- 根因:`business-crud-page` 自定义详情弹窗(`detailBox`)使用 `el-descriptions :column="2"`,`.el-descriptions__label` 在 `business-crud-page__detail-content` 里被全局固定 `width: 140px`,15 个汉字的超长 label 在 140px 下被挤成三行。
|
||||||
|
- 修复:
|
||||||
|
- 让 `business-crud-page` 的详情弹窗根节点也携带页面对话框的 `dialogCustomClass`(在 `:class` 数组中加入 `$attrs.option?.dialogCustomClass`),使 `temporary-credit-limit-dialog` 类能作用到详情弹窗。
|
||||||
|
- 在 `temporary-credit-limit.vue` 全局 `<style>` 中新增 `.temporary-credit-limit-dialog .business-crud-page__detail-content .el-descriptions__label { width: 180px !important; }`,只对该页详情 label 加宽,让 15 字 label 自然折成两行。
|
||||||
|
- 改动文件:`src/views/business/components/business-crud-page.vue`、`src/views/business/temporary-credit-limit.vue`。
|
||||||
|
- 结论:仅临时额度管理详情弹窗的 label 列宽加宽到 180px,其它页面详情弹窗保持 140px 不变。
|
||||||
|
|
||||||
|
## 年检记录费用字段单位放 label
|
||||||
|
- 需求:用户截图反馈 `annual-inspection-record` 新增弹窗中"费用"输入框右侧带"元" suffix,要求把"元"放到 label 后并用括号括起,即"费用(元)",保持风格一致。
|
||||||
|
- 改动文件:
|
||||||
|
- `src/option/vehicle/annual-inspection-record.js`:`label` 由 "费用" 改为 "费用(元)";移除 `append: '元'`(因表单走自定义 slot,该属性本不生效,但清理避免歧义)。
|
||||||
|
- `src/views/vehicle/annual-inspection-record.vue`:自定义 `#feeForm` 的 `<el-input>` 移除 `<template #append>元</template>`。
|
||||||
|
- 结论:新增/编辑弹窗中费用字段 label 显示为"费用(元)",输入框不再带右侧"元" suffix。
|
||||||
|
|
||||||
|
## 维修记录里程字段单位放 label(动态单位)
|
||||||
|
- 需求:用户要求 `maintenance-record` 把里程输入框右侧"公里" suffix 移到 label 后括起来,风格与"费用(元)"一致。
|
||||||
|
- 差异:该字段有单位切换(车辆→公里,船舶→海里),故 label 需动态。
|
||||||
|
- 改动文件:`src/views/vehicle/maintenance-record.vue`(option 内联在 data 中,无独立 option 文件):
|
||||||
|
- 默认 `label` 由 "里程/航程数" 改为 "里程/航程数(公里)"。
|
||||||
|
- `updateVehicleType()` 中原 `mileageColumn.append = mileageUnit;` 改为 `mileageColumn.label = \`里程/航程数(${mileageUnit})\``,跟随车船类型动态切换标签(车辆→公里 / 船舶→海里)。
|
||||||
|
- 自定义 `#mileageForm` 的 `<el-input>` 移除 `<template #append>{{ form.mileageUnit || '公里' }}</template>`。
|
||||||
|
- 结论:表单/列头 label 随车船类型显示"里程/航程数(公里)"或"里程/航程数(海里)",输入框不再带单位 suffix;列表数据值仍由 `#mileage` slot 的 `formatMileage()` 带单位显示(如"100 公里"),未改动。
|
||||||
|
|
||||||
|
## 全站 Avue CRUD 弹窗标题加页面全称
|
||||||
|
- 需求:新增/编辑/查看弹窗标题统一加全名称,如"新增空港机场主数据"(原只显示"新增"/"编辑"/"查看")。
|
||||||
|
- 根因:Avue 弹窗标题默认走 i18n 的 addTitle/editTitle/viewTitle,全站页面均未配置,故只有动作词。
|
||||||
|
- 实现:新增全局 mixin `src/utils/crud-dialog-title.js` 的 `setupCrudDialogTitle(app)`,在 `main.js` 中 `app.mount` 前调用注册;组件 `created` 时自动给含 `column` 数组的 `this.option` 注入 `addTitle/editTitle/viewTitle = 新增/编辑/查看 + 页面菜单中文标题`(来源 `this.$router.$avueRouter.generateTitle(this.$route,{label:'name'})`);页面可手动配置这三个字段覆盖,或定义 `getCrudPageTitle()` 自定义来源;已配置则不覆盖。
|
||||||
|
- 影响范围:全站约 80 个 avue-crud 页面自动生效;手写 el-dialog / PageAvueForm 独立表单页不受影响。
|
||||||
|
- 校验:dev 服务器 localhost:2889 正常(200)。HMR 热更新生效,无需重启。
|
||||||
|
|
||||||
|
## 合同管理独立表单页标题补漏
|
||||||
|
- 需求:用户反馈 `business/contract-manage/form` 独立表单页顶部没有像 `project-apply/form` 一样的"新增合同管理"标题。
|
||||||
|
- 根因:contract-manage 是手写表单页(非 business-crud-page),页面内已有 `formPageTitle` computed(取 `query.name` 或默认"新增/编辑合同管理"),但模板里未渲染。
|
||||||
|
- 修复:在 `src/views/business/contract-manage.vue` 的表单页 `<template v-else>` 中、`<el-form>` 前加入 `<div class="archive-page-form__title">{{ formPageTitle }}</div>`,复用全局 `archive-page-form__title` 样式。
|
||||||
|
- 结论:contract-manage/form 现在顶部显示"新增合同管理"/"编辑合同管理",与 project-apply 风格一致。
|
||||||
|
|
||||||
|
## formal-settlement 表格包进应付/应收 tabs
|
||||||
|
- 需求:结算-正式结算页(/settlement/formal-settlement)表格要包进"应付/应收"两个 tab 内(原 el-tabs 的 pane 是空壳,表格在 el-tabs 外作为兄弟节点)。
|
||||||
|
- 实现:复用已有组件 `src/views/settlement/components/formal-settlement-table-panel.vue`(工具栏+表格+分页一体,通过 emit 事件与父通信),分别挂入"应付""应收"两个 `el-tab-pane` 内,共享父级 `rows/columns/loading/page/hasPermissionFn`,事件回连:@create→openCreate、@payment→openPaymentDialog、@sync→handleSync、@export→handleExport、@refresh→loadTable、@page-change→onPageChange、@action→onAction(分发 view/edit/delete/submit/approve/return/void/print)、@update:selection→selection 同步。切 tab 仍走 `handleSettlementTypeChange` 重载数据。
|
||||||
|
- 配套改动:父页 `:has-permission` 传 `hasPermissionFn`(computed 返回箭头函数,避免方法作 prop 时 this 丢失导致权限恒为 true);`handlePrint(row)` 增加可选 row 入参;移除父页内联表格及对应 scoped 样式(.formal-page__toolbar/links/pagination);组件操作列 width 120→320(符合 AGENTS.md >3 按钮规范)。
|
||||||
|
- 校验:@vue/compiler-sfc parse/compileTemplate 0 错误、esbuild 脚本语法 OK;`pnpm build` 因沙箱保护 dist/ 被拦截(非代码问题)。仅改 formal-settlement.vue 一个页面文件 + 组件 width。
|
||||||
|
|
||||||
|
## 临时额度管理附件上传按钮移至表格左下角
|
||||||
|
- 需求:用户截图反馈 `business/temporary-credit-limit` 新增弹窗中「上传附件」按钮在表格上方,要求统一放到附件表格左下角,与 project-apply 的项目材料交互一致。
|
||||||
|
- 改动文件:`src/views/business/temporary-credit-limit.vue`:
|
||||||
|
- 模板:将 `vehicle-attachment-upload` 从 `temporary-credit-limit-page__attachment-head` 移除,放到 `el-table` 之后的新增 `temporary-credit-limit-page__attachment-upload` 容器内;head 内只保留「批量下载」按钮。
|
||||||
|
- 样式:`&__attachment-head` 的 `justify-content` 由 `space-between` 改为 `flex-end`;新增 `&__attachment-upload` 样式,左对齐并控制上传组件宽度自适应。
|
||||||
|
- 结论:临时额度管理附件区域现与合同管理、项目材料保持一致:批量下载在表格上方右侧,上传附件在表格下方左侧。
|
||||||
|
|
||||||
|
## 项目材料上传提示文字移到按钮右侧
|
||||||
|
- 需求:用户要求 project-apply/form「上传附件」按钮支持指定格式(pdf/bmp/jpeg/png/jpg/doc/docx/ppt/pptx/xlsx/xls/eml/msg/zip)、单文件 50M,并把提示文字放到按钮后面(右侧同一行)。
|
||||||
|
- 现状:project-apply.vue 第 537-540 行早已配置 `:file-types`、`:max-size="50"` 与完整 `tip` 文案,但 vehicle-attachment-upload 组件默认把提示渲染在按钮下方。
|
||||||
|
- 修复:仅改 `&__upload` 样式,用 `:deep` 把 `.vehicle-attachment-upload` 设为 `display:flex; align-items:center`,并把 `.el-upload__tip` 由默认块级(下方)改为 `display:inline-block; margin-left:12px`,使格式/大小提示与按钮同一行、位于按钮右侧。
|
||||||
|
- 结论:project-apply 附件提示现为"上传附件按钮 + 右侧灰色提示文字",未改动组件逻辑与其它页面。
|
||||||
|
|
||||||
|
## 附件格式说明三页统一(按钮右侧 30px / 500M)
|
||||||
|
- 需求:用户要求「支持pdf、bmp、…、zip,单个文件不超过500M」这段说明在 project-apply / temporary-credit-limit / contract-manage 三处附件上传区统一摆放:放到「上传附件」按钮右侧、间距 30px、文字左对齐;文件限制上限由 50M 改为 500M(说明与校验一致)。
|
||||||
|
- 实现(三页一致):
|
||||||
|
- 统一 `tip` 文案:`支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式,单个文件不超过500M`。
|
||||||
|
- `:max-size`(contract-manage 为 `maxSize`)统一 500;project-apply / temporary-credit-limit 由 50→500。
|
||||||
|
- 样式:用 `:deep` 把 `.vehicle-attachment-upload` 设为 `display:flex;align-items:center`,`.el-upload__tip` 改 `display:inline-block;margin-left:30px;color:#909399;font-size:13px;text-align:left`,使说明在按钮右侧 30px、左对齐。
|
||||||
|
- contract-manage 的 AttachmentSection render 把上传按钮从表格上方 head 移到表格下方左侧(`.contract-manage-form__attachment-upload`),head 仅保留「批量下载」;同步删除失效的 `__attachment-actions` 死样式,新增 `__attachment-upload` 样式。至此三页上传按钮均位于附件表格左下角、说明在按钮右侧。
|
||||||
|
- 校验:@vue/compiler-sfc 对三文件 parse/compileScript/compileTemplate 均 OK;dev localhost:2889 HMR 已生效。
|
||||||
|
|
||||||
|
## 全站附件上传统一(vehicle-attachment-upload 组件级单一事实来源)
|
||||||
|
- 需求:把"上传附件按钮在附件表格左下角 + 按钮右侧 30px 左对齐统一说明 + 单文件 500M"方案应用到整个站点,统一风格。
|
||||||
|
- 核心做法(改 1 个组件即全站生效):`src/components/vehicle-attachment-upload/main.vue`
|
||||||
|
- 新增常量 `UNIFIED_ATTACHMENT_TIP = '支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式,单个文件不超过500M'`;`tipText` 改为 `this.tip || UNIFIED_ATTACHMENT_TIP`(不再按 acceptText 拼装)。
|
||||||
|
- `maxSize` 默认值 `0` → `500`(说明与校验一致)。
|
||||||
|
- 模板 `v-if="showTip && ..."` 去掉 `showTip` 门控 → `v-if="tipText && !readonly"`,全站始终显示统一说明(原 `:show-tip="false"` 变为无害 no-op,未逐一清理)。
|
||||||
|
- SCSS 新增 `.vehicle-attachment-upload :deep(.el-upload){display:flex;align-items:center}` 与 `:deep(.el-upload__tip){display:inline-block;margin:0 0 0 30px;color:#909399;font-size:13px;text-align:left}`,按钮与说明内联、说明在按钮右侧 30px 左对齐。
|
||||||
|
- 表格型附件区布局对齐(上传移表格下方左侧,批量下载留表头右侧):business-crud-page.vue(2 处 attachmentsJson-form / 派车明细附件)、contract-manage-change.vue、pre-settlement-editor.vue、master-order-editor.vue、payment-application-form.vue、invoice-application-form.vue;各页新增 `__attachment-upload` 左对齐样式、`__attachment-head` 改 `justify-content:flex-end`。
|
||||||
|
- 大小异常值修正:bill-ledger-form / bill-payment-form 的 `:max-size="10"` → 500;invoice-application-form `:max-size="50"` → 500(同时把上传从表格上方移到下方)。
|
||||||
|
- 已是下方布局无需移动(仅随组件生效):invoice-receipt / receipt-claim-record / receipt-flow / bill-ledger / bill-payment / formal-settlement-editor(独立上传无表格)/ 各 vehicle 页(独立上传无表格)。
|
||||||
|
- 校验:@vue/compiler-sfc 对 12 个改动文件(组件 + 上述各页 + 此前已改的 project-apply/temporary-credit-limit/contract-manage)全部编译通过;grep 确认全站无残留非 500M 的附件 max-size。
|
||||||
|
|
||||||
|
## master-order 附件上传"按钮 + 描述"由两行改一行
|
||||||
|
- 需求:用户截图 `/business/master-order?mode=editor` 详情附件区,"上传附件"按钮与"支持pdf…"描述文字分别居中、各占一行,要求并到同一行(与 vehicle-attachment-upload 组件默认样式一致)。
|
||||||
|
- 根因:`master-order-editor.vue` 第 1814-1824 行 scoped CSS 把 `.master-editor__attachment-upload .el-upload` 强制 `display: inline-flex` 但未显式 `flex-wrap/align-items/text-align`;而 Element Plus 全局 `.el-upload` 默认 `text-align: center`,加 inline-flex 子元素被 EP 默认行为按各自一行居中显示。
|
||||||
|
- 修复:在 `.master-editor__attachment-upload` 内用 `:deep(.el-upload)` 显式声明 `display: inline-flex; align-items: center; flex-wrap: nowrap; text-align: left`,并 `:deep(.el-upload__tip)` 改 `display: inline-block; margin: 0 0 0 8px; color:#909399; font-size:13px; line-height:1.4; white-space:normal; text-align:left`,让按钮与说明内联排成一行。
|
||||||
|
- 结论:master-order 附件区与 project-apply/temporary-credit-limit/contract-manage 风格一致(按钮左 + 描述贴右侧)。
|
||||||
|
|
||||||
|
## vehicle-attachment-upload 恢复 showTip 门控
|
||||||
|
- 根因:用户截图 feedback `customer-archive/form` 的「OCR上传识别」按钮下方仍显示统一附件说明,要求「OCR上传识别这里不用加描述」。该组件虽有 `showTip` prop,但此前「全站附件上传统一」时把模板门控 `v-if="showTip && tipText && !readonly"` 简化成了 `v-if="tipText && !readonly"`,导致 `:show-tip="false"` 失效。
|
||||||
|
- 修复:恢复 `src/components/vehicle-attachment-upload/main.vue` 第 24 行的 `showTip &&` 条件,使 `:show-tip="false"` 可正常隐藏按钮旁说明;`customer-archive.vue` 中 OCR 上传实例已配置 `:show-tip="false"`,无需额外改动。
|
||||||
|
- 影响:所有 `:show-tip="false"` 的调用点(annual-inspection/maintenance/accident/violation/tire/customer-archive 等)现在会按预期隐藏提示;未配置 `show-tip` 或 `:show-tip="true"` 的实例继续显示 `UNIFIED_ATTACHMENT_TIP`。
|
||||||
|
|
||||||
|
## customer-archive 客商材料上传按钮左、描述右、间距 30px
|
||||||
|
- 需求:用户第三轮明确「客商材料」表格下"上传附件"按钮与「支持pdf…」描述需并排、按钮左、描述右、间距严格 30px。
|
||||||
|
- 定位:`src/views/vehicle/customer-archive.vue` 第 4637-4666 行 `.qualification-upload-bar`(grid 1fr auto 1fr 改 flex 的二次修正)。
|
||||||
|
- 修复:保留 flex 容器,按钮区 `.vehicle-attachment-upload > :deep(.el-upload)` `flex: 0 0 auto` 贴左固定;描述 `:deep(.el-upload__tip)` `margin-left: 30px + white-space: nowrap + overflow:hidden + text-overflow:ellipsis + text-align:left`,与按钮同行紧贴、间距固定 30px、超长文案省略号。
|
||||||
|
- 结论:布局"「上传附件」按钮 ←30px→ 「支持pdf…」描述",单行两端对齐。
|
||||||
|
|
||||||
|
## sidebar 子路由高亮回退(方案B)
|
||||||
|
- 需求:用户反馈点「客商档案」菜单后,再点新增/编辑/查看(跳子路由 /vehicle/customer-archive/form),左侧菜单选中灰底消失。
|
||||||
|
- 根因:sidebar `activeMenu` getter 在无 `meta.activeMenu` 时退到 `route.path`(即子路由 /vehicle/customer-archive/form),与菜单 path /vehicle/customer-archive 不匹配,`<el-menu :default-active>` 找不到项 → 高亮丢失。同因还影响 /business/contract-manage/change 等独立子路由。
|
||||||
|
- 修复(方案B,通用兜底,改 1 文件):`src/page/index/sidebar/index.vue`
|
||||||
|
- 新增 `menuPaths` computed:递归收集全站菜单 `website.menu` 的 `path` 字段进 Set。
|
||||||
|
- `activeMenu` 在 `return path` 前加分支:当 `path` 不在 menuPaths 时,过滤出所有 `path.startsWith(p + '/')` 的菜单路径,按长度降序取最长前缀匹配者作为高亮项(即 /vehicle/customer-archive/form → /vehicle/customer-archive)。
|
||||||
|
- 原有 `meta.activeMenu` 与 `menuIndexes`(带参菜单精确匹配)分支保持不变;路径完全相同的路由仍精确匹配,不受影响。
|
||||||
|
- 结论:一次改动全站受益,所有"父菜单 + 独立子表单页"场景(customer-archive/form、contract-manage/change 等)自动保持父菜单高亮,无需逐路由配 activeMenu。HMR 已生效。
|
||||||
|
|
||||||
|
## master-order-dispatch 运费单位 select 撑爆 append 槽
|
||||||
|
- 需求:用户截图 dispatch 页"任务信息"块下"数量 → 吨"与"单价 → 元/吨"两个 select 宽度比左侧 input 还宽,红框标记要求改小。
|
||||||
|
- 根因:`src/views/business/components/master-order-dispatch.vue` 第 702 行 `.dispatch-form` 全局规则 `:deep(.el-input), :deep(.el-select), :deep(.el-date-editor), :deep(.el-input-number) { width: 100%; }` 把整个 dispatch 表单内**所有** el-select 强制 100% 宽;这两个 select 处于 `el-input` 的 `#append` slot 内,被强制撑开 append 容器,append 又把整个 `el-col :span="6"` 列占满。第 707 行 `.freight-form { :deep(.freight-unit-select) { width: 92px; } }` 想兜底 92px,但因 specificity 与覆盖时机问题未生效。
|
||||||
|
- 修复(最小改动,2 处):
|
||||||
|
- 行 702 末尾追加 `:deep(.el-input-group__append .el-select) { width: auto; }`,使 append 内的 select 退回内容自适应宽度(避免被 100% 拉伸)。
|
||||||
|
- 行 707 强化兜底:`.freight-unit-select` 加 `flex: 0 0 92px; min-width: 0;`,固定 92px 防止 append flex 拉伸。
|
||||||
|
- 结论:单位 select(吨/元/吨)宽度由内容决定(≈92px),不再撑爆 append 与列;其它顶层 select(承运商/币种等)仍维持 100% 宽,行为不变。
|
||||||
|
|||||||
@@ -0,0 +1,343 @@
|
|||||||
|
# 2026-08-26
|
||||||
|
|
||||||
|
## el-table 内嵌 el-autocomplete 撑满列宽(全局规则补充)
|
||||||
|
|
||||||
|
**问题**: `business/transport-plan/form?mode=add` 独立表单页"货物信息"表格,
|
||||||
|
「货物名称」列 placeholder `请输入货物名称` 只显示 `请输入货物名…`。
|
||||||
|
|
||||||
|
**根因**: `element-ui.scss` 兜底规则只覆盖 `.el-input`,而 `<el-autocomplete>` 在 Element Plus 中
|
||||||
|
根节点是 `.el-autocomplete` 包装层,内部才是 `.el-input`,中间多了一层导致选择器不命中,
|
||||||
|
autocomplete 没有拉满 cell,placeholder 被内边距 / clear 图标挤压截断。
|
||||||
|
|
||||||
|
**修复**:
|
||||||
|
- `src/styles/element-ui.scss` 第 663 行兜底规则追加:
|
||||||
|
- `.cell > .el-autocomplete` `width:100%`
|
||||||
|
- `.cell > .el-autocomplete > .el-input` `width:100%`
|
||||||
|
- `.cell > .el-autocomplete .el-input__wrapper` `width:100%`
|
||||||
|
- `src/views/business/components/business-crud-page.vue:1520` 独立表单页
|
||||||
|
"货物名称"列 `min-width="150"` → `240`(与 1544 行「货物类型」cascader 列一致)。
|
||||||
|
|
||||||
|
其它内嵌 `<el-select>` / `<el-input>` / `<el-cascader>` 不受影响(选择器依旧命中),
|
||||||
|
3626 行(调度明细「货物名称」用的是 el-select)未做改动。
|
||||||
|
|
||||||
|
## 全站搜索栏 label 宽度统一 88px
|
||||||
|
|
||||||
|
**问题**: 主人反馈 `business/master-order` 搜索区 label 宽度 160px,要求全站统一改成 88px,
|
||||||
|
参考 `business/shipping-template`(已经是 88px)。
|
||||||
|
|
||||||
|
**调研**:
|
||||||
|
- `src/styles/element-ui.scss:133-136` 已有 `.avue-crud__search .el-form-item__label { min-width: 88px; }`,
|
||||||
|
全站 Avue 自动搜索栏视觉上就是 88px。
|
||||||
|
- shipping-template 走 `<business-crud-page>`(Avue),所以 label 是 88px。
|
||||||
|
- 但是项目里有 18 个文件,22 处直接手写 `<el-form ... label-width="160px">`,不走 `.avue-crud__search`,
|
||||||
|
视觉就是 160px。这些都是**搜索/筛选** `<el-form>`(顶层 query 或子表单),不是表单 dialog 内填表。
|
||||||
|
|
||||||
|
**改动**: 全部 22 处 `label-width="160px"` → `label-width="88px"`。
|
||||||
|
|
||||||
|
涉及文件:
|
||||||
|
- business: master-order.vue, voucher-manage.vue(3 处), loading-manage.vue
|
||||||
|
- payment: invoice-application, invoice-receipt, receipt-flow, receipt-claim-record,
|
||||||
|
payment-application, components/bill-ledger-search, components/bill-payment-search
|
||||||
|
- settlement: settlement-adjustment, receivable-payable-detail, pre-settlement,
|
||||||
|
formal-settlement, transport-reconciliation, components/transport-reconciliation-editor,
|
||||||
|
components/formal-settlement-editor(3 处,都是子筛选)
|
||||||
|
- transit: risk-disposal, exception-disposal
|
||||||
|
|
||||||
|
**遗漏补丁**: `transit/exception-disposal.vue` 搜索区不走 Avue,而是在 scoped 样式里用
|
||||||
|
`:deep(.el-form-item__label) { min-width: 160px }` 写死,盖过了全局 88px。
|
||||||
|
已改为 `min-width: 88px`(文件第 443 行)。`risk-disposal.vue` 无此 scoped 覆盖,本来就是 88px。
|
||||||
|
|
||||||
|
**未做改动**: 表单 dialog 内填写项(`shipping-template-dialog` /
|
||||||
|
`transport-plan-dialog` / `waybill-manage-dialog` 等)走专门的 dialogCustomClass + labelWidth:100,
|
||||||
|
不受本规则影响。
|
||||||
|
其余残留 160px 均非搜索栏: project-apply.vue:2095(表单详情弹窗 label,故意留 6 汉字)、
|
||||||
|
customer-archive.vue:4980(按钮 min-width)、cargo-type.vue:604(选择器拼错不生效,设 50px)。
|
||||||
|
|
||||||
|
## payment-application 表单 input 文字居左
|
||||||
|
|
||||||
|
- `src/views/payment/payment-application-form.vue`:追加 scoped 样式,使 `el-input-number` 的输入文字居左对齐(付款比例、申请付款金额等数字字段),与 bill-ledger-form 保持一致。
|
||||||
|
|
||||||
|
## 正式结算查看页去除内容行高
|
||||||
|
|
||||||
|
**问题**: `settlement/formal-settlement/form?mode=view` 中只读字段(如项目名称、合同名称)
|
||||||
|
多行文本行高过大,Element Plus 默认 `.el-form-item__content` 的 `line-height` 导致显示松散。
|
||||||
|
|
||||||
|
**修复**: `src/views/settlement/components/formal-settlement-editor.vue` scoped 样式追加:
|
||||||
|
```scss
|
||||||
|
.formal-editor :deep(.el-form-item__content) {
|
||||||
|
line-height: normal;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 全站表单项间距统一 14px
|
||||||
|
|
||||||
|
**诉求**: `settlement/pre-settlement/form?mode=add` 中 `.el-form-item` 间距偏大,要求统一为 14px 且全站一致(用户指"表单项间距")。
|
||||||
|
|
||||||
|
**排查**: 全站 `.el-form-item` 的 `margin-bottom` 取值不一致——表单填写区有 16px / 18px / 20px,
|
||||||
|
搜索栏统一 8px(保留),个别特殊分组 28px(risk-disposal,保留)。全局 `.el-form-item--default`
|
||||||
|
已是 14px,但各页面 scoped `:deep(.xxx .el-form-item)` 覆盖成了 16/18/20px。
|
||||||
|
|
||||||
|
**改动(表单填写区统一 14px,16/18/20 → 14)**:
|
||||||
|
- settlement: `components/pre-settlement-editor.vue:1637`(16→14)、
|
||||||
|
`components/formal-settlement-editor.vue:1560`(16→14)、
|
||||||
|
`receivable-payable-detail.vue:1860`(16→14)、
|
||||||
|
`components/transport-reconciliation-editor.vue:805`(16→14)、
|
||||||
|
`components/settlement-adjustment-editor.vue:560`(16→14)
|
||||||
|
- business: `voucher-manage.vue:1022`(16→14)、`loading-manage.vue:2751`(16→14)、
|
||||||
|
`project-apply.vue:2091`(16→14)、`contract-manage.vue:2253`(16→14)、
|
||||||
|
`components/business-crud-page.vue:13380/13894`(16→14)、
|
||||||
|
`components/master-order-dispatch.vue:700`(16→14)
|
||||||
|
- payment: `invoice-receipt-form.vue:755`(16→14)、`user.vue:1097`(16→14)、
|
||||||
|
`bill-ledger-form.vue:564`(16→14)、`payment-application-form.vue:1324`(16→14)、
|
||||||
|
`bill-payment-form.vue:382`(16→14)
|
||||||
|
- 全局: `components/cron-editor/main.vue:579`(18→14)、
|
||||||
|
`styles/element-ui.scss:430`(`.dialog-form--carded` 20→14)
|
||||||
|
|
||||||
|
**保留未动**: 所有 `__search` 搜索栏的 8px、risk-disposal 的 28px 特殊分组、transportCapacity
|
||||||
|
vehicle/driver/ship 与 customer-archive 等本就是 14px(含 !important)。
|
||||||
|
|
||||||
|
## project-apply 表头颜色在不同电脑不一致
|
||||||
|
|
||||||
|
**问题**: 客户反馈 `business/project-apply/form?mode=add` 页面中「客户信息」等表格表头颜色
|
||||||
|
在用户电脑是 `#374151`,客户电脑是 `#909399`。
|
||||||
|
|
||||||
|
**根因**:
|
||||||
|
- `src/styles/theme/go.scss` 中 `.theme-go .el-table tr th .cell { color: #374151 }` 把表头文字写死为 `#374151`。
|
||||||
|
- 客户电脑未使用 `theme-go`,表头文字走 Element Plus 默认 CSS 变量
|
||||||
|
`--el-table-header-text-color: #909399`。
|
||||||
|
- `src/views/business/project-apply.vue` 里的 `:deep(.el-table__header th) { color: #303133 }`
|
||||||
|
只作用在 `th` 上,颜色靠继承,优先级敌不过直接写在 `.cell` 上的规则和 Element Plus 默认值,
|
||||||
|
所以实际没生效。
|
||||||
|
|
||||||
|
**修复**:
|
||||||
|
- `src/styles/element-ui.scss` 在「统一全站 el-table 表头背景色」之后追加规则:
|
||||||
|
```scss
|
||||||
|
.el-table .el-table__header-wrapper th.el-table__cell .cell {
|
||||||
|
color: #374151;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
直接作用于 `.cell`,特异性高于 `theme-go` 和 Element Plus 默认,全站统一为 `#374151`。
|
||||||
|
- `src/views/business/project-apply.vue` 清理两处与全局冲突且不生效的局部表头样式:
|
||||||
|
删除 `background: #f5f7fa; color: #303133;`,保留 `font-weight: 600`,
|
||||||
|
选择器改为 `:deep(.el-table__header th .cell)`。
|
||||||
|
|
||||||
|
## 弹窗 / 独立表单页底栏「保存+提交+返回」按钮统一风格
|
||||||
|
|
||||||
|
**问题**: 主人截图 `business/project-apply/form?mode=add` 页面底部 `[保存][提交][返回]` 三个按钮,
|
||||||
|
- 保存 + 提交 都是 `type="primary"` 蓝实心,视觉层级无区分。
|
||||||
|
- 排序「主→主→次」,主操作不靠右,与全站其它页面(business-crud-page 等)已用的「次→中→主」不一致。
|
||||||
|
|
||||||
|
**修复**: 统一定 3 档层级 + 「次→中→主」排序。
|
||||||
|
| 语义 | 写法 |
|
||||||
|
| --- | --- |
|
||||||
|
| 次要(返回/取消) | 默认(无 type)灰描边 |
|
||||||
|
| 中间步骤(保存草稿) | `type="primary" plain` 蓝描边 |
|
||||||
|
| 主操作(提交) | `type="primary"` 蓝实心 |
|
||||||
|
|
||||||
|
排序模板:`[可选辅助(如同步)][返回/取消][保存草稿][提交]`,主操作永远最右。
|
||||||
|
|
||||||
|
**改动文件**:
|
||||||
|
- `business/project-apply.vue:617-651` — 主 footer + 变更 footer 都重排,`保存` 加 plain。
|
||||||
|
- `payment/invoice-receipt-form.vue:242-252` — 保存加 plain,返回挪到保存前面。
|
||||||
|
- `payment/invoice-application-form.vue:419-429` — 同上。
|
||||||
|
|
||||||
|
**未改动(已合规)**:
|
||||||
|
- `settlement/components/pre-settlement-editor.vue` — 默认已是「默认保存 + primary 提交」。
|
||||||
|
- `settlement/components/transport-reconciliation-editor.vue` — 两个 plain 中间步骤 + 完成对账 实心,层级清晰。
|
||||||
|
|
||||||
|
**沉淀**: `MEMORY.md` 新增「弹窗 / 独立表单页底栏按钮统一规则」一节,作为新页面 footer 写法标准。
|
||||||
|
|
||||||
|
## customer-archive 全部 footer 同步按新增项目模块标准对齐
|
||||||
|
|
||||||
|
**问题**: 主人指出客户档案页面 `/vehicle/customer-archive/form?name=新增客商档案` 没有按统一规则调整,
|
||||||
|
并明确要求「浮动页面底部、按钮区域靠右对齐,返回在第一个,中间的用浅蓝色,最后一个是 primary 深蓝色」,
|
||||||
|
参考新增项目模块 `/business/project-apply/form?mode=add`。
|
||||||
|
|
||||||
|
### customer-archive.vue 共 5 处 footer 改动
|
||||||
|
|
||||||
|
- `archive-form__footer` (802-809) 原状「取消/返回 + 保存 primary + 提交 success 绿」混合 4 按钮。改为 `[返回/取消/关闭] + 保存 plain + 提交 primary`,并删掉「success 绿」换成 primary 深蓝。
|
||||||
|
- `contact-dialog` (867-870) 原状 `[保存 primary][返回]`,容器居中。改为 `[返回][保存 plain]`,容器 flex-end。
|
||||||
|
- `receipt-dialog` (965-969) 同上模式。
|
||||||
|
- `invoice-dialog` (1085-1089) 同上模式。
|
||||||
|
- `score-detail-dialog` (1343-1359) 原状 total 左 + `[保存 primary][复评确认 primary][返回]`。改为 total 左 + `[返回][保存 plain][复评确认 primary]`。
|
||||||
|
|
||||||
|
### customer-archive.vue SCSS 同步
|
||||||
|
|
||||||
|
- `.contact-dialog__footer-actions` `justify-content: center` 改 `flex-end`。
|
||||||
|
- `.receipt-dialog__footer-actions` 同上。
|
||||||
|
- `.invoice-dialog__footer-actions` 同上。
|
||||||
|
- `.archive-form__footer` 维持 flex-end 不变(独立页 `.archive-page-form &` 下 `position: fixed` 浮动底部已经写好)。
|
||||||
|
|
||||||
|
### 顺序小结(标准模板)
|
||||||
|
|
||||||
|
```vue
|
||||||
|
<div class="xxx-dialog__footer-actions">
|
||||||
|
<!-- 最左:信息聚合(如总分合计、统计)用 flex:1 自己推 -->
|
||||||
|
<!-- 次要:默认描边灰按钮 -->
|
||||||
|
<el-button @click="close">返回</el-button>
|
||||||
|
<!-- 中间:浅蓝实心 plain -->
|
||||||
|
<el-button type="primary" plain @click="saveDraft">保存</el-button>
|
||||||
|
<!-- 主操作:蓝实心 -->
|
||||||
|
<el-button type="primary" @click="submit">提交</el-button>
|
||||||
|
</div>
|
||||||
|
```
|
||||||
|
|
||||||
|
左→右阅读顺序:辅助信息聚合 → 次要 → 中间步骤 → 主操作。视觉权重递增,颜色从「灰 → 蓝描边 → 蓝实心」。
|
||||||
|
|
||||||
|
## 全站 disabled 输入框文字颜色统一
|
||||||
|
|
||||||
|
**问题**: 客户档案编辑页等「不可编辑」状态下,`el-input` / `el-textarea` / `el-input-number` 的文字颜色
|
||||||
|
在不同电脑显示不一致(有的深、有的浅)。
|
||||||
|
|
||||||
|
**根因**: Element Plus 默认 disabled 文字色由 `--el-disabled-text-color` 控制,不同主题/浏览器/变量覆盖下可能表现为 `#374151` / `#606266` / `#a8abb2` / `#909399` 等。
|
||||||
|
|
||||||
|
**修复**: `src/styles/element-ui.scss` 在表头颜色统一规则后追加:
|
||||||
|
```scss
|
||||||
|
.el-input.is-disabled .el-input__inner,
|
||||||
|
.el-textarea.is-disabled .el-textarea__inner,
|
||||||
|
.el-input-number.is-disabled .el-input__inner {
|
||||||
|
color: #a8abb2;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
直接写死为 `#a8abb2`,覆盖 Element Plus 默认 CSS 变量及主题差异,保证全站一致。
|
||||||
|
**如需再深**,可把 `#a8abb2` 改为 `#606266`。
|
||||||
|
|
||||||
|
## shipping-template 独立表单页「关闭」按钮位置修正
|
||||||
|
|
||||||
|
**问题**: `/business/shipping-template/form?mode=add`(独立表单页)底部 `[提交][关闭]` 顺序,
|
||||||
|
主操作「提交」在左、次要「关闭」在右,与全站「次→主」规则不符。
|
||||||
|
|
||||||
|
**根因**: shipping-template 走 `business-crud-page` 复用的 PageAvueForm,footer 用的是 Avue-form 内置结构。
|
||||||
|
Avue-form 内置按钮默认在中间,自定义内容分两侧插槽:
|
||||||
|
- `#menu-form-before` slot → 在 Avue 内置按钮之左
|
||||||
|
- `#menu-form` slot → 在 Avue 内置按钮之右
|
||||||
|
|
||||||
|
之前「关闭」按钮写在 `#menu-form` slot(在 Avue 内置按钮之右),导致渲染成 `[Avue 提交][关闭]`,顺序反了。
|
||||||
|
|
||||||
|
**修复**: `src/views/business/components/business-crud-page.vue:2059-2090`
|
||||||
|
- 把「关闭」按钮从 `#menu-form` slot 移到 `#menu-form-before` slot 的「保存草稿」按钮之前。
|
||||||
|
- 触发条件 `v-if="isStandaloneFormPage && !showTransportPlanCreateActions"`,仅独立表单页生效;
|
||||||
|
弹窗模式(list 页内点新增/编辑)继续走 Avue 自带的 `[取消][提交]` 不动。
|
||||||
|
- 「关闭」按钮文字保持默认色(次要),无 type。
|
||||||
|
- 同步清空 `#menu-form` slot 中 shipping-template 残留(实际只剩 `showTransportPlanCreateActions` 块,
|
||||||
|
shipping-template 不会触发,留着不影响)。
|
||||||
|
|
||||||
|
**最终渲染**(独立表单页):
|
||||||
|
- 有运费合计 + 草稿:`[运费合计][关闭][保存草稿 plain][Avue 提交]`
|
||||||
|
- 仅有运费合计:`[运费合计][关闭][Avue 提交]`
|
||||||
|
- 无运费合计:`[关闭][Avue 提交]`(即主人截图场景)
|
||||||
|
|
||||||
|
**未触发场景**:
|
||||||
|
- transport-plan / waybill / loading-manage 等其它走 business-crud-page 但未声明 `standalone-form-page` 的页面,
|
||||||
|
本次未改。需要时可按相同模式补 slot。
|
||||||
|
|
||||||
|
## master-order 编辑页底栏按钮统一
|
||||||
|
|
||||||
|
**问题**: `/business/master-order?mode=editor`(多联总单编辑/新增页)底部按钮没统一。
|
||||||
|
|
||||||
|
**根因**: 编辑页是 `master-order.vue` 的 `mode==='editor'` 模板里内嵌 `<master-order-editor>` 组件,
|
||||||
|
主 footer 在 `src/views/business/components/master-order-editor.vue:534-539`。
|
||||||
|
|
||||||
|
**原状**:
|
||||||
|
```
|
||||||
|
[返回 default] [暂存 default] [确认创建 primary] [创建并调度 primary]
|
||||||
|
```
|
||||||
|
- 暂存 无 type,与返回同为灰描边,缺层级
|
||||||
|
- 确认创建 / 创建并调度 两个都 primary 实心,无视觉优先级
|
||||||
|
- footer 仅 `flex-end` + `padding:16px 0`,不浮动
|
||||||
|
|
||||||
|
**修复** (`master-order-editor.vue`):
|
||||||
|
- 按钮改:`[返回 default] [暂存 primary plain] [确认创建 primary plain] [创建并调度 primary]`
|
||||||
|
严格按「返回第一个、中间浅蓝 plain、最后深蓝实心」规则,仅最右一个深蓝。
|
||||||
|
- footer 样式改浮动底部:`position: sticky; bottom:0; z-index:10; background:#fff;
|
||||||
|
border-top:1px solid #eff1f7; box-shadow:0 -2px 8px rgba(0,0,0,.06); gap:12px; padding:12px 24px`。
|
||||||
|
|
||||||
|
**未动**: 页内各 el-dialog 的 footer(线路/地图/常用货物/货物导入等)已是 `[关闭 default][确定 primary]`,
|
||||||
|
符合「次→主」规则,无需调整。
|
||||||
|
|
||||||
|
## payment-application 表单页底栏按钮统一
|
||||||
|
|
||||||
|
**问题**: `/payment/payment-application/form?mode=add`(付款申请表单页)底部按钮没统一。
|
||||||
|
|
||||||
|
**根因**: 独立表单页 `src/views/payment/payment-application-form.vue` 的 `.payment-form-page__actions` footer(330 行)。
|
||||||
|
|
||||||
|
**原状**:
|
||||||
|
```
|
||||||
|
justify-content: center(居中)
|
||||||
|
[返回 default] [保存 default(缺 plain)] [提交 primary]
|
||||||
|
```
|
||||||
|
- 保存 无 type,与返回同为灰描边,缺层级
|
||||||
|
- footer 居中且不浮动
|
||||||
|
|
||||||
|
**修复** (`payment-application-form.vue`):
|
||||||
|
- 按钮:`[返回 default] [保存 primary plain] [提交 primary]`,仅最后深蓝。
|
||||||
|
- footer 样式:`justify-content: center` → `flex-end`;加 `position: sticky; bottom:0; z-index:10;
|
||||||
|
background:#fff; border-top:1px solid #eff1f7; box-shadow:0 -2px 8px rgba(0,0,0,.06); gap:12px; padding:12px 24px`。
|
||||||
|
|
||||||
|
**未动**: `payment-application.vue`(list 表格页,无独立 footer);`invoice-application-form.vue` / `invoice-receipt-form.vue` 上一轮已改。
|
||||||
|
|
||||||
|
## invoice-application / invoice-receipt 表单页底栏按钮统一
|
||||||
|
|
||||||
|
**问题**: `/payment/invoice-application/form?mode=add` 底部按钮没统一(用户反馈)。排查发现同族 `invoice-receipt-form.vue` 完全同款问题,一并修了。
|
||||||
|
|
||||||
|
**根因**: 两个发票表单页 footer 都是 `[同步 plain][返回 default][保存 plain][提交 primary]` + `justify-content: center`(居中),且未浮动。
|
||||||
|
- 同步 在 返回 之前,违反「返回在第一个」
|
||||||
|
- footer 居中,不靠右、不浮动
|
||||||
|
|
||||||
|
**修复**(`invoice-application-form.vue` 419-433 + 980;`invoice-receipt-form.vue` 242-256 + 777):
|
||||||
|
- 按钮重排为 `[返回 default][同步 plain][保存 plain][提交 primary]`,返回置首、最后仅提交深蓝。
|
||||||
|
- footer 样式:`justify-content: center` → `flex-end`;加 `position: sticky; bottom:0; z-index:10;
|
||||||
|
background:#fff; border-top:1px solid #eff1f7; box-shadow:0 -2px 8px rgba(0,0,0,.06); gap:12px; padding:12px 24px`。
|
||||||
|
|
||||||
|
**注意**: 之前首轮曾把这两个页「保存加 plain、返回挪到保存前面」,但当时没动 同步 的位置、没改居中/浮动,所以用户仍觉得没统一。本次彻底对齐。
|
||||||
|
|
||||||
|
## payment + settlement 模块底栏按钮全量统一
|
||||||
|
|
||||||
|
**背景**: 用户要求检查 payment 模块和 settlement 模块下所有页面底栏按钮是否统一。
|
||||||
|
|
||||||
|
### payment 模块(表单页 footer)
|
||||||
|
| 文件 | 原状 | 修复 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `payment/bill-ledger-form.vue` | `[确认 primary][取消 default]` + 居中 | `[取消 default][确认 primary]`;footer flex-end + sticky 浮动 |
|
||||||
|
| `payment/bill-payment-form.vue` | `[保存 primary][提交 primary][取消 default]` | `[取消 default][保存 plain][提交 primary]`;footer 加 sticky 浮动(已 flex-end) |
|
||||||
|
| `payment/receipt-flow-form.vue` | `[确认 primary][取消 default]` + 居中(class 误用 `receipt-claim-form-page__actions`) | `[取消 default][确认 primary]`;footer flex-end + sticky 浮动 |
|
||||||
|
| `payment/receipt-claim-record-form.vue` | 单「关闭」按钮居中 | footer flex-end + sticky 浮动 |
|
||||||
|
| (此前已改)invoice/payment-application 各表单页 | — | 已合规 |
|
||||||
|
|
||||||
|
### settlement 模块
|
||||||
|
| 文件 | 原状 | 修复 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `settlement/components/pre-settlement-editor.vue` | 两处 footer `[取消][保存 default][提交]`(弹窗 + pageMode) | 保存加 `type="primary" plain`;`&__page-actions` 加 sticky 浮动 |
|
||||||
|
| `settlement/components/formal-settlement-editor.vue` | footer 已 `[取消][提交]` 合规,独立页未浮动 | `.formal-editor__page-actions` 加 sticky 浮动 |
|
||||||
|
| `settlement/receivable-payable-detail.vue` | 生成费用弹窗 `[取消][上一步 primary][提交 primary]` | 上一步改 `type="primary" plain` |
|
||||||
|
| (已合规未动)`transport-reconciliation-editor.vue` | `[取消][保存草稿 plain][按匹配结果更新账单 plain][完成对账 primary]` | 已符合次→主 |
|
||||||
|
| (已合规未动)`settlement-adjustment-editor.vue` | 弹窗 `[取消][保存 primary]` | 合规 |
|
||||||
|
|
||||||
|
**注意**: settlement 的 `*_editor.vue` 多为「弹窗(!pageMode) + 独立页(pageMode)」双模式;弹窗 footer 走 `.el-dialog__footer` 全局规则(已右对齐/浮动),仅 pageMode 的 `.xxx__page-actions` 需手动加 sticky。
|
||||||
|
**注意**: payment 表单页剩余的 `justify-content: center` 全在 `__links` 链接行(非 action footer),属正常布局,未改。
|
||||||
|
|
||||||
|
## 浮动底栏根本修复:sticky → fixed
|
||||||
|
|
||||||
|
**问题**: 用户反馈 `/settlement/formal-settlement/form?mode=add`「有些页面还没能固定在底部」。
|
||||||
|
|
||||||
|
**根因(关键)**: 之前给 9 个独立表单页 footer 写的都是 `position: sticky; bottom:0`,但本项目布局
|
||||||
|
`.app-main` / `.basic-container` 祖先带 `overflow:hidden`,sticky 的滚动容器判断失效 → footer 永不吸底。
|
||||||
|
customer-archive 当初就是因此改用 `position:fixed`,且要带侧栏左偏移。
|
||||||
|
|
||||||
|
**修复(9 个文件全部 sticky→fixed)**:
|
||||||
|
- `business/components/master-order-editor.vue` `<footer>`(2050 行,含 `:global(.avue--collapse footer)`/`horizontal`)
|
||||||
|
- `payment/invoice-receipt-form.vue` / `bill-ledger-form.vue` / `receipt-claim-record-form.vue` /
|
||||||
|
`payment-application-form.vue` / `bill-payment-form.vue` / `invoice-application-form.vue` / `receipt-flow-form.vue`
|
||||||
|
各 `__actions`(均加 fixed + `:global(.avue--collapse .xxx)`/`horizontal` 左偏移 60px/0)
|
||||||
|
- `settlement/components/pre-settlement-editor.vue` `&__page-actions`(nested,全局覆盖放 style 末尾)
|
||||||
|
- `settlement/components/formal-settlement-editor.vue` `.formal-editor__page-actions`(上一轮已改 fixed,本轮复核确认)
|
||||||
|
|
||||||
|
**统一 fixed 模板**:
|
||||||
|
```scss
|
||||||
|
.xxx { position: fixed; right:0; left:230px; bottom:0; margin:0; z-index:10; flex-end + padding + border-top + 白底 + 上投影 }
|
||||||
|
:global(.avue--collapse .xxx) { left:60px; }
|
||||||
|
:global(.avue-layout--horizontal .xxx) { left:0; }
|
||||||
|
```
|
||||||
|
注意 `:global()` 要包整个选择器(customer-archive 写法),只包前缀会让 scoped 在中间选择器追加 data 属性而不匹配。
|
||||||
|
|
||||||
|
**验证**: 全仓 `position: sticky` 已清零(grep 无残留)。
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
# 2026-08-27 工作日志
|
||||||
|
|
||||||
|
## project-apply 表单 UI 调整(新增 / 重大项目补录)
|
||||||
|
文件:`src/views/business/project-apply.vue`
|
||||||
|
|
||||||
|
按截图需求修改项目管理表单(新增 + 重大项目补录同步):
|
||||||
|
1. 项目编号放开编辑(去掉 `disabled`),placeholder 改为"请输入项目编号,不填自动生成";编辑模式仍禁用。
|
||||||
|
2. 项目简称取消必填校验(仅保留 maxlength 20)。
|
||||||
|
3. 业务部门、项目由来说明单独占一行(新增 class `project-apply-form__item--full` + 样式 `grid-column: 1 / -1`)。
|
||||||
|
4. 业务部门下拉过滤"外部组织":原仅 `['add','edit']` 过滤,已补上 `majorSupplement`,重大项目补录不再显示外部组织。
|
||||||
|
|
||||||
|
待确认:后端 submit/saveDraft 在 `projectCode` 为空时是否自动生成编号(用户让后端同事补)。
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
# 2026-08-28 工作日志
|
||||||
|
|
||||||
|
## contract-manage 表单底部操作栏间距/文案修复
|
||||||
|
- 文件:`src/views/business/contract-manage.vue`
|
||||||
|
- 问题:底部浮动操作栏 `.contract-manage-page__footer` 用 `gap:8px`,与全站统一 12px 标准不一致("间距不一致不统一")。
|
||||||
|
- 修复:去掉 `gap:8px`,改用 `.el-button + .el-button { margin-left:12px }`,对齐全站"去 gap、12px"规范。
|
||||||
|
- 文案:底部"关闭"→"取消"(底部操作栏统一命名规范;详情弹窗/流程图弹窗的"关闭"为只读/纯关闭场景,按规范保留)。
|
||||||
|
|
||||||
|
## contract-manage 草稿编辑页按钮缺失修复
|
||||||
|
- 问题:编辑态(含草稿编辑)底部只有单个"提交"(submitEdit),缺"暂存/提交临时合同/提交正式合同",与新增页不一致。
|
||||||
|
- 修复:新增 computed `isDraftEdit`(`formMode==='edit' && form.approvalStatus==='draft'`);footer 三按钮条件由 `formMode==='add'` 改为 `formMode==='add' || isDraftEdit`,草稿编辑复用 `submitCreate`(按 id upsert + temporary/formal 提升),非草稿编辑仍走 submitEdit 单个"提交"。
|
||||||
|
|
||||||
|
## contract-manage-change 变更页底部操作栏统一改造
|
||||||
|
- 文件:`src/views/business/contract-manage-change.vue`
|
||||||
|
- 问题:`.page-footer` 左侧对齐、`gap:16px`、不悬浮,且按钮顺序/命名(提交→关闭)与新增页规范相反。
|
||||||
|
- 修复:
|
||||||
|
- DOM:按钮重排为 `[取消][提交]`(次要居左、主操作居右),"关闭"→"取消"。
|
||||||
|
- 样式:`.page-footer` 改为 `position:fixed` 悬浮吸底(left:230px / avue--collapse 60px / avue-layout--horizontal 0)、`justify-content:flex-end` 右对齐、去 gap 改用 `.el-button+.el-button{margin-left:12px}` 统一 12px、白底+上边框+上投影。
|
||||||
|
- 容器 `.contract-change-page` 加 `padding-bottom:72px`,避免内容被悬浮栏遮挡。
|
||||||
|
|
||||||
|
## contract-manage 新增页"合同文件"标题未加粗修复
|
||||||
|
- 文件:`src/views/business/contract-manage.vue`
|
||||||
|
- 问题:`attachment-section` 子组件内渲染的 `.dialog-section-title` 不受当前页面 scoped `> .dialog-section-title` 样式命中,导致"合同文件"标题字重未加粗(截图反馈)。
|
||||||
|
- 修复:在 `.contract-manage-form__section` 样式规则中补充 `:deep(.dialog-section-title)`,使直接子元素和子组件内部标题均统一为 16px/600/#303133。
|
||||||
|
|
||||||
|
## contract-manage 搜索栏"时间段快捷筛选"组位置前置
|
||||||
|
- 文件:`src/views/business/contract-manage.vue` + `src/option/business/contract-manage.js`
|
||||||
|
- 第一轮(理解偏差):把"签约类型"select 和 check-tag 组一起塞进 `#search-menu` slot。主人纠正:「签约类型」是普通搜索字段,应与第一行 8 个搜索项同排,不是 slot 内的辅助元素。
|
||||||
|
- 第二轮(终态):
|
||||||
|
- option 把 `signType` 加 `search:true / searchOrder:10 / searchPlaceholder:'请选择'`,作为 Avue 标准搜索字段,与其它 8 项同排(放在末尾)。
|
||||||
|
- 页面 `#search-menu` slot 移除「签约类型」select,仅留 5 个 el-check-tag。
|
||||||
|
- 页面 data 移除冗余的 `contractSignType:''`,onLoad/searchReset 不再手动维护 signType(Avue search form 自动绑定到 query)。
|
||||||
|
- 样式:`.el-select { width: 180px }` 已成 dead code,移除。
|
||||||
|
- `:deep(...)` 调整:去掉 `margin-right:auto`,只留 `order:-1`。`.avue-form__menu` 本身 `flex / flex-end`,check-tag 组排首项后,整体仍紧靠右侧,与 `[查询][重置][收起]` 形成 `[快捷筛选] [查询] [重置] [收起]` 右对齐序列。
|
||||||
|
|
||||||
|
## 登录验证码:滑块(behavior) → 图形字符验证码(image)
|
||||||
|
- 文件:`src/config/website.js`(第14行 `captchaType: 'behavior'` → `'image'`)、`src/page/login/userlogin.vue`、`src/styles/login.scss`
|
||||||
|
- 背景:登录页原 `captchaType:'behavior'`(滑块/旋转行为验证)。需求改成截图中的「输入框 + 右侧独立彩色字符验证码图片」。
|
||||||
|
- 改动:
|
||||||
|
1. `website.js` 改 `captchaType: 'image'` 启用图形验证码分支(代码原本就有 image 模式的 UI 与 `getCaptcha()` 逻辑,仅未启用)。
|
||||||
|
2. `userlogin.vue` image 分支模板:验证码图片从 `el-input` 的 `#append` 内联改为 form-item 内 `.login-code-wrap` 并排独立方块(输入框 flex:1 + 右侧 130px 图片块),点击刷新。
|
||||||
|
3. `login.scss` 重写 `.login-code/.login-code-wrap/.login-code-box/.login-code-img`:flex 并排、图片块带 1px 边框 + hover 主色高亮、`object-fit:fill` 撑满。
|
||||||
|
- 验证:`vite build --outDir /tmp/tms-verify-build` 全量编译通过(exit 0,无报错)。注意原 `pnpm build` 因 WorkBuddy safe-delete 钩子拦截清空 dist/(741 文件)而中断,非代码问题。
|
||||||
|
- 注意:登录页 `activeName` 默认 `'iam'`(IAM 统一登录),图形验证码在 `userlogin.vue`,需点「账号密码登录」才可见;验证码图片依赖后端 `/blade-auth/oauth/captcha` 返回的 `data.key` + `data.image`。
|
||||||
|
|
||||||
|
## 全站「所属组织」搜索统一为树形下拉(el-tree-select)
|
||||||
|
- 背景:合同管理页「所属组织」原为 cascader(radio 风格),客户档案页(vehicle/customer-archive)已用树形下拉。主人要求全站统一为树形。
|
||||||
|
- 统一方案:新建可复用 mixin `src/mixins/organization-search.js`(封装 organizationTreeOptions 树数据、loadOrganizationOptions()、renderOrganizationSearch(scope) 渲染函数,自动识别 organizationName / deptName 两种 prop 并挂 column.renderSearch;树节点 node-key='id')。
|
||||||
|
- 适用两种架构:
|
||||||
|
1. **avue-crud 搜索**(renderSearch 模式):option 列加 `searchslot:true`,视图混入 mixin + created/初始化调 loadOrganizationOptions。已改:contract-manage(option 去 cascader 改 searchslot,视图用 renderOrganizationSearch 渲染函数)、transportCapacity 的 driver/vehicle/ship 三页(option 去 type:select 改 searchslot,视图混 mixin)。
|
||||||
|
2. **自定义搜索表单**(query.deptName 文本框模式):替换 `<el-input v-model="query.deptName">` 为 `<el-tree-select>`,node-key='id',@update:model-value 用 findOrgById(val)?.rawLabel 把 id 转回部门名写入 query.deptName(保后端按名称过滤兼容)。已改 payment 模块 4 处:invoice-application / invoice-receipt / payment-application / components/bill-payment-search。
|
||||||
|
- 关键坑:mixin 内部树数据命名为 `organizationTreeOptions`(非 organizationOptions),与 transportCapacity 等页面表单自用的扁平 `organizationOptions` 隔离,避免相互覆盖破坏表单 select。
|
||||||
|
- 待办(同自定义表单模式,未改):settlement 模块 4 个视图(transport-reconciliation/formal-settlement/pre-settlement/settlement-adjustment,搜索用动态 v-for 渲染 searchFields,需给 deptName 加 `type:'tree'` 分支)、system/user.vue(deptName)。business 模块(waybill-manage/transport-plan 等)所属组织为 `hide:true` 不展示搜索,无需改。
|
||||||
|
|
||||||
|
## project-apply 业务部门栏占满宽度修复
|
||||||
|
- 文件:`src/views/business/project-apply.vue`
|
||||||
|
- 问题:「重大项目补录」(独立表单页 /business/project-apply/form?mode=majorSupplement)下"业务部门"项横跨整行,与上下两行半宽风格不一致。
|
||||||
|
- 根因:`<el-form-item label="业务部门">` 误加 `class="project-apply-form__item--full"`(该类对应样式 `:deep(.project-apply-form__item--full) { grid-column: 1 / -1; ... }` 是横跨整行的:本意只用于"项目由来说明"等多行文本字段)。
|
||||||
|
- 修复:移除该 class,业务部门恢复为半宽(一行两列网格的常规项),仅"项目由来说明"等需要全宽铺开的字段仍保留 full。同时把样式块上方注释由「占满整行的表单项(业务部门 / 项目由来说明)」改为「占满整行的表单项(如项目由来说明等多行文本字段)」,避免再误读。
|
||||||
|
|
||||||
|
## project-apply 字段 label 问号悬浮提示
|
||||||
|
- 文件:`src/views/business/project-apply.vue`
|
||||||
|
- 需求:把"项目资金使用额度"/"项目应收账款额度"两字段的提示从 placeholder 移到 label 右侧问号 tooltip。
|
||||||
|
- 实现:
|
||||||
|
- 两 `el-form-item` 加 `class="project-apply-form__tip-label"`,用 `#label` slot 包裹文字 + `<el-tooltip content=... placement="top"><el-icon class="project-apply-form__label-tip"><QuestionFilled /></el-icon></el-tooltip>`。
|
||||||
|
- placeholder 改回"请输入"。
|
||||||
|
- 提示文案按截图(去掉"额度"二字):资金使用额度→`实际业务回款周期内付款`;应收账款额度→`回款期内最大应收账款额`。
|
||||||
|
- scoped 样式:`__tip-label :deep(.el-form-item__label){vertical-align:top}` 保持默认 inline 布局,让文字按全局 `white-space: normal` 换行显示;`__label-tip{margin-left:4px;color:#a8abb2;cursor:help;vertical-align:-0.125em}` 问号与文字 baseline 对齐。
|
||||||
|
- 图标 `QuestionFilled` 已在 main.js 全局注册(@element-plus/icons-vue),模板可直接用。
|
||||||
|
- 可复用模式:其它表单字段如需 label 旁问号提示,套用此 slot 结构即可。
|
||||||
|
|
||||||
|
## project-apply 详情页客户/承运商表格改造
|
||||||
|
- 文件:`src/views/business/project-apply.vue`
|
||||||
|
- 需求:
|
||||||
|
1. 客户信息、承运商信息两个表格的「客户」「承运商」列改为可点击链接,跳转打开对应客商档案。
|
||||||
|
2. 删除两个表格的「联系人」「联系方式」列。
|
||||||
|
- 实现:
|
||||||
|
- 模板:两列的 `el-table-column` 用 `#default` slot 渲染 `<el-link type="primary" :underline="false" @click="openCustomerArchive(row)">`,显示 `row.customer` / `row.carrier`。
|
||||||
|
- 删除原 `prop="contact"` 和 `prop="phone"` 两列。
|
||||||
|
- methods 新增 `openCustomerArchive(row)`:取 `getCustomerRowId(row)`(`row.id || row.customerId || row.carrierId`),无 ID 时 `this.$message.warning`;有 ID 则 `this.$router.push({ path: '/vehicle/customer-archive/form', query: { id: String(id), name: '查看客商档案', view: '1' } })`。
|
||||||
|
- 注意:客商档案查看态由 `customer-archive.vue` 的 `this.$route.query.view === '1'` 识别,与现有查看逻辑一致。
|
||||||
|
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# 2026-08-30
|
||||||
|
|
||||||
|
## 项目立项(/business/project-apply)操作栏隐藏「作废」按钮
|
||||||
|
- 需求:列表操作列不再展示「作废」。
|
||||||
|
- 实现:删除 `src/option/business/project-apply.js` 中 `config.operations` 的 `voidProject` 条目(原 status: ['approved','change_approved'],permission: project_apply_void)。
|
||||||
|
- 操作列按钮由 `customOperations(row)` 从 `config.operations` 动态渲染,故仅改 option 配置即可,无需动 `project-apply.vue`。
|
||||||
|
- 保留 `src/api/business/project-apply.js` 的 `voidProject` 接口方法(未被引用),如需彻底下线可一并删除。
|
||||||
|
- 遗留:剩余操作项为 提交 / 撤回 / 通过 / 审批驳回 / 变更;`menuWidth` 仍为 200,无需调整。
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
# 2026-08-31
|
||||||
|
|
||||||
|
## 客商档案「所属组织」改为单选级联(customer-archive.vue)
|
||||||
|
- 表单区 `el-tree-select`(多选勾选树)→ `el-cascader` 单选级联;`deptCascaderProps` 开 `checkStrictly: true`,可任意层级选中(不必选到叶子)。
|
||||||
|
- 引入 computed `deptCascaderValue`(get/set)做「部门 ID ↔ 根到节点路径」双向转换:
|
||||||
|
- `archiveForm.deptId` 仍为选中部门 ID 数组(单选只一个),后端字段 `deptIds` 逗号串 / `deptName` 不变,保存逻辑 `normalizeArchive` 无需改。
|
||||||
|
- getter 依赖 `deptTree`,部门树异步加载完成后详情回显自动刷新(解决 created 里 initDeptTree 与 openArchive 并发的时序问题)。
|
||||||
|
- `onDeptChange(path)` 改为取路径末级 → 写 `deptId / deptIds / deptName`;新增 `findDeptPath(id)`、`findDeptLabel(id)` 递归查找。
|
||||||
|
- `normalizeDeptIds(detail)` 单选只取第一个 ID(历史多选数据自动收敛)。
|
||||||
|
- 列表搜索区 `renderDeptSearch` 同步改为 `h(ElCascader, ...)`(import 从 ElTreeSelect 换 ElCascader),`searchChange` 取路径末级 ID 转部门名称。
|
||||||
|
</content>
|
||||||
|
</invoke>
|
||||||
@@ -0,0 +1,187 @@
|
|||||||
|
# 2026-09-02 工作日志
|
||||||
|
|
||||||
|
## 合同/运力页「到期快捷筛选」标签统一改为独立一行
|
||||||
|
- 需求:把 avue-crud 搜索栏 `#search-menu` 里的 `<el-check-tag>` 到期快捷筛选组,移出搜索栏、单独成一行(搜索卡下方、表格上方),不加卡片包裹。
|
||||||
|
- 实现:改用 avue-crud 的 `#header` 插槽承载该组;CSS 由 `order:-1; margin-right:12px; min-width:0`(搜索按钮行内联)改为 `margin-bottom:12px`(独立行)。
|
||||||
|
- 涉及文件(4 处,均已改):
|
||||||
|
- `src/views/business/contract-manage.vue`(首改,用 `.contract-manage-page__expiry-search`)
|
||||||
|
- `src/views/transportCapacity/vehicle.vue`(`.transport-vehicle-page__expiry-tags`)
|
||||||
|
- `src/views/transportCapacity/driver.vue`(`.driver-page__expiry-tags`)
|
||||||
|
- `src/views/transportCapacity/ship.vue`(`.transport-ship-page__expiry-tags`)
|
||||||
|
- 各页变量名保留原样(contract-manage 用 contractExpiryScope/changeExpiryScope/contractExpiryStats;运力页用 query.expireStatus/handleExpireChange/expiryStat)。
|
||||||
|
- 已补改并修正:`payment/bill-ledger` 页。用户要求"放在卡片下面"(搜索白卡之外、表格之上独立一行),非卡片内分行。最终方案:把到期快捷筛选整组(标签 DOM + `shortcutOptions` 计算属性 + `handleShortcutChange`)从子组件 `bill-ledger-search.vue` 提升到页面 `bill-ledger.vue`,置于 `<bill-ledger-search>` 与 `<bill-ledger-table>` 之间(卡片下、表格上)。
|
||||||
|
- `bill-ledger-search.vue`:删除标签 DOM、`.bill-ledger-search__actions`/`.bill-ledger-search__actions-tags` CSS、`counts` prop、`shortcutOptions`/`handleShortcutChange`;按钮行 `.bill-ledger-search__actions-buttons` 恢复单行右对齐(`margin-bottom:8px`)。
|
||||||
|
- `bill-ledger.vue`:模板插入 `<div class="bill-ledger-page__expiry-tags">`(绑定 `query.expiryShortcut`,@change 调 `handleShortcutChange`→`handleSearch`);脚本加 `shortcutOptions` computed(用 `counts`)+ `handleShortcutChange` method;新增 `<style scoped>` 写入 `.bill-ledger-page__expiry-tags`(flex 行、`margin:8px 0`)。`emptyQuery()` 已含 `expiryShortcut:'all'`,无回归。
|
||||||
|
- 选中态样式统一:去掉 `.bill-ledger-page__expiry-tags :deep(.el-check-tag.is-checked)` 的 `background-color:#409eff` + `color:#fff` 蓝底白字覆盖,改用 Element Plus 默认浅蓝底深蓝字,与合同页一致。
|
||||||
|
|
||||||
|
## transportCapacity/ship 新增弹窗 input 宽度统一
|
||||||
|
- 问题:新增/修改弹窗内输入控件宽度不一致(文本框明显窄于下拉框、日期框)。
|
||||||
|
- 根因:`src/views/transportCapacity/ship.vue` 末尾 scoped 样式中独有 `.el-input__wrapper{width:150px !important}`,把文本框包裹层强制压成 150px,而 `el-select`(用 `.el-select__wrapper`)、日期/数字框不受影响 → 文本框与下拉框宽度不齐。同模块的 driver.vue / vehicle.vue 均无此规则。
|
||||||
|
- 修复:
|
||||||
|
1. 删除 `.el-input__wrapper{width:150px!important}` 异常规则。
|
||||||
|
2. 增强 `.ship-form` 内输入控件的 100% 宽度覆盖,补齐 `.el-select__wrapper` / `.el-cascader` / `.el-input__wrapper`,使文本框/下拉/日期/数字框均 100% 填满所在栅格列。
|
||||||
|
- 说明:弹窗仍保留不同栅格列宽(span6/8/12/16)的密集布局,同行字段已等宽;若需跨行全部 input 绝对像素等宽(统一栅格列宽),需进一步重排。
|
||||||
|
- 二次排查(用户反馈仍不一致):把 `.ship-form` 内控件 100% 覆盖从通用 `:deep(.el-input)` 改为更具体的 `:deep(.el-form-item__content > .el-input)` 并加 `!important`,同步覆盖 `.el-input__wrapper`/`.el-select__wrapper`,确保不会被 Element Plus 变量或更具体选择器压回默认/较窄宽度。请用户刷新浏览器验证。
|
||||||
|
- 三次修复(用户反馈第一行 span=6+6+12 三个字段宽度仍不齐):放弃「width: 100% 撑满 col」方案,改用「对齐 vehicle/customer-archive 的 `.archive-form` 风格」——label 固定 `calc(6em + 24px)` + 控件统一 `250px + max-width: 100%`。根因:`el-cascader` 默认 `display: inline-block`,即使 width: 100% 也不易撑满 col-content(与 input 视觉差 ~150px vs ~280px);span=6+6+12 下两列 form-item__content 实际不等宽(label-width=100 被长 label 撑开)。新方案固定 250px 后三字段视觉一致,参照客商档案。
|
||||||
|
- 同时清理模板中冗余 `label-width="88px"`(会被新 CSS 强制覆盖失效)。
|
||||||
|
|
||||||
|
## transportCapacity/ship 证书信息分组:附件下放到对应分组末尾 + label 缩短
|
||||||
|
- 需求:1. 「船舶国籍证书」「内河船舶最低安全配员证书」分组里 label 「证书有效期自」偏长,改短为「有效期自」(与下面统一)。2. 底部集中的 `.cert-upload-grid` 上传区调整到各证书分组末尾,让附件与字段同组。
|
||||||
|
- 修改:
|
||||||
|
- `src/views/transportCapacity/ship.vue` 模板 line 392/431:2 处 `label="证书有效期自"` → `label="有效期自"`。
|
||||||
|
- 模板结构重组:删除底部 `<el-row class="cert-upload-grid">...</el-row>`(原 line 472-548),把 6 个 `<image-upload-field>` 分别插入对应 `cert-block` 末尾(每个用 `class="ship-upload-item"`,独立 `<el-row :gutter="18"><el-col :span="8">`):
|
||||||
|
- 船舶所有权证书分组 → `ownershipCertImage`
|
||||||
|
- 内河船舶安全与环保证书分组 → `safetyCertImage`
|
||||||
|
- 船舶国籍证书分组 → `nationalityCertImage`
|
||||||
|
- 内河船舶最低安全配员证书分组 → `safeManningCertImage`
|
||||||
|
- 光船租赁登记证明书分组 → `leaseContractImage`(label="光船租赁登记证书")
|
||||||
|
- 船舶营业运输证书分组 → `businessTransportCertImage`(label="船舶营业运输证")
|
||||||
|
- 样式清理:删除无用的 `.cert-upload-grid { padding-top:8px }` / `.cert-upload-spacer { height:1px }`;保留 `.cert-block` / `.cert-block__title` / `.ship-upload-item`(`margin-bottom:14px`)。
|
||||||
|
- 验证:用户刷新浏览器看新布局。
|
||||||
|
|
||||||
|
## transportCapacity/ship 组合控件宽度对齐 250px 体系
|
||||||
|
- 问题:基础船舶信息里「安放龙骨日期/建造完工日期」的起止两个 date-picker、「航区」的 select 都是 `flex:1` 撑满所在 span=12 整列(约 498px),明显比单字段 250px 宽,视觉不协调。
|
||||||
|
- 修复(`src/views/transportCapacity/ship.vue` 末尾 scoped 样式):
|
||||||
|
- `.date-range-inline :deep(.el-date-editor)` 由 `flex:1; min-width:0` 增加 `max-width: 250px` → 两个 date-picker 在窗够宽时各对齐 250px、彼此等宽,窄窗时 flex:1 收缩不溢出。
|
||||||
|
- `.navigation-area-field :deep(.el-select)` 由 `flex:1; min-width:0` 增加 `max-width: 250px` → 航区 select 对齐 250px 单字段。
|
||||||
|
- 说明:`flex:1` 保底防溢出,`max-width:250px` 把组合控件拉回与单字段一致的 250px 体系(受所在列宽限制,安放龙骨 span=12 在常规窗宽下两个 date-picker 约 226px 等宽,更宽窗自动到 250px)。
|
||||||
|
|
||||||
|
## business/project-apply.vue 表单「业务部门/承办部门」级联选择器宽度统一
|
||||||
|
- 问题:项目新增/编辑表单(含独立表单页 `/business/project-apply/form`)中,业务部门、承办部门两个 `el-cascader` 的按钮宽度与同行的 select/input 不一致。
|
||||||
|
- 根因:scoped 样式里强制 100% 宽度的控件列表(`el-input` / `el-select` / `el-tree-select` / `el-date-editor`)漏了 `el-cascader`,导致级联选择器按内容宽度收缩,未填满栅格列。
|
||||||
|
- 修复:`src/views/business/project-apply.vue` 末尾 scoped 样式 `.project-apply-form` 的 100% 宽度规则补上 `:deep(.el-cascader)`。Vite HMR 已自动生效,无需重启 dev。
|
||||||
|
|
||||||
|
## 登录页隐藏租户栏
|
||||||
|
- 需求:登录页 `000000` 租户输入框隐藏。
|
||||||
|
- 根因:`src/page/login/userlogin.vue` 第 10 行 `el-form-item` 由 `tenantMode` 控制显示,初始值 `this.website.tenantMode`,`getTenant()` 请求 `/api/system/tenant/info` 成功时会把 `tenantMode=false` 自动隐藏并回填 `loginForm.tenantId`。截图里仍显示租户栏,说明该接口未正常返回(域名解析/后端/跨域),沿用了初始 `tenantMode`。
|
||||||
|
- 修复:
|
||||||
|
1. 删除 `userlogin.vue` 模板第 10-21 行整段租户 `el-form-item`(`v-if="tenantMode" prop="tenantId"`),不留 `v-if` 兜底,直接移除 DOM。
|
||||||
|
2. 同步删除 `loginRules.tenantId` 校验规则。
|
||||||
|
- 保留:`loginForm.tenantId: '000000'` 默认值、`getTenant()` 方法。提交登录时仍带 `tenantId` 字段,后端行为不变;接口正常时仍会用返回的 tenantId 覆盖默认值。
|
||||||
|
- 后续若要重新启用:恢复 `el-form-item` 即可(或改 `data()` 中 `tenantMode: this.website.tenantMode` 走配置开关)。
|
||||||
|
|
||||||
|
## 客商档案评分详情表控件/label 宽度对齐
|
||||||
|
- 问题:评分详情表弹窗内输入框、选择框、日期框宽度不一致;label 要求固定 88px 且超长换行。
|
||||||
|
- 修复(`src/views/vehicle/customer-archive.vue`):
|
||||||
|
- 模板 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
- `.score-detail-form` 样式:
|
||||||
|
- `el-form-item__label` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important`,保留 `white-space: normal !important; word-break: break-all; line-height: 1.4` 实现超长换行。
|
||||||
|
- `el-form-item__content > .el-input / .el-select / .el-date-editor` 由固定 `width: 150px` 改为 `width: 100%`,单字段撑满等宽;`.score-detail-form__range` 内双日期框保持 `flex: 1; min-width: 0` 均分。
|
||||||
|
- 参考:客商档案 `.archive-form` 的 label 换行与控件等宽处理思路。
|
||||||
|
|
||||||
|
## 评分详情表弹窗输入框/选择框宽度对齐 + label 88px 换行
|
||||||
|
- 问题:`src/views/vehicle/customer-archive.vue` 中「评分详情表」弹窗表单的输入框、选择框、日期框视觉宽度不一致;label 区域未严格固定 88px。
|
||||||
|
- 修复:
|
||||||
|
1. `el-form` 的 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 中 `.el-form-item__label` 强制 `flex:0 0 88px; width:88px; min-width:88px` 并保留 `white-space: normal` 换行。
|
||||||
|
3. 将单字段控件(`.el-form-item__content > .el-input/.el-select/.el-date-editor`)宽度由固定 `150px` 改为 `100%`,使其在固定 label 后自动等宽填满 content 区域。
|
||||||
|
- 保留:「临时额度申请使用期限」组合控件继续用 `.score-detail-form__range` 双 date-picker flex 均分布局。
|
||||||
|
|
||||||
|
|
||||||
|
## customer-archive 评分详情表:label 固定 88px 换行 + 控件宽度统一
|
||||||
|
- 问题:评分详情表弹窗内输入框与选择框宽度不一致,且 label 区域未按 88px 固定换行。
|
||||||
|
- 修复(`src/views/vehicle/customer-archive.vue`):
|
||||||
|
1. `score-detail-form` 的 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form :deep(.el-form-item__label)` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal !important; word-break: break-all; line-height: 1.4;` 实现长 label 自动换行。
|
||||||
|
3. 单字段控件(`.el-form-item__content > .el-input / .el-select / .el-date-editor`)统一 `width: 100%`,使输入框与选择框在相同栅格列内等宽。
|
||||||
|
- 说明:「临时额度申请使用期限」双日期组合仍由 `.score-detail-form__range` 控制 `flex:1` 均分,不受单字段 100% 影响。
|
||||||
|
|
||||||
|
## 评分详情表 label 宽度与控件宽度对齐
|
||||||
|
- 需求:评分详情弹窗内输入框与选择框宽度一致;label 宽度固定 88px,超长自动换行。
|
||||||
|
- 修改 `src/views/vehicle/customer-archive.vue`:
|
||||||
|
1. `<el-form>` 的 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 的 label 样式强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal !important; word-break: break-all; line-height: 1.4;` 实现换行。
|
||||||
|
3. 单字段控件(`.el-form-item__content > .el-input/.el-select/.el-date-editor`)由固定 `width: 150px` 改为 `width: 100%`,使输入框、下拉框、日期框均撑满同一 content 区,视觉宽度一致。
|
||||||
|
- 说明:「临时额度申请使用期限」两个 date-picker 仍由 `.score-detail-form__range` 的 `flex: 1; min-width: 0;` 控制,不受本次单字段 100% 影响。
|
||||||
|
|
||||||
|
## 客商档案「评分详情表」弹窗表单控件宽度对齐
|
||||||
|
- 问题:`src/views/vehicle/customer-archive.vue` 的「评分详情表」弹窗中,评定日期的 date-picker、拟申请额度等 input、评分量化表 select 等控件宽度不一致;label 需固定 88px 且长 label 换行。
|
||||||
|
- 修复:
|
||||||
|
1. `<el-form>` `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 样式:`.el-form-item__label` 强制 `flex:0 0 88px` + `width:88px` + `white-space:normal`,确保长 label 换行且宽度恒定。
|
||||||
|
3. 控件由固定 `width:150px` 改为 `.el-form-item__content > .el-input/.el-select/.el-date-editor { width:100% }`,单字段 input/select/date-picker 在 span=6 下等宽撑满 content 区。
|
||||||
|
- 备注:「临时额度申请使用期限」组合区保持 `.score-detail-form__range` 的 `flex:1` 双 date-picker 布局,不受单字段 100% 影响。
|
||||||
|
|
||||||
|
## customer-archive 评分详情表控件宽度与 label 换行对齐
|
||||||
|
- 问题:评分详情弹窗内 input、select、date-picker 宽度不一致;长 label(如「拟申请总资金使用额度(万元)」)未按 88px 换行。
|
||||||
|
- 修改 `src/views/vehicle/customer-archive.vue`:
|
||||||
|
1. `<el-form label-width="88">` → `label-width="88px"`,与全站风格一致。
|
||||||
|
2. `.score-detail-form` 样式:
|
||||||
|
- `el-form-item__label` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal` + `word-break: break-all` + `line-height: 1.4` 实现超长 label 换行。
|
||||||
|
- 单字段控件(`.el-form-item__content > .el-input/.el-select/.el-date-editor`)由固定 `width: 150px` 改为 `width: 100%`,使其在 88px label 下等宽撑满 content 区。
|
||||||
|
- 说明:双日期范围字段(临时额度申请使用期限)仍由 `.score-detail-form__range` 用 `flex:1; min-width:0` 均分,不受单字段 100% 规则影响。
|
||||||
|
|
||||||
|
## 评分详情表弹窗 label/控件宽度对齐
|
||||||
|
- 文件:`src/views/vehicle/customer-archive.vue`。
|
||||||
|
- 问题:评分详情表弹窗内 input 与 select/date-picker 宽度不一致;label 宽度未严格固定 88px、长 label 未换行。
|
||||||
|
- 修复:
|
||||||
|
1. `el-form` 的 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 样式里 label 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal`、`word-break: break-all` 换行。
|
||||||
|
3. 单字段控件(`.el-form-item__content > .el-input/.el-select/.el-date-editor`)统一 `width: 100%`,取代原先未生效/不齐的 `width: 150px`。
|
||||||
|
- 备注:「临时额度申请使用期限」两个 date-picker 仍由 `.score-detail-form__range` 的 `flex:1` 均分,不受 100% 宽度影响。
|
||||||
|
|
||||||
|
## 客商档案「评分详情表」弹窗控件宽度对齐与 label 换行
|
||||||
|
- 问题:评分详情表弹窗中 input、select、date-picker 宽度不一致;长 label 未换行。
|
||||||
|
- 修复 `src/views/vehicle/customer-archive.vue`:
|
||||||
|
1. `el-form` 的 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 样式:label 强制 `flex:0 0 88px`、`width:88px`、`white-space:normal`,超出换行。
|
||||||
|
3. 单字段控件(`.el-form-item__content > .el-input/.el-select/.el-date-editor`)统一 `width:100%`,撑满 content 区,与选择框等宽。
|
||||||
|
- 保留 `.score-detail-form__range` 内双 date-picker `flex:1; min-width:0` 的「起—止」布局。
|
||||||
|
|
||||||
|
## 评分详情表弹窗 label 与输入控件宽度对齐
|
||||||
|
- 文件:`src/views/vehicle/customer-archive.vue`
|
||||||
|
- 问题:评分详情表弹窗内输入框、下拉框、日期框宽度不一致;长 label 未换行。
|
||||||
|
- 修改:
|
||||||
|
1. `<el-form label-width="88">` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` label 样式强制 `width: 88px !important; flex: 0 0 88px !important; min-width: 88px !important;`,并保留 `white-space: normal` / `word-break: break-all` 换行。
|
||||||
|
3. 单字段控件(`.el-form-item__content > .el-input / .el-select / .el-date-editor`)统一 `width: 100%`,填满 label 剩余区域,保证 input/select/date-picker 视觉等宽。
|
||||||
|
- 说明:组合日期区间(`.score-detail-form__range`)保持两个 date-picker `flex:1` 均分,不受单字段 100% 影响。
|
||||||
|
|
||||||
|
## customer-archive 评分详情表 label/控件宽度对齐
|
||||||
|
- 问题:评分详情弹窗表单的输入框与选择框宽度不一致;label 宽度要求 88px 且超长换行。
|
||||||
|
- 修复:`src/views/vehicle/customer-archive.vue`
|
||||||
|
- `label-width="88"` → `label-width="88px"`。
|
||||||
|
- `.score-detail-form` 样式:`.el-form-item__label` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal !important` 等换行样式。
|
||||||
|
- 控件由固定 `width: 150px` 改为 `.el-form-item__content > .el-input/.el-select/.el-date-editor { width: 100%; }`,使输入框、下拉框、日期框在各自列内等宽撑满。
|
||||||
|
|
||||||
|
## 评分详情表弹窗:label 固定 88px 换行 + 输入/选择框宽度一致
|
||||||
|
- 问题:`src/views/vehicle/customer-archive.vue` 评分详情弹窗内输入框与选择框宽度不一致,label 长文本未换行。
|
||||||
|
- 修复:
|
||||||
|
1. `label-width="88"` → `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 样式:`.el-form-item__label` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important; white-space: normal !important;` 确保 88px 固定宽度并自动换行。
|
||||||
|
3. 单字段控件 `.el-form-item__content > .el-input / .el-select / .el-date-editor` 由固定 `150px` 改为 `width: 100%`,使输入框与选择框在各自栅格列内等宽撑满。
|
||||||
|
- 备注:「临时额度申请使用期限」双日期组合仍走 `.score-detail-form__range` 的 `flex:1; min-width:0`,不受单字段 100% 影响。
|
||||||
|
|
||||||
|
## 客商档案评分详情表控件宽度统一 + label 88px 换行
|
||||||
|
- 问题:`src/views/vehicle/customer-archive.vue` 评分详情弹窗内输入框与选择框宽度不一致;label 区域未严格固定 88px,长 label 换行效果不稳定。
|
||||||
|
- 修复:
|
||||||
|
1. 模板 `el-form` 的 `label-width="88"` 明确为 `label-width="88px"`。
|
||||||
|
2. scoped 样式 `.score-detail-form`:
|
||||||
|
- `.el-form-item__label` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal !important` / `word-break: break-all` 让超长 label 自动换行。
|
||||||
|
- 控件统一由固定 `width: 150px` 改为 `.el-form-item__content > .el-input/.el-select/.el-date-editor { width: 100%; }`,使输入框、下拉框、日期框在各自栅格列内等宽撑满。
|
||||||
|
- 说明:「临时额度申请使用期限」双日期组合区仍由 `.score-detail-form__range` 控制 flex:1 均分,不受单控件 100% 规则影响。
|
||||||
|
|
||||||
|
## customer-archive 评分详情表控件宽度统一 + label 换行
|
||||||
|
- 需求:评分详情弹窗内输入框与选择框宽度不一致;label 宽度需固定 88px 且超长换行。
|
||||||
|
- 修改(`src/views/vehicle/customer-archive.vue`):
|
||||||
|
1. 模板 `score-detail-form` 的 `label-width="88"` → `label-width="88px"`。
|
||||||
|
2. scoped 样式 `.score-detail-form`:`.el-form-item__label` 固定 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal !important; word-break: break-all; line-height: 1.4;` 实现换行。
|
||||||
|
3. 控件宽度由固定 `150px` 改为 `.el-form-item__content > .el-input/.el-select/.el-date-editor { width: 100%; }`,使输入框、下拉框、日期框在同一 content 区域内等宽撑满。
|
||||||
|
- 说明:双日期字段(临时额度期限)仍走 `.score-detail-form__range` 的 `flex:1` 布局,保持两个日期框均分并对齐。
|
||||||
|
|
||||||
|
## 评分详情表输入框/选择框宽度对齐 + label 固定 88px 换行
|
||||||
|
- 文件:`src/views/vehicle/customer-archive.vue`
|
||||||
|
- 问题:评分详情弹窗内输入框、选择框、日期框宽度不一致;长 label 需要固定 88px 并允许换行。
|
||||||
|
- 修改:
|
||||||
|
1. `label-width="88"` → `label-width="88px"`。
|
||||||
|
2. `.score-detail-form :deep(.el-form-item__label)` 强制 `flex:0 0 88px !important; width:88px !important; min-width:88px !important`,保留 `white-space:normal !important; word-break:break-all; line-height:1.4`。
|
||||||
|
3. 控件宽度由固定 150px 改为 `.el-form-item__content > .el-input/.el-select/.el-date-editor { width:100%; }`,使输入框、选择框、日期框在固定 label 后自动等宽填满 content 区。
|
||||||
|
- 保留 `.score-detail-form__range` 内双 date-editor `flex:1; min-width:0` 的收缩行为。
|
||||||
|
|
||||||
|
## vehicle/customer-archive 两处「详细地址」hover 溢出提示完整地址
|
||||||
|
- 需求:编辑客商档案页,详细地址字段(窄栏 + 长文本易截断)鼠标移上去显示完整地址;仅文本溢出才显示。
|
||||||
|
- 实现:两处 `el-input` 用 `<el-tooltip>` 包裹,`content` 绑定字段值,`placement="top"`,`:disabled="!xxxOverflow"`(溢出才显示),`style="display:block; width:100%"`(el-tooltip 根 span 默认 inline,必须 block 才能撑满栅格列)。
|
||||||
|
- 主表单(line 317,`archiveForm.registeredDetailAddress`):`ref="registeredDetailInput"` + `@input` 实时重算。
|
||||||
|
- 发票弹窗(line 1008,`invoiceForm.registeredDetailAddress`):`ref="invoiceDetailInput"`,readonly 地图回填,靠 `watch` + `openInvoice` 打开后 `nextTick` 重算(弹窗按需挂载,预填数据打开后 watch 已不触发)。
|
||||||
|
- 新增:`data` 加 `registeredDetailOverflow/invoiceDetailOverflow` 标记;`watch` 监听两字段值变化→`checkOverflow`;`methods.checkOverflow(refName,flag)` 读 `inst.$el.querySelector('input')` 的 `scrollWidth > clientWidth` 判定溢出;`openInvoice` 打开后双 nextTick 重算发票框溢出。
|
||||||
|
- 验证:`vite build --outDir /tmp/tms-check-build` 零报错(常规 build 仅因安全删除保护拦截清空 dist,与代码无关)。
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
|
||||||
|
## 合同管理独立表单页下拉框定位修复
|
||||||
|
- `src/views/business/contract-manage.vue` 全部 12 处 `el-select` 加 `:teleported="false"` + `:fit-input-width="true"`:下拉保持在输入框正下方、宽度与输入框一致(原 teleport 到 body 导致下拉漂移且按内容撑宽)。
|
||||||
|
- 若后续新增独立表单页出现同样问题,照加这两个属性即可。
|
||||||
|
- 追加:teleported=false 后 popper 因下方空间不足自动上翻,再给 12 处 el-select 加 `placement="bottom-start"` + `:popper-options="{ modifiers: [{ name: 'flip', enabled: false }] }"` 强制始终在下方展示。
|
||||||
|
|
||||||
|
## 调度弹窗司机输入框宽度不一致修复
|
||||||
|
- 现象:「编辑调度信息(精简录入)」弹窗中,司机(el-autocomplete)输入框比同行 250px 的其他输入框宽。
|
||||||
|
- 根因:`business-crud-page.vue` 约 13434 行的「表单控件统一 250px」规则漏了 `.el-autocomplete`(autocomplete 根节点是包装层,内部才是 .el-input)。
|
||||||
|
- 修复:在该规则选择器列表追加 `> .el-autocomplete` 和 `> .el-autocomplete > .el-input`,与运单独立表单页(13658 行 business-crud-page--form-page 先例)一致。
|
||||||
|
- 经验:凡「控件统一 250px」类规则,选择器必须包含 `.el-autocomplete` 包装层。
|
||||||
|
|
||||||
|
## 调度弹窗收发货地址行溢出修复
|
||||||
|
- 现象:「编辑调度信息」弹窗收发货信息行,地址输入框过宽,右侧「联系方式」列被挤出弹窗。
|
||||||
|
- 根因:`__dispatch-shipping-form __route-address-row` 网格地址列为 `minmax(280px, 1fr)`,各列最小宽度合计 1030px,弹窗不够宽时 grid 不换行直接溢出。
|
||||||
|
- 修复:地址列改 `minmax(0, 1fr)`(宽屏仍 1fr 拉伸,窄窗自动收窄,总最小宽降到 750px)。
|
||||||
|
- 备注:基础规则 `__route-address-row`(13750 行,运单独立表单页等在用,7 列含 40px 按钮列)仍是 minmax(280px,1fr),同样窄窗有溢出风险,暂未动(用户未反馈该页问题)。
|
||||||
|
|
||||||
|
## el-select 选中值 / 占位符颜色区分(全局)
|
||||||
|
- 需求:已选值 #606266,未选值保持 placeholder 灰 #909399。
|
||||||
|
- 根因:Element Plus 的选中值文本与占位符**共用同一节点** `<div class="el-select__selected-item el-select__placeholder [is-transparent]">`,仅靠 `.el-select__selected-item` 无法区分,导致未选态也被染成选中色。
|
||||||
|
- 区分标志:只有「未选值」或「已展开但无搜索输入」时才带 `.is-transparent`。
|
||||||
|
- 修复(`src/styles/element-ui.scss`):选中规则改为 `.el-select__wrapper:not(.is-disabled) .el-select__selected-item:not(.is-transparent)`;多选 tag 文字另加 `.el-select__tags-text` 规则(tag 自身 color 优先级更高,父级规则盖不到)。
|
||||||
|
- 经验:以后写任何「区分 el-select 有值/无值」的 CSS,一律用 `:not(.is-transparent)`。
|
||||||
@@ -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。
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# 2026-09-10
|
||||||
|
|
||||||
|
- 移除 project-apply 的 fund-risk-stats 请求(后端未实现端点,每次列表加载都弹 No endpoint 报错):删除 onLoad 内 refreshFundRiskStats 调用与该方法、data 中 fundRiskStats;头部风险标签去掉「(数量)」只留「高风险/中风险」;api/business/project-apply.js 保留 getFundRiskStats 定义并注释「后端就绪后恢复」。
|
||||||
|
EOF2
|
||||||
|
}
|
||||||
|
cat >> /Users/gxwebsoft/VUE/tms-erp-web-ws/.workbuddy/memory/2026-09-10.md <<'EOF'
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
# 2026-09-11
|
||||||
|
|
||||||
|
## 上传证件区域固定宽度导致跨机器错位(transportCapacity)
|
||||||
|
- 现象:driver.vue 新增弹窗的身份证/大头照上传框在本机对齐,他人电脑不对齐。
|
||||||
|
- 根因:`--large` 上传框写死 `width:240px`(ship 写 248px),而弹窗 `width:90%` + `el-col :span=6` 列宽是弹性的、上方输入框 `width:100%`;列宽随分辨率 / Windows 系统缩放 / 浏览器缩放变化,240px 只在特定宽度下恰好等于列宽。叠加 `labelWidth:auto` 靠 JS 实测字体(苹方 vs 微软雅黑)宽度,label 列宽也不同 → 起始位置漂移。
|
||||||
|
- 修复:三个文件改为 `width:100%; max-width:240px; flex:none`(ship 保留 248px 上限),窄屏跟随列宽、宽屏保持比例上限,左边缘恒与输入框对齐。
|
||||||
|
- `src/views/transportCapacity/driver.vue`(.driver-uploader--large)
|
||||||
|
- `src/views/transportCapacity/vehicle.vue`(.vehicle-uploader--large)
|
||||||
|
- `src/views/transportCapacity/ship.vue`(.ship-uploader--large)
|
||||||
|
- 用 @vue/compiler-sfc(脚本放项目根目录)验证三个 SFC 编译通过。
|
||||||
|
- 教训:本项目所有「固定 px 宽度的上传/控件」都要配 `max-width` + `width:100%`,否则高分屏/低分屏下必然错位。
|
||||||
|
|
||||||
|
## 合同详情由弹窗改为独立页面(contract-manage)
|
||||||
|
- 路由:新增 `/business/contract-manage/detail`(`src/router/views/index.js`,name『合同详情』,meta `keepAlive:false` + `activeMenu:'/business/contract-manage'`),组件仍复用 `contract-manage.vue`(与 form 页同一套路)。
|
||||||
|
- 页面内三分支:`v-if="!isFormPage && !isDetailPage"`(列表)/ `v-else-if="isFormPage"`(表单)/ `v-else`(详情)。**v-else 必须紧邻 form 分支的 `</template>`**,中间不能插其它组件,否则 Vue 编译报「v-else 无相邻 v-if」——弹窗类组件(billing-plan-editor / 附件预览 / 变更记录详情 / 流程)放在三个分支之后。
|
||||||
|
- 关键改动:`openDetail` 改 `router.push({ path:'/business/contract-manage/detail', query:{ id, name } })`;新增 `initDetailPage()`(按 query.id 拉详情,`resetDetailState()` 先清空)、`closeDetailPage()`(closeTag + 回列表)、`isDetailPage` / `detailPageTitle` computed;`created` 与 `$route.fullPath` watch 都要加 `else if (this.isDetailPage)`。
|
||||||
|
- 样式:`.contract-manage-detail--page { max-height:none; overflow:visible }`,去掉弹窗的 74vh 限制;底栏复用 `.contract-manage-page__footer`(fixed 浮动),只读详情页按钮保留「关闭」。
|
||||||
|
- 校验方式:dev server 已运行时 `curl "http://localhost:2889/src/views/business/contract-manage.vue"` 返回 200 即 Vite 编译通过(比整包 build 快)。
|
||||||
|
|
||||||
|
## 只给「查看弹窗」加宽 label(temporary-credit-limit)
|
||||||
|
- 场景:详情页长 label(「剩余项目资金使用额度(万元)」)换行超 2 行撑坏详情表格,但又不能影响新增/编辑页。
|
||||||
|
- **关键发现:Avue 的 `avue-form` 在 detail 模式下根节点会挂 `.avue--detail` 类**(源码 `node_modules/@smallwei/avue/lib/packages/element-plus/form/index3.js` 中 `class: normalizeClass([b(), { 'avue--detail': isDetail }])`)。所以「只针对详情态」的选择器就是:
|
||||||
|
```scss
|
||||||
|
.temporary-credit-limit-dialog .avue--detail .el-form-item__label { width:210px !important; flex:0 0 210px !important; }
|
||||||
|
```
|
||||||
|
新增/编辑弹窗无 `.avue--detail`,天然不受影响,不需要在 option 里做 mode 判断。
|
||||||
|
- 校验样式块编译:dev server 请求 `?vue&type=style&index=1&lang.scss`(**lang 必须写 scss,写 css 会 500**),grep 规则确认产物。
|
||||||
|
- 结论备忘:长 label 优先「加宽 + 换行 ≤2 行」,不要用单行省略 + tooltip —— 详情是纯阅读场景,hover 才能看全字段名的可发现性差。
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
# 2026-09-17 工作日志
|
||||||
|
|
||||||
|
## 配载管理(loading-manage):弹窗全部改为独立表单页/详情页
|
||||||
|
|
||||||
|
- 需求:`/business/loading-manage` 不再用弹窗,改成与新增合同(`/business/contract-manage/form?mode=add&name=新增合同管理`)一致的独立页面。
|
||||||
|
- 现状:新增/编辑**已经**是独立页(组件内 `isStandaloneFormPage` + `/business/loading-manage/form` 路由),但「详情」和「重新派单」仍是 el-dialog(用户截图即详情弹窗)。
|
||||||
|
- 改动(3 个文件):
|
||||||
|
1. `src/router/views/index.js`:新增 `/business/loading-manage/detail`(name 配载单详情,`meta.keepAlive:false, activeMenu:'/business/loading-manage'`),组件仍是 `loading-manage.vue`。
|
||||||
|
2. `src/views/business/loading-manage.vue`:
|
||||||
|
- computed 新增 `isStandaloneDetailPage`(path==='/business/loading-manage/detail')、`isStandalonePage`(form|detail 并集,作为隐藏列表容器的统一开关)、`detailPageTitle`、`formPageDefaultTitle`(add/edit/reassign 映射);`isStandaloneFormPage` 放行 `mode=reassign`。
|
||||||
|
- 模板中所有控制「是否独立页/是否弹窗」的 `isStandaloneFormPage` 改为 `isStandalonePage`;顶部标题按详情/表单取 `detailPageTitle`/`formPageTitle`。
|
||||||
|
- 新增 `gotoLoadingDetail(row)`(push `/detail?id=&name=配载单详情`,替换「配载单号」链接与操作列「详情」)、`gotoLoadingReassign(row)`(push `/form?mode=reassign&id=&name=重新派单`)、`initStandaloneDetailPage()`;`initStandaloneFormPage` 模式透传 edit/reassign;`openLoadingDialog` 对 add/edit/reassign 一律转独立页;`closeLoadingDialog` 判据改 `isStandalonePage`。
|
||||||
|
- `mounted` / `watch $route` 增加详情页分支(直接打开与页内切换都要 init);detail 分支除 id 变化外,`dialogMode !== 'view'` 也重新 init(防止从表单页切详情时残留表单态)。
|
||||||
|
- 兼容旧链接:`/business/loading-manage?detailId=x` 仍可用,会 replace 到详情页。
|
||||||
|
- 样式:底栏去掉写死的 `gap:8px`(全站统一 12px);页面模式的内容区解除 `max-height:78vh` 内嵌滚动盒 —— 原 `:global(.loading-manage-form-page .loading-manage-dialog__body)` 权重 (0,2,0) 低于 scoped 规则 (0,3,0) 一直没生效,改为 `.loading-manage-page .loading-manage-form-dialog.loading-manage-form-page .loading-manage-dialog__body` (0,4,0),内容改随 `#avue-view` 自然滚动(与合同页一致)。
|
||||||
|
3. `src/views/business/components/waybill-manage-page.vue`:`openLoadingDetail` 由 `/business/loading-manage?detailId=` 改为 push `/business/loading-manage/detail?id=&name=配载单详情`。
|
||||||
|
- 校验:dev server(2889)单独编译 4 个模块均 HTTP 200(含 scoped scss);`vite build` 仍会在无关文件 `src/page/login/facelogin.vue` 被沙箱敏感内容保护中断。
|
||||||
|
- 踩坑:**`<style scoped lang="scss">` 顶层写 `//` 注释**会让该样式模块编译 500(`Unexpected '/'. Escaping special characters with \ may help.`),已实测确认;顶层必须用 `/* */`。
|
||||||
|
- 未做:登录态无法在浏览器实测(无测试账号),需用户点 `/business/loading-manage` → 详情/重新派单 自测;`voucher-manage-detail` 跳配载时带的 `?loadingNo=` 参数本来就未被列表消费(历史遗留)。
|
||||||
|
|
||||||
|
## 运单管理详情:打卡时间轴改为按打卡顺序展示
|
||||||
|
|
||||||
|
- 文件:`src/views/business/components/waybill-manage-page.vue`(详情页「执行详情 → 打卡详情」tab)
|
||||||
|
- 需求:时间轴不再固定按流程节点顺序(发货/在途/到货/卸货/签收/回单),改为按打卡时间先后展示。
|
||||||
|
- 实现(不改后端、不改原始数据):
|
||||||
|
1. 新增 computed `orderedWaybillPunchRecords`:映射出 `punchedAt`(毫秒时间戳)后排序 —— **已打卡记录按打卡时间升序排在前**,未打卡记录保持后端返回的节点顺序排在其后;时间相同用原索引稳定排序。
|
||||||
|
2. 新增 method `waybillPunchRecordTimestamp(record)`:`punched === false` 或 `statusName === '未打卡'` 直接返回 null(防止后端返回计划时间造成误序);优先 `this.$dayjs(text).valueOf()`,失败兜底 `new Date(text.replace(/-/g,'/'))`(兼容 Safari)。
|
||||||
|
3. 模板 `el-timeline` 的 `v-for` 改用 `orderedWaybillPunchRecords`;`key` 由 `record.nodeCode || record.id || index` 改为 `${nodeCode||id||'punch'}-${index}`,避免同节点多次打卡(在途)时 key 重复。
|
||||||
|
- 校验:项目根目录临时脚本 `_verify-sfc.mjs`(@vue/compiler-sfc parse + compileScript + compileTemplate)通过,已删除脚本。
|
||||||
|
- 注意:`getPunchRecords`(`src/api/business/waybill-manage.js` → `/punch-records`)后端未提供节点排序字段,排序只能在前端做。
|
||||||
|
|
||||||
|
## 保险记录批量导入:前端归一化日期格式
|
||||||
|
|
||||||
|
- 文件:`src/views/vehicle/insurance-record.vue`(仅此一个文件)
|
||||||
|
- 背景:保险记录批量导入是**后端驱动**——前端 `handleImport` 经 `importBlob` 把原始 Excel 直接 POST 到 `/blade-transport/insurance-record/import-insurance-record`,前端不解析行。后端只认 `2026-09-01`,`2026-9-1` 导入失败。
|
||||||
|
- 决策:用户选择**前端归一化**(不动后端)。把 `openImportDialog` 改为自写 `httpRequest`:用 `xlsx` 读取 Excel → 把日期列(开始日期/结束日期/开票日期)`2026-9-1` 归一为 `2026-09-01` → 重写成新 File 再交给 `handleImportExcel` 上传;复用其失败明细下载与成功刷新逻辑。无日期列时回退为原文件(行为不变)。
|
||||||
|
- 关键方法:`normalizeExcelDates` / `readExcelRows` / `writeExcelFile` / `normalizeDateString`(正则 `^(\d{4})[-/.年](\d{1,2})[-/.月](\d{1,2})日?$`,用 `new Date` 校验合法性后补零;非法/已标准格式返回 null 保持原值)。
|
||||||
|
- 校验:本机 dev(localhost:2889)待用户部署自测。注意所有单元格经 `sheet_to_json(raw:false)` 后均为字符串,与 transport-plan-import 的客户端解析模式一致。
|
||||||
|
|
||||||
|
## 车/船务模块导出 xlsx「创建时间/更新时间」为空(后端 tms-api 修复)
|
||||||
|
|
||||||
|
- 现象:`/vehicle/insurance-record` 批量导出的 xlsx 里「创建时间」「更新时间」两列空白,「更新人」有值。用户要求车/船务模块所有页面统一修。
|
||||||
|
- 定位:导出由**后端**生成(前端只传查询参数,`exportColumns` 参数后端未使用)。实测 `~/Downloads/保险记录2026-09-17 20_46_08.xlsx`:K/M 列单元格无 `<v>` 节点(值 null),E/F/J 日期列是数值 46266.0(带 numFmt `yyyy-MM-dd`,WPS 显示为日期)。
|
||||||
|
- 根因:Service 用 BladeX `org.springblade.core.tool.utils.BeanUtil`(**继承 Spring `BeanUtils`**)做 `copyProperties`。实体 `TenantEntity.createTime/updateTime` 是 `java.util.Date`,导出类字段是 `java.time.LocalDateTime` → Spring BeanUtils **类型不兼容静默跳过**,值为 null。而「更新人」是手动 `UserCache.getUserRealName(...)` 赋值的,所以有值。(Hutool 的 BeanUtil 能转 Date→LocalDateTime,但本项目用的是 BladeX 版本,不能。)
|
||||||
|
- 佐证:项目里正常的导出(Waybill / LoadingManage / CustomerArchive / CommonCargo)时间字段一律用 `java.util.Date`,并在 Service 里手动 `excel.setCreateTime(record.getCreateTime())`。
|
||||||
|
- 修复(后端仓库 `/Users/gxwebsoft/JAVA/tms-api`,blade-transport 模块):在 13 个导出方法里补显式赋值(Date→LocalDateTime 用 BladeX `DateUtil.fromDate`,`Func.isEmpty` 判空),不改 Excel 类字段类型(避免影响自定义 converter 与导入模板)。
|
||||||
|
```java
|
||||||
|
excel.setCreateTime(Func.isEmpty(x.getCreateTime()) ? null : DateUtil.fromDate(x.getCreateTime()));
|
||||||
|
excel.setUpdateTime(Func.isEmpty(x.getUpdateTime()) ? null : DateUtil.fromDate(x.getUpdateTime()));
|
||||||
|
```
|
||||||
|
- 涉及文件(13 个 Service + 1 新建 Excel 类 + 设备台账 controller/接口):InsuranceRecord / ViolationRecord / MaintenanceRecord / MaintenancePlan / TireReplacementRecord / AccidentRecord / AnnualInspectionRecord / MileageRecord / TransportChangeRecord / EtcRecord / OilElectricRecord / OtherExpenseRecord / EquipmentLedger。
|
||||||
|
- 设备台账特殊:原 `EquipmentLedgerExcel` 根本没有审计列(前端列表有),新建 `EquipmentLedgerExportExcel extends EquipmentLedgerExcel`(创建时间/更新人/更新时间),导出链路改用新类,**导入模板仍用旧类不受影响**。
|
||||||
|
- 未验证:本机无 mvn(仅 IDEA 内置),且离线模式缺 `blade-bom` 无法编译;用 javap 确认 `DateUtil.fromDate(Date)` 存在 + 逐行 grep 复核代替。需用户在 IDEA 里编译并重新部署后自测。
|
||||||
|
- 同类隐患(本次未改,其他模块):TemporaryCreditLimit、ProcessConfig、CommonRoute、CommonAddress、ContractManage、ProjectApply、ShippingTemplate 的导出 Excel 也是 LocalDateTime 且未手动 set 时间。
|
||||||
|
|
||||||
|
## 保险记录保额 -1 问题排查(未结案,待用户验证 DB 环境)
|
||||||
|
|
||||||
|
- 症状:新增弹窗保额不填 → 再开编辑弹窗显示 -1,触发「不能小于 0」校验。
|
||||||
|
- 已排除:前端(源码/dist 构建/git 全历史)、后端 tms-api + tms-erp-api-ws(源码/编译产物 javap/git 历史)均无任何 -1 赋值逻辑;保额为 formslot el-input,空值传 ''。
|
||||||
|
- 关键链路:编辑弹窗 beforeOpen 走 `/detail` 接口(getOne 原生查询),**不经过**列表 SQL 的 `CASE WHEN insured_amount<0 THEN 0` 兜底——所以表格显示 0、弹窗显示原始值。
|
||||||
|
- 数据库截图(用户 Navicat):该行 insured_amount=NULL,全表无负数 → 说明用户浏览的库与后端实际连接的库**不是同一个/DDL 不一致**。系统存在「空数值=-1」惯例(MaintenanceRecordMapper 里程 `CASE WHEN mileage=-1 THEN NULL`;前端 waybill-manage.js/process-config.js 均有 `Number(v)===-1?'':v` 掩码)→ 后端真实库的 insured_amount 列默认值很可能是 -1,MP 插入排除 null 列 → 默认值 -1 入库。
|
||||||
|
- 待验证:在后端 Nacos 数据源指向的库执行 `SHOW CREATE TABLE blade_insurance_record` + `SELECT insured_amount FROM blade_insurance_record WHERE policy_no='11111' AND vehicle_no='沪AE31312'`。
|
||||||
|
- 修复方案(待确认):1) ALTER 列默认值改 NULL + UPDATE 存量负数为 NULL;2) 前端 beforeOpen 对 insuredAmount/premium 做 null/-1 → '' 归一(参照 waybill-manage normalizeNumericDisplayValue);3) 列表 SQL 的 CASE 兜底与 detail 不一致,可顺手统一。
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
# 2026-09-18
|
||||||
|
|
||||||
|
## 修复:改成独立整页后点左侧菜单仍弹出旧弹窗(loading-manage / project-apply)
|
||||||
|
|
||||||
|
**现象**:配载单管理、项目管理已改为「新增/编辑/详情走独立整页」,但从独立页返回或直接点左侧菜单时,页面上仍会盖出一个老的 `el-dialog`(新增项目管理 / 配载单)。
|
||||||
|
|
||||||
|
**根因**(已读 Vue runtime-core 源码确认):
|
||||||
|
- `src/router/tab.js` 按 `tabKey`(默认 fullPath)为每个标签建一个具名 wrapper 组件放进 `wrapperMap`,`src/page/index/layout.vue` 用 `<keep-alive :include="$store.getters.tagsKeep">` 缓存 —— 每个标签页一个实例,全部缓存不销毁。
|
||||||
|
- 组件被 deactivate 后**仍会随 `$route`(全局响应式)重新渲染**;此时 `isStandalonePage` 变 false,`<component :is="isStandalonePage ? 'div' : 'el-dialog'">` 由 div 翻回 `el-dialog`,而 `v-model`(`projectBox`/`dialogVisible`)仍是 true,`append-to-body` 使弹窗 Teleport 到 body。
|
||||||
|
- `KeepAlive.deactivate` 调 `move(vnode, storageContainer, ..., moveType=OUT)`,但 `TeleportImpl.move`(`moveTeleport`)忽略传入的 moveType、一律按 REORDER 处理 → **teleport 出去的 DOM 不会被搬回 storage container**,永久残留在 `document.body` 上并显示出来。
|
||||||
|
|
||||||
|
**修法**(不回退 tab.js 的 `return wrapper` 提交 c1c4fa1,改修根因):
|
||||||
|
- 独立页容器固定为 `<div v-if="isXxxPage">`,不再按路由回退成 `el-dialog`。
|
||||||
|
- 页内其它 `append-to-body` 二级弹窗加 `deactivated()` / `beforeUnmount()` → `closeInnerDialogs()` 把 v-model 置 false。
|
||||||
|
|
||||||
|
**改动文件**:
|
||||||
|
- `src/views/business/loading-manage.vue`:容器改 `<div v-if="isStandalonePage">`;删 `dialogVisible`、`dialogTitle`、`resetLoadingDialog`、`clearLoadingDialog`、页脚弹窗分支(含「清空」);`watch.$route` 简化;新增 `closeInnerDialogs()`(routeChange / commonAddress / candidateSearch)+ `deactivated`/`beforeUnmount`。
|
||||||
|
- `src/views/business/project-apply.vue`:容器改 `<div v-if="isProjectFormPage">`;删 `projectFormContainer`/`projectFormContainerProps`、`projectBox`、`resetProjectDialog`、`handleCancelProject`;`closeProjectForm` 简化为直接 push 列表;新增 `closeInnerDialogs()`(changeRecordDetail / 附件文档预览 / 图片预览 / 选人)+ `deactivated`/`beforeUnmount`。
|
||||||
|
|
||||||
|
**校验**:dev server(2889) curl 两个 .vue 及其 scoped style 模块,均 HTTP 200(500 才是编译失败)。`vite build` 因沙箱敏感内容保护会在 facelogin.vue 中断,未用。
|
||||||
|
|
||||||
|
**遗留同类风险(未改,已告知用户)**:`business/components/waybill-manage-page.vue`(`detailContainer` 在 PageDetail / el-dialog 间切)、`settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`(`pageMode ? 'div':'el-dialog'`)、`business/components/waybill-import-dialog.vue`(`standalone`/`createPage`)。统一修法:容器类型在 `created()` 锁定,不随路由/prop 翻转。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 追加修复:运单详情弹窗残留(waybill-manage-page.vue)
|
||||||
|
|
||||||
|
用户复现路径:打开 `/business/waybill-manage/detail?id=xxx` → 点「配载管理」菜单 → 页面上又冒出运单详情弹窗。与上面同一根因:`detailContainer()` 随 `isStandaloneWaybillDetailPage` 在 PageDetail / el-dialog 间翻转,`:append-to-body="!isStandaloneWaybillDetailPage"` 随之为 true,`v-model="detailBox"` 仍 true → Teleport 进 body 搬不回来。
|
||||||
|
|
||||||
|
**改动**(`src/views/business/components/waybill-manage-page.vue`):
|
||||||
|
- data 新增三个锁定标志 `formPageLocked` / `detailPageLocked` / `formModeLocked`,在 `created()` 一次性从 `isStandaloneWaybillFormPage` / `isStandaloneWaybillDetailPage` / `$route.query.mode` 取值。
|
||||||
|
- 模板里所有形态判定(根 class、`v-if="!detailPageLocked"` 的列表容器、`form-page-title`、`status`、独立表单页按钮块、分页 `v-show`、`:append-to-body`、detail-page class、内容 `v-if="detailBox || detailPageLocked"`、独立页 footer / 弹窗 footer slot)全部改读锁定标志。
|
||||||
|
- `detailContainer()` / `crudContainer()` / `pageFormOption()`(含 `boxType`)改读锁定标志,避免缓存实例的 option 变形。
|
||||||
|
- 新增 `closeInnerDialogs()`(关 detailBox、里程补录、附件文档/图片预览、变更路线、常用地址、流程图、运输路线/地址/站点/地图、常用货物、货物导入、过程配置、Excel 导入)+ `deactivated()` / `beforeUnmount()`。
|
||||||
|
|
||||||
|
**关键验证**:`onDeactivated` 在子组件里也会触发 —— apiLifecycle 的 `injectHook` 会向上遍历父链,发现 KeepAlive 父级就把钩子注入到根实例(runtime-core 的 `injectToKeepAliveRoot`),所以写在子组件 waybill-manage-page 上的 `deactivated` 有效。
|
||||||
|
|
||||||
|
**校验**:dev server curl 该 .vue 与 scoped style 均 200。仍未 commit。
|
||||||
|
|
||||||
|
**未提交**:上述改动 + 上一轮 loading-manage 独立页改造均未 commit。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 排查(未改码):配载单详情页反复弹「运单管理不存在」
|
||||||
|
|
||||||
|
用户截图:打开 `/business/loading-manage/detail?id=2097607162718441474&name=配载单详情`,连续弹出 6-7 条红色「运单管理不存在」,标签栏堆了一串「运单管理详情」。
|
||||||
|
|
||||||
|
**文案来源**:前端 src 里没有这句话,是后端 `BusinessException` 的 msg,被 `src/axios.js` 的响应拦截器(`status !== 200` → `ElMessage.error(message)`)统一弹出。
|
||||||
|
|
||||||
|
**主因(通道 A)**:`views/business/waybill-manage-detail.vue` 只有 23 行,写了 `:detail-id="$route.query.id"` —— 直接绑全局 `$route`,**没有路径守卫**。`waybill-manage-page.vue` 的 `detailId` watcher 是 `immediate` 且对任何非空 id 都 `openDetail({id})`。于是:
|
||||||
|
1. 之前打开过的每个运单详情标签(`/business/waybill-manage/detail?id=A`、`?id=B`…)各是一个被 keep-alive 缓存的独立实例;
|
||||||
|
2. 跳到配载单详情后,这些实例被 deactivate 但仍随 `$route` 重渲染 → `$route.query.id` 变成配载单 id;
|
||||||
|
3. prop 变化 → `openDetail({id: 配载单id})` → `getDetail(配载单id)` 去查运单 → 后端「运单管理不存在」→ 拦截器弹一次。**几个旧标签就几条提示**;
|
||||||
|
4. 且被污染实例的 `isStandaloneWaybillDetailPage` 仍是 live computed(false) → `openDetail` 走 `$router.push` 分支 → 又生成新的「运单管理详情」标签(标签栏那串的来源)。
|
||||||
|
|
||||||
|
同理风险:`waybill-manage.vue:6` 与 `transport-plan.vue:6` 的 `:detail-id="$route.query.detailId"`(`business-crud-page.vue:7356` 会 push `/business/loading-manage?detailId=id`,正好会污染运单列表实例)。
|
||||||
|
|
||||||
|
**次因(通道 B)**:`loading-manage.vue` 的 `restoreWaybillRows` 会用 `waybillIdsJson` 里的每个运单 id 并发 `getWaybillDetail(id)`,若历史运单已被删/失效,也会报同一句文案且并发多条。单条 `.catch(() => null)` 挡不住拦截器已弹出的提示。
|
||||||
|
|
||||||
|
**区分方法**:Network 里看报错请求的 `id` —— 等于 `2097607162718441474`(配载单 id)→ 通道 A;是别的数字(运单 id)→ 通道 B。或先关掉所有「运单管理详情」标签再复现,通道 A 会消失。
|
||||||
|
|
||||||
|
**待确认的修法**(用户要求先报不改):
|
||||||
|
1. `waybill-manage-page.vue`:`created()` 锁 `routePathLocked = this.$route.path`,`detailId` watcher 首行加 `if (this.$route.path !== this.routePathLocked) return;`。
|
||||||
|
2. `openDetail()` 的 push 分支加同样守卫(防其它调用路径)。
|
||||||
|
3. 宿主 view 绑定加路径守卫(`waybill-manage-detail.vue` / `waybill-manage.vue` / `transport-plan.vue`)双保险。
|
||||||
|
4. 可选:`getWaybillDetail` 支持静默模式,供 `restoreWaybillRows` 用,避免历史脏数据刷屏。
|
||||||
|
|
||||||
|
## 修复(已执行):「运单管理不存在」误报 + 误开标签
|
||||||
|
|
||||||
|
用户确认后按上方案落地,5 个文件:
|
||||||
|
|
||||||
|
1. `src/views/business/components/waybill-manage-page.vue`
|
||||||
|
- `data()` 新增 `routePathLocked: this.$route.path` —— **必须放 data,不能放 created**:Vue Options API 顺序是 data → computed → watch(immediate) → created(已在 runtime-core `applyOptions` 源码中核实)。放 created 会让首个 immediate watcher 读到空值。
|
||||||
|
- 新增 computed `isOwnedRouteActive() { return this.$route.path === this.routePathLocked; }`
|
||||||
|
- `detailId` watcher 首行加 `if (!this.isOwnedRouteActive) return;`
|
||||||
|
- `openDetail` 的 `$router.push` 分支同样加守卫。
|
||||||
|
2. `src/views/business/components/transport-plan-page.vue`:完全同构的写法(`:detail-id` host 一致),加同样的 `routePathLocked` + `isOwnedRouteActive` + watcher 守卫。
|
||||||
|
3. `src/views/business/waybill-manage-detail.vue`:`:detail-id="$route.query.id"` → `:detail-id="detailId"`,computed 做 `this.$route.path === '/business/waybill-manage/detail'` 守卫。
|
||||||
|
4. `src/views/business/waybill-manage.vue`:同上,守卫 `/business/waybill-manage`(保留旧链接 `?detailId=` 兼容)。
|
||||||
|
5. `src/views/business/transport-plan.vue`:同上,守卫 `/business/transport-plan`。
|
||||||
|
|
||||||
|
**验证**:
|
||||||
|
- dev server curl 5 个 .vue + 2 个 scoped style 全部 HTTP 200。
|
||||||
|
- 用 `@vue/server-renderer` 写了临时 mjs(已删)模拟带 `$route` 的 app,确认 **data() 里访问 `this.$route` 可行**:immediate watcher 触发时 `routePathLocked` 已是正确路径、首次加载不被拦截。
|
||||||
|
- `$route` 是 vue-router 挂在 `app.config.globalProperties` 上的 getter(vue-router.mjs:1498),组件实例化时已就绪。
|
||||||
|
|
||||||
|
**未做(第 4 条可选)**:给 `getWaybillDetail` 加静默模式供 `restoreWaybillRows` 使用(历史失效运单仍会刷多条红字),待用户定夺。
|
||||||
|
|
||||||
|
**另注**:`business-crud-page.vue:6651` 有同构的 `detailId` immediate watcher,但全项目只有上述 3 个宿主 view 传 `:detail-id`,它暂无调用方,未动。
|
||||||
|
|
||||||
|
**仍未 commit。**
|
||||||
|
|
||||||
|
## 修复(已执行):合同详情页整页空白 —— 路由表重复定义
|
||||||
|
|
||||||
|
**现象**:主订单详情点合同编号 → `/business/contract-manage/detail?id=...&name=合同详情` 内容区空白(侧栏/标签正常)。
|
||||||
|
|
||||||
|
**定位过程(关键:真实浏览器复现,不猜)**
|
||||||
|
1. 静态排查全部排除:`contract-manage.vue` 及其 26 个依赖 HTTP 200、模块 `import()` 成功、无循环依赖、详情分支引用的 24 个成员全部有定义。
|
||||||
|
2. dev 环境登录态无法直接拿(验证码 + `admin/admin` 报 `error_code 2004 用户密码强度过低`),改为**注入式复现**:
|
||||||
|
- `agent-browser open <目标 URL>`(落 `/login`);
|
||||||
|
- eval 取 `document.getElementById('app').__vue_app__.config.globalProperties` 拿 `$router` / `$store`;
|
||||||
|
- 写 cookie `saber3-access-token`(注意 token 走 **js-cookie**,不是 localStorage)+ `$store.state.user.token`;
|
||||||
|
- 覆写 `XMLHttpRequest.prototype.open/send` 让所有 `/api/**` 返回 `{code:200,data:{...}}`(defineProperty 伪造 readyState/status/responseText 后手动触发 `onloadend`)。
|
||||||
|
- 再 `$router.push(...)` 做 SPA 跳转。
|
||||||
|
3. 复现出空白,并拿到决定性证据:
|
||||||
|
- `/business/contract-manage/detail` → `$route.matched.length === 1`(只有 Layout,name undefined),`#avue-view.children.length === 0`,innerHTML 为 `<!---->`。
|
||||||
|
- 对照 `/business/contract-manage/change`(结构相同但未重复定义)→ `matched.length === 2`(Layout + 合同变更),内容完整渲染。
|
||||||
|
- `$router.getRoutes()` 里 detail 有 **3 条**记录:2 个 Layout 父记录 + 1 个子记录(`合同详情`)。
|
||||||
|
|
||||||
|
**根因**:`src/router/views/index.js` 中 `/business/contract-manage/detail` **被复制粘贴定义了两次**,两次的子路由都叫 `合同详情`。vue-router 的 `addRoute` 遇到重名会 `removeRoute(name)` 把先注册的子记录删掉,但**不会把它从父记录的 `children` 数组里摘除**;于是第一条 Layout 壳记录留在 matcher 列表里且排在前面,`resolve('/business/contract-manage/detail')` 命中这个"无有效子路由"的壳 → matched 只有 1 层 → `page/index/index.vue` 里 `#avue-view` 的二级 `<router-view>` 无匹配 → 内容区空白。
|
||||||
|
(`getRoutes()` 计数是判据:form / change 都是 2 条 = 父 + 子(健康),detail 是 3 条 = 2 父 + 1 子(坏)。)
|
||||||
|
|
||||||
|
**修复**:删除重复块(原 314-325 行),只保留 159-169 行那一份。
|
||||||
|
|
||||||
|
**验证**:
|
||||||
|
- 重复扫描脚本(正则匹配「顶层 path + `component: Layout` + 首个子路由 name」):views/index.js 27 条 Layout 子路由中仅 `合同详情` 重复;page/index.js 无重复 → 已清零。
|
||||||
|
- 修复后浏览器复验:detail → `matched.length === 2`(Layout + 合同详情)、`#avue-view.children.length === 1`,正文完整渲染「基本信息 / 签约类型 / 合同编号 HT-2026-001 / … / 变更记录」。
|
||||||
|
- 全量回归:48 条 business/vehicle/payment/settlement 路由 `resolve()` 后 `matched.length` 全部 ≥ 2,`bad: []`。
|
||||||
|
- `curl` 校验:`views/index.js`、`contract-manage.vue` 均 200。
|
||||||
|
- 残留报错均为 mock 数据形状不符所致(所有接口都返回同一个合同对象,导致 `tree.reduce` / `feeCategories.find` 之类失败),非真实缺陷。
|
||||||
|
|
||||||
|
**未 commit**(连同 1、2 轮改动一起待确认)。
|
||||||
@@ -1,63 +1,27 @@
|
|||||||
# 项目长期记忆(tms-erp-web-ws / Saber3 客商模块)
|
# 项目长期记忆(tms-erp-web-ws / Saber3)
|
||||||
|
|
||||||
## 设计约定(经用户确认的决策)
|
后端:`/Users/gxwebsoft/JAVA/tms-api`(`tms-erp-api-ws` 滞后,别看错仓库)。
|
||||||
|
|
||||||
### 弹窗分组:统一用全局 `<section-card>` 组件
|
## 列表 / 表单 / 详情三态同组件分流
|
||||||
- 整弹窗 body 由 `src/styles/element-ui.scss` 全局 `.el-dialog__body { background:#f5f6fa; padding:16px }` 统一灰底;每组 = 一张白底卡片(4px 主色竖条 + 8px 间距卡头 + 白底 body,圆角 6px + 极淡阴影)。
|
`/xxx`、`/xxx/form`、`/xxx/detail` 指向同一 `.vue`;form/detail 在 `src/router/views/index.js` 是 `component: Layout` + 空 `children.path` + `meta:{keepAlive:false}`(detail 另带 `activeMenu`)。组件内按 `$route.path` 分流,必须 `watch:{$route}` 重新 init;标签标题取 `query.name`;独立页容器固定 `<div v-if>`,不用 `el-dialog`。
|
||||||
- 组件已全局注册 `<section-card title="...">`,支持 `#title` / `#extra` slot。严禁再手写 `.xxx-form__block` + `.dialog-section-title` 拼凑卡片。
|
|
||||||
- 仅 3 项的小分组用 `el-col :span="8"` 均分一行。
|
|
||||||
|
|
||||||
### Avue 内置弹窗内用 section-card:需 dialogCustomClass 透明化 avue-form
|
## ⚠️ keep-alive 三坑
|
||||||
- 全站 `.el-dialog .avue-form { background:#fff; padding:8px 16px 4px }` 会把表单整体包白卡,内置弹窗放 section-card 会白卡叠白卡。
|
背景(`router/tab.js` + `page/index/index.vue`):按 `fullPath` 建 wrapper,`<keep-alive :include="tagsKeep">` 缓存,**每标签一实例、永不销毁**,deactivate 后**仍随全局 `$route` 重渲染**。
|
||||||
- 解法:option 顶层加 `dialogCustomClass:'xxx-dialog'`,再在 element-ui.scss 写三条:
|
|
||||||
① `.xxx-dialog .avue-form { background:transparent; box-shadow:none; padding:0 }`
|
|
||||||
② `.xxx-dialog .avue-form__group > .el-col > .el-form-item { margin-bottom:0 }`(防 form-item margin 与卡距叠加)
|
|
||||||
③ `.xxx-dialog .avue-dialog__footer, .avue-crud__dialog .xxx-dialog .avue-dialog__footer { margin-top:0 !important }`(抵消全局 947 行 `-30px !important` 上移)。
|
|
||||||
|
|
||||||
### 弹窗底部操作栏浮动(全站统一,全局 CSS 实现)
|
**坑一:独立页容器禁用 `<component :is>` 在 div / el-dialog 间切换。** `append-to-body` 走 Teleport,`TeleportImpl.move` 忽略 `moveType`,不会把 DOM 搬回缓存容器 → 切菜单冒出旧弹窗。修法:固定 `<div v-if>` + `deactivated(){closeInnerDialogs()}` + `beforeUnmount()`(写在子组件也生效)。已修 loading-manage / project-apply / waybill-manage-page;未修 `settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`、`waybill-import-dialog.vue`。
|
||||||
- `.el-dialog__body { max-height: calc(100vh - 200px); overflow-y:auto; overflow-x:hidden }`;`.el-dialog__footer { margin:0; padding:12px 20px; background:#fff; border-top:1px solid #ebeef5; box-shadow:0 -2px 8px rgba(0,0,0,.04) }`。
|
|
||||||
- **易踩坑**:Avue 内置弹窗 footer 真实 class 是 `.avue-dialog__footer`(非 `.el-dialog__footer`),且渲染在 `.el-dialog__body` 内、随 body 滚动滚出视口。要让它贴底须 `position:sticky; bottom:0; flex:none; background:#fff`(配合 body flex 列布局 + overflow-y:auto)。手写 el-dialog 的 `.el-dialog__footer` 在 body 外天然可见。
|
|
||||||
- **弹窗高度链**:① `.avue-dialog`(库内置)`max-height:calc(100% - 200px)` 控制整体上限;② `.avue-crud__dialog .el-dialog__body { max-height:calc(100vh - 200px); overflow-y:auto }`(451-457 行);③ 专项弹窗(shipping-template-dialog / transport-plan-dialog)`.el-dialog` 自身 `margin-top:4vh; height/max-height:calc(100vh-4vh-24px); display:flex; flex-direction:column` + header flex:none / body flex:1 1 auto; min-height:0; overflow-y:auto; max-height:none!important / footer sticky。**改这类弹窗尺寸只改 section-card 周边规则,不要动 body 内 max-height。**
|
|
||||||
|
|
||||||
### 上传证件区域尺寸规范(transportCapacity 强制)
|
**坑二:宿主 view 直绑全局 `$route.query.*` 给子组件 prop。** 缓存实例被灌入当前页 id → 拿错 id 查后端(批量弹「运单管理不存在」),live computed 还会误 push 标签。修法:`routePathLocked` 锁路径 + watcher / push 前判 `isOwnedRouteActive` + 宿主绑定加路径守卫。⚠️ `routePathLocked` **必须放 `data()`**(Options API 顺序 data → computed → watch(immediate) → created;放 created 会读到空值、挡掉首次加载)。已修 waybill-manage-page / transport-plan-page + 三个宿主 view。
|
||||||
- 二代身份证 85.6×53.98mm → 宽:高 ≈ **1.586:1**;取 ~75% → 固定 **240×151px**,el-col 内 `margin:0` 左对齐。
|
|
||||||
- 全 `<image-upload-field large>` 适用(身份证/行驶证/道路运输证/登记本/船舶各证)。每页 scoped 覆盖 `.xxx-uploader--large`(`width:240px`)与 `--large .el-upload`(`width:100%; height:151px`);注意 `.xxx-uploader` 须写在 `.xxx-uploader--large` 之前(同特定性,源码顺序决胜)。
|
|
||||||
|
|
||||||
### 上传图片点击放大预览(全局组件 `image-upload-field`)
|
**坑三:路由表重复定义 → 内容区整页空白(2026-09-18)。** `/business/contract-manage/detail` 在 `router/views/index.js` 定义两次、子路由同名 `合同详情`。重名 `addRoute` 会 `removeRoute(name)` 移除旧子记录,但**不从父记录 children 里摘除**,第一条 Layout 壳记录留在 matcher 且靠前 → `resolve()` 命中它 → `$route.matched.length === 1` → 二级 router-view 无匹配 → 侧栏/标签正常但内容空白。修法:删重复定义。排查:扫「顶层 path + 首个子路由 name」重复项。
|
||||||
- `src/components/image-upload-field/main.vue`:裸 `<img>` → `<el-image :preview-src-list="[value]" fit="contain" preview-teleported :z-index="3000" @click.stop>`。图片 `@click.stop` 阻止冒泡到 el-upload(否则重传);"更换"经隐藏 `input.el-upload__input` 的 `.click()`(el-upload 无 openFileDialog)。readonly 仅预览。driver/vehicle/ship 三页自动获得。z-index 必须 3000 + teleported 否则被 dialog 遮罩盖住。
|
|
||||||
|
|
||||||
### 独立表单页标题 `archive-page-form__title`(全局统一,参考 customer-archive)
|
## 样式硬规则
|
||||||
- 样式已**全局化**到 `src/styles/element-ui.scss`(5b 段):18px/600/#303133 + margin-bottom:20px + `::before` 4px 主色竖条 + 8px 间距。原 `customer-archive.vue`(scoped)与 `business-crud-page.vue`(`:global`)两处本地重复定义已删除,改由全局规则统一驱动(全站任意页面用此 class 即得统一标题)。
|
- 底栏 `flex; justify-content:flex-end`,**不写 gap**(靠 EP 默认 `.el-button+.el-button{margin-left:12px}`);浮动底栏必须 `position:fixed`(祖先 overflow:hidden 使 sticky 失效)+ `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`,`:global()` 要包整个选择器。
|
||||||
- **business-crud-page 系列**(shipping-template / transport-plan / waybill-manage / contract-manage 独立表单页):`PageAvueForm`(render `h('div',{class:dialogCustomClass},[titleDiv, avue-form])`)声明 `props.formPageTitle`,模板 `:form-page-title="isStandaloneFormPage ? formPageTitle : undefined"`;computed `formPageTitle()` 在 `isStandaloneFormPage && (isShippingTemplatePage || isTransportPlanPage || isWaybillDetailLayout || isContractConfig)` 时返回 `this.$route.query.name || '新增'/'编辑'+config.title`(`isWaybillDetailLayout` = `config.permission==='waybill_manage'`;`isContractConfig` = `config.permission==='contract_manage'`)。
|
- 按钮层级:次要=无 type;中间步骤=`primary plain`;主操作=`primary`(禁绿、禁两个蓝实心)。顺序 `[辅助][取消][保存草稿][提交]`。
|
||||||
- **loading-manage/form**:路由直接映射 `loading-manage.vue`(非 business-crud-page)。新增 computed `formPageTitle()`(`query.name || '新增/编辑配载管理'`),并在 `<component :is="isStandaloneFormPage?'div':'el-dialog'">` 内、body 前加 `<div v-if="isStandaloneFormPage" class="archive-page-form__title">`。
|
- 独立页标题 `.archive-page-form__title`;分组用全局 `<section-card>`;上传证件区 `width:100%; max-width:240px` + `.el-upload{height:151px}`。
|
||||||
- **master-order?mode=editor**:`master-order.vue` 把 `<master-order-editor>` 包进 `<template v-else-if="mode==='editor'">`,前置 `<div class="archive-page-form__title">{{ masterEditorTitle }}</div>`(computed `masterEditorTitle` = `routeId ? '编辑总单' : '新增总单'`)。
|
- ⚠️ `<style scoped lang="scss">` 顶层禁 `//` 注释(Vite5 + sass `Unexpected '/'` → 500),顶层用 `/* */`。其余见 `src/styles/element-ui.scss` 与 `AGENTS.md` 4.4。
|
||||||
- 扩展原则:新增独立表单页要带此标题,要么并入 business-crud-page 的 `formPageTitle` 条件(business-crud-page 系列),要么在对应页面模板手写 `<div class="archive-page-form__title">`(loading-manage / master-order 模式)。
|
|
||||||
|
|
||||||
### 表格列内嵌输入控件:全宽(全局 CSS,不动手写 scoped)
|
## 表单 / 自检 / 导出
|
||||||
- `element-ui.scss` 在 660-678 行加了一条全局规则:`.el-table .el-table__body td.el-table__cell .cell > .el-input-number/.el-input/.el-select/.el-date-editor/.el-cascader { width:100%; --el-*-width:100% }`(带对应 `--el-input-number-width` 等变量兜底)。
|
- placeholder 只写 `请输入`/`请选择`;例外:`请输入或选择车辆`、日期区间 `起`/`止`、示例值。校验 message 须带字段名。
|
||||||
- 适用场景:可编辑 el-table 列、弹窗内编辑表格。原先容易踩坑的是 el-plus 的 el-input-number 默认根 width=150px,cell 给到 min-width=150 后输入框只占自然宽度、看着"显示不全"。**新增任何"el-table cell 内嵌 el-input-number/el-input/el-select"需求不用再写 scoped 宽度**——已全局兜底。
|
- `business-crud-page.vue`:option 经 `cloneOption` 克隆,独立表单页走 `PageAvueForm`。
|
||||||
- 与"表单内 250px 全宽"互不冲突:本规则只命中 `.el-table .el-table__body td`,表单内 `.el-form-item__content >` 的 250px 规则仍生效。
|
- 自检:`curl "localhost:2889/src/xxx.vue"` 与 `"...?vue&type=style&index=0&scoped=true&lang.scss"`(200 / 500)。`vite build` 在 `facelogin.vue` 被沙箱中断,不能作唯一校验。dev `VITE_APP_API=/api` 代理 `172.16.203.228:8000`。
|
||||||
- 已覆盖:pre-settlement-editor「结算明细调整」弹窗(adjustDialog 列内 el-input-number/el-input 全宽)、transport-reconciliation-editor/formal-settlement-editor/settlement-adjustment-editor 同款结构。
|
- 导出:前端 `exportColumns` 后端未用,以 `XxxExportExcel.java` 为准;BladeX `BeanUtil` 类型不兼容静默跳过(`Date` → `LocalDateTime` 丢值,用 `DateUtil.fromDate`)。
|
||||||
|
|
||||||
### 业务状态标签文字化:全局 `.status-text` 工具类
|
|
||||||
- 需求:全站"调度状态/运单状态/审批状态"等用 `el-tag` 展示的字段,统一改为**普通文字,不带颜色、不显示 tag 背景/边框/圆点**。
|
|
||||||
- 实现:`element-ui.scss` 末尾 `.el-tag.status-text { background:transparent!important; border-color:transparent!important; color:var(--el-text-color-regular)!important; padding:0; margin:0; font-weight:normal!important; font-size:inherit!important; height:auto!important; vertical-align:baseline; line-height:inherit }`,并隐藏 `&::before` 圆点。`el-tag` 的 `:type` 继续保留在模板中(无需改动),但颜色/字号/行高已被全局 CSS 强制覆盖为与单元格普通文本一致。
|
|
||||||
- 用法:业务状态 `el-tag` 加 `class="status-text"`。
|
|
||||||
- **全站统一完成(2026-08-25)**:所有"状态语义"的 el-tag 均已加 `class="status-text"` 转纯文本,含:business-crud-page(#status/#businessStatus/#approvalStatus + 调度弹窗头)、master-order 系列、loading-manage 详情、结算(settlement-adjustment/pre-settlement/formal-settlement/formal-settlement-table-panel/transport-reconciliation-editor 匹配结果·状态)、payment(invoice-application/bill-payment-table/receipt-flow/receipt-claim-record/invoice-receipt/payment-application 审批·认领状态)、contract-manage(合同阶段 + 审批)、temporary-credit-limit、process-config、credit-score-quantification、flow(manager/follow 激活·挂起)、work(start 激活·挂起 / send 完成)、transportCapacity(vehicle 启用·认证 / driver / ship 启用)、base(railway-station/airport-master/currency/customer-type/fee-item/port-terminal 启用停用)、system(dept/authority apikey·ratelimit 启用禁用 / authlock lockStatus / dict·dictbiz 是否封存 / codesetting 否是)、resource(sms/oss statusName)、customer-archive(审批 + 启用停用)、transit/risk-disposal(column.tag/field.tag)。
|
|
||||||
- 例外(刻意保留 tag 样式,非状态语义):`loading-manage.vue` 列表状态列用 `<span class="loading-manage-page__status is-${status}">`(先例);"类型标签"——transport-flow-tag、transportTypeName、business-crud-page:3252 运输方式、loading-manage:399 运输方式 warning、authlock lockType(锁类型)、vehicle-ledger plateColor/businessRelation、cron-editor、以及 categoryName/version/code/tenantId/roleName/deptName/apiKey/remoteIp/env/tableName/method/recordLevel/pattern/modelTable/fileSize/node.tags 等"值/标签/提示"类。注:customer-archive 准入类型原在例外中,2026-08-25 用户要求也转纯文本(已加 status-text)。
|
|
||||||
|
|
||||||
## 关键文件
|
|
||||||
- 分组白卡:`src/components/section-card/main.vue`。
|
|
||||||
- 全局弹窗/section-card 样式:`src/styles/element-ui.scss`。
|
|
||||||
- 客商档案弹窗:`src/views/vehicle/customer-archive.vue`(用 `archive-page-form__title` 作页面标题,`:deep(.archive-dialog .el-dialog__body){max-height:72vh}`)。
|
|
||||||
- 司机/车辆/船舶档案:`src/views/transportCapacity/{driver,vehicle,ship}.vue`(手写 el-form + section-card + 240×151 证件图)。
|
|
||||||
- 项目补录弹窗:`src/views/business/project-apply.vue`(手写 el-dialog + #footer 浮动,视觉参照)。
|
|
||||||
|
|
||||||
## 环境注意
|
|
||||||
- Vite 代理跨域:axios `withCredentials=true`,直连绝对地址后端须 CORS `Allow-Origin` 为具体域名(不能用 `*`)。改 `.env`/`vite.config.mjs` 必须重启 dev。
|
|
||||||
|
|
||||||
## business-crud-page 复用模式(被 waybill/transport-plan/shipping-template/contract 共用)
|
|
||||||
- option 由 prop `crudOption` 经 `cloneOption` 克隆(保留所有顶层属性)。给各页 option 顶层加 `dialogCustomClass:'xxx-dialog'` + element-ui.scss `.xxx-dialog.el-dialog{height/max-height:calc(100vh - 40px)!important}` 可只影响该页。
|
|
||||||
- avue-crud 弹窗带 `avue-crud__dialog` class,受全局 `.avue-crud__dialog .avue-dialog__footer{margin-top:-30px!important}` 影响,自定义 footer 须加 `margin-top:0!important` 抵消。
|
|
||||||
- 独立表单页(contract-manage / shipping-template / waybill / transport-plan)走 `PageAvueForm`,不包 el-dialog,底部按钮随内容滚动不浮动。`pageFormOption`(6205 行)负责装配。contract 用 `buildContractFormGroupOption`(6861 行)按 order 分 7 组白卡。
|
|
||||||
- **查看详情弹窗(detailBox)自定义机制**:列表"查看/详情"按钮默认调 Avue 内置 `rowView`(列数复用 column.span,常呈 3 列)。要改成自定义两列白卡详情,在页面 `config` 加 `detailButton:true` + `detailSections:[{title, fields:[[prop,label,span],...]}]`,组件渲染 `section-card` + `el-descriptions(:column=2)`(field 默认占 1 列,span:2 整行)。数据经 `api.getDetail(row.id)` 拉取,值用 `formatDetailValue` 经 column.dicData 转字典显示 label。开关:`showDetailButton` 默认仅非草稿态显示"详情"(草稿态仍走 rowView 3 列);加 `config.detailButtonIgnoreDraftStatus:true` 可让所有状态(含草稿)都走自定义两列详情。statusProp='approvalStatus' 的页面草稿值须为 'draft'。
|
|
||||||
|
|||||||
@@ -13,6 +13,8 @@
|
|||||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
||||||
<meta name="format-detection" content="telephone=no" />
|
<meta name="format-detection" content="telephone=no" />
|
||||||
|
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
|
||||||
|
<meta http-equiv="Pragma" content="no-cache" />
|
||||||
<link rel="stylesheet" href="/iconfont/index.css" />
|
<link rel="stylesheet" href="/iconfont/index.css" />
|
||||||
<link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
|
<link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
|
||||||
<link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
|
<link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>oa登录</title>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.10.2/jquery.min.js">
|
||||||
|
</script>
|
||||||
|
<script>
|
||||||
|
// 获取URL查询字符串
|
||||||
|
const queryString = window.location.search;
|
||||||
|
|
||||||
|
// 使用URLSearchParams解析查询字符串
|
||||||
|
const urlParams = new URLSearchParams(queryString);
|
||||||
|
|
||||||
|
// 获取特定的参数值
|
||||||
|
var userid = urlParams.get('userid'); // 用户id
|
||||||
|
var username = urlParams.get('username'); // 用户名
|
||||||
|
var redirectUrl = urlParams.get('redirectUrl'); // 重定向地址
|
||||||
|
|
||||||
|
if(userid==null){
|
||||||
|
userid="";
|
||||||
|
}
|
||||||
|
if(username==null){
|
||||||
|
username="";
|
||||||
|
}
|
||||||
|
|
||||||
|
$.get("/oaApi/getToken?userid="+userid+"&username="+username,function(result){
|
||||||
|
debugger
|
||||||
|
//成功返回token
|
||||||
|
if(result.data.token){
|
||||||
|
//设置系统的cookie
|
||||||
|
document.cookie = "X-AUTH-TOKEN="+result.data.token;
|
||||||
|
|
||||||
|
if(redirectUrl==null){
|
||||||
|
//如果是登录就跳转到系统首页
|
||||||
|
window.location.href = "./";
|
||||||
|
}else {
|
||||||
|
//如果是待办有重定向就跳转
|
||||||
|
window.location.href = redirectUrl;
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
alert("该业务系统未同步当前oa用户");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -34,6 +34,7 @@
|
|||||||
"sm-crypto": "^0.4.0",
|
"sm-crypto": "^0.4.0",
|
||||||
"vue": "^3.5.13",
|
"vue": "^3.5.13",
|
||||||
"vue-i18n": "^11.4.2",
|
"vue-i18n": "^11.4.2",
|
||||||
|
"vue-pdf-embed": "^2.1.6",
|
||||||
"vue-router": "^4.3.2",
|
"vue-router": "^4.3.2",
|
||||||
"vue3-clipboard": "^1.0.0",
|
"vue3-clipboard": "^1.0.0",
|
||||||
"vuex": "^4.1.0",
|
"vuex": "^4.1.0",
|
||||||
|
|||||||
@@ -88,6 +88,9 @@ importers:
|
|||||||
vue-i18n:
|
vue-i18n:
|
||||||
specifier: ^11.4.2
|
specifier: ^11.4.2
|
||||||
version: 11.4.2(vue@3.5.34)
|
version: 11.4.2(vue@3.5.34)
|
||||||
|
vue-pdf-embed:
|
||||||
|
specifier: ^2.1.6
|
||||||
|
version: 2.1.6(vue@3.5.34)
|
||||||
vue-router:
|
vue-router:
|
||||||
specifier: ^4.3.2
|
specifier: ^4.3.2
|
||||||
version: 4.6.4(vue@3.5.34)
|
version: 4.6.4(vue@3.5.34)
|
||||||
@@ -1791,6 +1794,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-o8MolyzirkkLrcdsae/HEOiIcXWI7DS5zGpvqW8xTC2YUsW30rltFw2bDGvw/fskUdEMrQm2br68jzDS5BH2vw==}
|
resolution: {integrity: sha512-o8MolyzirkkLrcdsae/HEOiIcXWI7DS5zGpvqW8xTC2YUsW30rltFw2bDGvw/fskUdEMrQm2br68jzDS5BH2vw==}
|
||||||
engines: {node: '>=22.13.0 || >=24'}
|
engines: {node: '>=22.13.0 || >=24'}
|
||||||
|
|
||||||
|
pdfjs-dist@6.2.108:
|
||||||
|
resolution: {integrity: sha512-YxFb+SQcodN2rnX9Tn3dHYlqfb7NjlzzfONPpJd+AKoKtUjEdevTfbC07d5TcczzOK6261auRkP/M8OBHs9vFQ==}
|
||||||
|
engines: {node: '>=22.13.0 || >=24'}
|
||||||
|
|
||||||
picocolors@1.1.1:
|
picocolors@1.1.1:
|
||||||
resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
|
resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
|
||||||
|
|
||||||
@@ -2123,6 +2130,11 @@ packages:
|
|||||||
peerDependencies:
|
peerDependencies:
|
||||||
vue: ^3.0.0
|
vue: ^3.0.0
|
||||||
|
|
||||||
|
vue-pdf-embed@2.1.6:
|
||||||
|
resolution: {integrity: sha512-cNmclL9jGuRIqgm13fx/3ZZd1nW/Nn0zXfQUo/yd8AQU9GTFLLYRgFc5HM41v1+bMoj1wW59mZoB/cNQx8Y2Rw==}
|
||||||
|
peerDependencies:
|
||||||
|
vue: ^3.3.0
|
||||||
|
|
||||||
vue-router@4.6.4:
|
vue-router@4.6.4:
|
||||||
resolution: {integrity: sha512-Hz9q5sa33Yhduglwz6g9skT8OBPii+4bFn88w6J+J4MfEo4KRRpmiNG/hHHkdbRFlLBOqxN8y8gf2Fb0MTUgVg==}
|
resolution: {integrity: sha512-Hz9q5sa33Yhduglwz6g9skT8OBPii+4bFn88w6J+J4MfEo4KRRpmiNG/hHHkdbRFlLBOqxN8y8gf2Fb0MTUgVg==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
@@ -2780,30 +2792,30 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
vue: 3.5.34
|
vue: 3.5.34
|
||||||
|
|
||||||
'@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
'@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
|
||||||
dom7: 4.0.6
|
dom7: 3.0.0
|
||||||
is-url: 1.2.4
|
is-url: 1.2.4
|
||||||
lodash.throttle: 4.1.1
|
lodash.throttle: 4.1.1
|
||||||
nanoid: 5.1.11
|
nanoid: 3.3.12
|
||||||
slate: 0.123.0
|
slate: 0.72.8
|
||||||
snabbdom: 3.6.3
|
snabbdom: 3.6.3
|
||||||
|
|
||||||
'@wangeditor-next/code-highlight@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
|
'@wangeditor-next/code-highlight@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
|
||||||
dom7: 4.0.6
|
dom7: 4.0.6
|
||||||
prismjs: 1.30.0
|
prismjs: 1.30.0
|
||||||
slate: 0.123.0
|
slate: 0.123.0
|
||||||
snabbdom: 3.6.3
|
snabbdom: 3.6.3
|
||||||
|
|
||||||
'@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
'@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/event-emitter': 0.3.5
|
'@types/event-emitter': 0.3.5
|
||||||
'@uppy/core': 2.3.4
|
'@uppy/core': 2.3.4
|
||||||
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
||||||
dom7: 4.0.6
|
dom7: 3.0.0
|
||||||
event-emitter: 0.3.5
|
event-emitter: 0.3.5
|
||||||
html-void-elements: 3.0.0
|
html-void-elements: 3.0.0
|
||||||
i18next: 23.16.8
|
i18next: 23.16.8
|
||||||
@@ -2814,9 +2826,9 @@ snapshots:
|
|||||||
lodash.foreach: 4.5.0
|
lodash.foreach: 4.5.0
|
||||||
lodash.throttle: 4.1.1
|
lodash.throttle: 4.1.1
|
||||||
lodash.toarray: 4.4.0
|
lodash.toarray: 4.4.0
|
||||||
nanoid: 5.1.11
|
nanoid: 3.3.12
|
||||||
scroll-into-view-if-needed: 3.1.0
|
scroll-into-view-if-needed: 3.1.0
|
||||||
slate: 0.123.0
|
slate: 0.72.8
|
||||||
slate-history: 0.115.0(slate@0.123.0)
|
slate-history: 0.115.0(slate@0.123.0)
|
||||||
snabbdom: 3.6.3
|
snabbdom: 3.6.3
|
||||||
|
|
||||||
@@ -2824,13 +2836,13 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@uppy/core': 2.3.4
|
'@uppy/core': 2.3.4
|
||||||
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
||||||
'@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
|
||||||
'@wangeditor-next/code-highlight': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/code-highlight': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
|
||||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
|
||||||
'@wangeditor-next/list-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/list-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
|
||||||
'@wangeditor-next/table-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/table-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||||
'@wangeditor-next/upload-image-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/upload-image-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)
|
||||||
'@wangeditor-next/video-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/video-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||||
dom7: 4.0.6
|
dom7: 4.0.6
|
||||||
is-hotkey: 0.2.0
|
is-hotkey: 0.2.0
|
||||||
lodash.camelcase: 4.3.0
|
lodash.camelcase: 4.3.0
|
||||||
@@ -2843,16 +2855,16 @@ snapshots:
|
|||||||
slate: 0.123.0
|
slate: 0.123.0
|
||||||
snabbdom: 3.6.3
|
snabbdom: 3.6.3
|
||||||
|
|
||||||
'@wangeditor-next/list-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
|
'@wangeditor-next/list-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
|
||||||
dom7: 4.0.6
|
dom7: 4.0.6
|
||||||
slate: 0.123.0
|
slate: 0.123.0
|
||||||
snabbdom: 3.6.3
|
snabbdom: 3.6.3
|
||||||
|
|
||||||
'@wangeditor-next/table-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
'@wangeditor-next/table-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
|
||||||
dom7: 4.0.6
|
dom7: 4.0.6
|
||||||
lodash.debounce: 4.0.8
|
lodash.debounce: 4.0.8
|
||||||
lodash.throttle: 4.1.1
|
lodash.throttle: 4.1.1
|
||||||
@@ -2860,22 +2872,22 @@ snapshots:
|
|||||||
slate: 0.123.0
|
slate: 0.123.0
|
||||||
snabbdom: 3.6.3
|
snabbdom: 3.6.3
|
||||||
|
|
||||||
'@wangeditor-next/upload-image-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)':
|
'@wangeditor-next/upload-image-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@uppy/core': 2.3.4
|
'@uppy/core': 2.3.4
|
||||||
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
||||||
'@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
|
||||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
|
||||||
dom7: 4.0.6
|
dom7: 4.0.6
|
||||||
lodash.foreach: 4.5.0
|
lodash.foreach: 4.5.0
|
||||||
slate: 0.123.0
|
slate: 0.123.0
|
||||||
snabbdom: 3.6.3
|
snabbdom: 3.6.3
|
||||||
|
|
||||||
'@wangeditor-next/video-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
'@wangeditor-next/video-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@uppy/core': 2.3.4
|
'@uppy/core': 2.3.4
|
||||||
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
||||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
|
||||||
dom7: 4.0.6
|
dom7: 4.0.6
|
||||||
nanoid: 5.1.11
|
nanoid: 5.1.11
|
||||||
slate: 0.123.0
|
slate: 0.123.0
|
||||||
@@ -3822,6 +3834,10 @@ snapshots:
|
|||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@napi-rs/canvas': 1.0.2
|
'@napi-rs/canvas': 1.0.2
|
||||||
|
|
||||||
|
pdfjs-dist@6.2.108:
|
||||||
|
optionalDependencies:
|
||||||
|
'@napi-rs/canvas': 1.0.2
|
||||||
|
|
||||||
picocolors@1.1.1: {}
|
picocolors@1.1.1: {}
|
||||||
|
|
||||||
picomatch@2.3.2: {}
|
picomatch@2.3.2: {}
|
||||||
@@ -4171,6 +4187,11 @@ snapshots:
|
|||||||
'@vue/devtools-api': 6.6.4
|
'@vue/devtools-api': 6.6.4
|
||||||
vue: 3.5.34
|
vue: 3.5.34
|
||||||
|
|
||||||
|
vue-pdf-embed@2.1.6(vue@3.5.34):
|
||||||
|
dependencies:
|
||||||
|
pdfjs-dist: 6.2.108
|
||||||
|
vue: 3.5.34
|
||||||
|
|
||||||
vue-router@4.6.4(vue@3.5.34):
|
vue-router@4.6.4(vue@3.5.34):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@vue/devtools-api': 6.6.4
|
'@vue/devtools-api': 6.6.4
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 254 KiB |
|
Before Width: | Height: | Size: 310 KiB |
|
Before Width: | Height: | Size: 190 KiB |
|
Before Width: | Height: | Size: 136 KiB |
|
Before Width: | Height: | Size: 254 KiB |
|
Before Width: | Height: | Size: 310 KiB |
|
Before Width: | Height: | Size: 190 KiB |
|
Before Width: | Height: | Size: 136 KiB |
|
After Width: | Height: | Size: 11 KiB |
@@ -0,0 +1,31 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
export const getList = (current, size, params) =>
|
||||||
|
request({
|
||||||
|
url: '/blade-system/invoice-item/list',
|
||||||
|
method: 'get',
|
||||||
|
params: { ...params, current, size },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const getAll = () => getList(1, 1000, {});
|
||||||
|
|
||||||
|
export const getDetail = id =>
|
||||||
|
request({
|
||||||
|
url: '/blade-system/invoice-item/detail',
|
||||||
|
method: 'get',
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const submit = row =>
|
||||||
|
request({
|
||||||
|
url: '/blade-system/invoice-item/submit',
|
||||||
|
method: 'post',
|
||||||
|
data: row,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const remove = ids =>
|
||||||
|
request({
|
||||||
|
url: '/blade-system/invoice-item/remove',
|
||||||
|
method: 'post',
|
||||||
|
params: { ids },
|
||||||
|
});
|
||||||
@@ -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,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -92,13 +92,12 @@ export const createCrudApi = baseUrl => ({
|
|||||||
data,
|
data,
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
reassign(id) {
|
reassign(data) {
|
||||||
|
const payload = data && typeof data === 'object' ? data : { id: data };
|
||||||
return request({
|
return request({
|
||||||
url: `${baseUrl}/reassign`,
|
url: `${baseUrl}/reassign`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
params: {
|
data: payload,
|
||||||
id,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
batchComplete(ids) {
|
batchComplete(ids) {
|
||||||
|
|||||||
@@ -59,14 +59,14 @@ export const withdraw = id =>
|
|||||||
params: { id },
|
params: { id },
|
||||||
});
|
});
|
||||||
|
|
||||||
export const startChange = (id, reason) =>
|
export const startChange = (id, changeContent, changeReason = changeContent) =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/start-change`,
|
url: `${baseUrl}/start-change`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
params: {
|
params: {
|
||||||
id,
|
id,
|
||||||
changeContent: reason,
|
changeContent: changeContent || '',
|
||||||
changeReason: reason,
|
changeReason,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -24,10 +24,11 @@ export const getDetail = id =>
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export const getCarrierContracts = () =>
|
export const getCarrierContracts = projectIds =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/carrier-contracts`,
|
url: `${baseUrl}/carrier-contracts`,
|
||||||
method: 'get',
|
method: 'get',
|
||||||
|
params: { projectIds: (projectIds || []).join(',') },
|
||||||
});
|
});
|
||||||
|
|
||||||
export const saveDraft = row =>
|
export const saveDraft = row =>
|
||||||
@@ -78,6 +79,15 @@ export const cancel = id =>
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const start = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/start`,
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
export const complete = id =>
|
export const complete = id =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/complete`,
|
url: `${baseUrl}/complete`,
|
||||||
|
|||||||
@@ -13,11 +13,14 @@ export const getDetail = (id, waybillId) =>
|
|||||||
...(waybillId === undefined ? {} : { waybillId }),
|
...(waybillId === undefined ? {} : { waybillId }),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
export const getVoucherImages = waybillId =>
|
export const getVoucherImages = (waybillId, params = {}) =>
|
||||||
request({
|
request({
|
||||||
url: '/blade-transport/process-config/voucher-images',
|
url: '/blade-transport/process-config/voucher-images',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: { waybillId },
|
params: {
|
||||||
|
waybillId,
|
||||||
|
...params,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
export const submit = api.submit;
|
export const submit = api.submit;
|
||||||
export const remove = api.remove;
|
export const remove = api.remove;
|
||||||
|
|||||||
@@ -6,9 +6,24 @@ const api = createCrudApi(baseUrl);
|
|||||||
|
|
||||||
export const getList = api.getList;
|
export const getList = api.getList;
|
||||||
export const getDetail = api.getDetail;
|
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 submit = api.submit;
|
||||||
export const remove = api.remove;
|
export const remove = api.remove;
|
||||||
|
|
||||||
|
// 项目资金使用风险统计(高风险 / 中风险数量),供列表头部快速筛选标签使用
|
||||||
|
// 暂未启用:后端 /fund-risk-stats 端点尚未实现,列表页已移除调用,等后端就绪后恢复
|
||||||
|
export const getFundRiskStats = params =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/fund-risk-stats`,
|
||||||
|
method: 'get',
|
||||||
|
params,
|
||||||
|
});
|
||||||
|
|
||||||
export const saveDraft = row =>
|
export const saveDraft = row =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/save-draft`,
|
url: `${baseUrl}/save-draft`,
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ export const submit = api.submit;
|
|||||||
export const dispatch = api.dispatch;
|
export const dispatch = api.dispatch;
|
||||||
export const remove = api.remove;
|
export const remove = api.remove;
|
||||||
export const copy = api.copy;
|
export const copy = api.copy;
|
||||||
export const cancel = api.cancel;
|
|
||||||
export const complete = api.complete;
|
export const complete = api.complete;
|
||||||
|
|
||||||
export const importTransportPlan = ({
|
export const importTransportPlan = ({
|
||||||
@@ -36,3 +35,27 @@ export const importTransportPlan = ({
|
|||||||
timeout: 60000,
|
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,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -5,7 +5,29 @@ const baseUrl = '/blade-transport/voucher-manage';
|
|||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { 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 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 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 =>
|
export const createUploadDraft = data =>
|
||||||
request({ url: `${baseUrl}/upload-draft`, method: 'post', data });
|
request({ url: `${baseUrl}/upload-draft`, method: 'post', data });
|
||||||
export const completeUploadFile = data =>
|
export const completeUploadFile = data =>
|
||||||
@@ -17,6 +39,9 @@ export const getWaybillBatches = (current, size, params) =>
|
|||||||
method: 'get',
|
method: 'get',
|
||||||
params: { current, size, ...params },
|
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';
|
const fileTaskBaseUrl = '/blade-file/fileTask';
|
||||||
export const queryFileTask = md5 =>
|
export const queryFileTask = md5 =>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ const api = createCrudApi(baseUrl);
|
|||||||
export const getList = api.getList;
|
export const getList = api.getList;
|
||||||
export const getDetail = api.getDetail;
|
export const getDetail = api.getDetail;
|
||||||
export const submit = api.submit;
|
export const submit = api.submit;
|
||||||
|
export const saveDraft = data => request({ url: `${baseUrl}/save-draft`, method: 'post', data });
|
||||||
export const remove = api.remove;
|
export const remove = api.remove;
|
||||||
export const copy = api.copy;
|
export const copy = api.copy;
|
||||||
export const cancel = api.cancel;
|
export const cancel = api.cancel;
|
||||||
@@ -19,6 +20,38 @@ export const changeRoute = data =>
|
|||||||
method: 'post',
|
method: 'post',
|
||||||
data,
|
data,
|
||||||
});
|
});
|
||||||
|
export const maintainMileage = data =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/maintain-mileage`,
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
/** 运单打卡记录 + 司机上传凭证图 */
|
||||||
|
export const getPunchRecords = waybillId =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/punch-records`,
|
||||||
|
method: 'get',
|
||||||
|
params: { waybillId },
|
||||||
|
});
|
||||||
|
|
||||||
|
/** 运单车辆实时定位 */
|
||||||
|
export const locateVehicle = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/locate`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id },
|
||||||
|
timeout: 60000,
|
||||||
|
});
|
||||||
|
|
||||||
|
/** 运单车辆历史轨迹 */
|
||||||
|
export const trackVehicle = (id, startDate, endDate) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/track`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id, startDate, endDate },
|
||||||
|
timeout: 60000,
|
||||||
|
});
|
||||||
|
|
||||||
export const roadLoading = ids =>
|
export const roadLoading = ids =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/road-loading`,
|
url: `${baseUrl}/road-loading`,
|
||||||
@@ -29,9 +62,11 @@ export const roadLoading = ids =>
|
|||||||
});
|
});
|
||||||
|
|
||||||
export const getImportBatches = params => request({ url: `${baseUrl}/import-batch/list`, method: 'get', params });
|
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 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 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 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 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 saveImportDraft = data => request({ url: `${baseUrl}/import-batch/draft`, method: 'post', data });
|
||||||
|
export const validateImport = data => request({ url: `${baseUrl}/import-batch/validate`, method: 'post', data, responseType: 'blob' });
|
||||||
export const confirmImport = data => request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data });
|
export const confirmImport = data => request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data });
|
||||||
|
|||||||
@@ -34,7 +34,8 @@ export const exportBlob = (url, params, options = {}) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export const importBlob = (url, file) => {
|
export const importBlob = (url, file, options = {}) => {
|
||||||
|
const { timeout = 60000 } = options;
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append('file', file);
|
formData.append('file', file);
|
||||||
return request({
|
return request({
|
||||||
@@ -42,6 +43,6 @@ export const importBlob = (url, file) => {
|
|||||||
method: 'post',
|
method: 'post',
|
||||||
data: formData,
|
data: formData,
|
||||||
responseType: 'blob',
|
responseType: 'blob',
|
||||||
timeout: 60000,
|
timeout,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
export const getMkPublicDetail = (bizType, id) => {
|
||||||
|
return request({
|
||||||
|
url: `/blade-transport/mk-process/public/${bizType}/detail`,
|
||||||
|
method: 'get',
|
||||||
|
meta: {
|
||||||
|
isToken: false,
|
||||||
|
},
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const postMkPublicProcessMessage = (bizType, data) => {
|
||||||
|
return request({
|
||||||
|
url: `/blade-transport/mk-process/public/${bizType}/process-message`,
|
||||||
|
method: 'post',
|
||||||
|
meta: {
|
||||||
|
isToken: false,
|
||||||
|
},
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -12,6 +12,12 @@ export const getAvailableOptions = (keyword, deptId, selectedId) =>
|
|||||||
method: 'get',
|
method: 'get',
|
||||||
params: { keyword, deptId, selectedId },
|
params: { keyword, deptId, selectedId },
|
||||||
});
|
});
|
||||||
|
export const getAvailablePage = (current, size, keyword, deptId, selectedId) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/available-page`,
|
||||||
|
method: 'get',
|
||||||
|
params: { current, size, keyword, deptId, selectedId },
|
||||||
|
});
|
||||||
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
||||||
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,12 @@ const baseUrl = '/blade-transport/invoice-application';
|
|||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { 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 getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
export const getSettlementCandidates = keyword =>
|
export const getSettlementCandidates = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/settlement-candidates`, method: 'get', params: { keyword } });
|
request({
|
||||||
|
url: `${baseUrl}/settlement-candidates`,
|
||||||
|
method: 'get',
|
||||||
|
params: { current, size, ...params },
|
||||||
|
});
|
||||||
export const getSettlementDetails = settlementIds =>
|
export const getSettlementDetails = settlementIds =>
|
||||||
request({ url: `${baseUrl}/settlement-details`, method: 'get', params: { settlementIds } });
|
request({ url: `${baseUrl}/settlement-details`, method: 'get', params: { settlementIds } });
|
||||||
export const getReceiverInformation = settlementIds =>
|
export const getReceiverInformation = settlementIds =>
|
||||||
|
|||||||
@@ -4,6 +4,12 @@ const baseUrl = '/blade-transport/payment-application';
|
|||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { 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 getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
|
export const getReferenceAmount = (paymentType, referenceId, excludeId) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/reference-amount`,
|
||||||
|
method: 'get',
|
||||||
|
params: { paymentType, referenceId, excludeId: excludeId || undefined },
|
||||||
|
});
|
||||||
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
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 remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
||||||
@@ -12,16 +18,13 @@ export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'p
|
|||||||
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
||||||
export const syncKingdee = id =>
|
export const syncKingdee = id =>
|
||||||
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { 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 paymentTypeOptions = [
|
export const paymentTypeOptions = [
|
||||||
{ label: '项目预付', value: 'project_advance' },
|
{ label: '项目预付', value: 'project_advance' },
|
||||||
{ label: '进度预付', value: 'progress_advance' },
|
{ label: '进度预付', value: 'progress_advance' },
|
||||||
{ label: '结算付款', value: 'settlement_payment' },
|
{ label: '尾款付款', value: 'settlement_payment' },
|
||||||
];
|
|
||||||
export const paymentMethodOptions = [
|
|
||||||
{ label: '银行转账', value: 'bank_transfer' },
|
|
||||||
{ label: '银行承兑汇票', value: 'bank_draft' },
|
|
||||||
{ label: '商业承兑汇票', value: 'commercial_draft' },
|
|
||||||
];
|
];
|
||||||
export const approvalStatusOptions = [
|
export const approvalStatusOptions = [
|
||||||
{ label: '草稿', value: 'draft' },
|
{ label: '草稿', value: 'draft' },
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export const getSettlementCandidates = (keyword, flowId) =>
|
|||||||
params: { keyword, flowId },
|
params: { keyword, flowId },
|
||||||
});
|
});
|
||||||
export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
|
export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
|
||||||
export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
|
export const sync = data => request({ url: `${baseUrl}/sync`, method: 'post', data });
|
||||||
|
|
||||||
export const claimStatusOptions = [
|
export const claimStatusOptions = [
|
||||||
{ label: '未认领', value: 'unclaimed' },
|
{ label: '未认领', value: 'unclaimed' },
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ const baseUrl = '/blade-transport/formal-settlement';
|
|||||||
|
|
||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { 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 getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
export const getCandidates = (current, size, params) =>
|
export const getCandidates = (current, size, params) =>
|
||||||
request({
|
request({
|
||||||
@@ -13,7 +15,8 @@ export const getCandidates = (current, size, params) =>
|
|||||||
});
|
});
|
||||||
export const getContractOptions = (keyword, projectId) =>
|
export const getContractOptions = (keyword, projectId) =>
|
||||||
request({ url: `${baseUrl}/contract-options`, method: 'get', params: { keyword, projectId } });
|
request({ url: `${baseUrl}/contract-options`, method: 'get', params: { keyword, projectId } });
|
||||||
export const getNextNo = () => request({ url: `${baseUrl}/next-no`, method: 'get' });
|
export const getNextNo = settlementType =>
|
||||||
|
request({ url: `${baseUrl}/next-no`, method: 'get', params: { settlementType } });
|
||||||
export const getFeeOptions = () => request({ url: `${baseUrl}/fee-options`, method: 'get' });
|
export const getFeeOptions = () => request({ url: `${baseUrl}/fee-options`, method: 'get' });
|
||||||
export const getCandidateDetails = (current, size, params) =>
|
export const getCandidateDetails = (current, size, params) =>
|
||||||
request({
|
request({
|
||||||
@@ -31,7 +34,17 @@ export const syncKingdee = id =>
|
|||||||
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
|
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
|
||||||
export const getDetailFees = detailId =>
|
export const getDetailFees = detailId =>
|
||||||
request({ url: `${baseUrl}/detail-fees`, method: 'get', params: { detailId } });
|
request({ url: `${baseUrl}/detail-fees`, method: 'get', params: { detailId } });
|
||||||
|
export const getReceiptClaims = formalSettlementId =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/receipt-claims`,
|
||||||
|
method: 'get',
|
||||||
|
params: { formalSettlementId },
|
||||||
|
});
|
||||||
export const adjustDetail = data =>
|
export const adjustDetail = data =>
|
||||||
request({ url: `${baseUrl}/adjust-detail`, method: 'post', data });
|
request({ url: `${baseUrl}/adjust-detail`, method: 'post', data });
|
||||||
export const applyPayment = data =>
|
export const applyPayment = data =>
|
||||||
request({ url: `${baseUrl}/apply-payment`, method: 'post', 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 });
|
||||||
|
|||||||
@@ -10,6 +10,18 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get'
|
|||||||
export const getContractOptions = keyword =>
|
export const getContractOptions = keyword =>
|
||||||
request({ url: `${baseUrl}/contract-options`, method: 'get', params: { keyword } });
|
request({ url: `${baseUrl}/contract-options`, method: 'get', params: { keyword } });
|
||||||
|
|
||||||
|
export const getContractList = (current, size, params) =>
|
||||||
|
request({
|
||||||
|
url: '/blade-transport/contract-manage/list',
|
||||||
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
approvalStatuses: 'approved,change_approved',
|
||||||
|
...params,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
export const getFeeOptions = () => request({ url: `${baseUrl}/fee-options`, method: 'get' });
|
export const getFeeOptions = () => request({ url: `${baseUrl}/fee-options`, method: 'get' });
|
||||||
|
|
||||||
export const getCandidateDetails = (current, size, params) =>
|
export const getCandidateDetails = (current, size, params) =>
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ export const getFormalSettlements = keyword =>
|
|||||||
request({ url: `${baseUrl}/candidate-formal-settlements`, method: 'get', params: { keyword } });
|
request({ url: `${baseUrl}/candidate-formal-settlements`, method: 'get', params: { keyword } });
|
||||||
export const getFormalDetails = formalSettlementId =>
|
export const getFormalDetails = formalSettlementId =>
|
||||||
request({ url: `${baseUrl}/formal-details`, method: 'get', params: { formalSettlementId } });
|
request({ url: `${baseUrl}/formal-details`, method: 'get', params: { formalSettlementId } });
|
||||||
|
export const getFeeOptions = () =>
|
||||||
|
request({ url: `${baseUrl}/fee-options`, method: 'get' });
|
||||||
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
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 remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
export const submit = id => request({ url: `${baseUrl}/submit`, method: 'post', data: { id } });
|
export const submit = id => request({ url: `${baseUrl}/submit`, method: 'post', data: { id } });
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ const baseUrl = '/blade-transport/transport-reconciliation';
|
|||||||
|
|
||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { 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 getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
export const getFormalOptions = (current, size, params) =>
|
export const getFormalOptions = (current, size, params) =>
|
||||||
request({
|
request({
|
||||||
@@ -14,17 +16,21 @@ export const getFormalOptions = (current, size, params) =>
|
|||||||
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
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 remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
export const match = id => request({ url: `${baseUrl}/match`, 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 =>
|
export const manualMatch = data =>
|
||||||
request({ url: `${baseUrl}/manual-match`, method: 'post', data });
|
request({ url: `${baseUrl}/manual-match`, method: 'post', data });
|
||||||
export const unmatch = internalId =>
|
export const unmatch = internalId =>
|
||||||
request({ url: `${baseUrl}/unmatch`, method: 'post', params: { internalId } });
|
request({ url: `${baseUrl}/unmatch`, method: 'post', params: { internalId } });
|
||||||
export const adjust = data => request({ url: `${baseUrl}/adjust`, method: 'post', data });
|
export const adjust = data => request({ url: `${baseUrl}/adjust`, method: 'post', data });
|
||||||
export const updateByMatch = id =>
|
export const updateByMatch = (id, data) =>
|
||||||
request({ url: `${baseUrl}/update-by-match`, method: 'post', params: { id } });
|
request({ url: `${baseUrl}/update-by-match`, method: 'post', params: { id }, data });
|
||||||
export const complete = id =>
|
export const complete = id =>
|
||||||
request({ url: `${baseUrl}/complete`, method: 'post', params: { id } });
|
request({ url: `${baseUrl}/complete`, method: 'post', params: { id } });
|
||||||
export const template = mode =>
|
export const completeWithData = data =>
|
||||||
request({ url: `${baseUrl}/template`, method: 'get', params: { mode }, responseType: 'blob' });
|
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 importFile = (url, id, file) => {
|
||||||
const data = new FormData();
|
const data = new FormData();
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 调用 MK processSubmit 提交审核流
|
||||||
|
* @param {Object} data
|
||||||
|
* @param {string} data.templateCode 模板编码
|
||||||
|
* @param {string} data.submitIdentity 提交人(手机号)
|
||||||
|
* @param {string} data.loginName 登录账号(手机号)
|
||||||
|
* @param {string} data.formInstanceId 业务表单实例 id
|
||||||
|
* @param {string} [data.subject] 流程标题
|
||||||
|
*/
|
||||||
|
export const processSubmit = data => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/businessProcess/processSubmit',
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 调用 MK processDelete 删除审核流(驳回后重新提交前使用)
|
||||||
|
* @param {Object} data
|
||||||
|
* @param {string} data.formInstanceId 业务表单实例 id
|
||||||
|
*/
|
||||||
|
export const processDelete = data => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/businessProcess/processDelete',
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -41,6 +41,48 @@ export const add = row => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const syncIamOrganizations = () => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/sync-iam-organizations',
|
||||||
|
method: 'post',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const clearNonTopDept = signal => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/clear-non-top',
|
||||||
|
method: 'post',
|
||||||
|
timeout: 60000,
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const syncOaCompany = (current = 1, size = 20, signal) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/sync-oa-company',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
},
|
||||||
|
timeout: 60000,
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const syncOaDepartment = (current = 1, size = 20, signal) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/sync-oa-department',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
},
|
||||||
|
timeout: 60000,
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const update = row => {
|
export const update = row => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-system/dept/submit',
|
url: '/blade-system/dept/submit',
|
||||||
@@ -78,3 +120,10 @@ export const getDeptLazyTree = parentId => {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getPlatformCompanySelect = () => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/platform-company-select',
|
||||||
|
method: 'get',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -86,3 +86,10 @@ export const getDictionary = params => {
|
|||||||
params,
|
params,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getDictionaryAll = () => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dict-biz/select-all',
|
||||||
|
method: 'get',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -31,6 +31,19 @@ export const add = row => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const syncIamAccounts = (current = 1, size = 50, signal) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/user/sync-iam-accounts',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
},
|
||||||
|
timeout: 60000,
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const update = row => {
|
export const update = row => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-system/user/update',
|
url: '/blade-system/user/update',
|
||||||
|
|||||||
@@ -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',
|
||||||
|
});
|
||||||
@@ -47,3 +47,11 @@ export const update = row => {
|
|||||||
data: row,
|
data: row,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getExpiryStat = params => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/annual-inspection-record/expiry-stat',
|
||||||
|
method: 'get',
|
||||||
|
params,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -22,6 +22,19 @@ export const getDetail = id => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getPublicDetail = id => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/public/detail',
|
||||||
|
method: 'get',
|
||||||
|
meta: {
|
||||||
|
isToken: false,
|
||||||
|
},
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const getChangeRecordList = (customerId, current, size) => {
|
export const getChangeRecordList = (customerId, current, size) => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-transport/customer-archive/change-record/list',
|
url: '/blade-transport/customer-archive/change-record/list',
|
||||||
@@ -34,6 +47,32 @@ export const getChangeRecordList = (customerId, current, size) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getPublicChangeRecordList = (customerId, current, size) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/public/change-record/list',
|
||||||
|
method: 'get',
|
||||||
|
meta: {
|
||||||
|
isToken: false,
|
||||||
|
},
|
||||||
|
params: {
|
||||||
|
customerId,
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const postPublicProcessMessage = data => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/public/process-message',
|
||||||
|
method: 'post',
|
||||||
|
meta: {
|
||||||
|
isToken: false,
|
||||||
|
},
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const submit = row => {
|
export const submit = row => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-transport/customer-archive/submit',
|
url: '/blade-transport/customer-archive/submit',
|
||||||
|
|||||||
@@ -1,11 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dialog
|
<el-dialog v-model="visible" title="地图选择地址" width="920px" append-to-body @opened="initMap">
|
||||||
v-model="visible"
|
|
||||||
title="地图选择地址"
|
|
||||||
width="920px"
|
|
||||||
append-to-body
|
|
||||||
@opened="initMap"
|
|
||||||
>
|
|
||||||
<div class="address-map-picker__toolbar">
|
<div class="address-map-picker__toolbar">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="keyword"
|
v-model="keyword"
|
||||||
@@ -15,7 +9,14 @@
|
|||||||
/>
|
/>
|
||||||
<el-button type="primary" :loading="searching" @click="searchKeyword">搜索</el-button>
|
<el-button type="primary" :loading="searching" @click="searchKeyword">搜索</el-button>
|
||||||
</div>
|
</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>
|
<div class="address-map-picker__info">{{ status }}</div>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<el-button @click="visible = false">取消</el-button>
|
<el-button @click="visible = false">取消</el-button>
|
||||||
@@ -41,6 +42,14 @@ export default {
|
|||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
|
longitude: {
|
||||||
|
type: [String, Number],
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
latitude: {
|
||||||
|
type: [String, Number],
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
emits: ['update:modelValue', 'confirm'],
|
emits: ['update:modelValue', 'confirm'],
|
||||||
data() {
|
data() {
|
||||||
@@ -54,6 +63,8 @@ export default {
|
|||||||
amap: null,
|
amap: null,
|
||||||
marker: null,
|
marker: null,
|
||||||
geocoder: null,
|
geocoder: null,
|
||||||
|
searchResults: [],
|
||||||
|
mapInitializing: null,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@@ -63,8 +74,11 @@ export default {
|
|||||||
this.visible = value;
|
this.visible = value;
|
||||||
if (value) {
|
if (value) {
|
||||||
this.keyword = this.address || '';
|
this.keyword = this.address || '';
|
||||||
this.selected = {};
|
this.searchResults = [];
|
||||||
this.status = '可搜索地址或点击地图选点';
|
this.selected = this.buildInitialSelection();
|
||||||
|
this.status = this.selected.longitude
|
||||||
|
? this.selected.address || '已选点,可确认回填'
|
||||||
|
: '可搜索地址或点击地图选点';
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -78,6 +92,18 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
buildInitialSelection() {
|
||||||
|
const longitude = Number(this.longitude);
|
||||||
|
const latitude = Number(this.latitude);
|
||||||
|
if (!Number.isFinite(longitude) || !Number.isFinite(latitude)) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
longitude,
|
||||||
|
latitude,
|
||||||
|
address: this.address || '',
|
||||||
|
};
|
||||||
|
},
|
||||||
loadAmap() {
|
loadAmap() {
|
||||||
if (window.AMap && window.AMap.Map) {
|
if (window.AMap && window.AMap.Map) {
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
@@ -96,25 +122,51 @@ export default {
|
|||||||
return amapLoader;
|
return amapLoader;
|
||||||
},
|
},
|
||||||
initMap() {
|
initMap() {
|
||||||
this.loadAmap()
|
if (this.mapInitializing) return this.mapInitializing;
|
||||||
|
|
||||||
|
this.mapInitializing = this.loadAmap()
|
||||||
.then(() => {
|
.then(() => {
|
||||||
this.$nextTick(() => {
|
if (!window.AMap?.Map) {
|
||||||
if (!this.amap) {
|
throw new Error('高德地图组件未就绪');
|
||||||
this.amap = new window.AMap.Map(this.$refs.map, {
|
}
|
||||||
center: [116.40769, 39.89945],
|
return new Promise(resolve => {
|
||||||
zoom: 11,
|
this.$nextTick(() => {
|
||||||
});
|
if (!this.$refs.map) return resolve(null);
|
||||||
this.amap.on('click', event => this.pickPoint(event.lnglat));
|
const initial = this.buildInitialSelection();
|
||||||
} else {
|
const center =
|
||||||
this.amap.resize();
|
Number.isFinite(initial.longitude) && Number.isFinite(initial.latitude)
|
||||||
this.clearMarker();
|
? [initial.longitude, initial.latitude]
|
||||||
}
|
: [116.40769, 39.89945];
|
||||||
|
if (!this.amap) {
|
||||||
|
this.amap = new window.AMap.Map(this.$refs.map, {
|
||||||
|
center,
|
||||||
|
zoom: initial.longitude ? 14 : 11,
|
||||||
|
});
|
||||||
|
this.amap.on('click', event => this.pickPoint(event.lnglat));
|
||||||
|
} else {
|
||||||
|
this.amap.resize();
|
||||||
|
this.clearMarker();
|
||||||
|
this.amap.setZoomAndCenter(initial.longitude ? 14 : 11, center);
|
||||||
|
}
|
||||||
|
if (initial.longitude) {
|
||||||
|
const point = new window.AMap.LngLat(initial.longitude, initial.latitude);
|
||||||
|
this.renderMarker(point);
|
||||||
|
this.selected = { ...initial };
|
||||||
|
this.status = initial.address || '已选点,可确认回填';
|
||||||
|
}
|
||||||
|
resolve(this.amap);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
this.$message.error('高德地图组件加载失败,请稍后重试');
|
this.$message.error('高德地图组件加载失败,请稍后重试');
|
||||||
this.visible = false;
|
this.visible = false;
|
||||||
|
return null;
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
this.mapInitializing = null;
|
||||||
});
|
});
|
||||||
|
return this.mapInitializing;
|
||||||
},
|
},
|
||||||
ensureGeocoder() {
|
ensureGeocoder() {
|
||||||
if (this.geocoder) return Promise.resolve(this.geocoder);
|
if (this.geocoder) return Promise.resolve(this.geocoder);
|
||||||
@@ -154,15 +206,28 @@ export default {
|
|||||||
this.$message.warning('请输入地址关键词');
|
this.$message.warning('请输入地址关键词');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (this.searching) return;
|
||||||
|
this.searchResults = [];
|
||||||
this.searching = true;
|
this.searching = true;
|
||||||
this.loadAmap()
|
this.initMap()
|
||||||
.then(() => this.runGeocode('location', keyword))
|
.then(map => (map ? this.runGeocode('location', keyword) : null))
|
||||||
.then(result => {
|
.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) {
|
if (!point) {
|
||||||
throw new Error('未找到匹配地址');
|
throw new Error('未找到匹配地址');
|
||||||
}
|
}
|
||||||
this.pickPoint(point, keyword);
|
return this.$nextTick().then(() => {
|
||||||
|
this.amap?.resize();
|
||||||
|
this.pickPoint(point, geocodes[0]?.formattedAddress || keyword);
|
||||||
|
});
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
this.status = '未找到匹配地址';
|
this.status = '未找到匹配地址';
|
||||||
@@ -172,6 +237,11 @@ export default {
|
|||||||
this.searching = false;
|
this.searching = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
selectSearchResult(item) {
|
||||||
|
if (item && item.location) {
|
||||||
|
this.pickPoint(item.location, item.address || item.name || '');
|
||||||
|
}
|
||||||
|
},
|
||||||
pickPoint(point, fallbackAddress = '') {
|
pickPoint(point, fallbackAddress = '') {
|
||||||
const longitude = typeof point.getLng === 'function' ? point.getLng() : point.lng;
|
const longitude = typeof point.getLng === 'function' ? point.getLng() : point.lng;
|
||||||
const latitude = typeof point.getLat === 'function' ? point.getLat() : point.lat;
|
const latitude = typeof point.getLat === 'function' ? point.getLat() : point.lat;
|
||||||
@@ -181,7 +251,11 @@ export default {
|
|||||||
}
|
}
|
||||||
const lnglat = new window.AMap.LngLat(Number(longitude), Number(latitude));
|
const lnglat = new window.AMap.LngLat(Number(longitude), Number(latitude));
|
||||||
this.renderMarker(lnglat);
|
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.status = '正在解析地址...';
|
||||||
this.resolving = true;
|
this.resolving = true;
|
||||||
this.runGeocode('address', lnglat)
|
this.runGeocode('address', lnglat)
|
||||||
@@ -214,11 +288,19 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
confirm() {
|
confirm() {
|
||||||
|
if (!this.selected.longitude || !this.selected.latitude) {
|
||||||
|
this.$message.warning('请先搜索或点击地图完成选点');
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (!this.selected.address) {
|
if (!this.selected.address) {
|
||||||
this.$message.warning('请等待地址解析完成后再确认');
|
this.$message.warning('请等待地址解析完成后再确认');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.$emit('confirm', this.selected.address);
|
this.$emit('confirm', {
|
||||||
|
address: this.selected.address,
|
||||||
|
longitude: this.selected.longitude,
|
||||||
|
latitude: this.selected.latitude,
|
||||||
|
});
|
||||||
this.visible = false;
|
this.visible = false;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -238,11 +320,19 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__map {
|
&__map {
|
||||||
|
flex: 1 1 auto;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
min-width: 0;
|
||||||
height: 420px;
|
height: 420px;
|
||||||
border: 1px solid #eff1f7;
|
border: 1px solid #eff1f7;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&__content {
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
&__info {
|
&__info {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
color: #606266;
|
color: #606266;
|
||||||
|
|||||||
@@ -0,0 +1,108 @@
|
|||||||
|
<template>
|
||||||
|
<el-dialog
|
||||||
|
:model-value="modelValue"
|
||||||
|
title="变更记录详情"
|
||||||
|
append-to-body
|
||||||
|
destroy-on-close
|
||||||
|
align-center
|
||||||
|
width="1100px"
|
||||||
|
class="change-record-detail-dialog"
|
||||||
|
@update:model-value="$emit('update:modelValue', $event)"
|
||||||
|
@open="resetPage"
|
||||||
|
>
|
||||||
|
<el-table
|
||||||
|
:data="pageRows"
|
||||||
|
border
|
||||||
|
max-height="60vh"
|
||||||
|
:show-overflow-tooltip="false"
|
||||||
|
>
|
||||||
|
<el-table-column prop="field" label="变更字段" min-width="180" />
|
||||||
|
<el-table-column
|
||||||
|
prop="before"
|
||||||
|
label="变更前"
|
||||||
|
min-width="360"
|
||||||
|
class-name="change-record-detail-value"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="after"
|
||||||
|
label="变更后"
|
||||||
|
min-width="500"
|
||||||
|
class-name="change-record-detail-value"
|
||||||
|
/>
|
||||||
|
</el-table>
|
||||||
|
<el-empty v-if="!total" description="暂无变更内容" :image-size="60" />
|
||||||
|
<div class="change-record-detail-dialog__pager">
|
||||||
|
<el-pagination
|
||||||
|
v-model:current-page="currentPage"
|
||||||
|
v-model:page-size="pageSize"
|
||||||
|
background
|
||||||
|
:total="total"
|
||||||
|
:page-sizes="[10, 20, 50, 100]"
|
||||||
|
layout="total, sizes, prev, pager, next, jumper"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<el-button type="primary" @click="$emit('update:modelValue', false)">关闭</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
name: 'ChangeRecordDetailDialog',
|
||||||
|
props: {
|
||||||
|
modelValue: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
rows: {
|
||||||
|
type: Array,
|
||||||
|
default: () => [],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
emits: ['update:modelValue'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
currentPage: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
total() {
|
||||||
|
return this.rows.length;
|
||||||
|
},
|
||||||
|
pageRows() {
|
||||||
|
const start = (this.currentPage - 1) * this.pageSize;
|
||||||
|
return this.rows.slice(start, start + this.pageSize);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
rows() {
|
||||||
|
const maxPage = Math.max(1, Math.ceil(this.total / this.pageSize) || 1);
|
||||||
|
if (this.currentPage > maxPage) this.currentPage = 1;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
resetPage() {
|
||||||
|
this.currentPage = 1;
|
||||||
|
this.pageSize = 10;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.change-record-detail-dialog__pager {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
margin-top: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.change-record-detail-value .cell) {
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-break: break-word;
|
||||||
|
overflow: visible;
|
||||||
|
text-overflow: clip;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -576,7 +576,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.mode-content :deep(.el-form-item) {
|
.mode-content :deep(.el-form-item) {
|
||||||
margin-bottom: 18px;
|
margin-bottom: 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mode-content :deep(.el-form-item:last-child) {
|
.mode-content :deep(.el-form-item:last-child) {
|
||||||
|
|||||||
@@ -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>
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
<template>
|
||||||
|
<div v-loading="loading" class="pdf-preview">
|
||||||
|
<el-empty v-if="error" description="PDF预览失败" :image-size="72" />
|
||||||
|
<vue-pdf-embed
|
||||||
|
v-else-if="source"
|
||||||
|
:key="source"
|
||||||
|
:source="source"
|
||||||
|
annotation-layer
|
||||||
|
text-layer
|
||||||
|
@loaded="handleLoaded"
|
||||||
|
@loading-failed="handleError"
|
||||||
|
@rendering-failed="handleError"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { defineAsyncComponent } from 'vue';
|
||||||
|
import 'vue-pdf-embed/dist/styles/annotationLayer.css';
|
||||||
|
import 'vue-pdf-embed/dist/styles/textLayer.css';
|
||||||
|
|
||||||
|
const VuePdfEmbed = defineAsyncComponent(() => import('vue-pdf-embed'));
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'PdfPreview',
|
||||||
|
components: { VuePdfEmbed },
|
||||||
|
props: {
|
||||||
|
source: {
|
||||||
|
type: [String, Object],
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
emits: ['error', 'loaded'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
loading: true,
|
||||||
|
error: false,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
source: {
|
||||||
|
handler() {
|
||||||
|
this.loading = true;
|
||||||
|
this.error = false;
|
||||||
|
},
|
||||||
|
immediate: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
handleLoaded(pdf) {
|
||||||
|
this.loading = false;
|
||||||
|
this.$emit('loaded', pdf);
|
||||||
|
},
|
||||||
|
handleError(error) {
|
||||||
|
this.loading = false;
|
||||||
|
this.error = true;
|
||||||
|
this.$emit('error', error);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.pdf-preview {
|
||||||
|
width: 100%;
|
||||||
|
height: 72vh;
|
||||||
|
overflow: auto;
|
||||||
|
background-color: #f5f7fa;
|
||||||
|
|
||||||
|
:deep(.vue-pdf-embed) {
|
||||||
|
width: min(100%, 1200px);
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.vue-pdf-embed__page) {
|
||||||
|
margin-bottom: 12px;
|
||||||
|
background-color: #fff;
|
||||||
|
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.12);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,346 @@
|
|||||||
|
<template>
|
||||||
|
<div class="vehicle-attachment-table">
|
||||||
|
<div class="vehicle-attachment-table__toolbar">
|
||||||
|
<el-button type="primary" :disabled="!rows.length" @click="batchDownload">
|
||||||
|
批量下载
|
||||||
|
</el-button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<el-table :data="rows" border @selection-change="selectedRows = $event">
|
||||||
|
<el-table-column v-if="!readonly" type="selection" width="55" align="center" />
|
||||||
|
<el-table-column type="index" label="序号" width="70" align="center" />
|
||||||
|
<el-table-column label="文件名" min-width="240" show-overflow-tooltip>
|
||||||
|
<template #default="{ row }">
|
||||||
|
<span
|
||||||
|
class="vehicle-attachment-table__file-name"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
@click="previewAttachment(row)"
|
||||||
|
@keydown.enter="previewAttachment(row)"
|
||||||
|
@keydown.space.prevent="previewAttachment(row)"
|
||||||
|
>
|
||||||
|
{{ attachmentName(row) }}
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="附件描述" min-width="220">
|
||||||
|
<template #default="{ row, $index }">
|
||||||
|
<span v-if="readonly">{{ row.description || '-' }}</span>
|
||||||
|
<el-input
|
||||||
|
v-else
|
||||||
|
:model-value="row.description"
|
||||||
|
maxlength="200"
|
||||||
|
placeholder="请输入"
|
||||||
|
@update:model-value="value => updateDescription($index, value)"
|
||||||
|
/>
|
||||||
|
</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="180" align="center" sortable />
|
||||||
|
<el-table-column v-if="!readonly" label="操作" width="100" align="center" fixed="right">
|
||||||
|
<template #default="{ $index }">
|
||||||
|
<el-link type="danger" @click="removeAttachment($index)">删除</el-link>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<div v-if="!readonly" class="vehicle-attachment-table__upload">
|
||||||
|
<vehicle-attachment-upload
|
||||||
|
:model-value="rows"
|
||||||
|
:file-types="attachmentFileTypes"
|
||||||
|
:max-size="maxSize"
|
||||||
|
:show-tip="true"
|
||||||
|
:tip="`支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式,单个文件不超过${maxSize}MB`"
|
||||||
|
:show-file-list="false"
|
||||||
|
button-text="上传附件"
|
||||||
|
@update:model-value="handleUploadChange"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<el-dialog
|
||||||
|
v-model="documentPreviewVisible"
|
||||||
|
:title="previewFile.name || '附件预览'"
|
||||||
|
append-to-body
|
||||||
|
destroy-on-close
|
||||||
|
width="90%"
|
||||||
|
top="4vh"
|
||||||
|
class="vehicle-attachment-table__viewer-dialog"
|
||||||
|
>
|
||||||
|
<pdf-preview
|
||||||
|
v-if="documentPreviewVisible && previewFile.url && previewFile.isPdf"
|
||||||
|
:source="previewFile.url"
|
||||||
|
@error="handlePreviewError"
|
||||||
|
/>
|
||||||
|
<open-file-viewer
|
||||||
|
v-else-if="documentPreviewVisible && previewFile.url"
|
||||||
|
:file="previewFile.url"
|
||||||
|
:file-name="previewFile.name"
|
||||||
|
:mime-type="previewFile.mimeType"
|
||||||
|
width="100%"
|
||||||
|
height="72vh"
|
||||||
|
fit="contain"
|
||||||
|
theme="auto"
|
||||||
|
locale="zh-CN"
|
||||||
|
:toolbar="viewerToolbar"
|
||||||
|
:plugins="viewerPlugins"
|
||||||
|
@unsupported="handlePreviewUnsupported"
|
||||||
|
@error="handlePreviewError"
|
||||||
|
/>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
|
<el-image-viewer
|
||||||
|
v-if="imagePreviewVisible"
|
||||||
|
:url-list="imagePreviewUrls"
|
||||||
|
:initial-index="imagePreviewIndex"
|
||||||
|
@close="imagePreviewVisible = false"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { ElImageViewer } from 'element-plus';
|
||||||
|
import { OpenFileViewer } from '@open-file-viewer/vue';
|
||||||
|
import { fallbackPlugin, imagePlugin, officePlugin, textPlugin } from '@open-file-viewer/core';
|
||||||
|
import '@open-file-viewer/core/style.css';
|
||||||
|
import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
|
||||||
|
import PdfPreview from '@/components/pdf-preview/main.vue';
|
||||||
|
import { downloadFileByUrl } from '@/utils/util';
|
||||||
|
|
||||||
|
const attachmentFileTypes = [
|
||||||
|
'pdf',
|
||||||
|
'bmp',
|
||||||
|
'jpeg',
|
||||||
|
'png',
|
||||||
|
'jpg',
|
||||||
|
'doc',
|
||||||
|
'docx',
|
||||||
|
'ppt',
|
||||||
|
'pptx',
|
||||||
|
'xlsx',
|
||||||
|
'xls',
|
||||||
|
'eml',
|
||||||
|
'msg',
|
||||||
|
'zip',
|
||||||
|
];
|
||||||
|
|
||||||
|
const viewerPlugins = [
|
||||||
|
imagePlugin(),
|
||||||
|
officePlugin({ pdf: { workerSrc: pdfWorkerSrc, useFetchData: true } }),
|
||||||
|
textPlugin(),
|
||||||
|
fallbackPlugin(),
|
||||||
|
];
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'VehicleAttachmentTable',
|
||||||
|
components: {
|
||||||
|
ElImageViewer,
|
||||||
|
OpenFileViewer,
|
||||||
|
PdfPreview,
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
modelValue: {
|
||||||
|
type: [Array, String, Object],
|
||||||
|
default: () => [],
|
||||||
|
},
|
||||||
|
readonly: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
maxSize: {
|
||||||
|
type: Number,
|
||||||
|
default: 500,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
emits: ['update:modelValue'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
attachmentFileTypes,
|
||||||
|
selectedRows: [],
|
||||||
|
imagePreviewVisible: false,
|
||||||
|
imagePreviewUrls: [],
|
||||||
|
imagePreviewIndex: 0,
|
||||||
|
documentPreviewVisible: false,
|
||||||
|
previewFile: {},
|
||||||
|
viewerPlugins,
|
||||||
|
viewerToolbar: {
|
||||||
|
download: true,
|
||||||
|
fullscreen: true,
|
||||||
|
print: true,
|
||||||
|
rotate: true,
|
||||||
|
zoom: true,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
rows() {
|
||||||
|
if (Array.isArray(this.modelValue)) return this.modelValue;
|
||||||
|
if (this.modelValue && typeof this.modelValue === 'object') return [this.modelValue];
|
||||||
|
if (!this.modelValue) return [];
|
||||||
|
try {
|
||||||
|
const rows = JSON.parse(this.modelValue);
|
||||||
|
return Array.isArray(rows) ? rows : [];
|
||||||
|
} catch (error) {
|
||||||
|
return String(this.modelValue)
|
||||||
|
.split(',')
|
||||||
|
.map(item => item.trim())
|
||||||
|
.filter(Boolean)
|
||||||
|
.map(item => ({ name: item, url: item }));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
attachmentName(row = {}) {
|
||||||
|
return row.originalName || row.name || row.fileName || '附件';
|
||||||
|
},
|
||||||
|
attachmentUrl(row = {}) {
|
||||||
|
return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || row.src || '';
|
||||||
|
},
|
||||||
|
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() : '';
|
||||||
|
},
|
||||||
|
isImage(row) {
|
||||||
|
return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'].includes(this.attachmentExtension(row));
|
||||||
|
},
|
||||||
|
isPdf(row) {
|
||||||
|
const mimeType = String(row.mimeType || row.contentType || '').toLowerCase();
|
||||||
|
return mimeType.includes('application/pdf') || this.attachmentExtension(row) === 'pdf';
|
||||||
|
},
|
||||||
|
emitRows(rows) {
|
||||||
|
this.$emit('update:modelValue', rows);
|
||||||
|
},
|
||||||
|
handleUploadChange(rows) {
|
||||||
|
const uploadUserName = this.$store.getters.userInfo?.realName || '';
|
||||||
|
const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
|
||||||
|
this.emitRows(
|
||||||
|
(rows || []).map(row => ({
|
||||||
|
...row,
|
||||||
|
description: row.description || '',
|
||||||
|
uploadUserName: row.uploadUserName || uploadUserName,
|
||||||
|
uploadTime: row.uploadTime || uploadTime,
|
||||||
|
}))
|
||||||
|
);
|
||||||
|
},
|
||||||
|
updateDescription(index, description) {
|
||||||
|
const rows = this.rows.map((row, rowIndex) =>
|
||||||
|
rowIndex === index ? { ...row, description } : row
|
||||||
|
);
|
||||||
|
this.emitRows(rows);
|
||||||
|
},
|
||||||
|
removeAttachment(index) {
|
||||||
|
const rows = [...this.rows];
|
||||||
|
rows.splice(index, 1);
|
||||||
|
this.emitRows(rows);
|
||||||
|
},
|
||||||
|
formatFileSize(size) {
|
||||||
|
if (!size) return '';
|
||||||
|
const value = Number(size);
|
||||||
|
if (!Number.isFinite(value)) return String(size);
|
||||||
|
if (value < 1024) return `${value}B`;
|
||||||
|
if (value < 1024 * 1024) return `${(value / 1024).toFixed(1)}KB`;
|
||||||
|
return `${(value / 1024 / 1024).toFixed(1)}MB`;
|
||||||
|
},
|
||||||
|
downloadAttachment(row) {
|
||||||
|
const url = this.attachmentUrl(row);
|
||||||
|
if (!url) {
|
||||||
|
this.$message.warning('附件地址为空,无法下载');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
downloadFileByUrl(url, this.attachmentName(row));
|
||||||
|
},
|
||||||
|
batchDownload() {
|
||||||
|
const rows = this.selectedRows.length ? this.selectedRows : this.rows;
|
||||||
|
const downloadableRows = rows.filter(row => this.attachmentUrl(row));
|
||||||
|
if (!downloadableRows.length) {
|
||||||
|
this.$message.warning(
|
||||||
|
this.selectedRows.length ? '所选附件暂无可下载地址' : '暂无可下载附件'
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
downloadableRows.forEach((row, index) => {
|
||||||
|
window.setTimeout(() => this.downloadAttachment(row), index * 500);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
previewAttachment(row) {
|
||||||
|
const url = this.attachmentUrl(row);
|
||||||
|
if (!url) {
|
||||||
|
this.$message.warning('附件地址为空,无法预览');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (this.isImage(row)) {
|
||||||
|
this.imagePreviewUrls = this.rows
|
||||||
|
.filter(item => this.isImage(item) && this.attachmentUrl(item))
|
||||||
|
.map(item => this.attachmentUrl(item));
|
||||||
|
this.imagePreviewIndex = Math.max(this.imagePreviewUrls.indexOf(url), 0);
|
||||||
|
this.imagePreviewVisible = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const isPdf = this.isPdf(row);
|
||||||
|
this.previewFile = {
|
||||||
|
name: this.attachmentName(row),
|
||||||
|
url,
|
||||||
|
mimeType: isPdf ? 'application/pdf' : row.mimeType || row.contentType || '',
|
||||||
|
isPdf,
|
||||||
|
};
|
||||||
|
this.documentPreviewVisible = true;
|
||||||
|
},
|
||||||
|
handlePreviewUnsupported() {
|
||||||
|
this.$message.warning('当前文件暂不支持在线预览');
|
||||||
|
},
|
||||||
|
handlePreviewError() {
|
||||||
|
this.$message.error('附件预览失败');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.vehicle-attachment-table {
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
|
&__toolbar {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__file-name {
|
||||||
|
color: #409eff;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__file-name:hover,
|
||||||
|
&__file-name:focus-visible {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__upload {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-start;
|
||||||
|
margin-top: 12px;
|
||||||
|
|
||||||
|
:deep(.vehicle-attachment-upload) {
|
||||||
|
width: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.el-table th.el-table__cell) {
|
||||||
|
height: 42px;
|
||||||
|
padding: 8px 0;
|
||||||
|
background: #fafafa;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.el-table td.el-table__cell) {
|
||||||
|
height: 52px;
|
||||||
|
padding: 8px 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
:global(.vehicle-attachment-table__viewer-dialog .el-dialog__body) {
|
||||||
|
padding: 12px 16px 16px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -75,6 +75,9 @@ import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
|
|||||||
import { baseUrl } from '@/config/env';
|
import { baseUrl } from '@/config/env';
|
||||||
import { getUploadHeaders } from '@/utils/upload';
|
import { getUploadHeaders } from '@/utils/upload';
|
||||||
|
|
||||||
|
const UNIFIED_ATTACHMENT_TIP_PREFIX =
|
||||||
|
'支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式,单个文件不超过';
|
||||||
|
|
||||||
const MIME_MAP = {
|
const MIME_MAP = {
|
||||||
jpg: 'image/jpeg',
|
jpg: 'image/jpeg',
|
||||||
jpeg: 'image/jpeg',
|
jpeg: 'image/jpeg',
|
||||||
@@ -143,7 +146,7 @@ export default {
|
|||||||
},
|
},
|
||||||
maxSize: {
|
maxSize: {
|
||||||
type: Number,
|
type: Number,
|
||||||
default: 0,
|
default: 500,
|
||||||
},
|
},
|
||||||
readonly: {
|
readonly: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
@@ -212,10 +215,7 @@ export default {
|
|||||||
return this.acceptedList.join(',');
|
return this.acceptedList.join(',');
|
||||||
},
|
},
|
||||||
tipText() {
|
tipText() {
|
||||||
if (this.tip) return this.tip;
|
return this.tip || `${UNIFIED_ATTACHMENT_TIP_PREFIX}${this.maxSize}M`;
|
||||||
const typeText = this.acceptText || '所有类型';
|
|
||||||
const sizeText = this.maxSize > 0 ? `,单文件不超过 ${this.maxSize}MB` : '';
|
|
||||||
return `支持上传 ${typeText}${sizeText}`;
|
|
||||||
},
|
},
|
||||||
uploadingCount() {
|
uploadingCount() {
|
||||||
return this.fileList.filter(file => ['ready', 'uploading'].includes(file.status)).length;
|
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 data = (file.response && file.response.data) || file.data || file;
|
||||||
const url = data.link || data.url || data.domain || file.url || '';
|
const url = data.link || data.url || data.domain || file.url || '';
|
||||||
const originalName =
|
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 });
|
const extension = this.getExtension({ name: originalName, url });
|
||||||
return {
|
return {
|
||||||
...data,
|
...data,
|
||||||
@@ -372,6 +377,27 @@ export default {
|
|||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.vehicle-attachment-upload {
|
.vehicle-attachment-upload {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
div{
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.el-upload) {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.el-upload__tip) {
|
||||||
|
display: inline-block;
|
||||||
|
margin: 0 0 0 30px;
|
||||||
|
color: #909399;
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 1.4;
|
||||||
|
white-space: normal;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
:deep(.el-upload-list__item-name) {
|
:deep(.el-upload-list__item-name) {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ export default {
|
|||||||
tenantMode: true, // 是否开启租户模式
|
tenantMode: true, // 是否开启租户模式
|
||||||
tenantId: '000000', // 管理组租户编号
|
tenantId: '000000', // 管理组租户编号
|
||||||
captchaMode: true, // 是否开启验证码模式
|
captchaMode: true, // 是否开启验证码模式
|
||||||
captchaType: 'behavior', // 验证码类型(image:首屏图形验证码 behavior:登录时弹出点选/滑块/旋转随机行为验证)
|
captchaType: 'image', // 验证码类型(image:首屏图形验证码 behavior:登录时弹出点选/滑块/旋转随机行为验证)
|
||||||
switchMode: false, // 是否开启登录切换角色部门
|
switchMode: false, // 是否开启登录切换角色部门
|
||||||
lockPage: '/lock', // 锁屏页面地址
|
lockPage: '/lock', // 锁屏页面地址
|
||||||
tokenTime: 3000, // 定时刷新token间隔(单位:毫秒)
|
tokenTime: 3000, // 定时刷新token间隔(单位:毫秒)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
FROM nginx
|
FROM nginx
|
||||||
VOLUME /tmp
|
VOLUME /tmp
|
||||||
ENV LANG en_US.UTF-8
|
ENV LANG en_US.UTF-8
|
||||||
|
ADD ./src/docker/nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
ADD ./dist/ /usr/share/nginx/html/
|
ADD ./dist/ /usr/share/nginx/html/
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
EXPOSE 443
|
EXPOSE 443
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name localhost;
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
index index.html;
|
||||||
|
|
||||||
|
gzip on;
|
||||||
|
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
|
||||||
|
|
||||||
|
location /assets/ {
|
||||||
|
add_header Cache-Control "public, max-age=31536000, immutable";
|
||||||
|
try_files $uri =404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
add_header Cache-Control "no-store, no-cache, must-revalidate";
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +1,12 @@
|
|||||||
import store from './store';
|
import store from './store';
|
||||||
|
import { isChunkLoadError, reloadForChunkError } from './utils/chunk-reload';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
install: app => {
|
install: app => {
|
||||||
app.config.errorHandler = (err, vm, info) => {
|
app.config.errorHandler = (err, vm, info) => {
|
||||||
|
if (isChunkLoadError(err) && reloadForChunkError()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
store.commit('ADD_LOGS', {
|
store.commit('ADD_LOGS', {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
message: err.message,
|
message: err.message,
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { createApp } from 'vue';
|
import { createApp } from 'vue';
|
||||||
|
import { installChunkReload } from './utils/chunk-reload';
|
||||||
import website from './config/website';
|
import website from './config/website';
|
||||||
import axios from './axios';
|
import axios from './axios';
|
||||||
import router from './router/';
|
import router from './router/';
|
||||||
@@ -16,6 +17,7 @@ import { getScreen, findColumn } from './utils/util';
|
|||||||
import { setupPaginationEnhancer } from './utils/pagination';
|
import { setupPaginationEnhancer } from './utils/pagination';
|
||||||
import { setupDialogFormLabelAlign } from './utils/dialog-form-label';
|
import { setupDialogFormLabelAlign } from './utils/dialog-form-label';
|
||||||
import { setupTableColumnDrag } from './utils/table-column-drag';
|
import { setupTableColumnDrag } from './utils/table-column-drag';
|
||||||
|
import { setupCrudDialogTitle } from './utils/crud-dialog-title';
|
||||||
import './permission';
|
import './permission';
|
||||||
import error from './error';
|
import error from './error';
|
||||||
import App from './App.vue';
|
import App from './App.vue';
|
||||||
@@ -42,8 +44,10 @@ import tenantPackage from './views/system/tenantpackage.vue';
|
|||||||
import tenantDatasource from './views/system/tenantdatasource.vue';
|
import tenantDatasource from './views/system/tenantdatasource.vue';
|
||||||
// 通用弹窗分组白卡(灰底弹窗内使用,标题在卡内)
|
// 通用弹窗分组白卡(灰底弹窗内使用,标题在卡内)
|
||||||
import sectionCard from './components/section-card/main.vue';
|
import sectionCard from './components/section-card/main.vue';
|
||||||
|
import mapSearchResults from './components/map-search-results/main.vue';
|
||||||
|
|
||||||
window.$crudCommon = crudCommon;
|
window.$crudCommon = crudCommon;
|
||||||
|
installChunkReload();
|
||||||
debug();
|
debug();
|
||||||
window.axios = axios;
|
window.axios = axios;
|
||||||
const app = createApp(App);
|
const app = createApp(App);
|
||||||
@@ -65,6 +69,7 @@ app.component('formSetting', formSetting);
|
|||||||
app.component('tenantPackage', tenantPackage);
|
app.component('tenantPackage', tenantPackage);
|
||||||
app.component('tenantDatasource', tenantDatasource);
|
app.component('tenantDatasource', tenantDatasource);
|
||||||
app.component('sectionCard', sectionCard);
|
app.component('sectionCard', sectionCard);
|
||||||
|
app.component('mapSearchResults', mapSearchResults);
|
||||||
app.config.globalProperties.$app = app;
|
app.config.globalProperties.$app = app;
|
||||||
app.config.globalProperties.$dayjs = dayjs;
|
app.config.globalProperties.$dayjs = dayjs;
|
||||||
app.config.globalProperties.website = website;
|
app.config.globalProperties.website = website;
|
||||||
@@ -80,7 +85,7 @@ app.use(ElementPlus, {
|
|||||||
});
|
});
|
||||||
app.use(Avue, {
|
app.use(Avue, {
|
||||||
axios,
|
axios,
|
||||||
calcHeight: 10,
|
calcHeight: -26,
|
||||||
crudOption: {
|
crudOption: {
|
||||||
searchIcon: true,
|
searchIcon: true,
|
||||||
searchIndex: 4,
|
searchIndex: 4,
|
||||||
@@ -109,6 +114,7 @@ app.use(VueClipboard, {
|
|||||||
appendToBody: true, // 这可以帮助解决一些更复杂的使用场景下的问题
|
appendToBody: true, // 这可以帮助解决一些更复杂的使用场景下的问题
|
||||||
});
|
});
|
||||||
setupTableColumnDrag(app);
|
setupTableColumnDrag(app);
|
||||||
|
setupCrudDialogTitle(app);
|
||||||
app.mount('#app');
|
app.mount('#app');
|
||||||
setupPaginationEnhancer();
|
setupPaginationEnhancer();
|
||||||
setupDialogFormLabelAlign();
|
setupDialogFormLabelAlign();
|
||||||
|
|||||||
@@ -0,0 +1,173 @@
|
|||||||
|
import { getDeptTree } from '@/api/system/dept';
|
||||||
|
import { ElCascader } from 'element-plus';
|
||||||
|
import { h } from 'vue';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 所属组织 统一搜索 mixin
|
||||||
|
* ------------------------------------------------------------------
|
||||||
|
* 全站「所属组织」搜索栏统一为级联选择器(el-cascader,单选),风格与客商档案
|
||||||
|
* (vehicle/customer-archive.vue)保持一致。
|
||||||
|
*
|
||||||
|
* 接入步骤(在使用了 avue-crud 的页面中):
|
||||||
|
* 1. 混入本 mixin:mixins: [organizationSearch]
|
||||||
|
* 2. option 中「所属组织」列加上 searchslot: true(prop 为 organizationName 或 deptName 均可)
|
||||||
|
* 3. 在 created / 初始化时调用 this.loadOrganizationOptions()
|
||||||
|
*
|
||||||
|
* 说明:
|
||||||
|
* - 自动识别 organizationName / deptName 两种 prop,并挂载 column.renderSearch
|
||||||
|
* - 树节点标识统一用 id,级联值为「根 → 选中节点」的 id 路径数组
|
||||||
|
* - checkStrictly 打开,任意层级(含非末级)都可直接选中
|
||||||
|
* - 页面若已有 excludeExternalOrganization / normalizeOrgTree 等方法,
|
||||||
|
* 组件自身方法优先级更高,会覆盖本 mixin 的默认实现
|
||||||
|
* - 搜索值需在各自的 searchChange / normalizeSearch 中按后端要求转换为部门名称:
|
||||||
|
* 级联值是路径数组,统一用 findOrgById(路径)?.rawLabel 取末级名称
|
||||||
|
* - 表单区(新增/编辑)需要回显时,可用 findOrgPath(deptId) 把 id 转成路径,
|
||||||
|
* 参考 customer-archive 的 deptCascaderValue 计算属性
|
||||||
|
*/
|
||||||
|
const ORG_PROPS = ['organizationName', 'deptName'];
|
||||||
|
|
||||||
|
export default {
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
// 树形组织数据,仅供搜索栏 el-cascader 使用;
|
||||||
|
// 与页面自身 organizationOptions(多为表单扁平列表)隔离,避免相互覆盖
|
||||||
|
organizationTreeOptions: [],
|
||||||
|
organizationTreeFlatOptions: [],
|
||||||
|
organizationLoading: false,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
// 所属组织级联配置:checkStrictly 允许选中任意层级,不必选到末级
|
||||||
|
organizationCascaderProps() {
|
||||||
|
return {
|
||||||
|
value: 'id',
|
||||||
|
label: 'label',
|
||||||
|
children: 'children',
|
||||||
|
emitPath: true,
|
||||||
|
checkStrictly: true,
|
||||||
|
expandTrigger: 'click',
|
||||||
|
};
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
loadOrganizationOptions() {
|
||||||
|
if (this.organizationLoading) return;
|
||||||
|
this.organizationLoading = true;
|
||||||
|
const tenantId = this.userInfo?.tenantId;
|
||||||
|
getDeptTree(tenantId)
|
||||||
|
.then(res => {
|
||||||
|
const source = res.data?.data || res.data || [];
|
||||||
|
const tree = this.excludeExternalOrganization
|
||||||
|
? this.excludeExternalOrganization(source)
|
||||||
|
: source;
|
||||||
|
this.organizationTreeOptions = this.normalizeOrgTree(tree);
|
||||||
|
this.organizationTreeFlatOptions = this.flattenOrgTree(this.organizationTreeOptions);
|
||||||
|
const option = this.tableOption || this.option;
|
||||||
|
if (!option) return;
|
||||||
|
ORG_PROPS.forEach(prop => {
|
||||||
|
const column = this.findColumn?.(option.column, prop);
|
||||||
|
if (column) {
|
||||||
|
column.renderSearch = scope => this.renderOrganizationSearch(scope, prop);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
this.organizationLoading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 默认排除「外部组织」节点;页面可覆盖
|
||||||
|
excludeExternalOrganization(tree = []) {
|
||||||
|
return (tree || []).reduce((result, item) => {
|
||||||
|
const name = item.title || item.deptName || item.name || item.label || '';
|
||||||
|
if (String(name).trim() === '外部组织') return result;
|
||||||
|
result.push({
|
||||||
|
...item,
|
||||||
|
children: this.excludeExternalOrganization(item.children || []),
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
}, []);
|
||||||
|
},
|
||||||
|
normalizeOrgTree(tree = []) {
|
||||||
|
return (tree || []).map(item => {
|
||||||
|
const label = item.title || item.deptName || item.name || item.label || '';
|
||||||
|
const children = this.normalizeOrgTree(item.children || []);
|
||||||
|
return {
|
||||||
|
...item,
|
||||||
|
id: String(item.id),
|
||||||
|
label,
|
||||||
|
rawLabel: label,
|
||||||
|
children: children.length ? children : undefined,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
flattenOrgTree(tree = []) {
|
||||||
|
return (tree || []).flatMap(item => [
|
||||||
|
{ id: String(item.id), label: item.label, rawLabel: item.rawLabel },
|
||||||
|
...this.flattenOrgTree(item.children || []),
|
||||||
|
]);
|
||||||
|
},
|
||||||
|
// 兼容两种入参:级联路径数组(取末级)或单个部门 id
|
||||||
|
findOrgById(id) {
|
||||||
|
const value = Array.isArray(id) ? id.at(-1) : id;
|
||||||
|
return this.organizationTreeFlatOptions.find(item => String(item.id) === String(value));
|
||||||
|
},
|
||||||
|
// 由部门 id 反查「根 → 该节点」的 id 路径,供级联回显(找不到返回 null)
|
||||||
|
findOrgPath(id, tree = this.organizationTreeOptions, parents = []) {
|
||||||
|
const target = Array.isArray(id) ? id.at(-1) : id;
|
||||||
|
if (target === undefined || target === null || target === '') return null;
|
||||||
|
for (const node of tree || []) {
|
||||||
|
const path = [...parents, String(node.id)];
|
||||||
|
if (String(node.id) === String(target)) return path;
|
||||||
|
const matched = this.findOrgPath(target, node.children, path);
|
||||||
|
if (matched) return matched;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
},
|
||||||
|
// 由部门 id 取组织名称(末级),供表单提交
|
||||||
|
findOrgName(id) {
|
||||||
|
return this.findOrgById(id)?.rawLabel || '';
|
||||||
|
},
|
||||||
|
// 组织名称 → 级联路径(表单回显用;部门树异步加载完成后会自动重算)
|
||||||
|
resolveOrgPath(name) {
|
||||||
|
const value = String(name ?? '').trim();
|
||||||
|
if (!value) return [];
|
||||||
|
const node = this.organizationTreeFlatOptions.find(item => item.rawLabel === value);
|
||||||
|
return node ? this.findOrgPath(node.id) || [] : [];
|
||||||
|
},
|
||||||
|
// 级联路径 → 组织名称(表单/搜索提交用,取末级节点名称)
|
||||||
|
resolveOrgName(path) {
|
||||||
|
const value = Array.isArray(path)
|
||||||
|
? path.filter(item => item !== undefined && item !== null && item !== '')
|
||||||
|
: [];
|
||||||
|
return value.length ? this.findOrgById(value)?.rawLabel || '' : '';
|
||||||
|
},
|
||||||
|
// 搜索提交前把级联路径数组就地转成组织名称(后端按名称过滤)
|
||||||
|
normalizeOrganizationSearch(params, prop = 'organizationName') {
|
||||||
|
if (Array.isArray(params?.[prop])) {
|
||||||
|
params[prop] = this.resolveOrgName(params[prop]);
|
||||||
|
}
|
||||||
|
return params;
|
||||||
|
},
|
||||||
|
renderOrganizationSearch(scope, prop = 'organizationName') {
|
||||||
|
return h(ElCascader, {
|
||||||
|
modelValue: Array.isArray(scope.row?.[prop]) ? scope.row[prop] : [],
|
||||||
|
'onUpdate:modelValue': value => {
|
||||||
|
// 级联单选:modelValue 必须是 id 路径数组,否则控件内部状态会错乱导致无法再次选中
|
||||||
|
if (scope.row) scope.row[prop] = Array.isArray(value) ? value : [];
|
||||||
|
},
|
||||||
|
options: this.organizationTreeOptions,
|
||||||
|
props: {
|
||||||
|
label: 'label',
|
||||||
|
value: 'id',
|
||||||
|
children: 'children',
|
||||||
|
checkStrictly: true,
|
||||||
|
expandTrigger: 'click',
|
||||||
|
},
|
||||||
|
filterable: true,
|
||||||
|
clearable: true,
|
||||||
|
style: 'width: 100%',
|
||||||
|
placeholder: '请选择 所属组织',
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -26,6 +26,8 @@ export const getCargoTypeOption = ctx => ({
|
|||||||
height: 'auto',
|
height: 'auto',
|
||||||
calcHeight: 22,
|
calcHeight: 22,
|
||||||
dialogWidth: 760,
|
dialogWidth: 760,
|
||||||
|
// 货物类型弹窗单独使用样式,避免全局 Avue footer 上移遮挡底部备注字段
|
||||||
|
dialogCustomClass: 'cargo-type-dialog',
|
||||||
labelPosition: 'right',
|
labelPosition: 'right',
|
||||||
labelWidth: 'auto',
|
labelWidth: 'auto',
|
||||||
tip: false,
|
tip: false,
|
||||||
@@ -172,6 +174,7 @@ export const getCargoTypeOption = ctx => ({
|
|||||||
label: '备注',
|
label: '备注',
|
||||||
prop: 'remark',
|
prop: 'remark',
|
||||||
type: 'textarea',
|
type: 'textarea',
|
||||||
|
formslot: true,
|
||||||
minRows: 2,
|
minRows: 2,
|
||||||
span: 24,
|
span: 24,
|
||||||
minWidth: 180,
|
minWidth: 180,
|
||||||
|
|||||||
@@ -0,0 +1,148 @@
|
|||||||
|
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: 'unitCode',
|
||||||
|
minWidth: 150,
|
||||||
|
span: 24,
|
||||||
|
search: true,
|
||||||
|
searchOrder: 4,
|
||||||
|
searchSpan: 6,
|
||||||
|
maxlength: 50,
|
||||||
|
showWordLimit: true,
|
||||||
|
rules: [
|
||||||
|
{ required: true, message: '请输入计量单位编码', trigger: 'blur' },
|
||||||
|
{ max: 50, message: '计量单位编码不能超过50个字', trigger: 'blur' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
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,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
@@ -2,7 +2,6 @@ import {
|
|||||||
auditColumns,
|
auditColumns,
|
||||||
createCrudOption,
|
createCrudOption,
|
||||||
packageOptions,
|
packageOptions,
|
||||||
priceUnitOptions,
|
|
||||||
textRule,
|
textRule,
|
||||||
} from './common';
|
} from './common';
|
||||||
|
|
||||||
@@ -25,10 +24,42 @@ export const config = {
|
|||||||
enableAllDept: false,
|
enableAllDept: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 单价统一按两位小数展示;格式非法时保留原值,交由表单校验提示。
|
||||||
|
export const formatCargoValue = value => {
|
||||||
|
if (value === undefined || value === null) return '';
|
||||||
|
const raw = String(value).trim();
|
||||||
|
if (!raw || raw === '-1') return '';
|
||||||
|
if (!/^\d+(?:\.\d+)?$/.test(raw)) return raw;
|
||||||
|
const number = Number(raw);
|
||||||
|
return Number.isFinite(number) ? number.toFixed(2) : raw;
|
||||||
|
};
|
||||||
|
|
||||||
export const option = createCrudOption([
|
export const option = createCrudOption([
|
||||||
|
{
|
||||||
|
label: '一级货物类型',
|
||||||
|
prop: 'firstCargoTypeName',
|
||||||
|
formslot: true,
|
||||||
|
order: 60,
|
||||||
|
span: 12,
|
||||||
|
minWidth: 150,
|
||||||
|
editDisabled: true,
|
||||||
|
rules: [{ required: true, message: '请选择一级货物类型', trigger: 'change' }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '二级货物类型',
|
||||||
|
prop: 'secondCargoTypeName',
|
||||||
|
formslot: true,
|
||||||
|
order: 59,
|
||||||
|
span: 12,
|
||||||
|
minWidth: 150,
|
||||||
|
editDisabled: true,
|
||||||
|
rules: [{ required: true, message: '请选择二级货物类型', trigger: 'change' }],
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '货物名称',
|
label: '货物名称',
|
||||||
prop: 'cargoName',
|
prop: 'cargoName',
|
||||||
|
order: 50,
|
||||||
|
span: 12,
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
placeholder: '请输入',
|
placeholder: '请输入',
|
||||||
rules: textRule('货物名称', 100, true),
|
rules: textRule('货物名称', 100, true),
|
||||||
@@ -37,6 +68,8 @@ export const option = createCrudOption([
|
|||||||
label: '货物编号',
|
label: '货物编号',
|
||||||
prop: 'cargoCode',
|
prop: 'cargoCode',
|
||||||
formslot: true,
|
formslot: true,
|
||||||
|
order: 49,
|
||||||
|
span: 12,
|
||||||
minWidth: 120,
|
minWidth: 120,
|
||||||
maxlength: 20,
|
maxlength: 20,
|
||||||
showWordLimit: true,
|
showWordLimit: true,
|
||||||
@@ -45,14 +78,6 @@ export const option = createCrudOption([
|
|||||||
{ max: 20, message: '货物编号不能超过20个字符', trigger: 'blur' },
|
{ max: 20, message: '货物编号不能超过20个字符', trigger: 'blur' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: '一级货物类型',
|
|
||||||
prop: 'firstCargoTypeName',
|
|
||||||
formslot: true,
|
|
||||||
minWidth: 150,
|
|
||||||
editDisabled: true,
|
|
||||||
rules: [{ required: true, message: '请选择一级货物类型', trigger: 'change' }],
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: '一级货物类型编码',
|
label: '一级货物类型编码',
|
||||||
prop: 'firstCargoTypeCode',
|
prop: 'firstCargoTypeCode',
|
||||||
@@ -61,14 +86,6 @@ export const option = createCrudOption([
|
|||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
editDisabled: true,
|
editDisabled: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: '二级货物类型',
|
|
||||||
prop: 'secondCargoTypeName',
|
|
||||||
formslot: true,
|
|
||||||
minWidth: 150,
|
|
||||||
editDisabled: true,
|
|
||||||
rules: [{ required: true, message: '请选择二级货物类型', trigger: 'change' }],
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: '二级货物类型编码',
|
label: '二级货物类型编码',
|
||||||
prop: 'secondCargoTypeCode',
|
prop: 'secondCargoTypeCode',
|
||||||
@@ -174,12 +191,16 @@ export const option = createCrudOption([
|
|||||||
prop: 'packageType',
|
prop: 'packageType',
|
||||||
type: 'select',
|
type: 'select',
|
||||||
dicData: packageOptions,
|
dicData: packageOptions,
|
||||||
|
order: 39,
|
||||||
|
span: 12,
|
||||||
minWidth: 100,
|
minWidth: 100,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '品牌',
|
label: '品牌',
|
||||||
prop: 'brand',
|
prop: 'brand',
|
||||||
search: false,
|
search: false,
|
||||||
|
order: 40,
|
||||||
|
span: 12,
|
||||||
minWidth: 120,
|
minWidth: 120,
|
||||||
placeholder: '请输入',
|
placeholder: '请输入',
|
||||||
rules: textRule('品牌', 50),
|
rules: textRule('品牌', 50),
|
||||||
@@ -187,22 +208,18 @@ export const option = createCrudOption([
|
|||||||
{
|
{
|
||||||
label: '规格',
|
label: '规格',
|
||||||
prop: 'specification',
|
prop: 'specification',
|
||||||
|
order: 29,
|
||||||
|
span: 12,
|
||||||
minWidth: 120,
|
minWidth: 120,
|
||||||
placeholder: '请输入',
|
placeholder: '请输入',
|
||||||
rules: textRule('规格', 50),
|
rules: textRule('规格', 50),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '型号',
|
label: '货值',
|
||||||
prop: 'model',
|
|
||||||
minWidth: 120,
|
|
||||||
placeholder: '请输入',
|
|
||||||
rules: textRule('型号', 50),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '单价',
|
|
||||||
prop: 'cargoValue',
|
prop: 'cargoValue',
|
||||||
formslot: true,
|
formslot: true,
|
||||||
formatter: row => (String(row.cargoValue) === '-1' ? '' : row.cargoValue),
|
order: 30,
|
||||||
|
formatter: row => formatCargoValue(row.cargoValue),
|
||||||
minWidth: 120,
|
minWidth: 120,
|
||||||
rules: [
|
rules: [
|
||||||
{
|
{
|
||||||
@@ -225,10 +242,19 @@ export const option = createCrudOption([
|
|||||||
label: '计价单位',
|
label: '计价单位',
|
||||||
prop: 'priceUnit',
|
prop: 'priceUnit',
|
||||||
type: 'select',
|
type: 'select',
|
||||||
dicData: priceUnitOptions,
|
dicData: [],
|
||||||
display: false,
|
display: false,
|
||||||
minWidth: 120,
|
minWidth: 120,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '型号',
|
||||||
|
prop: 'model',
|
||||||
|
order: 19,
|
||||||
|
span: 12,
|
||||||
|
minWidth: 120,
|
||||||
|
placeholder: '请输入',
|
||||||
|
rules: textRule('型号', 50, true),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '尺寸',
|
label: '尺寸',
|
||||||
prop: 'sizeText',
|
prop: 'sizeText',
|
||||||
@@ -238,23 +264,19 @@ export const option = createCrudOption([
|
|||||||
rules: textRule('尺寸', 100),
|
rules: textRule('尺寸', 100),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '其他说明1',
|
label: '说明',
|
||||||
prop: 'descriptionOne',
|
prop: 'descriptionOne',
|
||||||
|
order: 20,
|
||||||
|
span: 12,
|
||||||
minWidth: 160,
|
minWidth: 160,
|
||||||
placeholder: '请输入',
|
placeholder: '请输入',
|
||||||
rules: textRule('其他说明1', 100),
|
rules: textRule('说明', 100),
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '其他说明2',
|
|
||||||
prop: 'descriptionTwo',
|
|
||||||
minWidth: 160,
|
|
||||||
placeholder: '请输入',
|
|
||||||
rules: textRule('其他说明2', 100),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '备注',
|
label: '备注',
|
||||||
prop: 'remark',
|
prop: 'remark',
|
||||||
type: 'textarea',
|
type: 'textarea',
|
||||||
|
order: 10,
|
||||||
minRows: 2,
|
minRows: 2,
|
||||||
span: 24,
|
span: 24,
|
||||||
maxlength: 200,
|
maxlength: 200,
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ export const planStatusOptions = [
|
|||||||
export const waybillStatusOptions = [
|
export const waybillStatusOptions = [
|
||||||
{ label: '草稿', value: 'draft' },
|
{ label: '草稿', value: 'draft' },
|
||||||
{ label: '待执行', value: 'pending' },
|
{ label: '待执行', value: 'pending' },
|
||||||
{ label: '进行中', value: 'processing' },
|
{ label: '进行中', value: 'running' },
|
||||||
{ label: '已完成', value: 'completed' },
|
{ label: '已完成', value: 'completed' },
|
||||||
{ label: '已取消', value: 'cancelled' },
|
{ label: '已取消', value: 'cancelled' },
|
||||||
];
|
];
|
||||||
@@ -49,7 +49,6 @@ export const waybillStatusOptions = [
|
|||||||
export const dataSourceOptions = [
|
export const dataSourceOptions = [
|
||||||
{ label: '手工创建', value: '手工创建' },
|
{ label: '手工创建', value: '手工创建' },
|
||||||
{ label: '批量导入', value: '批量导入' },
|
{ label: '批量导入', value: '批量导入' },
|
||||||
{ label: '模板生成', value: '模板生成' },
|
|
||||||
{ label: '计划调度', value: '计划调度' },
|
{ label: '计划调度', value: '计划调度' },
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -98,6 +97,11 @@ export const businessTypeOptions = [
|
|||||||
{ label: '普通业务', value: '普通业务' },
|
{ label: '普通业务', value: '普通业务' },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
export const businessModeOptions = [
|
||||||
|
{ label: '国内运输', value: '国内运输' },
|
||||||
|
{ label: '跨境运输', value: '跨境运输' },
|
||||||
|
];
|
||||||
|
|
||||||
export const settlementModeOptions = [
|
export const settlementModeOptions = [
|
||||||
{ label: '先票后款', value: '先票后款' },
|
{ label: '先票后款', value: '先票后款' },
|
||||||
{ label: '先款后票', value: '先款后票' },
|
{ label: '先款后票', value: '先款后票' },
|
||||||
@@ -126,12 +130,18 @@ export const contractApprovalStatusOptions = [
|
|||||||
{ label: '草稿', value: 'draft' },
|
{ label: '草稿', value: 'draft' },
|
||||||
{ label: '审批中', value: 'reviewing' },
|
{ label: '审批中', value: 'reviewing' },
|
||||||
{ label: '已驳回', value: 'rejected' },
|
{ label: '已驳回', value: 'rejected' },
|
||||||
|
{ label: '已撤回', value: 'withdrawn' },
|
||||||
{ label: '审批通过', value: 'approved' },
|
{ label: '审批通过', value: 'approved' },
|
||||||
{ label: '变更审批中', value: 'change_reviewing' },
|
{ label: '变更审批中', value: 'change_reviewing' },
|
||||||
{ label: '变更驳回', value: 'change_rejected' },
|
{ label: '变更驳回', value: 'change_rejected' },
|
||||||
{ label: '变更审批通过', value: 'change_approved' },
|
{ label: '变更审批通过', value: 'change_approved' },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
export const contractArchiveStatusOptions = [
|
||||||
|
{ label: '未归档', value: '未归档' },
|
||||||
|
{ label: '已归档', value: '已归档' },
|
||||||
|
];
|
||||||
|
|
||||||
export const nodeOptions = [
|
export const nodeOptions = [
|
||||||
{ label: '接单', value: '接单' },
|
{ label: '接单', value: '接单' },
|
||||||
{ label: '到场', value: '到场' },
|
{ label: '到场', value: '到场' },
|
||||||
@@ -170,6 +180,32 @@ export const nonNegativeRule = label => ({
|
|||||||
trigger: 'blur',
|
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 => ({
|
export const phoneRule = label => ({
|
||||||
pattern: /^1[3-9]\d{9}$/,
|
pattern: /^1[3-9]\d{9}$/,
|
||||||
message: `${label}格式不正确`,
|
message: `${label}格式不正确`,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import {
|
import {
|
||||||
auditColumns,
|
auditColumns,
|
||||||
contractApprovalStatusOptions,
|
contractApprovalStatusOptions,
|
||||||
|
contractArchiveStatusOptions,
|
||||||
contractCategoryOptions,
|
contractCategoryOptions,
|
||||||
contractStageOptions,
|
contractStageOptions,
|
||||||
createCrudOption,
|
createCrudOption,
|
||||||
@@ -27,6 +28,12 @@ const listDicFormatter = res => {
|
|||||||
return [];
|
return [];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const projectNameDicFormatter = res => {
|
||||||
|
const list = listDicFormatter(res);
|
||||||
|
// 过滤掉 projectName 为空的记录
|
||||||
|
return list.filter(item => item && item.projectName && String(item.projectName).trim());
|
||||||
|
};
|
||||||
|
|
||||||
export const config = {
|
export const config = {
|
||||||
title: '合同管理',
|
title: '合同管理',
|
||||||
permission: 'contract_manage',
|
permission: 'contract_manage',
|
||||||
@@ -42,7 +49,7 @@ export const config = {
|
|||||||
batchDelete: false,
|
batchDelete: false,
|
||||||
enableProjectSelect: true,
|
enableProjectSelect: true,
|
||||||
projectQueryParams: {
|
projectQueryParams: {
|
||||||
approvalStatuses: 'approved,change_approved',
|
contractSelectable: true,
|
||||||
},
|
},
|
||||||
actions: ['copy'],
|
actions: ['copy'],
|
||||||
statusProp: 'approvalStatus',
|
statusProp: 'approvalStatus',
|
||||||
@@ -65,6 +72,10 @@ export const config = {
|
|||||||
['legalSealFlag', '是否需要加盖法人章'],
|
['legalSealFlag', '是否需要加盖法人章'],
|
||||||
['copyCount', '一式(份)'],
|
['copyCount', '一式(份)'],
|
||||||
['paymentDays', '回款账期(天)'],
|
['paymentDays', '回款账期(天)'],
|
||||||
|
['contractAmount', '合同金额'],
|
||||||
|
['templateFlag', '是否范本'],
|
||||||
|
['originalContractNo', '原件合同编号'],
|
||||||
|
['electronicSealFlag', '是否电子章'],
|
||||||
['remark', '备注', 2],
|
['remark', '备注', 2],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
@@ -78,6 +89,7 @@ export const config = {
|
|||||||
['effectiveType', '生效类型'],
|
['effectiveType', '生效类型'],
|
||||||
['contractStage', '合同阶段'],
|
['contractStage', '合同阶段'],
|
||||||
['approvalStatus', '审核状态'],
|
['approvalStatus', '审核状态'],
|
||||||
|
['archiveStatus', '归档状态'],
|
||||||
['currentNode', '当前节点'],
|
['currentNode', '当前节点'],
|
||||||
['currentProcessor', '当前处理人'],
|
['currentProcessor', '当前处理人'],
|
||||||
],
|
],
|
||||||
@@ -98,7 +110,7 @@ export const config = {
|
|||||||
},
|
},
|
||||||
deleteStatus: ['draft'],
|
deleteStatus: ['draft'],
|
||||||
deleteStage: ['draft'],
|
deleteStage: ['draft'],
|
||||||
editStatus: ['draft', 'rejected', 'change_rejected'],
|
editStatus: ['draft', 'withdrawn', 'rejected', 'change_rejected'],
|
||||||
operations: [
|
operations: [
|
||||||
{
|
{
|
||||||
action: 'flow',
|
action: 'flow',
|
||||||
@@ -148,6 +160,16 @@ export const config = {
|
|||||||
stage: ['formal'],
|
stage: ['formal'],
|
||||||
permission: 'contract_manage_reject',
|
permission: 'contract_manage_reject',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
action: 'submitFormal',
|
||||||
|
label: '转正式合同',
|
||||||
|
statusProp: 'approvalStatus',
|
||||||
|
status: ['approved'],
|
||||||
|
stage: ['temporary'],
|
||||||
|
permission: 'contract_manage_formal',
|
||||||
|
confirmMessage: '确定将该临时合同提交正式合同审批吗?',
|
||||||
|
successMessage: '已提交正式合同审批',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
action: 'submitFormal',
|
action: 'submitFormal',
|
||||||
label: '重新提交转正',
|
label: '重新提交转正',
|
||||||
@@ -241,6 +263,7 @@ export const option = createCrudOption([
|
|||||||
searchPlaceholder: '请输入',
|
searchPlaceholder: '请输入',
|
||||||
order: 180,
|
order: 180,
|
||||||
slot: true,
|
slot: true,
|
||||||
|
overHidden: true,
|
||||||
minWidth: 240,
|
minWidth: 240,
|
||||||
rules: textRule('合同名称', 100, true),
|
rules: textRule('合同名称', 100, true),
|
||||||
},
|
},
|
||||||
@@ -254,8 +277,8 @@ export const option = createCrudOption([
|
|||||||
formslot: true,
|
formslot: true,
|
||||||
order: 165,
|
order: 165,
|
||||||
dicUrl:
|
dicUrl:
|
||||||
'/blade-transport/project-apply/list?current=1&size=9999&approvalStatuses=approved,change_approved',
|
'/blade-transport/project-apply/list?current=1&size=9999&contractSelectable=true',
|
||||||
dicFormatter: listDicFormatter,
|
dicFormatter: projectNameDicFormatter,
|
||||||
props: {
|
props: {
|
||||||
label: 'projectName',
|
label: 'projectName',
|
||||||
value: 'projectName',
|
value: 'projectName',
|
||||||
@@ -275,20 +298,11 @@ export const option = createCrudOption([
|
|||||||
prop: 'organizationName',
|
prop: 'organizationName',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 3,
|
searchOrder: 3,
|
||||||
searchType: 'cascader',
|
searchslot: true,
|
||||||
searchPlaceholder: '全部',
|
searchPlaceholder: '请选择 所属组织',
|
||||||
formslot: true,
|
formslot: true,
|
||||||
order: 120,
|
order: 120,
|
||||||
dicData: [],
|
dicData: [],
|
||||||
props: {
|
|
||||||
label: 'label',
|
|
||||||
value: 'id',
|
|
||||||
children: 'children',
|
|
||||||
},
|
|
||||||
checkStrictly: true,
|
|
||||||
emitPath: false,
|
|
||||||
showAllLevels: false,
|
|
||||||
filterable: true,
|
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
rules: selectRule('所属组织'),
|
rules: selectRule('所属组织'),
|
||||||
},
|
},
|
||||||
@@ -308,7 +322,9 @@ export const option = createCrudOption([
|
|||||||
label: '签约类型',
|
label: '签约类型',
|
||||||
prop: 'signType',
|
prop: 'signType',
|
||||||
type: 'select',
|
type: 'select',
|
||||||
search: false,
|
search: true,
|
||||||
|
searchOrder: 10,
|
||||||
|
searchPlaceholder: '请选择',
|
||||||
span: 8,
|
span: 8,
|
||||||
order: 190,
|
order: 190,
|
||||||
dicData: signTypeOptions,
|
dicData: signTypeOptions,
|
||||||
@@ -475,6 +491,47 @@ export const option = createCrudOption([
|
|||||||
order: 50,
|
order: 50,
|
||||||
minWidth: 130,
|
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: '创建时间',
|
label: '创建时间',
|
||||||
prop: 'createTime',
|
prop: 'createTime',
|
||||||
@@ -512,6 +569,19 @@ export const option = createCrudOption([
|
|||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
editDisplay: false,
|
editDisplay: false,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '归档状态',
|
||||||
|
prop: 'archiveStatus',
|
||||||
|
type: 'select',
|
||||||
|
search: true,
|
||||||
|
searchOrder: 5,
|
||||||
|
searchPlaceholder: '请选择',
|
||||||
|
slot: true,
|
||||||
|
dicData: contractArchiveStatusOptions,
|
||||||
|
minWidth: 110,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '当前节点',
|
label: '当前节点',
|
||||||
prop: 'currentNode',
|
prop: 'currentNode',
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ export const transportTypeDict = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export const carrierTypeOptions = ['承运商', '自运', '网货平台'];
|
export const carrierTypeOptions = ['承运商', '自运'];
|
||||||
|
|
||||||
export const loadingStatusOptions = [
|
export const loadingStatusOptions = [
|
||||||
{ label: '草稿', value: 'draft' },
|
{ label: '草稿', value: 'draft' },
|
||||||
|
|||||||
@@ -85,6 +85,7 @@ export const option = {
|
|||||||
type: 'number',
|
type: 'number',
|
||||||
min: 0,
|
min: 0,
|
||||||
max: 999,
|
max: 999,
|
||||||
|
formatter: row => (Number(row.defaultFinishDays) === -1 ? '' : row.defaultFinishDays),
|
||||||
span: 12,
|
span: 12,
|
||||||
minWidth: 170,
|
minWidth: 170,
|
||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
@@ -137,7 +138,6 @@ export const option = {
|
|||||||
searchPlaceholder: '请选择',
|
searchPlaceholder: '请选择',
|
||||||
dicData: processStatusOptions,
|
dicData: processStatusOptions,
|
||||||
slot: true,
|
slot: true,
|
||||||
hide: true,
|
|
||||||
fixed: 'right',
|
fixed: 'right',
|
||||||
minWidth: 100,
|
minWidth: 100,
|
||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import {
|
import {
|
||||||
auditColumns,
|
auditColumns,
|
||||||
|
businessModeOptions,
|
||||||
businessTypeOptions,
|
businessTypeOptions,
|
||||||
createCrudOption,
|
createCrudOption,
|
||||||
effectiveTypeOptions,
|
|
||||||
nonNegativeRule,
|
nonNegativeRule,
|
||||||
projectApprovalStatusOptions,
|
projectApprovalStatusOptions,
|
||||||
projectSourceOptions,
|
projectSourceOptions,
|
||||||
@@ -12,23 +12,28 @@ import {
|
|||||||
textRule,
|
textRule,
|
||||||
} from './common';
|
} from './common';
|
||||||
|
|
||||||
|
const projectEffectiveTypeOptions = [
|
||||||
|
{ label: '临时', value: 'temporary' },
|
||||||
|
{ 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 => [
|
const amountRules = label => [
|
||||||
{ required: true, message: `请输入${label}`, trigger: 'blur' },
|
{ required: true, message: `请输入${label}`, trigger: 'blur' },
|
||||||
nonNegativeRule(label),
|
nonNegativeRule(label),
|
||||||
];
|
];
|
||||||
|
|
||||||
const userDicFormatter = res => {
|
|
||||||
const list = Array.isArray(res)
|
|
||||||
? res
|
|
||||||
: Array.isArray(res.data)
|
|
||||||
? res.data
|
|
||||||
: res.data?.records || [];
|
|
||||||
return list.map(user => ({
|
|
||||||
...user,
|
|
||||||
realName: user.realName || user.name || user.account,
|
|
||||||
}));
|
|
||||||
};
|
|
||||||
|
|
||||||
const formatUserRealName = (row, role) =>
|
const formatUserRealName = (row, role) =>
|
||||||
row[`${role}RealName`] ||
|
row[`${role}RealName`] ||
|
||||||
row[`${role}UserRealName`] ||
|
row[`${role}UserRealName`] ||
|
||||||
@@ -85,25 +90,16 @@ export const config = {
|
|||||||
status: ['approved'],
|
status: ['approved'],
|
||||||
permission: 'project_apply_change',
|
permission: 'project_apply_change',
|
||||||
},
|
},
|
||||||
{
|
|
||||||
action: 'voidProject',
|
|
||||||
label: '作废',
|
|
||||||
type: 'danger',
|
|
||||||
statusProp: 'approvalStatus',
|
|
||||||
status: ['approved', 'change_approved'],
|
|
||||||
permission: 'project_apply_void',
|
|
||||||
prompt: '请输入作废原因',
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
export const option = createCrudOption([
|
export const option = createCrudOption([
|
||||||
{
|
{
|
||||||
label: '立项申请单号',
|
label: '申请单号',
|
||||||
prop: 'applyNo',
|
prop: 'applyNo',
|
||||||
search: true,
|
search: true,
|
||||||
searchPlaceholder: '请输入',
|
searchPlaceholder: '请输入',
|
||||||
searchOrder: 7,
|
searchOrder: 10,
|
||||||
minWidth: 220,
|
minWidth: 220,
|
||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
editDisabled: true,
|
editDisabled: true,
|
||||||
@@ -111,6 +107,9 @@ export const option = createCrudOption([
|
|||||||
{
|
{
|
||||||
label: '项目编号',
|
label: '项目编号',
|
||||||
prop: 'projectCode',
|
prop: 'projectCode',
|
||||||
|
search: true,
|
||||||
|
searchPlaceholder: '请输入',
|
||||||
|
searchOrder: 5,
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
editDisabled: true,
|
editDisabled: true,
|
||||||
@@ -120,7 +119,7 @@ export const option = createCrudOption([
|
|||||||
prop: 'projectName',
|
prop: 'projectName',
|
||||||
search: true,
|
search: true,
|
||||||
searchPlaceholder: '请输入',
|
searchPlaceholder: '请输入',
|
||||||
searchOrder: 6,
|
searchOrder: 9,
|
||||||
minWidth: 180,
|
minWidth: 180,
|
||||||
maxlength: 50,
|
maxlength: 50,
|
||||||
rules: textRule('项目名称', 50, true),
|
rules: textRule('项目名称', 50, true),
|
||||||
@@ -131,7 +130,7 @@ export const option = createCrudOption([
|
|||||||
hide: true,
|
hide: true,
|
||||||
minWidth: 140,
|
minWidth: 140,
|
||||||
maxlength: 20,
|
maxlength: 20,
|
||||||
rules: textRule('项目简称', 20, true),
|
rules: textRule('项目简称', 20),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '项目类型',
|
label: '项目类型',
|
||||||
@@ -147,12 +146,18 @@ export const option = createCrudOption([
|
|||||||
{
|
{
|
||||||
label: '客户名称',
|
label: '客户名称',
|
||||||
prop: 'customerNames',
|
prop: 'customerNames',
|
||||||
|
search: true,
|
||||||
|
searchPlaceholder: '请输入',
|
||||||
|
searchOrder: 6,
|
||||||
minWidth: 180,
|
minWidth: 180,
|
||||||
rules: textRule('客户名称', 255, true),
|
rules: textRule('客户名称', 255, true),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '下游承运商',
|
label: '下游承运商',
|
||||||
prop: 'carrierNames',
|
prop: 'carrierNames',
|
||||||
|
search: true,
|
||||||
|
searchPlaceholder: '请输入',
|
||||||
|
searchOrder: 7,
|
||||||
minWidth: 180,
|
minWidth: 180,
|
||||||
rules: textRule('下游承运商', 255, true),
|
rules: textRule('下游承运商', 255, true),
|
||||||
},
|
},
|
||||||
@@ -164,42 +169,42 @@ export const option = createCrudOption([
|
|||||||
rules: textRule('业务部门', 50, true),
|
rules: textRule('业务部门', 50, true),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '承办部门',
|
label: '平台公司',
|
||||||
prop: 'undertakeDeptName',
|
prop: 'undertakeDeptName',
|
||||||
search: true,
|
search: true,
|
||||||
searchPlaceholder: '请输入',
|
searchPlaceholder: '请输入',
|
||||||
searchOrder: 5,
|
searchOrder: 8,
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
rules: textRule('承办部门', 50, true),
|
rules: textRule('平台公司', 50, true),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '承办部门ID',
|
label: '平台公司ID',
|
||||||
prop: 'undertakeDeptId',
|
prop: 'undertakeDeptId',
|
||||||
hide: true,
|
hide: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '项目负责人',
|
label: '项目负责人',
|
||||||
prop: 'principalUserName',
|
prop: 'principalUserName',
|
||||||
|
search: true,
|
||||||
|
searchPlaceholder: '请输入',
|
||||||
|
searchOrder: 4,
|
||||||
minWidth: 130,
|
minWidth: 130,
|
||||||
formatter: row => formatUserRealName(row, 'principal'),
|
formatter: row => formatUserRealName(row, 'principal'),
|
||||||
rules: textRule('项目负责人', 50, true),
|
rules: textRule('项目负责人', 50, true),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '项目负责人',
|
label: '资金使用风险',
|
||||||
|
prop: 'fundUseRisk',
|
||||||
|
slot: true,
|
||||||
|
minWidth: 150,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
hide: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '项目负责人ID',
|
||||||
prop: 'principalUserId',
|
prop: 'principalUserId',
|
||||||
type: 'select',
|
|
||||||
search: true,
|
|
||||||
searchPlaceholder: '请选择',
|
|
||||||
searchOrder: 4,
|
|
||||||
filterable: true,
|
|
||||||
dicUrl: '/blade-system/user/user-list',
|
|
||||||
dicFormatter: userDicFormatter,
|
|
||||||
props: {
|
|
||||||
label: 'realName',
|
|
||||||
value: 'id',
|
|
||||||
},
|
|
||||||
hide: true,
|
hide: true,
|
||||||
display: false,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '项目经办人',
|
label: '项目经办人',
|
||||||
@@ -310,6 +315,15 @@ export const option = createCrudOption([
|
|||||||
hide: true,
|
hide: true,
|
||||||
minWidth: 130,
|
minWidth: 130,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '业务模式',
|
||||||
|
prop: 'businessMode',
|
||||||
|
type: 'select',
|
||||||
|
dicData: businessModeOptions,
|
||||||
|
hide: true,
|
||||||
|
minWidth: 120,
|
||||||
|
rules: [selectRule('业务模式')],
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '项目规模(万元)',
|
label: '项目规模(万元)',
|
||||||
prop: 'projectScale',
|
prop: 'projectScale',
|
||||||
@@ -328,6 +342,15 @@ export const option = createCrudOption([
|
|||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
rules: [nonNegativeRule('预计利润')],
|
rules: [nonNegativeRule('预计利润')],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '利润率(%)',
|
||||||
|
prop: 'profitRate',
|
||||||
|
type: 'number',
|
||||||
|
precision: 2,
|
||||||
|
hide: true,
|
||||||
|
minWidth: 120,
|
||||||
|
rules: [nonNegativeRule('利润率')],
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '资金需求(万元)',
|
label: '资金需求(万元)',
|
||||||
prop: 'fundDemand',
|
prop: 'fundDemand',
|
||||||
@@ -379,7 +402,7 @@ export const option = createCrudOption([
|
|||||||
search: true,
|
search: true,
|
||||||
searchPlaceholder: '请选择',
|
searchPlaceholder: '请选择',
|
||||||
searchOrder: 1,
|
searchOrder: 1,
|
||||||
dicData: effectiveTypeOptions,
|
dicData: projectEffectiveTypeOptions,
|
||||||
value: 'temporary',
|
value: 'temporary',
|
||||||
minWidth: 110,
|
minWidth: 110,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -55,8 +55,8 @@ export const config = {
|
|||||||
'templateType',
|
'templateType',
|
||||||
'transportType',
|
'transportType',
|
||||||
'createUserName',
|
'createUserName',
|
||||||
'remark',
|
|
||||||
'updateTime',
|
'updateTime',
|
||||||
|
'remark',
|
||||||
'createTime',
|
'createTime',
|
||||||
],
|
],
|
||||||
exportColumns: [
|
exportColumns: [
|
||||||
@@ -65,8 +65,8 @@ export const config = {
|
|||||||
{ prop: 'templateType', label: '模板类型' },
|
{ prop: 'templateType', label: '模板类型' },
|
||||||
{ prop: 'transportType', label: '运输方式' },
|
{ prop: 'transportType', label: '运输方式' },
|
||||||
{ prop: 'createUserName', label: '创建人' },
|
{ prop: 'createUserName', label: '创建人' },
|
||||||
{ prop: 'remark', label: '备注' },
|
|
||||||
{ prop: 'updateTime', label: '更新时间' },
|
{ prop: 'updateTime', label: '更新时间' },
|
||||||
|
{ prop: 'remark', label: '备注' },
|
||||||
{ prop: 'createTime', label: '创建时间' },
|
{ prop: 'createTime', label: '创建时间' },
|
||||||
],
|
],
|
||||||
enableAllDept: false,
|
enableAllDept: false,
|
||||||
@@ -82,12 +82,14 @@ export const config = {
|
|||||||
detailAttachmentDescriptionPlain: true,
|
detailAttachmentDescriptionPlain: true,
|
||||||
enableTransportPlanForm: true,
|
enableTransportPlanForm: true,
|
||||||
enableShippingTemplateFreight: true,
|
enableShippingTemplateFreight: true,
|
||||||
editableRoadAddress: true,
|
editableRoadAddress: false,
|
||||||
fixedTransportAddressType: true,
|
fixedTransportAddressType: true,
|
||||||
enableTemplateCodePreview: true,
|
enableTemplateCodePreview: true,
|
||||||
attachmentTitle: '附件',
|
attachmentTitle: '附件',
|
||||||
defaultForm: {
|
defaultForm: {
|
||||||
templateType: '运输计划',
|
templateType: '运输计划',
|
||||||
|
transportType: '公路运输',
|
||||||
|
transportTypeName: '公路运输',
|
||||||
},
|
},
|
||||||
transportFormRequiredFields: [
|
transportFormRequiredFields: [
|
||||||
['projectName', '项目'],
|
['projectName', '项目'],
|
||||||
@@ -119,15 +121,16 @@ export const option = {
|
|||||||
labelWidth: 0,
|
labelWidth: 0,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '模板编号',
|
label: '模板类型',
|
||||||
prop: 'templateCode',
|
prop: 'templateType',
|
||||||
|
type: 'select',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 4,
|
searchOrder: 2,
|
||||||
span: 8,
|
span: 8,
|
||||||
order: 390,
|
order: 390,
|
||||||
minWidth: 170,
|
dicData: templateTypeOptions,
|
||||||
disabled: true,
|
minWidth: 120,
|
||||||
placeholder: '系统自动生成',
|
rules: selectRule('模板类型'),
|
||||||
display: true,
|
display: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -142,16 +145,15 @@ export const option = {
|
|||||||
display: true,
|
display: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '模板类型',
|
label: '模板编号',
|
||||||
prop: 'templateType',
|
prop: 'templateCode',
|
||||||
type: 'select',
|
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 2,
|
searchOrder: 4,
|
||||||
span: 8,
|
span: 8,
|
||||||
order: 370,
|
order: 370,
|
||||||
dicData: templateTypeOptions,
|
minWidth: 170,
|
||||||
minWidth: 120,
|
disabled: true,
|
||||||
rules: selectRule('模板类型'),
|
placeholder: '系统自动生成',
|
||||||
display: true,
|
display: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -269,7 +271,7 @@ export const option = {
|
|||||||
order: 270,
|
order: 270,
|
||||||
hide: true,
|
hide: true,
|
||||||
labelWidth: '0px',
|
labelWidth: '0px',
|
||||||
className: 'business-crud-page__full-form-item',
|
className: 'shipping-template-page__full-form-item',
|
||||||
},
|
},
|
||||||
{ label: '运费信息', prop: 'freightJson', hide: true, display: false },
|
{ label: '运费信息', prop: 'freightJson', hide: true, display: false },
|
||||||
{
|
{
|
||||||
@@ -290,7 +292,7 @@ export const option = {
|
|||||||
order: 250,
|
order: 250,
|
||||||
hide: true,
|
hide: true,
|
||||||
labelWidth: '0px',
|
labelWidth: '0px',
|
||||||
className: 'business-crud-page__full-form-item',
|
className: 'shipping-template-page__full-form-item',
|
||||||
},
|
},
|
||||||
{ label: '项目ID', prop: 'projectId', hide: true, display: false },
|
{ label: '项目ID', prop: 'projectId', hide: true, display: false },
|
||||||
{ label: '客户合同ID', prop: 'contractId', hide: true, display: false },
|
{ label: '客户合同ID', prop: 'contractId', hide: true, display: false },
|
||||||
@@ -300,7 +302,14 @@ export const option = {
|
|||||||
{ label: '收货地', prop: 'arrivalName', hide: true, display: false },
|
{ label: '收货地', prop: 'arrivalName', hide: true, display: false },
|
||||||
{ label: '收货联系人', prop: 'arrivalContact', hide: true, display: false },
|
{ label: '收货联系人', prop: 'arrivalContact', hide: true, display: false },
|
||||||
{ label: '收货联系方式', prop: 'arrivalPhone', hide: true, display: false },
|
{ label: '收货联系方式', prop: 'arrivalPhone', hide: true, display: false },
|
||||||
{ label: '所属组织', prop: 'deptName', minWidth: 150, addDisplay: false, editDisplay: false, display: false },
|
{
|
||||||
|
label: '所属组织',
|
||||||
|
prop: 'deptName',
|
||||||
|
minWidth: 150,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
display: false,
|
||||||
|
},
|
||||||
...auditColumns.map(column => ({
|
...auditColumns.map(column => ({
|
||||||
...column,
|
...column,
|
||||||
display: false,
|
display: false,
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {
|
|||||||
createCrudOption,
|
createCrudOption,
|
||||||
nonNegativeRule,
|
nonNegativeRule,
|
||||||
textRule,
|
textRule,
|
||||||
|
withSearchPlaceholders,
|
||||||
} from './common';
|
} from './common';
|
||||||
|
|
||||||
const listDicFormatter = res => {
|
const listDicFormatter = res => {
|
||||||
@@ -15,6 +16,12 @@ const listDicFormatter = res => {
|
|||||||
return [];
|
return [];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const projectNameDicFormatter = res => {
|
||||||
|
const list = listDicFormatter(res);
|
||||||
|
// 过滤掉 projectName 为空的记录
|
||||||
|
return list.filter(item => item && item.projectName && String(item.projectName).trim());
|
||||||
|
};
|
||||||
|
|
||||||
const userDicFormatter = res =>
|
const userDicFormatter = res =>
|
||||||
listDicFormatter(res).map(user => ({
|
listDicFormatter(res).map(user => ({
|
||||||
...user,
|
...user,
|
||||||
@@ -50,30 +57,25 @@ export const config = {
|
|||||||
detailAlignCenter: true,
|
detailAlignCenter: true,
|
||||||
detailSections: [
|
detailSections: [
|
||||||
{
|
{
|
||||||
title: '申请信息',
|
title: '项目额度信息',
|
||||||
fields: [
|
fields: [
|
||||||
['applicationNo', '申请单号', 1],
|
['projectName', '项目名称', 1],
|
||||||
['projectName', '项目', 1],
|
|
||||||
['projectCode', '项目编号', 1],
|
['projectCode', '项目编号', 1],
|
||||||
['undertakeDeptName', '承办部门', 1],
|
['undertakeDeptName', '承办部门', 1],
|
||||||
['applyDeptName', '申请部门', 1],
|
|
||||||
['applicantName', '申请人', 1],
|
|
||||||
['approvalStatus', '审批状态', 1],
|
|
||||||
['currentNode', '当前节点', 1],
|
|
||||||
['currentProcessor', '当前处理人', 1],
|
|
||||||
['validUntil', '申请有效期至', 1],
|
|
||||||
['remark', '备注', 1],
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: '额度信息',
|
|
||||||
fields: [
|
|
||||||
['projectFundLimit', '项目资金使用额度(万元)', 1],
|
['projectFundLimit', '项目资金使用额度(万元)', 1],
|
||||||
['usedFundLimit', '已使用项目资金使用额度(万元)', 1],
|
['usedFundLimit', '已使用项目资金使用额度(万元)', 1],
|
||||||
['remainingFundLimit', '剩余项目资金使用额度(万元)', 1],
|
['remainingFundLimit', '剩余项目资金使用额度(万元)', 1],
|
||||||
['applyLimit', '申请临时额度(万元)', 1],
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '临时额度信息',
|
||||||
|
fields: [
|
||||||
|
['applyLimit', '申请临时额度(万元)', 1],
|
||||||
|
['validUntil', '申请有效期至', 1],
|
||||||
|
['remark', '备注', 4],
|
||||||
|
],
|
||||||
|
showAttachment: true,
|
||||||
|
},
|
||||||
],
|
],
|
||||||
operations: [
|
operations: [
|
||||||
{
|
{
|
||||||
@@ -118,7 +120,10 @@ export const config = {
|
|||||||
|
|
||||||
export const option = {
|
export const option = {
|
||||||
dialogCustomClass: 'temporary-credit-limit-dialog',
|
dialogCustomClass: 'temporary-credit-limit-dialog',
|
||||||
...createCrudOption([
|
addTitle: '新增临时额度申请',
|
||||||
|
editTitle: '编辑临时额度申请',
|
||||||
|
viewTitle: '查看临时额度申请',
|
||||||
|
...createCrudOption(withSearchPlaceholders([
|
||||||
{
|
{
|
||||||
label: '申请单号',
|
label: '申请单号',
|
||||||
prop: 'applicationNo',
|
prop: 'applicationNo',
|
||||||
@@ -129,6 +134,14 @@ export const option = {
|
|||||||
editDisplay: false,
|
editDisplay: false,
|
||||||
editDisabled: true,
|
editDisabled: true,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '',
|
||||||
|
prop: 'projectQuotaInfoTitle',
|
||||||
|
formslot: true,
|
||||||
|
span: 24,
|
||||||
|
hide: true,
|
||||||
|
labelWidth: 0,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '项目名称',
|
label: '项目名称',
|
||||||
prop: 'projectName',
|
prop: 'projectName',
|
||||||
@@ -137,7 +150,7 @@ export const option = {
|
|||||||
searchType: 'select',
|
searchType: 'select',
|
||||||
formslot: true,
|
formslot: true,
|
||||||
dicUrl: '/blade-transport/project-apply/list?current=1&size=9999',
|
dicUrl: '/blade-transport/project-apply/list?current=1&size=9999',
|
||||||
dicFormatter: listDicFormatter,
|
dicFormatter: projectNameDicFormatter,
|
||||||
props: {
|
props: {
|
||||||
label: 'projectName',
|
label: 'projectName',
|
||||||
value: 'projectName',
|
value: 'projectName',
|
||||||
@@ -158,6 +171,7 @@ export const option = {
|
|||||||
prop: 'projectCode',
|
prop: 'projectCode',
|
||||||
hide: true,
|
hide: true,
|
||||||
disabled: true,
|
disabled: true,
|
||||||
|
placeholder: '请输入',
|
||||||
span: 6,
|
span: 6,
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
rules: textRule('项目编号', 50),
|
rules: textRule('项目编号', 50),
|
||||||
@@ -167,6 +181,7 @@ export const option = {
|
|||||||
prop: 'undertakeDeptName',
|
prop: 'undertakeDeptName',
|
||||||
hide: true,
|
hide: true,
|
||||||
disabled: true,
|
disabled: true,
|
||||||
|
placeholder: '请输入',
|
||||||
span: 6,
|
span: 6,
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
rules: textRule('承办部门', 50, true),
|
rules: textRule('承办部门', 50, true),
|
||||||
@@ -176,6 +191,7 @@ export const option = {
|
|||||||
prop: 'projectFundLimit',
|
prop: 'projectFundLimit',
|
||||||
hide: true,
|
hide: true,
|
||||||
disabled: true,
|
disabled: true,
|
||||||
|
placeholder: '请输入',
|
||||||
span: 6,
|
span: 6,
|
||||||
minWidth: 200,
|
minWidth: 200,
|
||||||
rules: [nonNegativeRule('项目资金使用额度')],
|
rules: [nonNegativeRule('项目资金使用额度')],
|
||||||
@@ -185,6 +201,7 @@ export const option = {
|
|||||||
prop: 'usedFundLimit',
|
prop: 'usedFundLimit',
|
||||||
hide: true,
|
hide: true,
|
||||||
disabled: true,
|
disabled: true,
|
||||||
|
placeholder: '请输入',
|
||||||
span: 6,
|
span: 6,
|
||||||
minWidth: 220,
|
minWidth: 220,
|
||||||
value: 0,
|
value: 0,
|
||||||
@@ -195,11 +212,20 @@ export const option = {
|
|||||||
prop: 'remainingFundLimit',
|
prop: 'remainingFundLimit',
|
||||||
hide: true,
|
hide: true,
|
||||||
disabled: true,
|
disabled: true,
|
||||||
|
placeholder: '请输入',
|
||||||
span: 6,
|
span: 6,
|
||||||
minWidth: 230,
|
minWidth: 230,
|
||||||
value: 0,
|
value: 0,
|
||||||
rules: [nonNegativeRule('剩余项目资金使用额度')],
|
rules: [nonNegativeRule('剩余项目资金使用额度')],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '',
|
||||||
|
prop: 'temporaryCreditInfoTitle',
|
||||||
|
formslot: true,
|
||||||
|
span: 24,
|
||||||
|
hide: true,
|
||||||
|
labelWidth: 0,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '申请临时额度(万元)',
|
label: '申请临时额度(万元)',
|
||||||
prop: 'applyLimit',
|
prop: 'applyLimit',
|
||||||
@@ -217,9 +243,31 @@ export const option = {
|
|||||||
type: 'date',
|
type: 'date',
|
||||||
format: 'YYYY-MM-DD',
|
format: 'YYYY-MM-DD',
|
||||||
valueFormat: 'YYYY-MM-DD',
|
valueFormat: 'YYYY-MM-DD',
|
||||||
|
placeholder: '请选择',
|
||||||
span: 6,
|
span: 6,
|
||||||
minWidth: 140,
|
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: '申请部门',
|
label: '申请部门',
|
||||||
@@ -284,27 +332,9 @@ export const option = {
|
|||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
editDisplay: 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 })),
|
...auditColumns.map(column => ({ ...column, hide: true })),
|
||||||
]),
|
])),
|
||||||
dialogWidth: '96%',
|
dialogWidth: '1100px',
|
||||||
menuFixed: 'right',
|
menuFixed: 'right',
|
||||||
menuWidth: 320,
|
menuWidth: 320,
|
||||||
index: false,
|
index: false,
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import {
|
import {
|
||||||
auditColumns,
|
auditColumns,
|
||||||
createCrudOption,
|
createCrudOption,
|
||||||
dataSourceOptions,
|
|
||||||
phoneRule,
|
phoneRule,
|
||||||
planStatusOptions,
|
planStatusOptions,
|
||||||
selectRule,
|
selectRule,
|
||||||
@@ -9,6 +8,12 @@ import {
|
|||||||
withSearchPlaceholders,
|
withSearchPlaceholders,
|
||||||
} from './common';
|
} from './common';
|
||||||
|
|
||||||
|
const transportPlanDataSourceOptions = [
|
||||||
|
{ label: '批量导入', value: '批量导入' },
|
||||||
|
{ label: '手工创建', value: '手工创建' },
|
||||||
|
{ label: '外部系统', value: '外部系统' },
|
||||||
|
];
|
||||||
|
|
||||||
const listDicFormatter = res => {
|
const listDicFormatter = res => {
|
||||||
const data = res?.data || res;
|
const data = res?.data || res;
|
||||||
if (Array.isArray(data)) return data;
|
if (Array.isArray(data)) return data;
|
||||||
@@ -18,6 +23,12 @@ const listDicFormatter = res => {
|
|||||||
return [];
|
return [];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const projectNameDicFormatter = res => {
|
||||||
|
const list = listDicFormatter(res);
|
||||||
|
// 过滤掉 projectName 为空的记录
|
||||||
|
return list.filter(item => item && item.projectName && String(item.projectName).trim());
|
||||||
|
};
|
||||||
|
|
||||||
const parseGoodsRows = value => {
|
const parseGoodsRows = value => {
|
||||||
if (!value) return [];
|
if (!value) return [];
|
||||||
if (Array.isArray(value)) return value;
|
if (Array.isArray(value)) return value;
|
||||||
@@ -61,7 +72,11 @@ const getSecondCargoTypeName = item =>
|
|||||||
'货物';
|
'货物';
|
||||||
|
|
||||||
const formatGoodsInfo = row => {
|
const formatGoodsInfo = row => {
|
||||||
const rows = parseGoodsRows(row.goodsJson);
|
const rows =
|
||||||
|
[row.goodsJson, row.goodsList, row.goodsRows, row.cargoList, row.cargoRows, row.goods]
|
||||||
|
.map(source => parseGoodsRows(source))
|
||||||
|
.filter(source => source.length)
|
||||||
|
.sort((left, right) => right.length - left.length)[0] || [];
|
||||||
if (!rows.length) return row.goodsInfo || '';
|
if (!rows.length) return row.goodsInfo || '';
|
||||||
|
|
||||||
const groups = rows.reduce((result, item = {}) => {
|
const groups = rows.reduce((result, item = {}) => {
|
||||||
@@ -78,11 +93,22 @@ const formatGoodsInfo = row => {
|
|||||||
item.goodsQuantity,
|
item.goodsQuantity,
|
||||||
item.quantityUnit,
|
item.quantityUnit,
|
||||||
item.goodsQuantityUnit,
|
item.goodsQuantityUnit,
|
||||||
|
item.cargoUnit,
|
||||||
item.unit,
|
item.unit,
|
||||||
].some(Boolean);
|
].some(Boolean);
|
||||||
if (!hasGoodsInfo) return result;
|
if (!hasGoodsInfo) return result;
|
||||||
|
|
||||||
const unit = item.quantityUnit || item.goodsQuantityUnit || item.unit || '';
|
const unit = String(
|
||||||
|
item.quantityUnit ||
|
||||||
|
item.goodsQuantityUnit ||
|
||||||
|
item.cargoUnit ||
|
||||||
|
item.unit ||
|
||||||
|
row.quantityUnit ||
|
||||||
|
row.goodsQuantityUnit ||
|
||||||
|
row.cargoUnit ||
|
||||||
|
row.unit ||
|
||||||
|
''
|
||||||
|
).trim();
|
||||||
if (!result[unit]) {
|
if (!result[unit]) {
|
||||||
result[unit] = {
|
result[unit] = {
|
||||||
typeName: getSecondCargoTypeName(item),
|
typeName: getSecondCargoTypeName(item),
|
||||||
@@ -150,9 +176,12 @@ const formatDispatchProgress = row => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
const lines = Array.from(summary.entries()).map(
|
const lines = Array.from(summary.entries()).map(
|
||||||
([unit, item]) => `${formatDispatchQuantity(item.assigned)}/${formatDispatchQuantity(item.total)}${unit}`
|
([unit, item]) =>
|
||||||
|
`${formatDispatchQuantity(item.assigned)}/${formatDispatchQuantity(item.total)}${unit}`
|
||||||
);
|
);
|
||||||
return lines.length ? lines.join('\n') : row.dispatchProgressName || row.dispatchProgress || row.progress || '';
|
return lines.length
|
||||||
|
? lines.join('\n')
|
||||||
|
: row.dispatchProgressName || row.dispatchProgress || row.progress || '';
|
||||||
};
|
};
|
||||||
|
|
||||||
const auditColumn = prop => ({ ...auditColumns.find(item => item.prop === prop) });
|
const auditColumn = prop => ({ ...auditColumns.find(item => item.prop === prop) });
|
||||||
@@ -162,7 +191,6 @@ export const config = {
|
|||||||
permission: 'transport_plan',
|
permission: 'transport_plan',
|
||||||
exportUrl: '/blade-transport/transport-plan/export-transport-plan',
|
exportUrl: '/blade-transport/transport-plan/export-transport-plan',
|
||||||
exportName: '运输计划',
|
exportName: '运输计划',
|
||||||
enableAllDept: false,
|
|
||||||
enableProjectSelect: true,
|
enableProjectSelect: true,
|
||||||
projectQueryParams: {
|
projectQueryParams: {
|
||||||
approvalStatuses: 'approved,change_approved',
|
approvalStatuses: 'approved,change_approved',
|
||||||
@@ -176,18 +204,18 @@ export const config = {
|
|||||||
enableTransportPlanCreateActions: true,
|
enableTransportPlanCreateActions: true,
|
||||||
enableTransportPlanImport: true,
|
enableTransportPlanImport: true,
|
||||||
fixedTransportAddressType: true,
|
fixedTransportAddressType: true,
|
||||||
transportPlanImportTitle: '导入发货计划',
|
transportPlanImportTitle: '导入运输计划',
|
||||||
transportPlanTemplateUrl: '/blade-transport/transport-plan/export-template',
|
transportPlanTemplateUrl: '/blade-transport/transport-plan/export-template',
|
||||||
attachmentTitle: '附件',
|
attachmentTitle: '附件',
|
||||||
searchRangeMap: {
|
searchRangeMap: {
|
||||||
planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
|
planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
|
||||||
planEndDateRange: ['planEndDateStart', 'planEndDateEnd'],
|
createTimeRange: ['createTimeStart', 'createTimeEnd', '00:00:00', '23:59:59'],
|
||||||
},
|
},
|
||||||
actions: ['copy', 'complete'],
|
actions: ['copy', 'complete'],
|
||||||
statusProp: 'businessStatus',
|
statusProp: 'businessStatus',
|
||||||
statusTextProp: 'businessStatusName',
|
statusTextProp: 'businessStatusName',
|
||||||
deleteStatus: ['draft', 'waiting_dispatch'],
|
deleteStatus: ['draft'],
|
||||||
editStatus: ['draft', 'waiting_dispatch'],
|
editStatus: ['draft', 'waiting_dispatch', 'dispatching'],
|
||||||
detailButton: true,
|
detailButton: true,
|
||||||
detailSections: [
|
detailSections: [
|
||||||
{
|
{
|
||||||
@@ -293,7 +321,6 @@ export const option = {
|
|||||||
prop: 'goodsInfo',
|
prop: 'goodsInfo',
|
||||||
formatter: row => formatGoodsInfo(row),
|
formatter: row => formatGoodsInfo(row),
|
||||||
minWidth: 320,
|
minWidth: 320,
|
||||||
className: 'business-crud-page__goods-info-cell',
|
|
||||||
overHidden: false,
|
overHidden: false,
|
||||||
showOverflowTooltip: false,
|
showOverflowTooltip: false,
|
||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
@@ -305,7 +332,6 @@ export const option = {
|
|||||||
prop: 'dispatchProgress',
|
prop: 'dispatchProgress',
|
||||||
formatter: row => formatDispatchProgress(row),
|
formatter: row => formatDispatchProgress(row),
|
||||||
minWidth: 120,
|
minWidth: 120,
|
||||||
className: 'business-crud-page__dispatch-progress-cell',
|
|
||||||
overHidden: false,
|
overHidden: false,
|
||||||
showOverflowTooltip: false,
|
showOverflowTooltip: false,
|
||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
@@ -315,6 +341,7 @@ export const option = {
|
|||||||
{
|
{
|
||||||
label: '发货地址',
|
label: '发货地址',
|
||||||
prop: 'departureAddress',
|
prop: 'departureAddress',
|
||||||
|
slot: true,
|
||||||
formslot: true,
|
formslot: true,
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 7,
|
searchOrder: 7,
|
||||||
@@ -326,6 +353,7 @@ export const option = {
|
|||||||
{
|
{
|
||||||
label: '到货地址',
|
label: '到货地址',
|
||||||
prop: 'arrivalAddress',
|
prop: 'arrivalAddress',
|
||||||
|
slot: true,
|
||||||
formslot: true,
|
formslot: true,
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 6,
|
searchOrder: 6,
|
||||||
@@ -344,7 +372,7 @@ export const option = {
|
|||||||
span: 6,
|
span: 6,
|
||||||
order: 400,
|
order: 400,
|
||||||
dicUrl: '/blade-transport/project-apply/list?current=1&size=9999',
|
dicUrl: '/blade-transport/project-apply/list?current=1&size=9999',
|
||||||
dicFormatter: listDicFormatter,
|
dicFormatter: projectNameDicFormatter,
|
||||||
props: {
|
props: {
|
||||||
label: 'projectName',
|
label: 'projectName',
|
||||||
value: 'projectName',
|
value: 'projectName',
|
||||||
@@ -371,6 +399,7 @@ export const option = {
|
|||||||
span: 6,
|
span: 6,
|
||||||
order: 350,
|
order: 350,
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
|
rules: [{ required: true, message: '请选择计划开始日期', trigger: 'change' }],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '计划结束日期',
|
label: '计划结束日期',
|
||||||
@@ -381,6 +410,7 @@ export const option = {
|
|||||||
span: 6,
|
span: 6,
|
||||||
order: 340,
|
order: 340,
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
|
rules: [{ required: true, message: '请选择计划结束日期', trigger: 'change' }],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '数据来源',
|
label: '数据来源',
|
||||||
@@ -388,7 +418,7 @@ export const option = {
|
|||||||
type: 'select',
|
type: 'select',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 1,
|
searchOrder: 1,
|
||||||
dicData: dataSourceOptions,
|
dicData: transportPlanDataSourceOptions,
|
||||||
minWidth: 120,
|
minWidth: 120,
|
||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
editDisplay: false,
|
editDisplay: false,
|
||||||
@@ -549,8 +579,8 @@ export const option = {
|
|||||||
viewDisplay: false,
|
viewDisplay: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '计划结束日期',
|
label: '创建时间',
|
||||||
prop: 'planEndDateRange',
|
prop: 'createTimeRange',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
format: 'YYYY-MM-DD',
|
format: 'YYYY-MM-DD',
|
||||||
valueFormat: 'YYYY-MM-DD',
|
valueFormat: 'YYYY-MM-DD',
|
||||||
@@ -580,7 +610,7 @@ export const option = {
|
|||||||
order: 270,
|
order: 270,
|
||||||
hide: true,
|
hide: true,
|
||||||
labelWidth: '0px',
|
labelWidth: '0px',
|
||||||
className: 'business-crud-page__full-form-item',
|
className: 'transport-plan-page__full-form-item',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '',
|
label: '',
|
||||||
@@ -601,7 +631,7 @@ export const option = {
|
|||||||
order: 260,
|
order: 260,
|
||||||
hide: true,
|
hide: true,
|
||||||
labelWidth: '0px',
|
labelWidth: '0px',
|
||||||
className: 'business-crud-page__full-form-item',
|
className: 'transport-plan-page__full-form-item',
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -19,6 +19,12 @@ const transportTypeDict = {
|
|||||||
|
|
||||||
const isEmpty = value => value === undefined || value === null || value === '';
|
const isEmpty = value => value === undefined || value === null || value === '';
|
||||||
const normalizeNumericDisplayValue = value => (Number(value) === -1 ? '' : 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 => {
|
const parseJsonArray = value => {
|
||||||
if (Array.isArray(value)) return value;
|
if (Array.isArray(value)) return value;
|
||||||
@@ -92,14 +98,32 @@ const getProcessConfigNodes = row => {
|
|||||||
|
|
||||||
const isAcceptProcessNode = node => node.key === 'accept' || node.name === '接单';
|
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 =>
|
const requiresDriverAcceptConfirmation = row =>
|
||||||
getProcessConfigNodes(row).some(
|
getProcessConfigNodes(row).some(node => {
|
||||||
node =>
|
if (!isAcceptProcessNode(node) || node.enabled === false) return false;
|
||||||
isAcceptProcessNode(node) &&
|
if (node.confirmMode === 'no_confirm_accept') return false;
|
||||||
node.enabled !== false &&
|
// 与后端一致:是否确认=是 即需接单(不强制依赖 confirmDriver)
|
||||||
node.confirmMode === 'yes' &&
|
return node.confirmMode === 'yes' || !node.confirmMode;
|
||||||
node.confirmDriver === true
|
});
|
||||||
);
|
|
||||||
|
const getDriverRejectReason = row => {
|
||||||
|
if (!row) return '';
|
||||||
|
const reason =
|
||||||
|
row.driverRejectReason ||
|
||||||
|
row.driverRefuseReason ||
|
||||||
|
row.acceptRejectReason ||
|
||||||
|
row.rejectReason ||
|
||||||
|
'';
|
||||||
|
return String(reason || '').trim();
|
||||||
|
};
|
||||||
|
|
||||||
const isDriverRejectedStatus = value => {
|
const isDriverRejectedStatus = value => {
|
||||||
if (value === null || value === undefined || typeof value === 'boolean') return false;
|
if (value === null || value === undefined || typeof value === 'boolean') return false;
|
||||||
@@ -122,6 +146,7 @@ const isDriverRejectedStatus = value => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const hasDriverRejectRecord = row => {
|
const hasDriverRejectRecord = row => {
|
||||||
|
if (String(row.driverAcceptStatus || '').toLowerCase() === 'rejected') return true;
|
||||||
const rejectRecordValues = [
|
const rejectRecordValues = [
|
||||||
row.driverRejectTime,
|
row.driverRejectTime,
|
||||||
row.driverRejectedTime,
|
row.driverRejectedTime,
|
||||||
@@ -161,9 +186,16 @@ const hasDriverRejectRecord = row => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const isDriverRejectedWaybill = row =>
|
const isDriverRejectedWaybill = row =>
|
||||||
requiresDriverAcceptConfirmation(row) && hasDriverRejectRecord(row);
|
(row.requireAccept === true ||
|
||||||
|
row.requireAccept === 1 ||
|
||||||
|
requiresDriverAcceptConfirmation(row)) &&
|
||||||
|
hasDriverRejectRecord(row);
|
||||||
|
|
||||||
const hasDriverAcceptRecord = row => {
|
const hasDriverAcceptRecord = row => {
|
||||||
|
if (String(row.driverAcceptStatus || '').toLowerCase() === 'accepted') return true;
|
||||||
|
if (['rejected', 'pending'].includes(String(row.driverAcceptStatus || '').toLowerCase())) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
const recordValues = [
|
const recordValues = [
|
||||||
row.driverAcceptTime,
|
row.driverAcceptTime,
|
||||||
row.driverAcceptedTime,
|
row.driverAcceptedTime,
|
||||||
@@ -172,6 +204,7 @@ const hasDriverAcceptRecord = row => {
|
|||||||
row.driverAcceptedBy,
|
row.driverAcceptedBy,
|
||||||
row.acceptUserId,
|
row.acceptUserId,
|
||||||
row.acceptUserName,
|
row.acceptUserName,
|
||||||
|
row.driverAcceptDriverId,
|
||||||
];
|
];
|
||||||
if (recordValues.some(value => value !== null && value !== undefined && value !== '')) {
|
if (recordValues.some(value => value !== null && value !== undefined && value !== '')) {
|
||||||
return true;
|
return true;
|
||||||
@@ -207,6 +240,26 @@ const getFirstValue = (row, props) => {
|
|||||||
|
|
||||||
const getGoodsRows = row => parseJsonArray(row.goodsList || row.goodsRows || row.goodsJson);
|
const getGoodsRows = row => parseJsonArray(row.goodsList || row.goodsRows || row.goodsJson);
|
||||||
|
|
||||||
|
const getDetailedGoodsRows = row => {
|
||||||
|
const goodsRows = [
|
||||||
|
row.goodsJson,
|
||||||
|
row.goodsList,
|
||||||
|
row.goodsRows,
|
||||||
|
row.cargoList,
|
||||||
|
row.cargoRows,
|
||||||
|
row.goods,
|
||||||
|
]
|
||||||
|
.map(source => {
|
||||||
|
if (source === undefined || source === null || source === '') return [];
|
||||||
|
if (Array.isArray(source)) return source;
|
||||||
|
if (typeof source === 'object') return [source];
|
||||||
|
return parseJsonArray(source);
|
||||||
|
})
|
||||||
|
.filter(source => source.length)
|
||||||
|
.sort((left, right) => right.length - left.length);
|
||||||
|
return goodsRows[0] || [];
|
||||||
|
};
|
||||||
|
|
||||||
const getBillingRows = row => {
|
const getBillingRows = row => {
|
||||||
const freightRows = parseJsonArray(row.freightList || row.freightRows || row.freightJson);
|
const freightRows = parseJsonArray(row.freightList || row.freightRows || row.freightJson);
|
||||||
if (freightRows.length) return freightRows;
|
if (freightRows.length) return freightRows;
|
||||||
@@ -218,9 +271,25 @@ const getBillingRows = row => {
|
|||||||
const joinText = list => list.filter(item => !isEmpty(item)).join('/');
|
const joinText = list => list.filter(item => !isEmpty(item)).join('/');
|
||||||
|
|
||||||
const formatGoodsInfo = row => {
|
const formatGoodsInfo = row => {
|
||||||
|
const goodsRows = [
|
||||||
|
row.goodsJson,
|
||||||
|
row.goodsList,
|
||||||
|
row.goodsRows,
|
||||||
|
row.cargoList,
|
||||||
|
row.cargoRows,
|
||||||
|
row.goods,
|
||||||
|
]
|
||||||
|
.map(source => {
|
||||||
|
if (source === undefined || source === null || source === '') return [];
|
||||||
|
if (Array.isArray(source)) return source;
|
||||||
|
if (typeof source === 'object') return [source];
|
||||||
|
return parseJsonArray(source);
|
||||||
|
})
|
||||||
|
.filter(source => source.length)
|
||||||
|
.sort((left, right) => right.length - left.length)[0] || [];
|
||||||
const text = getFirstValue(row, ['goodsInfo', 'cargoInfo']);
|
const text = getFirstValue(row, ['goodsInfo', 'cargoInfo']);
|
||||||
if (text) return text;
|
if (!goodsRows.length) return text || '';
|
||||||
return getGoodsRows(row)
|
return goodsRows
|
||||||
.map(item => {
|
.map(item => {
|
||||||
const name = getFirstValue(item, ['cargoName', 'goodsName', 'name']);
|
const name = getFirstValue(item, ['cargoName', 'goodsName', 'name']);
|
||||||
const type = getFirstValue(item, ['cargoType', 'goodsType', 'typeName']);
|
const type = getFirstValue(item, ['cargoType', 'goodsType', 'typeName']);
|
||||||
@@ -228,12 +297,13 @@ const formatGoodsInfo = row => {
|
|||||||
normalizeNumericDisplayValue(
|
normalizeNumericDisplayValue(
|
||||||
getFirstValue(item, ['quantity', 'cargoQuantity', 'goodsQuantity'])
|
getFirstValue(item, ['quantity', 'cargoQuantity', 'goodsQuantity'])
|
||||||
),
|
),
|
||||||
getFirstValue(item, ['quantityUnit', 'cargoUnit', 'unit']),
|
getFirstValue(item, ['quantityUnit', 'goodsQuantityUnit', 'cargoUnit', 'unit']) ||
|
||||||
|
getFirstValue(row, ['quantityUnit', 'goodsQuantityUnit', 'cargoUnit', 'unit']),
|
||||||
]);
|
]);
|
||||||
return joinText([name, type, quantity]);
|
return joinText([name, type, quantity]);
|
||||||
})
|
})
|
||||||
.filter(Boolean)
|
.filter(Boolean)
|
||||||
.join('; ');
|
.join('; ') || text || '';
|
||||||
};
|
};
|
||||||
|
|
||||||
const formatGoodsField = (row, props) => {
|
const formatGoodsField = (row, props) => {
|
||||||
@@ -246,6 +316,28 @@ const formatGoodsField = (row, props) => {
|
|||||||
const formatUnitPrice = row => {
|
const formatUnitPrice = row => {
|
||||||
const value = normalizeNumericDisplayValue(getFirstValue(row, ['unitPrice', 'price']));
|
const value = normalizeNumericDisplayValue(getFirstValue(row, ['unitPrice', 'price']));
|
||||||
const unit = getFirstValue(row, ['priceUnit', 'billingUnit', 'unit']);
|
const unit = getFirstValue(row, ['priceUnit', 'billingUnit', 'unit']);
|
||||||
|
|
||||||
|
const goodsRows = getDetailedGoodsRows(row);
|
||||||
|
if (goodsRows.length > 1) {
|
||||||
|
const billingRows = getBillingRows(row);
|
||||||
|
const goodsPrices = goodsRows
|
||||||
|
.map((item, index) => {
|
||||||
|
const itemPrice = normalizeNumericDisplayValue(
|
||||||
|
getFirstValue(item, ['unitPrice', 'price'])
|
||||||
|
);
|
||||||
|
if (!isEmpty(itemPrice)) return itemPrice;
|
||||||
|
return normalizeNumericDisplayValue(
|
||||||
|
getFirstValue(billingRows[index] || {}, ['unitPrice', 'price'])
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.filter(itemPrice => !isEmpty(itemPrice));
|
||||||
|
const priceKeys = goodsPrices.map(itemPrice => {
|
||||||
|
const numericPrice = Number(itemPrice);
|
||||||
|
return Number.isFinite(numericPrice) ? String(numericPrice) : String(itemPrice).trim();
|
||||||
|
});
|
||||||
|
if (new Set(priceKeys).size > 1) return '-';
|
||||||
|
}
|
||||||
|
|
||||||
if (!isEmpty(value)) return unit ? `${value}(${unit})` : value;
|
if (!isEmpty(value)) return unit ? `${value}(${unit})` : value;
|
||||||
const billing = getBillingRows(row).find(
|
const billing = getBillingRows(row).find(
|
||||||
item => !isEmpty(normalizeNumericDisplayValue(item.unitPrice))
|
item => !isEmpty(normalizeNumericDisplayValue(item.unitPrice))
|
||||||
@@ -256,10 +348,10 @@ const formatUnitPrice = row => {
|
|||||||
return billingUnit ? `${billingPrice}(${billingUnit})` : billingPrice;
|
return billingUnit ? `${billingPrice}(${billingUnit})` : billingPrice;
|
||||||
};
|
};
|
||||||
|
|
||||||
const formatAmount = (row, props) => getFirstValue(row, props);
|
const formatAmount = (row, props) => formatMoneyDisplay(getFirstValue(row, props));
|
||||||
|
|
||||||
const sumAmount = list =>
|
const sumAmount = (rows = []) =>
|
||||||
list.reduce((sum, item) => {
|
rows.reduce((sum, item) => {
|
||||||
const value = getFirstValue(item, ['freightAmount', 'amount', 'totalAmount']);
|
const value = getFirstValue(item, ['freightAmount', 'amount', 'totalAmount']);
|
||||||
return isEmpty(value) ? sum : sum + Number(value || 0);
|
return isEmpty(value) ? sum : sum + Number(value || 0);
|
||||||
}, 0);
|
}, 0);
|
||||||
@@ -278,7 +370,7 @@ const calculateFreightTotal = rows => {
|
|||||||
return sum + Number(item.unitPrice || 0) * Number(item.quantity || 0);
|
return sum + Number(item.unitPrice || 0) * Number(item.quantity || 0);
|
||||||
}, 0);
|
}, 0);
|
||||||
if (!hasAmountField) return '';
|
if (!hasAmountField) return '';
|
||||||
return Number.isFinite(total) ? Number(total.toFixed(2)).toString() : '';
|
return Number.isFinite(total) ? total.toFixed(2) : '';
|
||||||
};
|
};
|
||||||
|
|
||||||
const formatFreight = row => {
|
const formatFreight = row => {
|
||||||
@@ -286,9 +378,9 @@ const formatFreight = row => {
|
|||||||
if (!isEmpty(value)) return value;
|
if (!isEmpty(value)) return value;
|
||||||
const freight = parseJsonObject(row.freightJson);
|
const freight = parseJsonObject(row.freightJson);
|
||||||
const freightValue = getFirstValue(freight, ['freightAmount', 'transportFee']);
|
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 : []);
|
const total = sumAmount(Array.isArray(freight.freightItems) ? freight.freightItems : []);
|
||||||
return total ? total : '';
|
return total ? formatMoneyDisplay(total) : '';
|
||||||
};
|
};
|
||||||
|
|
||||||
const formatOtherFeeTotal = row => {
|
const formatOtherFeeTotal = row => {
|
||||||
@@ -305,10 +397,10 @@ const formatFreightTotal = row => {
|
|||||||
const otherFeeTotal = !isEmpty(otherFee) ? otherFee : formatOtherFeeTotal(row);
|
const otherFeeTotal = !isEmpty(otherFee) ? otherFee : formatOtherFeeTotal(row);
|
||||||
if (!isEmpty(calculated)) {
|
if (!isEmpty(calculated)) {
|
||||||
const total = Number(calculated || 0) + Number(otherFeeTotal || 0);
|
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']);
|
const value = getFirstValue(freight, ['totalFreightAmount', 'totalFreight', 'totalAmount']);
|
||||||
if (!isEmpty(value)) return value;
|
if (!isEmpty(value)) return formatMoneyDisplay(value);
|
||||||
return formatAmount(row, ['freightTotal', 'totalFreight', 'totalAmount']);
|
return formatAmount(row, ['freightTotal', 'totalFreight', 'totalAmount']);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -318,6 +410,8 @@ export const config = {
|
|||||||
title: '运单管理',
|
title: '运单管理',
|
||||||
permission: 'waybill_manage',
|
permission: 'waybill_manage',
|
||||||
importUrl: '/blade-transport/waybill-manage/import-waybill-manage',
|
importUrl: '/blade-transport/waybill-manage/import-waybill-manage',
|
||||||
|
exportUrl: '/blade-transport/waybill-manage/export-waybill-manage',
|
||||||
|
exportName: '运单管理',
|
||||||
defaultForm: {
|
defaultForm: {
|
||||||
carrierType: '承运商',
|
carrierType: '承运商',
|
||||||
transportType: 'road',
|
transportType: 'road',
|
||||||
@@ -364,29 +458,37 @@ export const config = {
|
|||||||
statusProp: 'businessStatus',
|
statusProp: 'businessStatus',
|
||||||
statusTextProp: 'businessStatusName',
|
statusTextProp: 'businessStatusName',
|
||||||
formatStatus(row, prop, defaultText) {
|
formatStatus(row, prop, defaultText) {
|
||||||
if (
|
if (prop !== 'businessStatus') return defaultText;
|
||||||
prop === 'businessStatus' &&
|
const status = String(row.businessStatus || '');
|
||||||
requiresDriverAcceptConfirmation(row) &&
|
const terminalStatuses = ['draft', 'completed', 'cancelled', 'waiting_dispatch', 'dispatching'];
|
||||||
isInProgressStatus(row, defaultText) &&
|
const needAccept =
|
||||||
!hasDriverAcceptRecord(row)
|
row.requireAccept === true ||
|
||||||
) {
|
row.requireAccept === 1 ||
|
||||||
|
requiresDriverAcceptConfirmation(row);
|
||||||
|
// 需司机接单且尚未接单 → 待执行(含库中仍为 running 的历史数据展示校正)
|
||||||
|
if (needAccept && !hasDriverAcceptRecord(row) && !terminalStatuses.includes(status)) {
|
||||||
return '待执行';
|
return '待执行';
|
||||||
}
|
}
|
||||||
if (
|
if (status === 'pending') return '待执行';
|
||||||
prop === 'businessStatus' &&
|
if (status === 'running' || status === 'processing') return '进行中';
|
||||||
row.businessStatus === 'pending' &&
|
|
||||||
!requiresDriverAcceptConfirmation(row)
|
|
||||||
) {
|
|
||||||
return '进行中';
|
|
||||||
}
|
|
||||||
return defaultText;
|
return defaultText;
|
||||||
},
|
},
|
||||||
canReassign(row) {
|
canReassign(row) {
|
||||||
return isDriverRejectedWaybill(row);
|
return isDriverRejectedWaybill(row);
|
||||||
},
|
},
|
||||||
|
getDriverRejectReason,
|
||||||
|
isDriverRejectedWaybill,
|
||||||
canEdit(row) {
|
canEdit(row) {
|
||||||
|
// 进行中的运单不允许编辑
|
||||||
|
if (isInProgressStatus(row, row.businessStatusName)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
return !isDriverRejectedWaybill(row);
|
return !isDriverRejectedWaybill(row);
|
||||||
},
|
},
|
||||||
|
canCancel(row) {
|
||||||
|
// 进行中的运单不允许取消
|
||||||
|
return !isInProgressStatus(row, row.businessStatusName);
|
||||||
|
},
|
||||||
deleteStatus: ['draft'],
|
deleteStatus: ['draft'],
|
||||||
editStatus: ['draft', 'pending'],
|
editStatus: ['draft', 'pending'],
|
||||||
};
|
};
|
||||||
@@ -578,7 +680,7 @@ export const option = {
|
|||||||
viewDisplay: false,
|
viewDisplay: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '单价(计价单位)',
|
label: '单价',
|
||||||
prop: 'unitPrice',
|
prop: 'unitPrice',
|
||||||
formatter: row => formatUnitPrice(row),
|
formatter: row => formatUnitPrice(row),
|
||||||
minWidth: 140,
|
minWidth: 140,
|
||||||
@@ -808,7 +910,7 @@ export const option = {
|
|||||||
order: 760,
|
order: 760,
|
||||||
hide: true,
|
hide: true,
|
||||||
labelWidth: '0px',
|
labelWidth: '0px',
|
||||||
className: 'business-crud-page__full-form-item',
|
className: 'waybill-manage-page__full-form-item',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '实际发货时间',
|
label: '实际发货时间',
|
||||||
@@ -920,7 +1022,7 @@ export const option = {
|
|||||||
order: 740,
|
order: 740,
|
||||||
hide: true,
|
hide: true,
|
||||||
labelWidth: '0px',
|
labelWidth: '0px',
|
||||||
className: 'business-crud-page__full-form-item',
|
className: 'waybill-manage-page__full-form-item',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '所属组织',
|
label: '所属组织',
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
export const billLedgerTableColumns = [
|
export const billLedgerTableColumns = [
|
||||||
{ prop: 'billNo', label: '票据编号', minWidth: 170 },
|
{ prop: 'billNo', label: '票据编号', minWidth: 170, link: true },
|
||||||
{ prop: 'receiverName', label: '收票单位', minWidth: 170 },
|
{ prop: 'receiverName', label: '收票单位', minWidth: 170 },
|
||||||
{ prop: 'issuerName', label: '出票单位', minWidth: 170 },
|
{ prop: 'issuerName', label: '出票单位', minWidth: 170 },
|
||||||
{ prop: 'billTypeName', label: '汇票类型', minWidth: 110 },
|
{ prop: 'billTypeName', label: '汇票类型', minWidth: 110 },
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
export const invoiceApplicationTableColumns = [
|
export const invoiceApplicationTableColumns = [
|
||||||
{ prop: 'applicationNo', label: '单据号', minWidth: 170, link: true },
|
{ prop: 'applicationNo', label: '单据号', minWidth: 170, link: true },
|
||||||
{ prop: 'settlementNos', label: '结算单号', minWidth: 190, link: true },
|
{ prop: 'settlementNos', label: '结算单号', minWidth: 190 },
|
||||||
{ prop: 'projectName', label: '所属项目', minWidth: 140 },
|
{ prop: 'projectName', label: '所属项目', minWidth: 140 },
|
||||||
{ prop: 'deptName', label: '所属组织', minWidth: 140 },
|
{ prop: 'deptName', label: '所属组织', minWidth: 140 },
|
||||||
{ prop: 'issuerName', label: '开票方', minWidth: 150 },
|
{ prop: 'issuerName', label: '开票方', minWidth: 150 },
|
||||||
@@ -21,8 +21,8 @@ export const invoiceApplicationDetailColumns = [
|
|||||||
{ prop: 'vehicleNo', label: '车号', minWidth: 120 },
|
{ prop: 'vehicleNo', label: '车号', minWidth: 120 },
|
||||||
{ prop: 'departureAddress', label: '发货地址', minWidth: 180 },
|
{ prop: 'departureAddress', label: '发货地址', minWidth: 180 },
|
||||||
{ prop: 'arrivalAddress', label: '到货地址', minWidth: 180 },
|
{ prop: 'arrivalAddress', label: '到货地址', minWidth: 180 },
|
||||||
{ prop: 'actualDepartureTime', label: '实际发货时间', minWidth: 170 },
|
{ prop: 'actualDepartureTime', label: '实际发货时间', minWidth: 170, dateTime: true },
|
||||||
{ prop: 'actualCompletionTime', label: '实际完成时间', minWidth: 170 },
|
{ prop: 'actualCompletionTime', label: '实际完成时间', minWidth: 170, dateTime: true },
|
||||||
{ prop: 'transportType', label: '运输类型', minWidth: 120 },
|
{ prop: 'transportType', label: '运输类型', minWidth: 120 },
|
||||||
{ prop: 'cargoName', label: '货物名称', minWidth: 140 },
|
{ prop: 'cargoName', label: '货物名称', minWidth: 140 },
|
||||||
{ prop: 'cargoType', label: '货物类型', minWidth: 130 },
|
{ prop: 'cargoType', label: '货物类型', minWidth: 130 },
|
||||||
@@ -30,5 +30,4 @@ export const invoiceApplicationDetailColumns = [
|
|||||||
{ prop: 'mileage', label: '里程(KM)', minWidth: 120 },
|
{ prop: 'mileage', label: '里程(KM)', minWidth: 120 },
|
||||||
{ prop: 'batchNo', label: '批次号', minWidth: 120 },
|
{ prop: 'batchNo', label: '批次号', minWidth: 120 },
|
||||||
{ prop: 'freightAmount', label: '运费', minWidth: 120, money: true },
|
{ prop: 'freightAmount', label: '运费', minWidth: 120, money: true },
|
||||||
{ prop: 'feeItemsJson', label: '费用项目', minWidth: 180 },
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
export const receiptFlowTableColumns = [
|
export const receiptFlowTableColumns = [
|
||||||
{ prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150 },
|
{ prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true },
|
||||||
{ prop: 'payerName', label: '付款人', minWidth: 130 },
|
{ prop: 'payerName', label: '付款人', minWidth: 130 },
|
||||||
{ prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
|
{ prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
|
||||||
{ prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
|
{ prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ export const formalSettlementFormFields = [
|
|||||||
{ label: '汇率日期', prop: 'exchangeRateDate', type: 'date', required: true },
|
{ label: '汇率日期', prop: 'exchangeRateDate', type: 'date', required: true },
|
||||||
{ label: '结算汇率', prop: 'exchangeRate', type: 'number', required: true },
|
{ label: '结算汇率', prop: 'exchangeRate', type: 'number', required: true },
|
||||||
{ label: '本位币合计', prop: 'localSettlementAmount', readonly: true, money: true },
|
{ label: '本位币合计', prop: 'localSettlementAmount', readonly: true, money: true },
|
||||||
{ label: '申请付款金额(含预付)', prop: 'appliedPaymentAmount', readonly: true, money: true },
|
{ label: '创建人', prop: 'createUserName', readonly: true },
|
||||||
{ label: '已收/已付合计', prop: 'paidAmount', readonly: true, money: true },
|
{ label: '创建时间', prop: 'createTime', readonly: true },
|
||||||
];
|
];
|
||||||
|
|
||||||
export const createFormalSettlementForm = () => ({
|
export const createFormalSettlementForm = () => ({
|
||||||
@@ -27,6 +27,8 @@ export const createFormalSettlementForm = () => ({
|
|||||||
sourceDetailIds: [],
|
sourceDetailIds: [],
|
||||||
exchangeRateDate: '',
|
exchangeRateDate: '',
|
||||||
exchangeRate: 1,
|
exchangeRate: 1,
|
||||||
|
createUserName: '',
|
||||||
|
createTime: '',
|
||||||
attachmentsJson: '[]',
|
attachmentsJson: '[]',
|
||||||
remark: '',
|
remark: '',
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -7,11 +7,21 @@ export const approvalStatusOptions = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
export const invoiceStatusOptions = [
|
export const invoiceStatusOptions = [
|
||||||
{ label: '未收/开票', value: 'unreceived' },
|
{ label: '未开/收票', value: 'unreceived' },
|
||||||
{ label: '部分收/开票', value: 'partial' },
|
{ label: '部分开/收票', value: 'partial' },
|
||||||
{ label: '已收/开票', value: 'completed' },
|
{ label: '已开/收票', value: 'completed' },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
export const invoiceStatusName = (value, settlementType) => {
|
||||||
|
const payable = settlementType === 'payable';
|
||||||
|
const labels = {
|
||||||
|
unreceived: payable ? '未收票' : '未开票',
|
||||||
|
partial: payable ? '部分收票' : '部分开票',
|
||||||
|
completed: payable ? '已收票' : '已开票',
|
||||||
|
};
|
||||||
|
return labels[value] || value || '-';
|
||||||
|
};
|
||||||
|
|
||||||
export const paymentStatusOptions = [
|
export const paymentStatusOptions = [
|
||||||
{ label: '未收/付款', value: 'unpaid' },
|
{ label: '未收/付款', value: 'unpaid' },
|
||||||
{ label: '部分收/付款', value: 'partial' },
|
{ label: '部分收/付款', value: 'partial' },
|
||||||
@@ -28,7 +38,7 @@ export const formalSettlementSearchFields = [
|
|||||||
{ label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
|
{ label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
|
||||||
{ label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
|
{ label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
|
||||||
{ label: '项目', prop: 'projectName', type: 'input' },
|
{ label: '项目', prop: 'projectName', type: 'input' },
|
||||||
{ label: '所属组织', prop: 'deptName', type: 'input' },
|
{ label: '所属组织', prop: 'deptName', type: 'cascader' },
|
||||||
{ label: '合同编号', prop: 'contractNo', type: 'input' },
|
{ label: '合同编号', prop: 'contractNo', type: 'input' },
|
||||||
{ label: '付款方', prop: 'payerName', type: 'input' },
|
{ label: '付款方', prop: 'payerName', type: 'input' },
|
||||||
{ label: '收款方', prop: 'payeeName', type: 'input' },
|
{ label: '收款方', prop: 'payeeName', type: 'input' },
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
export const formalSettlementTableColumns = [
|
export const formalSettlementTableColumns = [
|
||||||
{ label: '结算单号', prop: 'formalSettlementNo', minWidth: 160, link: true, fixed: 'left' },
|
{ label: '结算单号', prop: 'formalSettlementNo', minWidth: 160, link: true, fixed: 'left' },
|
||||||
{ label: '预结算单号', prop: 'preSettlementNos', minWidth: 190 },
|
|
||||||
{ label: '来源', prop: 'sourceType', minWidth: 110 },
|
{ label: '来源', prop: 'sourceType', minWidth: 110 },
|
||||||
{ label: '付款方', prop: 'payerName', minWidth: 150 },
|
{ label: '付款方', prop: 'payerName', minWidth: 150 },
|
||||||
{ label: '收款方', prop: 'payeeName', minWidth: 150 },
|
{ label: '收款方', prop: 'payeeName', minWidth: 150 },
|
||||||
@@ -12,13 +11,16 @@ export const formalSettlementTableColumns = [
|
|||||||
{ label: '本位币结算金额', prop: 'localSettlementAmount', minWidth: 155, money: true },
|
{ label: '本位币结算金额', prop: 'localSettlementAmount', minWidth: 155, money: true },
|
||||||
{ label: '结算汇率', prop: 'exchangeRate', minWidth: 110 },
|
{ label: '结算汇率', prop: 'exchangeRate', minWidth: 110 },
|
||||||
{ label: '申请付款金额(含预付)', prop: 'appliedPaymentAmount', minWidth: 185, money: true },
|
{ label: '申请付款金额(含预付)', prop: 'appliedPaymentAmount', minWidth: 185, money: true },
|
||||||
{ label: '已收/已付合计', prop: 'paidAmount', minWidth: 145, money: true },
|
{ label: '已收/已付合计(含预付)', prop: 'paidAmount', minWidth: 200, money: true },
|
||||||
|
{ label: '剩余可付金额', prop: 'remainingPayableAmount', minWidth: 145, money: true },
|
||||||
|
{ label: '发票金额', prop: 'invoiceAmount', minWidth: 130, money: true },
|
||||||
{ label: '发票状态', prop: 'invoiceStatusName', minWidth: 120 },
|
{ label: '发票状态', prop: 'invoiceStatusName', minWidth: 120 },
|
||||||
{ label: '收付款状态', prop: 'paymentStatusName', minWidth: 120 },
|
{ label: '收付款状态', prop: 'paymentStatusName', minWidth: 120 },
|
||||||
{ label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
|
{ label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
|
||||||
{ label: '当前节点', prop: 'currentNode', minWidth: 130 },
|
{ label: '当前节点', prop: 'currentNode', minWidth: 130 },
|
||||||
{ label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
|
{ label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
|
||||||
{ label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
|
{ label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
|
||||||
|
{ label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
|
||||||
{ label: '创建人', prop: 'createUserName', minWidth: 110 },
|
{ label: '创建人', prop: 'createUserName', minWidth: 110 },
|
||||||
{ label: '创建时间', prop: 'createTime', minWidth: 170 },
|
{ label: '创建时间', prop: 'createTime', minWidth: 170 },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ export const preSettlementSearchFields = [
|
|||||||
{ label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
|
{ label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
|
||||||
{ label: '预付单号', prop: 'advanceNo', type: 'input' },
|
{ label: '预付单号', prop: 'advanceNo', type: 'input' },
|
||||||
{ label: '项目名称', prop: 'projectName', type: 'input' },
|
{ label: '项目名称', prop: 'projectName', type: 'input' },
|
||||||
{ label: '所属组织', prop: 'deptName', type: 'input' },
|
{ label: '所属组织', prop: 'deptName', type: 'cascader' },
|
||||||
{ label: '合同名称', prop: 'contractName', type: 'input' },
|
{ label: '合同名称', prop: 'contractName', type: 'input' },
|
||||||
{ label: '合同编号', prop: 'contractNo', type: 'input' },
|
{ label: '合同编号', prop: 'contractNo', type: 'input' },
|
||||||
{ label: '收款方', prop: 'payeeName', type: 'input' },
|
{ label: '收款方', prop: 'payeeName', type: 'input' },
|
||||||
|
|||||||
@@ -10,8 +10,18 @@ export const preSettlementTableColumns = [
|
|||||||
{ label: '原币结算金额', prop: 'settlementAmount', minWidth: 140, money: true, precision: 2 },
|
{ label: '原币结算金额', prop: 'settlementAmount', minWidth: 140, money: true, precision: 2 },
|
||||||
{ label: '本位币结算金额', prop: 'localSettlementAmount', minWidth: 150, money: true, precision: 2 },
|
{ label: '本位币结算金额', prop: 'localSettlementAmount', minWidth: 150, money: true, precision: 2 },
|
||||||
{ label: '结算汇率', prop: 'exchangeRate', minWidth: 110, precision: 2 },
|
{ label: '结算汇率', prop: 'exchangeRate', minWidth: 110, precision: 2 },
|
||||||
{ label: '申请预付金额', prop: 'advanceAppliedAmount', minWidth: 140, money: true },
|
{
|
||||||
{ label: '已付款金额', prop: 'advancePaidAmount', minWidth: 130, money: true },
|
label: '申请预付金额',
|
||||||
|
prop: 'advanceAppliedAmount',
|
||||||
|
minWidth: 190,
|
||||||
|
money: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '已付款金额',
|
||||||
|
prop: 'advancePaidAmount',
|
||||||
|
minWidth: 200,
|
||||||
|
money: true,
|
||||||
|
},
|
||||||
{ label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
|
{ label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
|
||||||
{ label: '当前节点', prop: 'currentNode', minWidth: 130 },
|
{ label: '当前节点', prop: 'currentNode', minWidth: 130 },
|
||||||
{ label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
|
{ label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ export const searchFields = [
|
|||||||
{ label: '单据号', prop: 'documentNo', type: 'input' },
|
{ label: '单据号', prop: 'documentNo', type: 'input' },
|
||||||
{ label: '生成日期', prop: 'generateDateRange', type: 'daterange' },
|
{ label: '生成日期', prop: 'generateDateRange', type: 'daterange' },
|
||||||
{ label: '客户名称', prop: 'customerName', type: 'input' },
|
{ label: '客户名称', prop: 'customerName', type: 'input' },
|
||||||
{ label: '所属组织', prop: 'deptName', type: 'input' },
|
{ label: '所属组织', prop: 'deptName', type: 'cascader' },
|
||||||
{ label: '项目名称', prop: 'projectName', type: 'input' },
|
{ label: '项目名称', prop: 'projectName', type: 'input' },
|
||||||
{ label: '货物类型', prop: 'cargoType', type: 'input' },
|
{ label: '货物类型', prop: 'cargoType', type: 'input' },
|
||||||
{ label: '货物名称', prop: 'cargoName', type: 'input' },
|
{ label: '货物名称', prop: 'cargoName', type: 'input' },
|
||||||
@@ -57,20 +57,17 @@ export const feeDetailBaseColumns = [
|
|||||||
{ label: '货物类型', prop: 'cargoType', minWidth: 130 },
|
{ label: '货物类型', prop: 'cargoType', minWidth: 130 },
|
||||||
{ label: '规格', prop: 'specification', minWidth: 120 },
|
{ label: '规格', prop: 'specification', minWidth: 120 },
|
||||||
{ label: '型号', prop: 'model', minWidth: 120 },
|
{ label: '型号', prop: 'model', minWidth: 120 },
|
||||||
{ label: '运费计费要素', prop: 'billingFactor', minWidth: 130 },
|
{ label: '计费要素', prop: 'billingFactor', minWidth: 130 },
|
||||||
{ label: '运费计费类型', prop: 'billingType', minWidth: 130 },
|
{ label: '计费类型', prop: 'billingType', minWidth: 130 },
|
||||||
{ label: '运输量', prop: 'transportQuantityText', minWidth: 120 },
|
{ label: '运输量', prop: 'transportQuantityText', minWidth: 120 },
|
||||||
{ label: '运费计算单位', prop: 'priceUnit', minWidth: 130 },
|
{ label: '运费计算单位', prop: 'priceUnit', minWidth: 130 },
|
||||||
{ label: '运输单价', prop: 'unitPrice', minWidth: 120 },
|
{ label: '运输单价', prop: 'unitPrice', minWidth: 120 },
|
||||||
{ label: '里程(KM)', prop: 'mileage', minWidth: 120 },
|
{ label: '里程(KM)', prop: 'mileage', minWidth: 120 },
|
||||||
{ label: '运输费', prop: 'freightAmount', minWidth: 180 }
|
{ label: '运输费', prop: 'freightAmount', minWidth: 180 },
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
export const feeDetailTailColumns = [
|
export const feeDetailTailColumns = [
|
||||||
{ label: '原总金额', prop: 'originalAmountText', minWidth: 120 },
|
{ label: '结算金额', prop: 'originalAmountText', minWidth: 120 },
|
||||||
{ label: '调整金额', prop: 'adjustAmountText', minWidth: 120 },
|
|
||||||
{ label: '调整后总金额', prop: 'afterAmountText', minWidth: 140 },
|
|
||||||
{ label: '备注', prop: 'remark', minWidth: 160 },
|
{ label: '备注', prop: 'remark', minWidth: 160 },
|
||||||
{ label: '最后录入人', prop: 'updateUserName', minWidth: 120 },
|
{ label: '最后录入人', prop: 'updateUserName', minWidth: 120 },
|
||||||
{ label: '最后录入时间', prop: 'updateTime', minWidth: 170 },
|
{ label: '最后录入时间', prop: 'updateTime', minWidth: 170 },
|
||||||
@@ -139,4 +136,11 @@ export const generatePreviewColumns = [
|
|||||||
{ label: '货物名称', prop: 'cargoName', minWidth: 140 },
|
{ label: '货物名称', prop: 'cargoName', minWidth: 140 },
|
||||||
{ label: '货物类型', prop: 'cargoType', minWidth: 140 },
|
{ label: '货物类型', prop: 'cargoType', minWidth: 140 },
|
||||||
{ label: '规格', prop: 'specification', minWidth: 140 },
|
{ label: '规格', prop: 'specification', minWidth: 140 },
|
||||||
|
{ label: '型号', prop: 'model', minWidth: 120 },
|
||||||
|
{ label: '计费要素', prop: 'billingFactor', minWidth: 130 },
|
||||||
|
{ label: '计费类型', prop: 'billingType', minWidth: 130 },
|
||||||
|
{ label: '运输量', prop: 'transportQuantityText', minWidth: 120 },
|
||||||
|
{ label: '运费计算单位', prop: 'priceUnit', minWidth: 130 },
|
||||||
|
{ label: '运输单价', prop: 'unitPrice', minWidth: 120 },
|
||||||
|
{ label: '里程(KM)', prop: 'mileage', minWidth: 120 },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
export const settlementAdjustmentFormFields = [
|
export const settlementAdjustmentFormFields = [
|
||||||
{ label: '单据号', prop: 'adjustmentNo' },
|
{ label: '单据号', prop: 'adjustmentNo' },
|
||||||
{ label: '关联结算单号', prop: 'formalSettlementId' },
|
{ label: '关联结算单号', prop: 'formalSettlementId' },
|
||||||
{ label: '客户/客商名称', prop: 'customerName' },
|
{ label: '客户', prop: 'customerName' },
|
||||||
{ label: '结算单类型', prop: 'settlementTypeName' },
|
{ label: '结算单类型', prop: 'settlementTypeName' },
|
||||||
{ label: '关联合同名称', prop: 'contractName' },
|
{ label: '关联合同名称', prop: 'contractName' },
|
||||||
{ label: '关联项目', prop: 'projectName' },
|
{ label: '关联项目', prop: 'projectName' },
|
||||||
{ label: '原结算金额', prop: 'originalSettlementAmount', money: true },
|
{ label: '原结算金额', prop: 'originalSettlementAmount', money: true },
|
||||||
{ label: '调整金额', prop: 'adjustmentAmount', money: true },
|
{ label: '调整金额', prop: 'adjustmentAmount', money: true },
|
||||||
{ label: '调整后结算金额', prop: 'adjustedSettlementAmount', money: true },
|
{ label: '调整后结算金额', prop: 'adjustedSettlementAmount', money: true },
|
||||||
|
{ label: '创建日期', prop: 'createTime' },
|
||||||
|
{ label: '创建人', prop: 'createUserName' },
|
||||||
];
|
];
|
||||||
|
|
||||||
export const createSettlementAdjustmentForm = () => ({
|
export const createSettlementAdjustmentForm = () => ({
|
||||||
@@ -24,5 +26,8 @@ export const createSettlementAdjustmentForm = () => ({
|
|||||||
adjustmentAmount: 0,
|
adjustmentAmount: 0,
|
||||||
originalSettlementAmount: 0,
|
originalSettlementAmount: 0,
|
||||||
adjustedSettlementAmount: 0,
|
adjustedSettlementAmount: 0,
|
||||||
|
createTime: '',
|
||||||
|
createUserName: '',
|
||||||
|
attachmentsJson: '[]',
|
||||||
remark: '',
|
remark: '',
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ export const settlementAdjustmentSearchFields = [
|
|||||||
{ label: '日期', prop: 'createDateRange', type: 'daterange' },
|
{ label: '日期', prop: 'createDateRange', type: 'daterange' },
|
||||||
{ label: '客户名称', prop: 'customerName', type: 'input' },
|
{ label: '客户名称', prop: 'customerName', type: 'input' },
|
||||||
{ label: '项目名称', prop: 'projectName', type: 'input' },
|
{ label: '项目名称', prop: 'projectName', type: 'input' },
|
||||||
{ label: '所属组织', prop: 'deptName', type: 'input' },
|
{ label: '所属组织', prop: 'deptName', type: 'cascader' },
|
||||||
{ label: '关联结算单', prop: 'formalSettlementNo', type: 'input' },
|
{ label: '关联结算单', prop: 'formalSettlementNo', type: 'input' },
|
||||||
{
|
{
|
||||||
label: '结算单类型',
|
label: '结算单类型',
|
||||||
|
|||||||
@@ -8,8 +8,6 @@ export const settlementAdjustmentTableColumns = [
|
|||||||
{ label: '合同编号', prop: 'contractNo', minWidth: 150 },
|
{ label: '合同编号', prop: 'contractNo', minWidth: 150 },
|
||||||
{ label: '合同名称', prop: 'contractName', minWidth: 170 },
|
{ label: '合同名称', prop: 'contractName', minWidth: 170 },
|
||||||
{ label: '调整金额', prop: 'adjustmentAmount', minWidth: 130, money: true },
|
{ label: '调整金额', prop: 'adjustmentAmount', minWidth: 130, money: true },
|
||||||
{ label: '原结算金额', prop: 'originalSettlementAmount', minWidth: 140, money: true },
|
|
||||||
{ label: '调整后结算金额', prop: 'adjustedSettlementAmount', minWidth: 160, money: true },
|
|
||||||
{ label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
|
{ label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
|
||||||
{ label: '当前节点', prop: 'currentNode', minWidth: 120 },
|
{ label: '当前节点', prop: 'currentNode', minWidth: 120 },
|
||||||
{ label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
|
{ label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
|
||||||
|
|||||||
@@ -2,10 +2,8 @@ export const transportReconciliationFormFields = [
|
|||||||
{ prop: 'reconciliationNo', label: '对账单号', readonly: true },
|
{ prop: 'reconciliationNo', label: '对账单号', readonly: true },
|
||||||
{ prop: 'reconciliationMode', label: '对账模式', type: 'mode' },
|
{ prop: 'reconciliationMode', label: '对账模式', type: 'mode' },
|
||||||
{ prop: 'formalSettlementNo', label: '正式结算单', type: 'formal' },
|
{ prop: 'formalSettlementNo', label: '正式结算单', type: 'formal' },
|
||||||
{ prop: 'payerName', label: '付款方', readonly: true },
|
{ prop: 'customerName', label: '客户/承运商', readonly: true },
|
||||||
{ prop: 'payeeName', label: '收款方', readonly: true },
|
|
||||||
{ prop: 'projectName', label: '项目', readonly: true },
|
{ prop: 'projectName', label: '项目', readonly: true },
|
||||||
{ prop: 'deptName', label: '所属组织', readonly: true },
|
|
||||||
{ prop: 'contractName', label: '合同名称', readonly: true },
|
{ prop: 'contractName', label: '合同名称', readonly: true },
|
||||||
{ prop: 'paidAmount', label: '已付合计', money: true, readonly: true },
|
{ prop: 'paidAmount', label: '已付合计', money: true, readonly: true },
|
||||||
{ prop: 'reconcilerName', label: '对账人', readonly: true },
|
{ prop: 'reconcilerName', label: '对账人', readonly: true },
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export const reconciliationMatchStatusOptions = [
|
export const reconciliationMatchStatusOptions = [
|
||||||
{ label: '全部', value: '' },
|
{ label: '全部', value: 'all' },
|
||||||
{ label: '未匹配', value: 'unmatched' },
|
{ label: '未匹配', value: 'unmatched' },
|
||||||
{ label: '部分匹配', value: 'partial' },
|
{ label: '部分匹配', value: 'partial' },
|
||||||
{ label: '已匹配', value: 'matched' },
|
{ label: '已匹配', value: 'matched' },
|
||||||
];
|
];
|
||||||
|
|
||||||
export const reconciliationStatusOptions = [
|
export const reconciliationStatusOptions = [
|
||||||
{ label: '全部', value: '' },
|
{ label: '全部', value: 'all' },
|
||||||
{ label: '未完成', value: 'unfinished' },
|
{ label: '未完成', value: 'unfinished' },
|
||||||
{ label: '已完成', value: 'completed' },
|
{ label: '已完成', value: 'completed' },
|
||||||
];
|
];
|
||||||
@@ -15,7 +15,7 @@ export const transportReconciliationSearchFields = [
|
|||||||
{ prop: 'reconciliationNo', label: '对账单号', type: 'input' },
|
{ prop: 'reconciliationNo', label: '对账单号', type: 'input' },
|
||||||
{ prop: 'preSettlementNos', label: '预结算单号', type: 'input' },
|
{ prop: 'preSettlementNos', label: '预结算单号', type: 'input' },
|
||||||
{ prop: 'projectName', label: '项目', type: 'input' },
|
{ prop: 'projectName', label: '项目', type: 'input' },
|
||||||
{ prop: 'deptName', label: '所属组织', type: 'input' },
|
{ prop: 'deptName', label: '所属组织', type: 'cascader' },
|
||||||
{ prop: 'contractNo', label: '合同编号', type: 'input' },
|
{ prop: 'contractNo', label: '合同编号', type: 'input' },
|
||||||
{ prop: 'payerName', label: '付款方', type: 'input' },
|
{ prop: 'payerName', label: '付款方', type: 'input' },
|
||||||
{ prop: 'payeeName', label: '收款方', type: 'input' },
|
{ prop: 'payeeName', label: '收款方', type: 'input' },
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ export const transportReconciliationTableColumns = [
|
|||||||
export const internalColumns = [
|
export const internalColumns = [
|
||||||
{ prop: 'documentNo', label: '单据号', minWidth: 150 },
|
{ prop: 'documentNo', label: '单据号', minWidth: 150 },
|
||||||
{ prop: 'waybillNo', label: '运单号', minWidth: 120 },
|
{ prop: 'waybillNo', label: '运单号', minWidth: 120 },
|
||||||
{ prop: 'matchedExternalLineNo', label: '匹配外部账单行号', minWidth: 140 },
|
{ prop: 'matchedExternalLineNo', label: '匹配外部账单行号', minWidth: 180 },
|
||||||
{ prop: 'vehicleNo', label: '车号', minWidth: 100 },
|
{ prop: 'vehicleNo', label: '车号', minWidth: 100 },
|
||||||
{ prop: 'departureAddress', label: '发货地址', minWidth: 180 },
|
{ prop: 'departureAddress', label: '发货地址', minWidth: 180 },
|
||||||
{ prop: 'arrivalAddress', label: '到货地址', minWidth: 180 },
|
{ prop: 'arrivalAddress', label: '到货地址', minWidth: 180 },
|
||||||
@@ -27,13 +27,10 @@ export const internalColumns = [
|
|||||||
{ prop: 'transportType', label: '运输类型', minWidth: 120 },
|
{ prop: 'transportType', label: '运输类型', minWidth: 120 },
|
||||||
{ prop: 'cargoName', label: '货物名称', minWidth: 120 },
|
{ prop: 'cargoName', label: '货物名称', minWidth: 120 },
|
||||||
{ prop: 'cargoType', 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: '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: 'batchNo', label: '批次号', minWidth: 100 },
|
||||||
{ prop: 'unitPrice', label: '运输单价', minWidth: 110, money: true },
|
{ prop: 'unitPrice', label: '运输单价', minWidth: 110, money: true },
|
||||||
{ prop: 'freightAmount', label: '运输费', minWidth: 110, money: true },
|
|
||||||
{ prop: 'settlementAmount', label: '结算金额', minWidth: 120, money: true },
|
{ prop: 'settlementAmount', label: '结算金额', minWidth: 120, money: true },
|
||||||
{ prop: 'matchResult', label: '匹配结果', minWidth: 100 },
|
{ prop: 'matchResult', label: '匹配结果', minWidth: 100 },
|
||||||
{ prop: 'updateResult', label: '账单更新结果', minWidth: 130 },
|
{ prop: 'updateResult', label: '账单更新结果', minWidth: 130 },
|
||||||
@@ -50,7 +47,7 @@ export const externalVehicleColumns = [
|
|||||||
{ prop: 'cargoName', label: '货物名称', minWidth: 120 },
|
{ prop: 'cargoName', label: '货物名称', minWidth: 120 },
|
||||||
{ prop: 'cargoType', label: '货物类型', minWidth: 120 },
|
{ prop: 'cargoType', label: '货物类型', minWidth: 120 },
|
||||||
{ prop: 'transportQuantity', label: '运输总量', minWidth: 100, number: true },
|
{ 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: 'batchNo', label: '批次号', minWidth: 100 },
|
||||||
{ prop: 'unitPrice', label: '运输单价', minWidth: 110, money: true },
|
{ prop: 'unitPrice', label: '运输单价', minWidth: 110, money: true },
|
||||||
{ prop: 'freightAmount', 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: 'cargoType', label: '货物类型', minWidth: 120 },
|
||||||
{ prop: 'specification', label: '规格', minWidth: 100 },
|
{ prop: 'specification', label: '规格', minWidth: 100 },
|
||||||
{ prop: 'model', 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: '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: 'freightAmount', label: '运输费', minWidth: 110, money: true },
|
||||||
{ prop: 'settlementAmount', label: '结算金额', minWidth: 120, money: true },
|
{ prop: 'settlementAmount', label: '结算费用合计', minWidth: 130, money: true },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ export const GRANT_TYPE_DIC = [
|
|||||||
{ label: '社交登录', value: 'social' },
|
{ label: '社交登录', value: 'social' },
|
||||||
{ label: '客户端凭证', value: 'client_credentials' },
|
{ label: '客户端凭证', value: 'client_credentials' },
|
||||||
{ label: '刷新令牌', value: 'refresh_token' },
|
{ label: '刷新令牌', value: 'refresh_token' },
|
||||||
|
{ label: '退出登录', value: 'logout' },
|
||||||
];
|
];
|
||||||
|
|
||||||
export const authLogOption = {
|
export const authLogOption = {
|
||||||
@@ -38,7 +39,7 @@ export const authLogOption = {
|
|||||||
prop: 'realName',
|
prop: 'realName',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '授权类型',
|
label: '操作类型',
|
||||||
prop: 'grantType',
|
prop: 'grantType',
|
||||||
type: 'select',
|
type: 'select',
|
||||||
search: true,
|
search: true,
|
||||||
@@ -80,7 +81,7 @@ export const authLogOption = {
|
|||||||
width: 120,
|
width: 120,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '登录时间',
|
label: '操作时间',
|
||||||
prop: 'loginTime',
|
prop: 'loginTime',
|
||||||
sortable: true,
|
sortable: true,
|
||||||
span: 24,
|
span: 24,
|
||||||
|
|||||||
@@ -1,12 +1,9 @@
|
|||||||
import { getDeptLazyTree } from '@/api/system/dept';
|
import { getDeptLazyTree } from '@/api/system/dept';
|
||||||
|
import { validateLoginPassword } from '@/utils/validate';
|
||||||
|
|
||||||
export const userOption = safe => {
|
export const userOption = safe => {
|
||||||
const validatePass = (rule, value, callback) => {
|
const validatePass = (rule, value, callback) => {
|
||||||
if (value === '') {
|
validateLoginPassword(rule, value, callback);
|
||||||
callback(new Error('请输入密码'));
|
|
||||||
} else {
|
|
||||||
callback();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
const validatePass2 = (rule, value, callback) => {
|
const validatePass2 = (rule, value, callback) => {
|
||||||
if (value === '') {
|
if (value === '') {
|
||||||
|
|||||||
@@ -76,14 +76,17 @@ export const option = {
|
|||||||
prop: 'posts',
|
prop: 'posts',
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '驾驶车辆',
|
||||||
|
prop: 'drivingVehicle',
|
||||||
|
minWidth: 130,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '所属组织',
|
label: '所属组织',
|
||||||
prop: 'organizationName',
|
prop: 'organizationName',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 1,
|
searchOrder: 1,
|
||||||
type: 'select',
|
searchslot: true,
|
||||||
filterable: true,
|
|
||||||
dicData: [],
|
|
||||||
slot: true,
|
slot: true,
|
||||||
minWidth: 160,
|
minWidth: 160,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -37,9 +37,7 @@ export const option = {
|
|||||||
prop: 'organizationName',
|
prop: 'organizationName',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 1,
|
searchOrder: 1,
|
||||||
type: 'select',
|
searchslot: true,
|
||||||
filterable: true,
|
|
||||||
dicData: [],
|
|
||||||
slot: true,
|
slot: true,
|
||||||
minWidth: 160,
|
minWidth: 160,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ export const option = {
|
|||||||
searchMenuPosition: 'right',
|
searchMenuPosition: 'right',
|
||||||
border: true,
|
border: true,
|
||||||
index: true,
|
index: true,
|
||||||
selection: false,
|
selection: true,
|
||||||
addBtn: false,
|
addBtn: false,
|
||||||
editBtn: false,
|
editBtn: false,
|
||||||
delBtn: false,
|
delBtn: false,
|
||||||
@@ -21,7 +21,7 @@ export const option = {
|
|||||||
label: '车牌号',
|
label: '车牌号',
|
||||||
prop: 'plateNo',
|
prop: 'plateNo',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 6,
|
searchOrder: 7,
|
||||||
slot: true,
|
slot: true,
|
||||||
minWidth: 120,
|
minWidth: 120,
|
||||||
},
|
},
|
||||||
@@ -29,7 +29,7 @@ export const option = {
|
|||||||
label: '业务关系',
|
label: '业务关系',
|
||||||
prop: 'businessRelation',
|
prop: 'businessRelation',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 5,
|
searchOrder: 6,
|
||||||
searchValue: '',
|
searchValue: '',
|
||||||
type: 'select',
|
type: 'select',
|
||||||
dicData: [
|
dicData: [
|
||||||
@@ -46,17 +46,22 @@ export const option = {
|
|||||||
prop: 'organizationName',
|
prop: 'organizationName',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 1,
|
searchOrder: 1,
|
||||||
type: 'select',
|
searchslot: true,
|
||||||
filterable: true,
|
|
||||||
dicData: [],
|
|
||||||
slot: true,
|
slot: true,
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '使用部门',
|
||||||
|
prop: 'useDepartment',
|
||||||
|
search: true,
|
||||||
|
searchOrder: 3,
|
||||||
|
minWidth: 140,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '车辆类型',
|
label: '车辆类型',
|
||||||
prop: 'vehicleType',
|
prop: 'vehicleType',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 4,
|
searchOrder: 5,
|
||||||
type: 'select',
|
type: 'select',
|
||||||
dicData: [
|
dicData: [
|
||||||
{ label: '全部', value: '' },
|
{ label: '全部', value: '' },
|
||||||
@@ -110,7 +115,7 @@ export const option = {
|
|||||||
label: '车辆状态',
|
label: '车辆状态',
|
||||||
prop: 'status',
|
prop: 'status',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 3,
|
searchOrder: 4,
|
||||||
type: 'select',
|
type: 'select',
|
||||||
slot: true,
|
slot: true,
|
||||||
dicData: [
|
dicData: [
|
||||||
|
|||||||
@@ -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,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||