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/views/mes/tm/tool/data.ts | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/mes/tm/tool/data.ts b/src/views/mes/tm/tool/data.ts
index af2c051..682b7f9 100644
--- a/src/views/mes/tm/tool/data.ts
+++ b/src/views/mes/tm/tool/data.ts
@@ -11,7 +11,7 @@
MesToolStatusEnum,
} from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { Button } from 'ant-design-vue';
@@ -181,8 +181,8 @@
label: '涓嬫淇濆吇鏃ユ湡',
component: 'DatePicker',
componentProps: {
- format: 'YYYY-MM-DD HH:mm:ss',
- showTime: true,
+ format: 'YYYY-MM-DD',
+ showTime: false,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
dependencies: {
@@ -302,7 +302,7 @@
formatter: ({ row }) => {
if (row.maintenType === MesMaintenTypeEnum.REGULAR) {
return row.nextMaintenDate
- ? formatDateTime(row.nextMaintenDate)
+ ? formatDate(row.nextMaintenDate)
: '-';
}
if (row.maintenType === MesMaintenTypeEnum.USAGE) {
@@ -326,7 +326,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
@@ -416,7 +416,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
];
}
--
Gitblit v1.9.3