From 1f29e50d81c9168a9d5b4e90dbaebc2b6d4a47e3 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 08 八月 2025 17:39:58 +0800
Subject: [PATCH] Merge branch 'dev_ai' of http://114.132.189.42:9002/r/product-inventory-management into dev_ai

---
 src/views/equipmentManagement/upkeep/Form/MaintenanceForm.vue |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/views/equipmentManagement/upkeep/Form/MaintenanceForm.vue b/src/views/equipmentManagement/upkeep/Form/MaintenanceForm.vue
index 4ff0237..bc3db70 100644
--- a/src/views/equipmentManagement/upkeep/Form/MaintenanceForm.vue
+++ b/src/views/equipmentManagement/upkeep/Form/MaintenanceForm.vue
@@ -46,7 +46,8 @@
   form.maintenanceActuallyName =
     data.maintenanceActuallyName ?? userStore.nickName;
   form.maintenanceActuallyTime =
-    data.maintenanceActuallyTime ?? dayjs().format("YYYY-MM-DD HH:mm:ss");
+    dayjs(data.maintenanceActuallyTime).format("YYYY-MM-DD HH:mm:ss") ??
+    dayjs().format("YYYY-MM-DD HH:mm:ss");
   form.maintenanceResult = data.maintenanceResult;
 };
 

--
Gitblit v1.9.3