From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/meeting/bookings.vue | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 4cca73b..6f44d68 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -1,5 +1,5 @@
<template>
- <TableLayout :permissions="['business:bookings:query']">
+ <TableLayout rel="tableLayoutEle" :permissions="['business:bookings:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="浼氳瀹�" prop="roomId">
@@ -26,7 +26,7 @@
<el-form-item label="棰勭害浜�" prop="realName">
<el-input v-model="searchForm.realName" placeholder="璇疯緭鍏ラ绾︿汉" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="浼氳鐘舵��" prop="status">
+ <el-form-item label="浼氳鐘舵��" prop="meetingStatus">
<el-select v-model="searchForm.meetingStatus" filterable clearable placeholder="璇烽�夋嫨鐘舵��">
<el-option v-for="item in status" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
@@ -55,7 +55,7 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="[
+ <ul class="toolbar" ref="toolbarEle" v-permissions="[
'business:bookings:create',
'business:bookings:exportExcel',
]">
@@ -69,7 +69,7 @@
@click="exportExcel">瀵煎嚭</el-button>
</li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" align="center" width="55"></el-table-column> -->
<el-table-column prop="name" label="浼氳涓婚" align="center" min-width="120px" show-overflow-tooltip>
<template slot-scope="{ row }">
@@ -93,8 +93,8 @@
<!-- {{ row.status==0 ? '姝ｅ父' : '鍙栨秷' }} -->
</template>
</el-table-column>
+ <el-table-column prop="remark" label="浼氳闇�姹�" align="center" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="150px"></el-table-column>
- <!-- <el-table-column prop="content" label="浼氳鍐呭" min-width="100px"></el-table-column> -->
<el-table-column v-if="
containPermissions([
'business:bookings:update',
@@ -104,17 +104,15 @@
<template slot-scope="{ row }">
<template>
<el-button type="text" @click="$refs.operaBookingsDetailWindow.open('浼氳璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
- <el-button v-if="row.meetingStatus == '1' && 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.creator === userInfo.id && (row.meetingStatus == '1' || row.meetingStatus == '4')"
+ v-if="row.hasRole ==1 && (row.meetingStatus == '1' || row.meetingStatus == '4')"
@click="handleStart(row)">寮�濮�</el-button>
- <el-button type="text" v-if="row.creator === userInfo.id && row.meetingStatus == '2'"
+ <el-button type="text" v-if=" row.hasRole ==1 && [2, 0].includes(row.meetingStatus)"
@click="handleEnd(row)">缁撴潫</el-button>
- <el-button v-if="row.creator === userInfo.id && (row.meetingStatus == '1' || row.meetingStatus == '4')"
- type="text" @click="cancelMeeting(row.id)">鎾ゅ洖</el-button>
+ <el-button v-if="row.hasRole ==1 && [1, 4].includes(row.meetingStatus)" 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>
- <!-- <el-button v-else type="text" @click="deleteById(row)" v-permissions="['business:bookings:delete']">鍒犻櫎</el-button> -->
</template>
</el-table-column>
</el-table>
@@ -143,10 +141,10 @@
name: 'Bookings',
extends: BaseTable,
components: { TableLayout, Pagination, OperaBookingsWindow, OperaBookingsDetailWindow },
- data() {
+ data () {
return {
date: [],
- userInfo: this.$store.state.userInfo,
+ // userInfo: this.$store.state.userInfo,
// 鎼滅储
searchForm: {
roomId: '',
@@ -186,12 +184,12 @@
link: 'https://dmtest.ahapp.net/meeting_h5/' // H5_LINK_ADDR
}
},
- provide() {
+ provide () {
return {
rooms: () => this.rooms
}
},
- created() {
+ created () {
this.config({
module: '浼氳瀹ら瀹氫俊鎭〃',
api: '/meeting/bookings',
@@ -214,7 +212,7 @@
this.changeRadio('0')
},
methods: {
- changeRadio(e) {
+ changeRadio (e) {
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
@@ -234,7 +232,7 @@
}
this.search()
},
- newTree(tree) {
+ newTree (tree) {
if (tree == null) {
return []
}
@@ -251,12 +249,12 @@
return newItem
})
},
- selectDate(v) {
+ selectDate (v) {
this.searchForm.endTime = v[1] + ' 23:59:59'
this.searchForm.startTime = v[0] + ' 00:00:00'
this.searchForm.radio = null
},
- reset() {
+ reset () {
this.$refs.searchForm.resetFields()
this.date = []
this.searchForm.radio = ''
@@ -265,7 +263,7 @@
// this.changeRadio('0')
this.search()
},
- copy(row) {
+ copy (row) {
const text = `${row.realName} 閭�璇锋偍鍔犲叆浼氳\n浼氳涓婚锛�${row.name}\n浼氳瀹わ細${row.roomName}\n浼氳鏃堕棿锛�${row.meetingTime}\n鐐瑰嚮閾炬帴鐩存帴鍔犲叆浼氳锛歕n${this.link}?id=${row.id}`
this.$copyText(text)
.then(() => {
@@ -274,10 +272,10 @@
.catch(e => {
})
},
- handleStart(row) {
+ handleStart (row) {
this.$dialog.messageWaring('寮�濮嬩細璁�', '鏄惁寮�濮嬪綋鍓嶄細璁紵')
.then(() => {
- let fn = new Date(row.startTime).getTime() > new Date().getTime() ? startEarlyById : startById
+ const fn = new Date(row.startTime).getTime() > new Date().getTime() ? startEarlyById : startById
fn({ id: row.id })
.then(() => {
this.$message.success('浼氳宸插紑濮�')
@@ -287,7 +285,7 @@
})
})
},
- handleEnd(row) {
+ handleEnd (row) {
this.$dialog.messageWaring('缁撴潫浼氳', '鏄惁缁撴潫褰撳墠浼氳锛�')
.then(() => {
meetingEndById({ id: row.id })
@@ -299,7 +297,7 @@
})
})
},
- cancelMeeting(id) {
+ cancelMeeting (id) {
this.$dialog.messageWaring('鍙栨秷浼氳', '鏄惁鍙栨秷褰撳墠浼氳锛�')
.then(() => {
cancelById({ id })
@@ -311,7 +309,7 @@
})
})
},
- showDetail(id) {
+ showDetail (id) {
bookingsDetail(id)
.then(res => {
this.$refs.operaBookingsDetailWindow.open('浼氳璇︽儏', res)
@@ -319,7 +317,7 @@
.catch(e => {
})
},
- editBookings(id) {
+ editBookings (id) {
bookingsDetail(id)
.then(res => {
this.$refs.operaBookingsWindow.open('缂栬緫浼氳棰勭害', res)
@@ -327,7 +325,7 @@
.catch(e => {
})
},
- handlePageChange(pageIndex) {
+ handlePageChange (pageIndex) {
this.__checkApi()
this.tableData.pagination.pageIndex = pageIndex || this.tableData.pagination.pageIndex
this.isWorking.search = true
--
Gitblit v1.9.3