diff --git a/src/pages/index.vue b/src/pages/index.vue
index ebdb472..a223b4b 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <view class="page-container">
     <NavBar :title="pageTitle" />
     <scroll-view scroll-y class="main-scroll" :scroll-top="scrollTop" scroll-with-animation @scroll="onScroll">
diff --git a/src/pages_function/pages/equipmentMaintenance/form.vue b/src/pages_function/pages/equipmentMaintenance/form.vue
index 4d4fa4c..bec32e8 100644
--- a/src/pages_function/pages/equipmentMaintenance/form.vue
+++ b/src/pages_function/pages/equipmentMaintenance/form.vue
@@ -365,6 +365,7 @@ onLoad(async (options) => {
   repairId.value = String(options?.id || '')
   await initAllDict()
   await Promise.all([fetchUsers(), fetchDevices(), fetchComponents()])
+  if (!repairId.value) formData.requireDate = formatPickerDate(Date.now())
   if (repairId.value) {
     await fetchDetail(repairId.value)
   }
@@ -436,6 +437,8 @@ async function fetchDetail(id) {
     formData.requireDate = formatPickerDate(detail?.requireDate)
     formData.finishDate = formatPickerDate(detail?.finishDate)
     formData.confirmDate = formatPickerDate(detail?.confirmDate)
+    if (!formData.finishDate && mode.value === 'repair') formData.finishDate = formatPickerDate(Date.now())
+    if (!formData.confirmDate && mode.value === 'repair') formData.confirmDate = formatPickerDate(Date.now())
     formData.repairStatus = normalizedRepairStatus
     formData.repairResult = normalizedRepairStatus
     formData.acceptedBy = normalizeUserId(detail?.acceptedBy)