diff --git a/src/api/system/role.ts b/src/api/system/role.ts index d375936..c0dca59 100644 --- a/src/api/system/role.ts +++ b/src/api/system/role.ts @@ -108,7 +108,7 @@ export interface RolePageVO { /** 角色编码 */ code?: string; /** 角色ID */ - id?: number; + id: number; /** 角色名称 */ name?: string; /** 排序 */ @@ -132,7 +132,7 @@ export interface RoleForm { /** 角色名称 */ name?: string; /** 排序 */ - sort?: number; + sort: number; /** 角色状态(1-正常;0-停用) */ status?: number; } diff --git a/src/components/cu-date-query/index.vue b/src/components/cu-date-query/index.vue index 330d722..8f94561 100644 --- a/src/components/cu-date-query/index.vue +++ b/src/components/cu-date-query/index.vue @@ -35,6 +35,19 @@ watch( (val) => { if (Array.isArray(val) && val.length === 2 && val[0] && val[1]) { dateRange.value = val.map((item) => new Date(item).getTime()); + } else if (typeof val === "string" && val.includes(",")) { + const [startDate, endDate] = val.split(","); + + if ( + startDate && + endDate && + !isNaN(new Date(startDate).getTime()) && + !isNaN(new Date(endDate).getTime()) + ) { + dateRange.value = [new Date(startDate).getTime(), new Date(endDate).getTime()]; + } else { + dateRange.value = null; + } } else { dateRange.value = null; } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index ff257ff..5806204 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,6 +1,6 @@