From b92ca63c89b74404c3684f18c734d83531a9dd3f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 三月 2025 16:01:45 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/meeting/bookings.vue | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 830a762..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>
@@ -99,16 +102,15 @@
])
" label="鎿嶄綔" min-width="140" align="center" fixed="right">
<template slot-scope="{ row }">
- <template>
+ <template>
<el-button type="text" @click="$refs.operaBookingsDetailWindow.open('浼氳璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
- <el-button v-if="row.status == '0' &&row.creator === userInfo.id " type="text" @click="$refs.operaBookingsWindow.open('缂栬緫浼氳棰勭害', row)">缂栬緫</el-button>
+ <el-button v-if=" (row.meetingStatus == '1' || row.meetingStatus == '4') &&row.creator === userInfo.id " type="text" @click="$refs.operaBookingsWindow.open('缂栬緫浼氳棰勭害', row)">缂栬緫</el-button>
<el-button type="text"
v-if="row.hasRole ==1 && (row.meetingStatus == '1' || row.meetingStatus == '4')"
@click="handleStart(row)">寮�濮�</el-button>
<el-button type="text" v-if=" row.hasRole ==1&& row.meetingStatus == '2'"
@click="handleEnd(row)">缁撴潫</el-button>
- <el-button v-if="row.hasRole ==1 && (row.meetingStatus == '1' || row.meetingStatus == '4')"
- type="text" @click="cancelMeeting(row.id)">鎾ゅ洖</el-button>
+ <el-button v-if="row.hasRole ==1 && (row.meetingStatus == '1' || row.meetingStatus == '4')" type="text" @click="cancelMeeting(row.id)">鎾ゅ洖</el-button>
<el-button type="text" @click="deleteById(row)" class="red" v-permissions="['business:bookings:delete']">鍒犻櫎</el-button>
</template>
</template>
@@ -142,7 +144,7 @@
data() {
return {
date: [],
- curUserInfo: this.$store.state.userInfo,
+ // userInfo: this.$store.state.userInfo,
// 鎼滅储
searchForm: {
roomId: '',
@@ -214,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