From cce6c3d3e166887344035c3e244c9d06f382abf7 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 16:28:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
ui/admin-ui3/src/utils/ruoyi.ts | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ui/admin-ui3/src/utils/ruoyi.ts b/ui/admin-ui3/src/utils/ruoyi.ts
index 8664cf5..4038f00 100644
--- a/ui/admin-ui3/src/utils/ruoyi.ts
+++ b/ui/admin-ui3/src/utils/ruoyi.ts
@@ -3,6 +3,7 @@
* Copyright (c) 2019 ruoyi
*/
import {ElForm} from "element-plus";
+import dayjs from "dayjs";
type FormInstance = InstanceType<typeof ElForm>
// 鏃ユ湡鏍煎紡鍖�
@@ -67,6 +68,16 @@
search.params['begin' + propName] = dateRange[0];
search.params['end' + propName] = dateRange[1];
}
+ return search;
+}
+export function addDateRangeNew(params: any, dateRange: any[], propName: string) {
+ let search = params;
+ dateRange = Array.isArray(dateRange) ? dateRange : [];
+ if(dateRange.length >0){
+ search[ propName+'Begin' ] = dateRange[0];
+ search[ propName + 'End'] = dateRange[1];
+ }
+
return search;
}
@@ -252,3 +263,6 @@
}
return outString;
}
+export function formatDate(date:any){
+ return dayjs(date).format('YYYY-MM-DD HH:mm:ss');
+}
\ No newline at end of file
--
Gitblit v1.8.0