diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue index 606b6bb..4b5d0e4 100644 --- a/src/components/dialog/selectEmployeesDialog.vue +++ b/src/components/dialog/selectEmployeesDialog.vue @@ -57,7 +57,6 @@ }) // 默认给deptId赋值 listQuery.deptId = props.deptId -const { proxy } = getCurrentInstance() const checkedList = ref([]) // 多选的数据 const multipleTable = ref([]) @@ -85,14 +84,16 @@ const saveDialog = () => { // 多选 if (props.multi) { - const checkedList = multipleTable.value.map(item => ({ - ...item, - type: 1, // type: 1.成员 2.角色 - // targetId: item.roleId, - // name: item.roleName, - targetId: item.id, - name: item.name, - })) + const checkedList = multipleTable.value.map((item: IEmployees) => { + return { + ...item, + type: 1, // type: 1.成员 2.角色 + // targetId: item.roleId, + // name: item.roleName, + targetId: item.id, + name: item.name, + } + }) emits('change', checkedList) } else { @@ -100,6 +101,7 @@ emits('change', checkValue) } } + const select = ref('') // 获取列表数据 const fetchData = (isNowPage = false) => { @@ -120,14 +122,6 @@ multipleTable.value = val } -// 获取组织列表树数据 -const fetchTreeData = () => { - getDeptTreeList(listQuery).then((res) => { - treeData.value = toTreeList(res.data, '0', true) - }).catch(() => { - }) -} - // 查询数据 const search = () => { fetchData(true) @@ -170,7 +164,7 @@ :total="total" :columns="columns" :query="listQuery" - :list-loading="loadingTable" + :list-loading="loading" :is-showmulti-select="multi" @change="changePage" @multi-select="multiSelect" @@ -192,7 +186,7 @@