From febd15c55dd6f81702f123b5ef5d2932c4a6760c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 03 七月 2025 11:37:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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