From abeb38d44718730071dbf0e557b8468af6983a27 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 13 十月 2026 17:54:01 +0800
Subject: [PATCH] fix: 时间 1.设备维修单，库存流水，报工时间，BI大屏数据（还有配置管理），用户，角色，部门，岗位，字典，日志列表展示时间修改
---
src/views/bi/dashboard/index.vue | 10 +++++++++-
src/views/system/user/data.ts | 2 +-
src/views/wls/transaction/data.ts | 2 +-
src/views/system/operatelog/data.ts | 6 +++---
src/views/system/role/data.ts | 2 +-
src/views/bi/config/chart/data.ts | 2 +-
src/views/mes/dv/repair/data.ts | 6 +++---
src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue | 2 +-
src/views/system/dict/data.ts | 4 ++--
src/views/system/loginlog/data.ts | 6 +++---
src/views/system/post/data.ts | 2 +-
src/views/system/dept/data.ts | 2 +-
src/views/bi/config/data-source/data.ts | 2 +-
src/views/mes/pro/feedback/data.ts | 10 ++++++++--
14 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/src/views/bi/config/chart/data.ts b/src/views/bi/config/chart/data.ts
index 44b770d..4c7a5bb 100644
--- a/src/views/bi/config/chart/data.ts
+++ b/src/views/bi/config/chart/data.ts
@@ -201,7 +201,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 170,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/bi/config/data-source/data.ts b/src/views/bi/config/data-source/data.ts
index 7375b4e..c621eba 100644
--- a/src/views/bi/config/data-source/data.ts
+++ b/src/views/bi/config/data-source/data.ts
@@ -127,7 +127,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 170,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/bi/dashboard/index.vue b/src/views/bi/dashboard/index.vue
index cac84a6..c1bbf5c 100644
--- a/src/views/bi/dashboard/index.vue
+++ b/src/views/bi/dashboard/index.vue
@@ -134,8 +134,16 @@
return formatNumber(v);
}
+// 澶у睆琛ㄦ牸閲岀殑鏃ユ湡鍒楀彧灞曠ず鍒板ぉ锛堝舰濡� 2026-09-01 10:23:45 鐨勫�煎垏鎴� 2026-09-01锛夛紝
+// 鍥捐〃 SQL 閲岀殑 order_time / receipt_date / create_time / hire_date 閮芥槸甯︽椂鍒嗙鐨�
+const DATE_TIME_RE = /^\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}(?::\d{2})?(?:\.\d+)?$/;
+
function getCellValue(row: unknown, col: string): unknown {
- return (row as Record<string, unknown>)[col];
+ const val = (row as Record<string, unknown>)[col];
+ if (typeof val === 'string' && DATE_TIME_RE.test(val)) {
+ return val.slice(0, 10);
+ }
+ return val;
}
// ======== 鐪嬫澘涓婚鑹� ========
diff --git a/src/views/mes/dv/repair/data.ts b/src/views/mes/dv/repair/data.ts
index 6d9e47b..a185c3d 100644
--- a/src/views/mes/dv/repair/data.ts
+++ b/src/views/mes/dv/repair/data.ts
@@ -300,13 +300,13 @@
field: 'requireDate',
title: '鎶ヤ慨鏃ユ湡',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'finishDate',
title: '瀹屾垚鏃ユ湡',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'result',
@@ -330,7 +330,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/pro/feedback/data.ts b/src/views/mes/pro/feedback/data.ts
index 32056e7..3e25ee4 100644
--- a/src/views/mes/pro/feedback/data.ts
+++ b/src/views/mes/pro/feedback/data.ts
@@ -13,6 +13,7 @@
MesProWorkOrderStatusEnum,
} from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
+import { formatDate } from '@vben/utils';
import { Button } from 'ant-design-vue';
@@ -20,6 +21,7 @@
import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
import { getSimpleUserList } from '#/api/system/user';
import { loadParamDetails } from './param-state';
+
import { getRangePickerDefaultProps } from '#/utils';
import { MdItemSelect } from '#/views/mes/md/item/components';
import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
@@ -147,7 +149,7 @@
field: 'feedbackTime',
title: '鎶ュ伐鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{ field: 'approveUserNickname', title: '瀹℃牳浜�', width: 100 },
{
@@ -488,7 +490,11 @@
{ field: 'materialScrapQuantity', label: '鏂欏簾鏁伴噺' },
{ field: 'otherScrapQuantity', label: '鍏朵粬搴熷搧' },
{ field: 'feedbackUserNickname', label: '鎶ュ伐浜�' },
- { field: 'feedbackTime', label: '鎶ュ伐鏃堕棿' },
+ {
+ field: 'feedbackTime',
+ label: '鎶ュ伐鏃堕棿',
+ render: (val) => formatDate(val) as string,
+ },
{ field: 'approveUserNickname', label: '瀹℃牳浜�' },
{ field: 'remark', label: '澶囨敞' },
];
diff --git a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
index 40fe4f8..7edccdf 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
@@ -191,7 +191,7 @@
field: 'feedbackTime',
title: '鎶ュ伐鏃堕棿',
width: 170,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/system/dept/data.ts b/src/views/system/dept/data.ts
index 9fe39e2..7537d23 100644
--- a/src/views/system/dept/data.ts
+++ b/src/views/system/dept/data.ts
@@ -175,7 +175,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/system/dict/data.ts b/src/views/system/dict/data.ts
index cfa455a..2dc93cb 100644
--- a/src/views/system/dict/data.ts
+++ b/src/views/system/dict/data.ts
@@ -137,7 +137,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
@@ -342,7 +342,7 @@
title: '鍒涘缓鏃堕棿',
field: 'createTime',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/system/loginlog/data.ts b/src/views/system/loginlog/data.ts
index 386d832..a7db14d 100644
--- a/src/views/system/loginlog/data.ts
+++ b/src/views/system/loginlog/data.ts
@@ -5,7 +5,7 @@
import { h } from 'vue';
import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { DictTag } from '#/components/dict-tag';
import { getRangePickerDefaultProps } from '#/utils';
@@ -88,7 +88,7 @@
field: 'createTime',
title: '鐧诲綍鏃ユ湡',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
@@ -141,7 +141,7 @@
{
field: 'createTime',
label: '鐧诲綍鏃ユ湡',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
];
}
diff --git a/src/views/system/operatelog/data.ts b/src/views/system/operatelog/data.ts
index c75d4c2..e98e6b4 100644
--- a/src/views/system/operatelog/data.ts
+++ b/src/views/system/operatelog/data.ts
@@ -5,7 +5,7 @@
import { h } from 'vue';
import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { getSimpleUserList } from '#/api/system/user';
import { DictTag } from '#/components/dict-tag';
@@ -106,7 +106,7 @@
field: 'createTime',
title: '鎿嶄綔鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'bizId',
@@ -190,7 +190,7 @@
{
field: 'createTime',
label: '鎿嶄綔鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'bizId',
diff --git a/src/views/system/post/data.ts b/src/views/system/post/data.ts
index ca71395..3366e04 100644
--- a/src/views/system/post/data.ts
+++ b/src/views/system/post/data.ts
@@ -168,7 +168,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/system/role/data.ts b/src/views/system/role/data.ts
index b8efae8..ea76b9b 100644
--- a/src/views/system/role/data.ts
+++ b/src/views/system/role/data.ts
@@ -253,7 +253,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/system/user/data.ts b/src/views/system/user/data.ts
index 8506c40..d67b4f9 100644
--- a/src/views/system/user/data.ts
+++ b/src/views/system/user/data.ts
@@ -342,7 +342,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/wls/transaction/data.ts b/src/views/wls/transaction/data.ts
index 117aa3f..75af4b8 100644
--- a/src/views/wls/transaction/data.ts
+++ b/src/views/wls/transaction/data.ts
@@ -203,7 +203,7 @@
field: 'transactionTime',
title: '浜嬪姟鏃堕棿',
width: 160,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
];
}
--
Gitblit v1.9.3