|
|
@@ -2,7 +2,7 @@
|
|
|
<div class="p-2">
|
|
|
<el-row :gutter="20">
|
|
|
<!-- 部门树 -->
|
|
|
- <el-col :lg="4" :xs="24" style="">
|
|
|
+ <!-- <el-col :lg="4" :xs="24" style="">
|
|
|
<el-card shadow="hover">
|
|
|
<el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
|
|
|
<el-tree
|
|
|
@@ -18,8 +18,8 @@
|
|
|
@node-click="handleNodeClick"
|
|
|
/>
|
|
|
</el-card>
|
|
|
- </el-col>
|
|
|
- <el-col :lg="20" :xs="24">
|
|
|
+ </el-col> -->
|
|
|
+ <el-col :lg="24" :xs="24">
|
|
|
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
|
|
|
<div v-show="showSearch" class="mb-[10px]">
|
|
|
<el-card shadow="hover">
|
|
|
@@ -615,9 +615,7 @@ const handleUpdate = async (row?: UserForm) => {
|
|
|
dialog.title = '修改用户';
|
|
|
Object.assign(form.value, data.user);
|
|
|
postOptions.value = data.posts;
|
|
|
- roleOptions.value = Array.from(
|
|
|
- new Map([...data.roles, ...data.user.roles].map(role => [role.roleId, role])).values()
|
|
|
- );
|
|
|
+ roleOptions.value = Array.from(new Map([...data.roles, ...data.user.roles].map((role) => [role.roleId, role])).values());
|
|
|
form.value.postIds = data.postIds;
|
|
|
form.value.roleIds = data.roleIds;
|
|
|
form.value.password = '';
|