From 7fb8113c8e5e1e4431d035dbef980eff536c9423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 7 Aug 2026 15:11:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(core):=20=E7=BB=9F=E4=B8=80=E5=85=A8?= =?UTF-8?q?=E7=AB=99=E6=97=B6=E9=97=B4=E5=88=97=E5=8A=A0=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E5=8F=B8=E6=9C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 所有含时间的列表列（创建时间、更新时间、起止日期等）均增加排序功能，兼顾Avue option和手写el-table-column - 司机管理「姓名身份证号」列拆分为独立的「姓名」「身份证号」两列，分别使用插槽渲染 - 修复车辆/船舶/司机管理「所属组织」列前导空格问题，value 使用无缩进原始标签 - 调整司机管理页到期筛选标签位置，移至搜索菜单行并优化样式，删除过渡占位筛选字段 - 增加组织名称列自定义插槽，去除已入库旧数据的前导空白 - 更新相关样式，删除无用样式代码，增加表格列排序样式支持 --- .workbuddy/memory/2026-08-07.md | 47 +++++++++++++++++++ src/option/base/common-address.js | 2 + src/option/business/common.js | 2 + src/option/business/contract-manage.js | 5 ++ src/option/business/project-apply.js | 1 + src/option/business/transport-plan.js | 2 + src/option/business/waybill-manage.js | 4 ++ src/option/system/authlog.js | 1 + src/option/transportCapacity/driver.js | 33 +++++-------- .../transportCapacity/transport-ship.js | 1 + .../transportCapacity/transport-vehicle.js | 3 +- src/option/vehicle/accident-record.js | 3 ++ .../vehicle/annual-inspection-record.js | 4 ++ src/option/vehicle/equipment-ledger.js | 3 ++ src/option/vehicle/etc-record.js | 4 ++ src/option/vehicle/insurance-record.js | 4 ++ src/option/vehicle/mileage-record.js | 2 + src/option/vehicle/oil-electric-record.js | 3 ++ src/option/vehicle/other-expense-record.js | 3 ++ src/option/vehicle/tire-replacement-record.js | 3 ++ src/option/vehicle/transport-change-record.js | 2 + src/views/authority/apikey.vue | 4 +- src/views/authority/ratelimit.vue | 3 +- src/views/base/airport-master.vue | 2 + src/views/base/currency.vue | 3 ++ src/views/base/customer-type.vue | 2 + src/views/base/fee-item.vue | 2 + src/views/base/port-terminal.vue | 2 + src/views/base/railway-station.vue | 2 + .../components/business-crud-page.vue | 28 +++++------ .../components/waybill-import-dialog.vue | 4 +- src/views/business/loading-manage.vue | 6 +-- src/views/business/project-apply.vue | 4 +- src/views/data/record.vue | 1 + src/views/desk/notice-composition.vue | 1 + src/views/desk/notice.vue | 1 + src/views/flow/follow.vue | 1 + src/views/flow/manager.vue | 1 + src/views/flow/model.vue | 2 + src/views/monitor/log/api.vue | 1 + src/views/monitor/log/error.vue | 1 + src/views/monitor/log/usual.vue | 1 + src/views/report/reportlist.vue | 2 + src/views/system/dept.vue | 2 +- src/views/system/tenant.vue | 2 + src/views/transportCapacity/driver.vue | 38 ++++++--------- src/views/transportCapacity/ship.vue | 11 +++-- src/views/transportCapacity/vehicle.vue | 11 +++-- src/views/util/form.vue | 1 + src/views/util/table.vue | 1 + .../vehicle/credit-score-quantification.vue | 1 + src/views/vehicle/customer-archive.vue | 11 +++-- src/views/vehicle/maintenance-plan.vue | 4 ++ src/views/vehicle/maintenance-record.vue | 4 ++ src/views/work/claim.vue | 1 + src/views/work/done.vue | 1 + src/views/work/send.vue | 1 + src/views/work/start.vue | 1 + src/views/work/todo.vue | 1 + 59 files changed, 216 insertions(+), 81 deletions(-) diff --git a/.workbuddy/memory/2026-08-07.md b/.workbuddy/memory/2026-08-07.md index a36c356..490b6e2 100644 --- a/.workbuddy/memory/2026-08-07.md +++ b/.workbuddy/memory/2026-08-07.md @@ -1,5 +1,28 @@ # 2026-08-07 工作日志 +## 修复车辆/船舶/司机管理「所属组织」列前导空格 +- 症状：车辆管理列表截图中「所属组织」列值左侧有明显缩进空格。 +- 根因：组织下拉选项构建时把带层级缩进（全角空格 `'　'.repeat(level)`）的字符串同时作为 `label` 和 `value`，保存到后端后表格直接回显该值，导致前导空格。 +- 改动： + - `src/views/transportCapacity/vehicle.vue`、`ship.vue`、`driver.vue` + - `flattenDeptOptions` / `formatDeptOptions`：`value` 改为无缩进的 `rawLabel`，`label` 仍保留缩进用于下拉层级展示。 + - 表格增加 `#organizationName` 插槽，对 `row.organizationName` 去除前导半角/全角空白，兼容已入库的旧数据。 + - `src/option/transportCapacity/transport-vehicle.js`、`transport-ship.js`、`driver.js` + - 「所属组织」列增加 `slot: true`，使自定义插槽生效。 +- 验证：通过 `git diff` 确认 6 个文件改动正确。 + +## 调整司机管理到期筛选标签位置 +- 需求：截图反馈司机管理页「全部 / 30天内到期 / 已到期」三个筛选标签放在搜索表单右侧，占位突兀，希望与搜索/重置按钮同排或放到更合适位置。 +- 方案：参考 `business-crud-page.vue` 的 `#search-menu` 插槽，把筛选标签移到搜索菜单行（搜索/重置按钮同一排），标签居左、按钮居右。 +- 改动： + - `src/views/transportCapacity/driver.vue` + - `#expireStatus-search` 插槽改为 `#search-menu` 插槽。 + - `.driver-page__expiry-tags` 增加 `order: -1`、`margin-right: auto`、`min-width: 0`，移除 `width: 100%` 和不再需要的响应式媒体查询。 + - `src/option/transportCapacity/driver.js` + - 删除仅作为占位用的 `expireStatus` 隐藏搜索字段（`search: true`、`searchSpan: 6` 等）。 +- 说明：筛选逻辑仍通过 `query.expireStatus` + `handleExpireChange` 工作，不受字段删除影响；车辆/船舶管理页有相同布局，如需统一可复用该改法。 +- 验证：通过 `git diff` 确认改动正确。 + ## 运输计划调度弹窗恢复左右分栏布局 - 需求：客户提供「计划详情」参考截图，要求调度弹窗改回「左侧基本信息卡 + 右侧收发货路线卡」的左右分栏布局。 - 改动：`src/views/business/components/business-crud-page.vue` @@ -108,3 +131,27 @@ - 评分详情弹窗的「证明材料」改为 ``。 - 清理不再使用的样式：`.archive-form__group`、`.section-title`、`.section-head`、`.customer-material-section`、`.change-record-section`、`.invoice-form__section-title`、`.score-material-section` 等。 - 验证：`npm run build` 成功（exit code 0）。 + +## 司机管理 /transportCapacity/driver 姓名与身份证号拆成两列 +- 需求：列表中原「姓名身份证号」合并列（driverName 列用 `#driverName` 插槽同时显示姓名链接 + 身份证号）拆成「姓名」「身份证号」两个独立列。 +- 改动： + - `src/option/transportCapacity/driver.js` + - 原 `label: '姓名身份证号'` 列改为 `label: '姓名'`（minWidth 120，保留 slot/search，searchOrder 7 不变）。 + - 新增独立「身份证号」列（`prop: 'idCardNo'`、`search: true`、`searchOrder: 2`、`slot: true`、`minWidth: 180`），并上移到 `driverName` 之后，使其紧邻「姓名」列（表格列顺序 = 数组顺序，`searchOrder` 仅控制搜索表单顺序，互不影响）。 + - 原 `idCardNo` 隐藏搜索列（`hide: true`）被该新列取代后删除重复定义。 + - `src/views/transportCapacity/driver.vue` + - `#driverName` 插槽只保留姓名链接（去掉原内联的身份证号 ``）。 + - 新增 `#idCardNo` 插槽显示 `row.idCardNo || '-'`（空值显示横杠）。 + - 删除不再使用的 `.driver-page__identity` 样式块。 +- 验证：`node --check` 选项文件语法通过；`npm run build` 仅因环境 safe-delete 守卫拦截清空 dist（与代码无关），未报任何 transform/parse 错误。 + +## 全站时间列统一加排序（参考 /base/cargo-type） +- 需求：用户截图 /business/contract-manage 页面，要求「有时间的都加一个排序」，参考 /base/cargo-type（该页面 createTime/updateTime 已设 `sortable: true`）。 +- 方案：Avue 列加 `sortable: true`；手写 `` 加 `sortable` 属性。精确匹配时间相关 label/prop，排除 `hide: true` 的搜索专用字段。 +- 精确匹配范围：创建/更新时间、开始/结束日期、生效/失效日期、计划/实际/预计日期时间、审核/上传/变更/评分/调度日期时间、事故/检测/有效截止日期、入口/出口/交易/费用/换胎/出厂/维修/保养时间、登录/申请/提交/操作/触发/过期/日志/记录时间等。 +- 改动文件（共 53 个）： + - **src/option（18 个）**：base/common-address.js、business/common.js、business/contract-manage.js、business/project-apply.js、business/transport-plan.js、business/waybill-manage.js、system/authlog.js、transportCapacity/driver.js、vehicle/accident-record.js、vehicle/annual-inspection-record.js、vehicle/etc-record.js、vehicle/equipment-ledger.js、vehicle/insurance-record.js、vehicle/mileage-record.js、vehicle/oil-electric-record.js、vehicle/other-expense-record.js、vehicle/tire-replacement-record.js、vehicle/transport-change-record.js。 + - **src/views 内联 Avue option（30 个）**：flow/follow.vue、flow/manager.vue、flow/model.vue、desk/notice.vue、desk/notice-composition.vue、report/reportlist.vue、work/done.vue、work/todo.vue、work/start.vue、work/claim.vue、work/send.vue、authority/ratelimit.vue、authority/apikey.vue、monitor/log/api.vue、monitor/log/usual.vue、monitor/log/error.vue、base/railway-station.vue、base/airport-master.vue、base/currency.vue、base/customer-type.vue、base/fee-item.vue、base/port-terminal.vue、data/record.vue、util/form.vue、util/table.vue、system/tenant.vue、vehicle/maintenance-plan.vue、vehicle/maintenance-record.vue、vehicle/credit-score-quantification.vue、vehicle/customer-archive.vue。 + - **src/views 手写 el-table（6 个）**：system/dept.vue、business/loading-manage.vue、business/components/waybill-import-dialog.vue、business/project-apply.vue、vehicle/customer-archive.vue、business/components/business-crud-page.vue。 +- 注意：弹窗内子表（如合同变更记录、项目附件/变更、客商档案评分/材料/变更记录等）时间列也一并加了排序；util/form.vue、util/table.vue 为示例页同样处理。 +- 验证：`npm run build` 成功（exit code 0）；构建日志中的 CSS `*` 告警为历史既有，与本次无关。 diff --git a/src/option/base/common-address.js b/src/option/base/common-address.js index bbf6df1..ea43503 100644 --- a/src/option/base/common-address.js +++ b/src/option/base/common-address.js @@ -158,6 +158,7 @@ export const createOption = () => ({ { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -168,6 +169,7 @@ export const createOption = () => ({ { label: '创建时间', prop: 'createTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/business/common.js b/src/option/business/common.js index bbecf30..9c2e976 100644 --- a/src/option/business/common.js +++ b/src/option/business/common.js @@ -227,6 +227,7 @@ export const auditColumns = [ { label: '创建时间', prop: 'createTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -237,6 +238,7 @@ export const auditColumns = [ { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/business/contract-manage.js b/src/option/business/contract-manage.js index c664700..6c3c7ba 100644 --- a/src/option/business/contract-manage.js +++ b/src/option/business/contract-manage.js @@ -313,6 +313,7 @@ export const option = createCrudOption([ { label: '开始日期', prop: 'startDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -323,6 +324,7 @@ export const option = createCrudOption([ { label: '结束日期', prop: 'endDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -333,6 +335,7 @@ export const option = createCrudOption([ { label: '临时效力起', prop: 'temporaryStartDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -343,6 +346,7 @@ export const option = createCrudOption([ { label: '临时效力止', prop: 'temporaryEndDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -425,6 +429,7 @@ export const option = createCrudOption([ { label: '创建时间', prop: 'createTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/business/project-apply.js b/src/option/business/project-apply.js index 057773e..6feeb97 100644 --- a/src/option/business/project-apply.js +++ b/src/option/business/project-apply.js @@ -386,6 +386,7 @@ export const option = createCrudOption([ { label: '审核通过时间', prop: 'approvedTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/business/transport-plan.js b/src/option/business/transport-plan.js index cda3ed3..a5fa776 100644 --- a/src/option/business/transport-plan.js +++ b/src/option/business/transport-plan.js @@ -306,6 +306,7 @@ export const option = { { label: '计划开始日期', prop: 'planStartDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -316,6 +317,7 @@ export const option = { { label: '计划结束日期', prop: 'planEndDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', diff --git a/src/option/business/waybill-manage.js b/src/option/business/waybill-manage.js index 44a004c..fb9b1fe 100644 --- a/src/option/business/waybill-manage.js +++ b/src/option/business/waybill-manage.js @@ -392,6 +392,7 @@ export const option = { { label: '实际发货时间', prop: 'startDate', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -400,6 +401,7 @@ export const option = { { label: '实际完成时间', prop: 'endDate', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -429,6 +431,7 @@ export const option = { { label: '预计发货日期', prop: 'estimatedStartTime', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -442,6 +445,7 @@ export const option = { { label: '预计完成日期', prop: 'estimatedEndTime', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', diff --git a/src/option/system/authlog.js b/src/option/system/authlog.js index 6fc01aa..d550790 100644 --- a/src/option/system/authlog.js +++ b/src/option/system/authlog.js @@ -82,6 +82,7 @@ export const authLogOption = { { label: '登录时间', prop: 'loginTime', + sortable: true, span: 24, width: 180, }, diff --git a/src/option/transportCapacity/driver.js b/src/option/transportCapacity/driver.js index 951568b..0027a84 100644 --- a/src/option/transportCapacity/driver.js +++ b/src/option/transportCapacity/driver.js @@ -20,12 +20,20 @@ export const option = { dialogClickModal: false, column: [ { - label: '姓名身份证号', + label: '姓名', prop: 'driverName', search: true, searchOrder: 7, slot: true, - minWidth: 220, + minWidth: 120, + }, + { + label: '身份证号', + prop: 'idCardNo', + search: true, + searchOrder: 2, + slot: true, + minWidth: 180, }, { label: '手机号码', @@ -76,6 +84,7 @@ export const option = { type: 'select', filterable: true, dicData: [], + slot: true, minWidth: 160, }, { @@ -101,6 +110,7 @@ export const option = { { label: '驾驶认证（日期）', prop: 'drivingLicenseEndDate', + sortable: true, slot: true, minWidth: 140, align: 'center', @@ -108,16 +118,10 @@ export const option = { { label: '从业资格认证（日期）', prop: 'qualificationEndDate', + sortable: true, slot: true, minWidth: 160, }, - { - label: '身份证号', - prop: 'idCardNo', - search: true, - searchOrder: 2, - hide: true, - }, { label: '准驾车型', prop: 'drivingType', @@ -135,16 +139,5 @@ export const option = { { label: 'C2', value: 'C2' }, ], }, - { - label: '', - prop: 'expireStatus', - search: true, - searchOrder: 0, - searchSpan: 6, - hide: true, - addDisplay: false, - editDisplay: false, - viewDisplay: false, - }, ], }; diff --git a/src/option/transportCapacity/transport-ship.js b/src/option/transportCapacity/transport-ship.js index b1cb9ad..4675d0e 100644 --- a/src/option/transportCapacity/transport-ship.js +++ b/src/option/transportCapacity/transport-ship.js @@ -40,6 +40,7 @@ export const option = { type: 'select', filterable: true, dicData: [], + slot: true, minWidth: 160, }, { diff --git a/src/option/transportCapacity/transport-vehicle.js b/src/option/transportCapacity/transport-vehicle.js index dc3249f..425f466 100644 --- a/src/option/transportCapacity/transport-vehicle.js +++ b/src/option/transportCapacity/transport-vehicle.js @@ -14,7 +14,7 @@ export const option = { editBtn: false, delBtn: false, viewBtn: false, - menuWidth: 320, + menuWidth: 250, dialogClickModal: false, column: [ { @@ -49,6 +49,7 @@ export const option = { type: 'select', filterable: true, dicData: [], + slot: true, minWidth: 150, }, { diff --git a/src/option/vehicle/accident-record.js b/src/option/vehicle/accident-record.js index d4ddb7e..51c4d22 100644 --- a/src/option/vehicle/accident-record.js +++ b/src/option/vehicle/accident-record.js @@ -83,6 +83,7 @@ export const option = { { label: '事故发生日期', prop: 'accidentDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -200,6 +201,7 @@ export const option = { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'date', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -250,6 +252,7 @@ export const option = { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/vehicle/annual-inspection-record.js b/src/option/vehicle/annual-inspection-record.js index 35e638b..9643780 100644 --- a/src/option/vehicle/annual-inspection-record.js +++ b/src/option/vehicle/annual-inspection-record.js @@ -82,6 +82,7 @@ export const option = { { label: '检测评定日期', prop: 'inspectionAssessmentDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -93,6 +94,7 @@ export const option = { { label: '有效期截止日', prop: 'validUntilDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -206,6 +208,7 @@ export const option = { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'date', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -254,6 +257,7 @@ export const option = { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/vehicle/equipment-ledger.js b/src/option/vehicle/equipment-ledger.js index 0951367..b137a1a 100644 --- a/src/option/vehicle/equipment-ledger.js +++ b/src/option/vehicle/equipment-ledger.js @@ -86,6 +86,7 @@ export const option = { { label: '出厂日期', prop: 'factoryDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -133,6 +134,7 @@ export const option = { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -144,6 +146,7 @@ export const option = { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/vehicle/etc-record.js b/src/option/vehicle/etc-record.js index 6ef9827..981a29e 100644 --- a/src/option/vehicle/etc-record.js +++ b/src/option/vehicle/etc-record.js @@ -62,6 +62,7 @@ export const option = { { label: '入口时间', prop: 'entryTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -85,6 +86,7 @@ export const option = { { label: '出口时间', prop: 'exitTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -169,6 +171,7 @@ export const option = { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -189,6 +192,7 @@ export const option = { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/vehicle/insurance-record.js b/src/option/vehicle/insurance-record.js index 492fa7d..f246b3c 100644 --- a/src/option/vehicle/insurance-record.js +++ b/src/option/vehicle/insurance-record.js @@ -111,6 +111,7 @@ export const option = { { label: '开始日期', prop: 'startDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -120,6 +121,7 @@ export const option = { { label: '结束日期', prop: 'endDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -173,6 +175,7 @@ export const option = { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'date', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -223,6 +226,7 @@ export const option = { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/vehicle/mileage-record.js b/src/option/vehicle/mileage-record.js index bd162d8..3e0b981 100644 --- a/src/option/vehicle/mileage-record.js +++ b/src/option/vehicle/mileage-record.js @@ -157,6 +157,7 @@ export const option = { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'date', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -209,6 +210,7 @@ export const option = { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/vehicle/oil-electric-record.js b/src/option/vehicle/oil-electric-record.js index a8c710e..052e164 100644 --- a/src/option/vehicle/oil-electric-record.js +++ b/src/option/vehicle/oil-electric-record.js @@ -51,6 +51,7 @@ export const option = { { label: '交易时间', prop: 'transactionTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -217,6 +218,7 @@ export const option = { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'date', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -265,6 +267,7 @@ export const option = { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/vehicle/other-expense-record.js b/src/option/vehicle/other-expense-record.js index b3bb1cf..0046dfd 100644 --- a/src/option/vehicle/other-expense-record.js +++ b/src/option/vehicle/other-expense-record.js @@ -81,6 +81,7 @@ export const option = { { label: '费用日期', prop: 'expenseDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -173,6 +174,7 @@ export const option = { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -193,6 +195,7 @@ export const option = { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/vehicle/tire-replacement-record.js b/src/option/vehicle/tire-replacement-record.js index c434617..9b50753 100644 --- a/src/option/vehicle/tire-replacement-record.js +++ b/src/option/vehicle/tire-replacement-record.js @@ -70,6 +70,7 @@ export const option = { { label: '换胎时间', prop: 'replacementTime', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -140,6 +141,7 @@ export const option = { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'date', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -190,6 +192,7 @@ export const option = { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/option/vehicle/transport-change-record.js b/src/option/vehicle/transport-change-record.js index 1480147..8db7894 100644 --- a/src/option/vehicle/transport-change-record.js +++ b/src/option/vehicle/transport-change-record.js @@ -96,6 +96,7 @@ export const option = { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'date', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -146,6 +147,7 @@ export const option = { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/views/authority/apikey.vue b/src/views/authority/apikey.vue index bc5541e..5a0fc1c 100644 --- a/src/views/authority/apikey.vue +++ b/src/views/authority/apikey.vue @@ -434,6 +434,7 @@ export default { { label: '过期时间', prop: 'expireTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -512,7 +513,8 @@ export default { { label: '请求方法', prop: 'method', slot: true, width: 85 }, { label: '调用IP', prop: 'remoteIp', search: true, width: 140 }, { label: '耗时(ms)', prop: 'time', width: 85 }, - { label: '日志时间', prop: 'createTime', span: 24, width: 180 }, + { label: '日志时间', prop: 'createTime', +sortable: true, span: 24, width: 180 }, { label: '用户代理', prop: 'userAgent', span: 24, hide: true }, { label: '请求数据', prop: 'params', type: 'textarea', span: 24, minRows: 2, hide: true }, ], diff --git a/src/views/authority/ratelimit.vue b/src/views/authority/ratelimit.vue index c934eca..c47b653 100644 --- a/src/views/authority/ratelimit.vue +++ b/src/views/authority/ratelimit.vue @@ -393,7 +393,8 @@ export default { { label: '服务IP', prop: 'serverIp', hide: true, width: 160 }, { label: '环境', prop: 'env', hide: true, width: 85 }, { label: '用户代理', prop: 'userAgent', span: 24, hide: true }, - { label: '触发时间', prop: 'createTime', span: 24, width: 170 }, + { label: '触发时间', prop: 'createTime', +sortable: true, span: 24, width: 170 }, { label: '请求数据', prop: 'params', type: 'textarea', span: 24, minRows: 2, hide: true }, ], }, diff --git a/src/views/base/airport-master.vue b/src/views/base/airport-master.vue index b2cc09a..8c44c70 100644 --- a/src/views/base/airport-master.vue +++ b/src/views/base/airport-master.vue @@ -447,6 +447,7 @@ export default { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -458,6 +459,7 @@ export default { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/views/base/currency.vue b/src/views/base/currency.vue index afd8dda..91f30c7 100644 --- a/src/views/base/currency.vue +++ b/src/views/base/currency.vue @@ -203,6 +203,7 @@ export default { { label: '生效日期', prop: 'effectiveDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -224,6 +225,7 @@ export default { { label: '失效日期', prop: 'expiryDate', + sortable: true, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -287,6 +289,7 @@ export default { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/views/base/customer-type.vue b/src/views/base/customer-type.vue index 9cfc6f2..cced3b9 100644 --- a/src/views/base/customer-type.vue +++ b/src/views/base/customer-type.vue @@ -135,6 +135,7 @@ export default { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -146,6 +147,7 @@ export default { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/views/base/fee-item.vue b/src/views/base/fee-item.vue index a33cc79..335fee6 100644 --- a/src/views/base/fee-item.vue +++ b/src/views/base/fee-item.vue @@ -214,6 +214,7 @@ export default { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -225,6 +226,7 @@ export default { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/views/base/port-terminal.vue b/src/views/base/port-terminal.vue index 38850e9..bd2fe24 100644 --- a/src/views/base/port-terminal.vue +++ b/src/views/base/port-terminal.vue @@ -629,6 +629,7 @@ export default { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -639,6 +640,7 @@ export default { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/views/base/railway-station.vue b/src/views/base/railway-station.vue index 909ef7d..fb24d5e 100644 --- a/src/views/base/railway-station.vue +++ b/src/views/base/railway-station.vue @@ -411,6 +411,7 @@ export default { { label: '更新时间', prop: 'updateTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', @@ -422,6 +423,7 @@ export default { { label: '创建时间', prop: 'createTime', + sortable: true, type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue index ab6ae76..17231fa 100644 --- a/src/views/business/components/business-crud-page.vue +++ b/src/views/business/components/business-crud-page.vue @@ -1344,7 +1344,7 @@ - + - + - + @@ -2315,7 +2315,7 @@ min-width="160" align="center" show-overflow-tooltip - /> + sortable/>