From 1755192ff6533145a6ed82da31d9f7816bbe00f5 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 14 七月 2025 15:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/equipmentManagement/repair/Form/MaintainForm.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/views/equipmentManagement/repair/Form/MaintainForm.vue b/src/views/equipmentManagement/repair/Form/MaintainForm.vue
index 75e97dd..bbb25c1 100644
--- a/src/views/equipmentManagement/repair/Form/MaintainForm.vue
+++ b/src/views/equipmentManagement/repair/Form/MaintainForm.vue
@@ -40,7 +40,8 @@
form.maintenanceName = data.maintenanceName ?? userStore.nickName;
form.maintenanceResult = data.maintenanceResult;
form.maintenanceTime =
- data.maintenanceTime ?? dayjs().format("YYYY-MM-DD HH:mm:ss");
+ dayjs(data.maintenanceTime).format("YYYY-MM-DD HH:mm:ss") ??
+ dayjs().format("YYYY-MM-DD HH:mm:ss");
};
const getForm = () => {
--
Gitblit v1.9.3