From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/meeting/bookings.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 8592bd7..2be5978 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -139,10 +139,10 @@
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'
export default {
name: 'Bookings',
extends: BaseTable,
@@ -163,7 +163,6 @@
isdeleted: '',
remark: '',
name: '',
- roomId: '',
startTime: '',
endTime: '',
content: ''
@@ -195,11 +194,11 @@
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)
})
@@ -216,9 +215,15 @@
},
methods: {
newTree(tree) {
+ if(tree ==null){
+ return []
+ }
return tree.map(item => {
let newItem = {...item}
- if (item.children.length == 0) {
+ if(newItem){
+ newItem.children=newItem.childList
+ }
+ if (item.children && item.children.length == 0) {
this.$delete( newItem, 'children' )
} else {
newItem.children = this.newTree(newItem.children)
--
Gitblit v1.9.3