|
@@ -111,10 +111,15 @@ import { Search } from '@element-plus/icons-vue'
|
|
|
import UserList from './component/userList.vue';
|
|
|
import api from '/@/api/system'
|
|
|
|
|
|
-const getDeptTree = api.dept.getList({status: -1})
|
|
|
+const getDeptTree = () => api.dept.getList({status: -1})
|
|
|
|
|
|
//TODO 批量操作需要在后端完成
|
|
|
-const getUserByIds = async (id: number[]) => await Promise.all(id.map(it=>api.user.detail(it)))
|
|
|
+const getUserByIds = ({ ids: id }: {ids: number[]}) => {
|
|
|
+ if (id === undefined) return Promise.resolve({code: 0,list: []})
|
|
|
+ if (id.length == 0) return Promise.resolve({code: 0, list: []})
|
|
|
+
|
|
|
+ return Promise.all(id.map(it=>api.user.detail(it)))
|
|
|
+}
|
|
|
// import {getDeptTree, getUserByIds} from '/@/api/system/user/index';
|
|
|
|
|
|
interface QueryParam {
|
|
@@ -171,9 +176,7 @@ export default defineComponent({
|
|
|
const initData = ()=>{
|
|
|
if(prop.modelValue&&prop.modelValue.length>0){
|
|
|
getUserByIds({ids:prop.modelValue}).then((res:any)=>{
|
|
|
- if(res.code === 0){
|
|
|
- deptUser.value = res.data.userList??[];
|
|
|
- }
|
|
|
+ deptUser.value = res ?? [];
|
|
|
});
|
|
|
}else{
|
|
|
deptUser.value = []
|
|
@@ -209,7 +212,7 @@ export default defineComponent({
|
|
|
// 初始化表格数据
|
|
|
const initTableData = () => {
|
|
|
getDeptTree().then((res:any)=>{
|
|
|
- state.deptData = res.data.deps
|
|
|
+ state.deptData = res
|
|
|
})
|
|
|
getUserList()
|
|
|
};
|