From 89a5fedfe041ebacb2d81ecae1023b206cd3f353 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 四月 2025 09:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
eims-ui/apps/web-antd/src/views/eims/insp-st/data.tsx | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/eims-ui/apps/web-antd/src/views/eims/insp-st/data.tsx b/eims-ui/apps/web-antd/src/views/eims/insp-st/data.tsx
index e4de7f4..fee6672 100644
--- a/eims-ui/apps/web-antd/src/views/eims/insp-st/data.tsx
+++ b/eims-ui/apps/web-antd/src/views/eims/insp-st/data.tsx
@@ -44,9 +44,26 @@
fixed: 'left'
},
{
- title: '淇濆吇骞存湀',
- field: 'planTime',
- minWidth: 120
+ title: '淇濆吇鏃堕棿',
+ field: 'planTimeStr',
+ minWidth: 200,
+ slots: {
+ default: ({ row }) => {
+ // 鍒ゆ柇鏄惁闇�瑕佹樉绀烘椂闂�
+ if (!row.type) return '';
+
+ // 鑾峰彇鍘熷鏃堕棿瀛楃涓�
+ const fullDate = row.planTimeStr;
+
+ // 鏍规嵁鏉′欢鍐冲畾鏄剧ず鏍煎紡
+ // 绀轰緥鏉′欢锛氬鏋� status 鏄煇涓壒瀹氬�硷紙渚嬪 'monthly'锛夛紝鍒欐樉绀� YYYY-MM
+ if (row.type === 'Month') {
+ return fullDate.slice(0, 7); // 鎴彇鍓� 7 涓瓧绗︼紝寰楀埌 YYYY-MM
+ }
+ // 榛樿鏄剧ず瀹屾暣鏃ユ湡 YYYY-MM-DD
+ return fullDate;
+ }
+ }
},
{
title: '鐘舵��',
@@ -54,6 +71,7 @@
minWidth: 80,
slots: {
default: ({ row }) => {
+ if (!row.status) return '';
return renderDict(row.status, DictEnum.EIMS_INSPECT_STATUS);
}
}
--
Gitblit v1.9.3