From ccbe1710b9c52b0ca23150b0a9ca763da6e1223c Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Thu, 12 Sep 2024 15:43:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/utils/utility.js | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/gz-customerSystem/src/utils/utility.js b/gz-customerSystem/src/utils/utility.js
index ad223f4..2ca8375 100644
--- a/gz-customerSystem/src/utils/utility.js
+++ b/gz-customerSystem/src/utils/utility.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:57:54
- * @LastEditTime: 2024-08-21 16:58:17
+ * @LastEditTime: 2024-09-12 10:55:38
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 公共模块方法
@@ -165,6 +165,8 @@
return info({ type: 'success', content });
}
+
+
// 手机号码正则
export const mobileRegExp = new RegExp('^1([0-9][0-9]|[0-9][0-9]|[0-9][0-9]|[0-9][0-9]|[0-9][0-9])\\d{8}$', 'g');
@@ -178,8 +180,12 @@
}
// 时间格式化
-export function timeFormat(value, isValue) {
- return !!value ? moment(value).format('YYYY-MM-DD HH:mm:ss') : isValue ? '' : '-';
+export function timeFormat(value, isValue, timeFormat) {
+ return !!value ? moment(value).format(timeFormat ? timeFormat : 'YYYY-MM-DD HH:mm:ss') : isValue ? '' : '-';
+}
+
+export function minuteFormat(value, isValue) {
+ return !!value ? moment(value).format('YYYY-MM-DD HH:mm') : isValue ? '' : '-';
}
export function dateFormat(value) {
--
Gitblit v1.8.0