From dda4c08d41693d2495a13e7db230c3e9747540de Mon Sep 17 00:00:00 2001 From: wujianwei <wjw@11.com> Date: 星期二, 02 九月 2025 10:33:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master --- ui/admin-ui3/src/utils/ruoyi.ts | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ui/admin-ui3/src/utils/ruoyi.ts b/ui/admin-ui3/src/utils/ruoyi.ts index 8664cf5..0725b48 100644 --- a/ui/admin-ui3/src/utils/ruoyi.ts +++ b/ui/admin-ui3/src/utils/ruoyi.ts @@ -69,6 +69,16 @@ } 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; +} // 鍥炴樉鏁版嵁瀛楀吀 export function selectDictLabel(datas: { [x: string]: { label: any } }, value: string) { -- Gitblit v1.8.0