From 2af71bcf522c485ea005184c977986374a7dcc4a Mon Sep 17 00:00:00 2001
From: Sanakey <714737083@qq.com>
Date: 星期六, 28 九月 2024 09:47:10 +0800
Subject: [PATCH] Merge branch 'feng-v1-editor' of http://192.168.100.20:9090/r/onbus_crm into li-v1
---
src/utils/dateUtil.ts | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/utils/dateUtil.ts b/src/utils/dateUtil.ts
index e18387d..65c693d 100644
--- a/src/utils/dateUtil.ts
+++ b/src/utils/dateUtil.ts
@@ -5,6 +5,8 @@
const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
const DATE_FORMAT = 'YYYY-MM-DD';
+const DATE_DAY_FORMAT = 'YYYY-MM-DD HH:mm';
+
export function formatToDateTime(date?: dayjs.ConfigType, format = DATE_TIME_FORMAT): string {
return dayjs(date).format(format);
@@ -13,5 +15,13 @@
export function formatToDate(date?: dayjs.ConfigType, format = DATE_FORMAT): string {
return dayjs(date).format(format);
}
+export function formatToDateDay(date?: dayjs.ConfigType, format = DATE_DAY_FORMAT): string {
+ return dayjs(date).format(format);
+}
+export function isBeforeToDay(date?: dayjs.ConfigType): boolean {
+ //鑾峰彇浠婂ぉ鐨勬棩鏈�
+ const now = dayjs();
+ return dayjs(date).isBefore(dayjs(now));
+}
export const dateUtil = dayjs;
--
Gitblit v1.8.0