From 415bf078cb4f9615e9090663b7880e35817fd036 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期六, 11 五月 2024 18:54:26 +0800 Subject: [PATCH] 最新版本 --- admin/src/views/meeting/bookings.vue | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue index e0c4f2f..2be5978 100644 --- a/admin/src/views/meeting/bookings.vue +++ b/admin/src/views/meeting/bookings.vue @@ -141,7 +141,7 @@ import OperaBookingsDetailWindow from '@/views/meeting/components/OperaBookingsDetailWindow' import { findList } from '@/api/meeting/rooms' import { getSystemDictData } from '@/api/system/dictData' -import { fetchTree } from '@/api/system/department' +import { fetchList } from '@/api/business/company' import { cancelById, bookingsDetail } from '@/api/meeting/bookings' export default { name: 'Bookings', @@ -163,7 +163,6 @@ isdeleted: '', remark: '', name: '', - roomId: '', startTime: '', endTime: '', content: '' @@ -199,7 +198,7 @@ '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