|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
<template>
|
|
|
<div class="user-page">
|
|
<div class="user-page">
|
|
|
- <UserQuery :departmentList="departmentList" />
|
|
|
|
|
|
|
+ <UserQuery :departmentList="departmentList" />
|
|
|
<div class="user-list">
|
|
<div class="user-list">
|
|
|
<BasicTable
|
|
<BasicTable
|
|
|
:columns="columns"
|
|
:columns="columns"
|
|
@@ -56,7 +56,12 @@
|
|
|
</template>
|
|
</template>
|
|
|
</BasicTable>
|
|
</BasicTable>
|
|
|
</div>
|
|
</div>
|
|
|
- <CreateDrawer ref="createDrawerRef" :title="drawerTitle" @change="reloadTable" :departmentList="departmentList" />
|
|
|
|
|
|
|
+ <CreateDrawer
|
|
|
|
|
+ ref="createDrawerRef"
|
|
|
|
|
+ :title="drawerTitle"
|
|
|
|
|
+ @change="reloadTable"
|
|
|
|
|
+ :departmentList="departmentList"
|
|
|
|
|
+ />
|
|
|
<ResetCodeDrawer ref="ResetCodeDrawerRef" :title="drawerTitle" @change="reloadTable" />
|
|
<ResetCodeDrawer ref="ResetCodeDrawerRef" :title="drawerTitle" @change="reloadTable" />
|
|
|
<CreateAdminDrawer
|
|
<CreateAdminDrawer
|
|
|
v-if="userStore?.info?.username === ROOT_USER"
|
|
v-if="userStore?.info?.username === ROOT_USER"
|
|
@@ -95,12 +100,12 @@
|
|
|
import { EditType } from './types';
|
|
import { EditType } from './types';
|
|
|
import { ROOT_USER } from './types';
|
|
import { ROOT_USER } from './types';
|
|
|
import { deptTreeList } from '@/api/auth/dept';
|
|
import { deptTreeList } from '@/api/auth/dept';
|
|
|
-import useSceneInfos from '@/hooks/useSceneInfos';
|
|
|
|
|
-// import { TreeProps,ElTreeItem } from 'element-plus/es/components/tree-v2/src/types';
|
|
|
|
|
-
|
|
|
|
|
-const sceneInfos = useSceneInfos();
|
|
|
|
|
- const {calculateTreeData } = sceneInfos;
|
|
|
|
|
|
|
+ import useSceneInfos from '@/hooks/useSceneInfos';
|
|
|
|
|
+ import { ElMessage, ElMessageBox } from 'element-plus';
|
|
|
|
|
+ // import { TreeProps,ElTreeItem } from 'element-plus/es/components/tree-v2/src/types';
|
|
|
|
|
|
|
|
|
|
+ const sceneInfos = useSceneInfos();
|
|
|
|
|
+ const { calculateTreeData } = sceneInfos;
|
|
|
|
|
|
|
|
const useUserDetail = useUser();
|
|
const useUserDetail = useUser();
|
|
|
const { userList, page, pageSize, totalCount } = storeToRefs(useUserDetail);
|
|
const { userList, page, pageSize, totalCount } = storeToRefs(useUserDetail);
|
|
@@ -141,7 +146,7 @@ const sceneInfos = useSceneInfos();
|
|
|
key: 'action',
|
|
key: 'action',
|
|
|
fixed: 'right',
|
|
fixed: 'right',
|
|
|
render(record) {
|
|
render(record) {
|
|
|
- return h(ActionColomns as any,{
|
|
|
|
|
|
|
+ return h(ActionColomns as any, {
|
|
|
space: 20,
|
|
space: 20,
|
|
|
color: '#629bf9',
|
|
color: '#629bf9',
|
|
|
style: 'img',
|
|
style: 'img',
|
|
@@ -219,13 +224,34 @@ const sceneInfos = useSceneInfos();
|
|
|
nickname: record.nickname,
|
|
nickname: record.nickname,
|
|
|
username: record.username,
|
|
username: record.username,
|
|
|
};
|
|
};
|
|
|
- userDel(delDetail);
|
|
|
|
|
|
|
+ ElMessageBox.confirm('确认要删除该用户吗', {
|
|
|
|
|
+ confirmButtonText: '确认',
|
|
|
|
|
+ cancelButtonText: '取消',
|
|
|
|
|
+ type: 'warning',
|
|
|
|
|
+ })
|
|
|
|
|
+ .then(() => {
|
|
|
|
|
+ userDel(delDetail);
|
|
|
|
|
+ ElMessage({
|
|
|
|
|
+ type: 'success',
|
|
|
|
|
+ message: '删除成功',
|
|
|
|
|
+ });
|
|
|
|
|
+ })
|
|
|
|
|
+ .catch(() => {
|
|
|
|
|
+ ElMessage({
|
|
|
|
|
+ type: 'info',
|
|
|
|
|
+ message: '取消删除',
|
|
|
|
|
+ });
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
onMounted(async () => {
|
|
onMounted(async () => {
|
|
|
getList();
|
|
getList();
|
|
|
deptTreeList().then((res) => {
|
|
deptTreeList().then((res) => {
|
|
|
- departmentList.value = calculateTreeData(res, { level: 3, valueKey: 'deptId', labelKey: 'deptName' }, 1);
|
|
|
|
|
|
|
+ departmentList.value = calculateTreeData(
|
|
|
|
|
+ res,
|
|
|
|
|
+ { level: 3, valueKey: 'deptId', labelKey: 'deptName' },
|
|
|
|
|
+ 1,
|
|
|
|
|
+ );
|
|
|
});
|
|
});
|
|
|
const res = await roleAllList();
|
|
const res = await roleAllList();
|
|
|
roleData.value = res.list.map((item: any) => {
|
|
roleData.value = res.list.map((item: any) => {
|