Merge remote-tracking branch 'origin/master'

jiangping

2024-10-30 cf295b38650730cc2fbe3bee19c77fdea411095b

 admin/src/views/meeting/components/selectMember.vue

@@ -51,7 +51,7 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalAlertWindow from '@/components/common/GlobalAlertWindow'
import { findTreeUser } from '@/api/system/department'
// import { findTreeUser } from '@/api/system/department'
import { fetchList as userList } from '@/api/system/user'
export default {
  name: 'selectMember',
@@ -133,34 +133,34 @@
      } else {
        parentId = node.data.id
      }
      findTreeUser({parentId})
        .then(res => {
          // this.data = [res]
          if (!parentId) {
            resolve([res])
          } else {
            let resolveList = []
            if (res.userList) {
              res.userList.forEach(item => {
                let index = this.selectList.findIndex(sel => sel.id == item.id)
                resolveList.push({
                  ...item,
                  name: item.realname,
                  isUser: true,
                  isSelect: index !== -1
                })
              });
            }
            if (res.children) {
              res.children.forEach(item => {
                resolveList.push(item)
              })
            }
      // findTreeUser({parentId})
      //   .then(res => {
      //     // this.data = [res]
      //     if (!parentId) {
      //       resolve([res])
      //     } else {
      //       let resolveList = []
      //       if (res.userList) {
      //         res.userList.forEach(item => {
      //           let index = this.selectList.findIndex(sel => sel.id == item.id)
      //           resolveList.push({
      //             ...item,
      //             name: item.realname,
      //             isUser: true,
      //             isSelect: index !== -1
      //           })
      //         });
      //       }
      //       if (res.children) {
      //         res.children.forEach(item => {
      //           resolveList.push(item)
      //         })
      //       }

            resolve(resolveList)
          }
      //       resolve(resolveList)
      //     }

        })
      //   })
    },
    inputAction() {
      if (!this.filterText) {