From c88fe3ea9fd8bd1ea556b4769a1a0cd6c9b5661d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 11:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/meeting/bookings.vue | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index a9b8266..8b1fe08 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -32,10 +32,13 @@
</el-select>
</el-form-item>
<el-form-item label="璧锋鏃堕棿" prop="startTime">
- <el-date-picker v-model="date" type="datetimerange" range-separator="鑷�" value-format="yyyy-MM-dd HH:mm:ss"
+ <!-- <el-date-picker v-model="date" type="datetimerange" range-separator="鑷�" value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿"
- @change="selectDate"></el-date-picker>
- <!-- <el-date-picker v-model="searchForm.startTime" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ紑濮嬫椂闂�" @change="search"/> -->
+ @change="selectDate"></el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -43,7 +46,7 @@
<el-radio-button label="2">杩�30澶�</el-radio-button>
</el-radio-group>
<!-- <el-form-item label="缁撴潫鏃堕棿" prop="endTime">
- <el-date-picker v-model="searchForm.endTime" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ョ粨鏉熸椂闂�" @change="search"/>
+ <el-date-picker v-model="searchForm.endTime" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="search"/>
</el-form-item> -->
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -213,15 +216,19 @@
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
- this.date = timeForMat(0)
} else if (e === '1') {
this.searchForm.startTime = timeForMat(6)[0]
this.searchForm.endTime = timeForMat(6)[1]
- this.date = timeForMat(6)
} else if (e === '2') {
this.searchForm.startTime = timeForMat(29)[0]
this.searchForm.endTime = timeForMat(29)[1]
- this.date = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
}
this.search()
},
--
Gitblit v1.9.3