From b56b8c9a26342cad3ddefa0a293d4ae1d7040d89 Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Fri, 4 Jul 2025 18:52:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/license/license/index.ts | 1 + .../web-antd/src/locales/langs/en-US/license.json | 3 ++- .../web-antd/src/locales/langs/zh-CN/license.json | 3 ++- apps/web-antd/src/views/license/license/data.ts | 15 +++++++++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/apps/web-antd/src/api/license/license/index.ts b/apps/web-antd/src/api/license/license/index.ts index e267eb0..4ccc5a8 100644 --- a/apps/web-antd/src/api/license/license/index.ts +++ b/apps/web-antd/src/api/license/license/index.ts @@ -18,6 +18,7 @@ export namespace LicenseApi { activationCode: string; // 激活码 licenseContent: string; // License内容 applicant: number; // 申请人 + applicationTime: Dayjs | string; // 申请时间 approver: number; // 审批人 status: number; // 状态 remark: string; // 备注 diff --git a/apps/web-antd/src/locales/langs/en-US/license.json b/apps/web-antd/src/locales/langs/en-US/license.json index 696e29b..f925910 100644 --- a/apps/web-antd/src/locales/langs/en-US/license.json +++ b/apps/web-antd/src/locales/langs/en-US/license.json @@ -17,5 +17,6 @@ "checkAll": "Check All", "licenseAdminHelp": "Assigned to persons who have permission to generate licenses, and send email reminders", "apply": "Apply", - "applyAction": "Apply For {0}" + "applyAction": "Apply For {0}", + "applicationTime": "Application Time" } diff --git a/apps/web-antd/src/locales/langs/zh-CN/license.json b/apps/web-antd/src/locales/langs/zh-CN/license.json index 808a290..da41bb9 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/license.json +++ b/apps/web-antd/src/locales/langs/zh-CN/license.json @@ -17,5 +17,6 @@ "checkAll": "全选", "licenseAdminHelp": "指派给有权限生成License的人员,并且发送邮件提醒", "apply": "申请", - "applyAction": "申请{0}" + "applyAction": "申请{0}", + "applicationTime": "申请时间" } diff --git a/apps/web-antd/src/views/license/license/data.ts b/apps/web-antd/src/views/license/license/data.ts index dbbce63..90fc5f1 100644 --- a/apps/web-antd/src/views/license/license/data.ts +++ b/apps/web-antd/src/views/license/license/data.ts @@ -294,6 +294,15 @@ export function useGridFormSchema(): VbenFormSchema[] { option.label.toLowerCase().includes(input.toLowerCase()), }, }, + { + fieldName: 'applicationTime', + label: $t('license.applicationTime'), + component: 'RangePicker', + componentProps: { + ...getRangePickerDefaultProps(), + allowClear: true, + }, + }, { fieldName: 'approver', label: $t('license.approver'), @@ -401,6 +410,12 @@ export function useGridColumns( title: $t('license.applicant'), minWidth: 120, }, + { + field: 'applicationTime', + title: $t('license.applicationTime'), + minWidth: 120, + formatter: 'formatDateTime', + }, { field: 'approver', title: $t('license.approver'),