From 534533425b15b183cea60fa162d9884e5d3c6243 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 13 十月 2026 17:55:50 +0800
Subject: [PATCH] Merge branch 'dev_海西州_北京同仁堂' into dev_海西州_惠牧
---
src/components/operate-log/operate-log.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/operate-log/operate-log.vue b/src/components/operate-log/operate-log.vue
index 8b49466..a868e16 100644
--- a/src/components/operate-log/operate-log.vue
+++ b/src/components/operate-log/operate-log.vue
@@ -3,7 +3,7 @@
import { DICT_TYPE } from '@vben/constants';
import { getDictLabel, getDictObj } from '@vben/hooks';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { Tag, Timeline } from 'ant-design-vue';
@@ -11,6 +11,7 @@
withDefaults(defineProps<OperateLogProps>(), {
logList: () => [],
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
});
/** 鑾峰緱 userType 棰滆壊 */
@@ -48,7 +49,7 @@
</template>
<div class="ml-2 flex flex-wrap items-center gap-2 leading-[22px]">
<span class="w-[140px] shrink-0 text-[13px] text-gray-400">
- {{ formatDateTime(log.createTime) }}
+ {{ formatDate(log.createTime, dateFormat) }}
</span>
<Tag color="success" class="!mr-0">{{ log.userName }}</Tag>
<span>{{ log.action }}</span>
--
Gitblit v1.9.3