From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/meeting/bookings.vue | 100 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 66 insertions(+), 34 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 8592bd7..706d8fc 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -46,7 +46,7 @@
<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-form-item label="璧锋鏃堕棿" prop="startTime">
<el-date-picker
v-model="date"
type="datetimerange"
@@ -58,6 +58,15 @@
></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> -->
@@ -139,10 +148,11 @@
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 } from '@/api/meeting/bookings'
+import { timeForMat } from '@/utils/util'
export default {
name: 'Bookings',
extends: BaseTable,
@@ -163,10 +173,10 @@
isdeleted: '',
remark: '',
name: '',
- roomId: '',
startTime: '',
endTime: '',
- content: ''
+ content: '',
+ radio: 0
},
props: {
label: 'name',
@@ -182,12 +192,12 @@
status: [
{ name: '鍏ㄩ儴', id: '' },
{ name: '姝ｅ父', id: '0' },
- { name: '鍙栨秷', id: '1' },
+ { name: '鍙栨秷', id: '1' }
],
- link: 'https://dmtest.ahapp.net/meeting_h5/' //H5_LINK_ADDR
+ link: 'https://dmtest.ahapp.net/meeting_h5/' // H5_LINK_ADDR
}
},
- provide() {
+ provide () {
return {
rooms: () => this.rooms
}
@@ -195,50 +205,74 @@
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: {
- newTree(tree) {
+ 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) {
+ selectDate (v) {
this.searchForm.endTime = v[1] + ' 23:59:59'
this.searchForm.startTime = v[0] + ' 00:00:00'
+ this.searchForm.radio = null
},
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}`
+ 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(() => {
this.$message.success('浼氳淇℃伅澶嶅埗鎴愬姛锛屽幓鍒嗕韩缁欏悓浜嬪惂~')
@@ -247,10 +281,10 @@
this.$message.error(e)
})
},
- cancelMeeting(id) {
+ cancelMeeting (id) {
this.$dialog.messageWaring('鍙栨秷浼氳', '鏄惁鍙栨秷褰撳墠浼氳锛�')
.then(() => {
- cancelById({id})
+ cancelById({ id })
.then(() => {
this.$message.success('鍙栨秷鎴愬姛')
this.handlePageChange()
@@ -259,9 +293,8 @@
this.$message.error(e)
})
})
-
},
- showDetail(id) {
+ showDetail (id) {
bookingsDetail(id)
.then(res => {
this.$refs.operaBookingsDetailWindow.open('浼氳璇︽儏', res)
@@ -270,7 +303,7 @@
this.$message.error(e)
})
},
- editBookings(id) {
+ editBookings (id) {
bookingsDetail(id)
.then(res => {
this.$refs.operaBookingsWindow.open('缂栬緫浼氳棰勭害', res)
@@ -278,15 +311,14 @@
.catch(e => {
this.$message.error(e)
})
-
},
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,
@@ -304,7 +336,7 @@
.finally(() => {
this.isWorking.search = false
})
- },
- },
+ }
+ }
}
</script>
--
Gitblit v1.9.3