From 9e0f0ee575c7b490e768af0188a494eec7944492 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 27 Jan 2026 12:30:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-wx/src/subPackages/flightApplication/add.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/uniapps/work-wx/src/subPackages/flightApplication/add.vue b/uniapps/work-wx/src/subPackages/flightApplication/add.vue
index 080da5c..d660720 100644
--- a/uniapps/work-wx/src/subPackages/flightApplication/add.vue
+++ b/uniapps/work-wx/src/subPackages/flightApplication/add.vue
@@ -329,20 +329,22 @@
@confirm="onPickerPlanType"
@cancel="isShowPlanType = false"
/>
- <up-datetime-picker
+ <u-datetime-picker
:show="isShowStartTime"
v-model="startTime"
mode="datetime"
+ :min-date="minDate"
@confirm="onConfirmStartTime"
@cancel="isShowStartTime = false"
- ></up-datetime-picker>
- <up-datetime-picker
+ ></u-datetime-picker>
+ <u-datetime-picker
:show="isShowEndTime"
v-model="endTime"
mode="datetime"
+ :min-date="minDate"
@confirm="onConfirmEndTime"
@cancel="isShowEndTime = false"
- ></up-datetime-picker>
+ ></u-datetime-picker>
<!-- <u-calendar :show="isShowTimeRange" mode="date" @confirm="onConfirmTimeRange" @close="isShowTimeRange = false" :close-on-click-overlay="true"></u-calendar> -->
<!-- <u-calendar :show="isShowTimeRange" mode="range" @confirm="onConfirmTimeRange" @close="isShowTimeRange = false" :close-on-click-overlay="true" :allow-same-day="true" :show-time="true" time-format="HH:mm:ss"></u-calendar> -->
<!-- 飞行器 -->
@@ -541,6 +543,7 @@
const isShowStartTime = ref(false)
// 是否显示结束时间选择器
const isShowEndTime = ref(false)
+const minDate = ref(Date.now()); // 设置最小日期为当前时间戳
const startTime = ref(Date.now()); // 设置默认值为当前时间戳
const endTime = ref(Date.now()); // 设置默认值为当前时间戳
@@ -714,6 +717,8 @@
duration: 2000
})
}
+ }).finally(() => {
+ isSubmitDisabled.value = false
})
}
onMounted(() => {
--
Gitblit v1.9.3