From b33f2e78ffd4fd401698b84a33dc3c293793c62f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 二月 2025 16:22:33 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/meeting/bookings.vue | 279 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 174 insertions(+), 105 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 8592bd7..882ef72 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -3,23 +3,13 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="浼氳瀹�" prop="roomId">
- <el-select
- v-model="searchForm.roomId"
- filterable
- clearable
- placeholder="璇烽�夋嫨浼氳瀹�"
- >
+ <el-select v-model="searchForm.roomId" filterable clearable placeholder="璇烽�夋嫨浼氳瀹�">
<el-option v-for="item in rooms" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="棰勭害閮ㄩ棬" prop="department">
- <el-cascader
- v-model="searchForm.department"
- :options="department"
- :show-all-levels="false"
- clearable
- :props="props"
- ></el-cascader>
+ <el-cascader v-model="searchForm.department" :options="department" :show-all-levels="false" clearable
+ :props="props"></el-cascader>
<!-- @change="handleChange" -->
<!-- <el-select
v-model="searchForm.departmentId"
@@ -37,27 +27,21 @@
<el-input v-model="searchForm.realName" placeholder="璇疯緭鍏ラ绾︿汉" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浼氳鐘舵��" prop="status">
- <el-select
- v-model="searchForm.status"
- filterable
- clearable
- placeholder="璇烽�夋嫨鐘舵��"
- >
+ <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>
</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"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- @change="selectDate"
- ></el-date-picker>
+ <el-form-item label="璧锋鏃堕棿" prop="startTime">
+ <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"/> -->
</el-form-item>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <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-form-item> -->
@@ -68,68 +52,73 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:bookings:create', 'business:bookings:exportExcel']">
- <li><el-button type="primary" @click="$refs.operaBookingsWindow.open('鏂板缓浼氳')" v-permissions="['business:bookings:create']">鏂板缓</el-button></li>
+ <ul class="toolbar" v-permissions="[
+ 'business:bookings:create',
+ 'business:bookings:exportExcel',
+ ]">
+ <li>
+ <el-button type="primary" @click="$refs.operaBookingsWindow.open('鏂板缓浼氳')"
+ v-permissions="['business:bookings:create']">鏂板缓</el-button>
+ </li>
<!-- <li><el-button @click="deleteByIdInBatch" v-permissions="['business:bookings:delete']">鍒犻櫎</el-button></li> -->
- <li><el-button :loading="isWorking.export" v-permissions="['business:bookings:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
+ <li>
+ <el-button :loading="isWorking.export" v-permissions="['business:bookings:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button>
+ </li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- border
- @selection-change="handleSelectionChange"
- >
+ <el-table 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}">
+ <template slot-scope="{ row }">
<span class="long-title-style">{{ row.name }}</span>
</template>
</el-table-column>
<el-table-column prop="roomName" label="浼氳瀹�" align="center" min-width="120px" show-overflow-tooltip>
- <template slot-scope="{row}">
+ <template slot-scope="{ row }">
<span class="long-title-style">{{ row.roomName }}</span>
</template>
</el-table-column>
<el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column>
<el-table-column prop="managerInfo" label="棰勭害浜�" align="center" min-width="100px"></el-table-column>
- <el-table-column label="鐘舵��" align="center" min-width="60px">
- <template slot-scope="{row}">
- <span v-if="row.status==0" style="color:rgb(127, 178, 53)">姝ｅ父</span>
- <span v-else style="color:rgb(234, 54, 38)">鍙栨秷</span>
+ <el-table-column label="浼氳鐘舵��" align="center" min-width="60px">
+ <template slot-scope="{ row }">
+ <span v-if="row.meetingStatus == 1">鏈紑濮�</span>
+ <span v-if="row.meetingStatus == 2">杩涜涓�</span>
+ <span v-if="row.meetingStatus == 3">宸茬粨鏉�</span>
+ <span v-if="row.meetingStatus == 4">鍗冲皢寮�濮�</span>
+ <span v-if="row.meetingStatus == 5">宸叉挙閿�</span>
<!-- {{ row.status==0 ? '姝ｅ父' : '鍙栨秷' }} -->
</template>
</el-table-column>
- <el-table-column prop="createDate" 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', 'business:bookings:delete'])"
- label="鎿嶄綔"
- min-width="120"
- align="center"
- fixed="right"
- >
- <template slot-scope="{row}">
- <template v-if="row.status==0">
- <el-button type="text" @click="$refs.operaBookingsDetailWindow.open('浼氳璇︽儏', row)">鏌ョ湅</el-button>
- <el-button v-if="row.flag == 0" type="text" @click="$refs.operaBookingsWindow.open('缂栬緫浼氳棰勭害', row)" v-permissions="['business:bookings:update']">淇敼</el-button>
- <el-button type="text" @click="copy(row)">澶嶅埗</el-button>
- <el-button v-if="row.flag == 0" type="text" @click="cancelMeeting(row.id)" v-permissions="['business:bookings:update']">鍙栨秷</el-button>
+ <el-table-column v-if="
+ containPermissions([
+ 'business:bookings:update',
+ 'business:bookings:delete',
+ ])
+ " label="鎿嶄綔" min-width="140" align="center" fixed="right">
+ <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 type="text" v-if="row.creator===userInfo.id &&(row.meetingStatus == '1' || row.meetingStatus == '4')" @click="handleStart(row)">寮�濮�</el-button>
+ <el-button type="text" v-if="row.creator===userInfo.id && row.meetingStatus == '2'" @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>
</template>
- <el-button v-else type="text" @click="deleteById(row)" v-permissions="['business:bookings:delete']">鍒犻櫎</el-button>
+ <!-- <el-button v-else type="text" @click="deleteById(row)" v-permissions="['business:bookings:delete']">鍒犻櫎</el-button> -->
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaBookingsWindow ref="operaBookingsWindow" @success="handlePageChange"/>
- <OperaBookingsDetailWindow ref="operaBookingsDetailWindow"/>
+ <OperaBookingsWindow ref="operaBookingsWindow" @success="handlePageChange" />
+ <OperaBookingsDetailWindow @success="search" ref="operaBookingsDetailWindow" />
+
</TableLayout>
</template>
@@ -139,34 +128,36 @@
import Pagination from '@/components/common/Pagination'
import OperaBookingsWindow from '@/views/meeting/components/OperaBookingsWindow'
import OperaBookingsDetailWindow from '@/views/meeting/components/OperaBookingsDetailWindow'
-import { findList } from '@/views/meeting/api/rooms'
+import { findList } from '@/api/meeting/rooms'
import { getSystemDictData } from '@/api/system/dictData'
-import { fetchTree } from '@/api/system/department'
-import { cancelById, bookingsDetail } from '@/views/meeting/api/bookings'
+import { fetchList } from '@/api/business/company'
+import { cancelById, bookingsDetail, startEarlyById, startById, meetingEndById } from '@/api/meeting/bookings'
+import { timeForMat } from '@/utils/util'
export default {
name: 'Bookings',
extends: BaseTable,
components: { TableLayout, Pagination, OperaBookingsWindow, OperaBookingsDetailWindow },
- data () {
+ data() {
return {
date: [],
+ userInfo: this.$store.state.userInfo,
// 鎼滅储
searchForm: {
roomId: '',
// departmentId: [],
department: [],
realName: '',
- status: '',
+ meetingStatus: '',
createDate: '',
editor: '',
editDate: '',
isdeleted: '',
remark: '',
name: '',
- roomId: '',
startTime: '',
endTime: '',
- content: ''
+ content: '',
+ radio: 0
},
props: {
label: 'name',
@@ -180,11 +171,13 @@
{ name: '寮�鍙戦儴闂�', id: '0' }
],
status: [
- { name: '鍏ㄩ儴', id: '' },
- { name: '姝ｅ父', id: '0' },
- { name: '鍙栨秷', id: '1' },
+ { name: '鏈紑濮�', id: 1 },
+ { name: '鍗冲皢寮�濮�', id: 4 },
+ { name: '杩涜涓�', id: 2 },
+ { name: '宸叉挙閿�', id: 5 },
+ { name: '宸茬粨鏉�', id: 3 }
],
- link: 'https://dmtest.ahapp.net/meeting_h5/' //H5_LINK_ADDR
+ link: 'https://dmtest.ahapp.net/meeting_h5/' // H5_LINK_ADDR
}
},
provide() {
@@ -192,74 +185,120 @@
rooms: () => this.rooms
}
},
- created () {
+ created() {
this.config({
module: '浼氳瀹ら瀹氫俊鎭〃',
- api: '@/views/meeting/api/bookings',
+ api: '/meeting/bookings',
'field.id': 'id',
'field.main': 'id'
})
- fetchTree()
+ fetchList(1)
.then(res => {
this.department = this.newTree(res)
})
getSystemDictData('H5_LINK_ADDR')
.then(res => {
- console.log(res);
- this.link=res.code
+ console.log(res)
+ this.link = res.code
})
- findList({status:0})
+ findList({ status: 0 })
.then(res => {
this.rooms = res
})
- this.search()
+ this.changeRadio('0')
},
methods: {
+ changeRadio(e) {
+ 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)
+ }
+ this.search()
+ },
newTree(tree) {
+ if (tree == null) {
+ return []
+ }
return tree.map(item => {
- let newItem = {...item}
- if (item.children.length == 0) {
- this.$delete( newItem, 'children' )
+ const newItem = { ...item }
+ if (newItem) {
+ newItem.children = newItem.childList
+ }
+ if (item.children && item.children.length == 0) {
+ this.$delete(newItem, 'children')
} else {
newItem.children = this.newTree(newItem.children)
}
return newItem
- });
+ })
},
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 = '0'
this.searchForm.startTime = ''
this.searchForm.endTime = ''
- this.search()
+ this.changeRadio('0')
},
copy(row) {
- let text = `${row.realName} 閭�璇锋偍鍔犲叆浼氳\n浼氳涓婚锛�${row.name}\n浼氳瀹わ細${row.roomName}\n浼氳鏃堕棿锛�${row.meetingTime}\n鐐瑰嚮閾炬帴鐩存帴鍔犲叆浼氳锛歕n${this.link}?id=${row.id}`
+ const text = `${row.realName} 閭�璇锋偍鍔犲叆浼氳\n浼氳涓婚锛�${row.name}\n浼氳瀹わ細${row.roomName}\n浼氳鏃堕棿锛�${row.meetingTime}\n鐐瑰嚮閾炬帴鐩存帴鍔犲叆浼氳锛歕n${this.link}?id=${row.id}`
this.$copyText(text)
.then(() => {
this.$message.success('浼氳淇℃伅澶嶅埗鎴愬姛锛屽幓鍒嗕韩缁欏悓浜嬪惂~')
})
.catch(e => {
- this.$message.error(e)
+ })
+ },
+ handleStart(row) {
+ this.$dialog.messageWaring('寮�濮嬩細璁�', '鏄惁寮�濮嬪綋鍓嶄細璁紵')
+ .then(() => {
+ let fn = new Date(row.startTime).getTime() > new Date().getTime() ? startEarlyById : startById
+ fn({ id: row.id })
+ .then(() => {
+ this.$message.success('浼氳宸插紑濮�')
+ this.handlePageChange()
+ })
+ .catch(e => {
+ })
+ })
+ },
+ handleEnd(row) {
+ this.$dialog.messageWaring('缁撴潫浼氳', '鏄惁缁撴潫褰撳墠浼氳锛�')
+ .then(() => {
+ meetingEndById({ id: row.id })
+ .then(() => {
+ this.$message.success('浼氳宸茬粨鏉�')
+ this.handlePageChange()
+ })
+ .catch(e => {
+ })
})
},
cancelMeeting(id) {
this.$dialog.messageWaring('鍙栨秷浼氳', '鏄惁鍙栨秷褰撳墠浼氳锛�')
.then(() => {
- cancelById({id})
+ cancelById({ id })
.then(() => {
this.$message.success('鍙栨秷鎴愬姛')
this.handlePageChange()
})
.catch(e => {
- this.$message.error(e)
})
})
-
},
showDetail(id) {
bookingsDetail(id)
@@ -267,7 +306,6 @@
this.$refs.operaBookingsDetailWindow.open('浼氳璇︽儏', res)
})
.catch(e => {
- this.$message.error(e)
})
},
editBookings(id) {
@@ -276,17 +314,15 @@
this.$refs.operaBookingsWindow.open('缂栬緫浼氳棰勭害', res)
})
.catch(e => {
- this.$message.error(e)
})
-
},
- handlePageChange (pageIndex) {
+ handlePageChange(pageIndex) {
this.__checkApi()
this.tableData.pagination.pageIndex = pageIndex || this.tableData.pagination.pageIndex
this.isWorking.search = true
- let form = JSON.parse(JSON.stringify(this.searchForm))
+ const form = JSON.parse(JSON.stringify(this.searchForm))
if (form.department.length) {
- form.departmentId = form.department[form.department.length-1]
+ form.departmentId = form.department[form.department.length - 1]
}
this.api.fetchList({
page: this.tableData.pagination.pageIndex,
@@ -299,12 +335,45 @@
this.tableData.pagination.total = data.total
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.search = false
})
- },
- },
+ }
+ }
}
</script>
+
+<style lang="scss" scoped>
+.detail_modal {
+ padding: 20px 16px;
+
+ .title {
+ text-align: center;
+ font-weight: 600;
+ font-size: 16px;
+ margin-bottom: 20px;
+ }
+
+ .h1 {
+ font-weight: 600;
+ font-size: 16px;
+ margin-bottom: 15px;
+ }
+
+ .line {
+ display: flex;
+ margin-bottom: 10px;
+
+ .label {
+ width: 70px;
+ color: #888888;
+ }
+
+ .value {
+ color: #333333;
+ }
+ }
+}
+</style>
--
Gitblit v1.9.3