From 44c3a3903919065b62cd494e5e4ddd40df44c4ff Mon Sep 17 00:00:00 2001 From: zy <276996223@qq.com> Date: Fri, 7 Feb 2025 09:35:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=BF=E5=AE=87=E5=8A=A0=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enterprises/index.ts | 2 +- src/utils/dict.ts | 1 + src/utils/formatTime.ts | 14 +++++++++ src/views/enterprises/index.vue | 7 ++--- src/views/qualification/index.vue | 16 +++++----- src/views/task/index.vue | 50 ++++++++++++++++++++++++------- 6 files changed, 67 insertions(+), 23 deletions(-) diff --git a/src/api/enterprises/index.ts b/src/api/enterprises/index.ts index ab443c4..b1001f7 100644 --- a/src/api/enterprises/index.ts +++ b/src/api/enterprises/index.ts @@ -22,7 +22,7 @@ export interface EnterprisesVO { export const EnterprisesApi = { // 查询企业分页 getEnterprisesPage: async (params: any) => { - return await request.get({ url: `/system/enterprise/page`, params }) + return await request.get({ url: `/system/enterprise/pcpage`, params }) }, // 查询企业详情 diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 4d52182..4b9f63f 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -138,6 +138,7 @@ export enum DICT_TYPE { TASK_TYPE_PARENT = 'task_type_parent', TASK_PRIORITY = 'task_priority', TASK_EXEC_TIME = 'task_exec_time', + TASK_STATE = 'task_state', // ========== INFRA 模块 ========== INFRA_BOOLEAN_STRING = 'infra_boolean_string', INFRA_JOB_STATUS = 'infra_job_status', diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index 99eb428..5ca4b10 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -212,6 +212,20 @@ export function dateFormatter2(_row: any, _column: TableColumnCtx, cellValu return cellValue ? formatDate(cellValue, 'YYYY-MM-DD') : '' } + +/** + * element plus 的时间 Formatter 实现，使用 YYYY年MM月DD日 格式 + * + * @param row 行数据 + * @param column 字段 + * @param cellValue 字段值 + */ +export function dateFormatter3(_row: any, _column: TableColumnCtx, cellValue: any): string { + return cellValue ? formatDate(cellValue, 'YYYY年MM月DD日') : '' +} + + + /** * 设置起始日期，时间为00:00:00 * @param param 传入日期 diff --git a/src/views/enterprises/index.vue b/src/views/enterprises/index.vue index 37a44df..182b4e8 100644 --- a/src/views/enterprises/index.vue +++ b/src/views/enterprises/index.vue @@ -96,13 +96,13 @@ - - + + - + @@ -126,7 +126,6 @@ :formatter="dateFormatter" width="180px" /> -