完善导出功能
This commit is contained in:
WUSIJIAN
@@ -1,18 +1,18 @@
|
||||
<template>
|
||||
<div class="system-edit-user-container">
|
||||
<el-dialog :title="(ruleForm.userId!==0?'修改':'添加')+'用户'" v-model="isShowDialog" width="769px">
|
||||
<el-dialog :title="(ruleForm.userId !== 0 ? '修改' : '添加') + '用户'" v-model="isShowDialog" width="769px">
|
||||
<el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="90px">
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="ruleForm.userId===0">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="ruleForm.userId === 0">
|
||||
<el-form-item label="用户名" prop="userName">
|
||||
<el-input v-model="ruleForm.userName" placeholder="请输入账户名称" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="ruleForm.userId===0">
|
||||
<el-form-item label="账户密码" prop="password">
|
||||
<el-input v-model="ruleForm.password" placeholder="请输入" type="password" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="ruleForm.userId === 0">
|
||||
<el-form-item label="账户密码" prop="password">
|
||||
<el-input v-model="ruleForm.password" placeholder="请输入" type="password" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="用户昵称" prop="nickName">
|
||||
<el-input v-model="ruleForm.nickName" placeholder="请输入用户昵称" clearable></el-input>
|
||||
@@ -21,12 +21,7 @@
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="关联角色" prop="roleIds">
|
||||
<el-select v-model="ruleForm.roleIds" placeholder="请选择" clearable class="w100" multiple>
|
||||
<el-option
|
||||
v-for="role in roleList"
|
||||
:key="'role-'+role.id"
|
||||
:label="role.name"
|
||||
:value="role.id">
|
||||
</el-option>
|
||||
<el-option v-for="role in roleList" :key="'role-' + role.id" :label="role.name" :value="role.id"> </el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -34,7 +29,7 @@
|
||||
<el-form-item label="部门" prop="deptId">
|
||||
<el-cascader
|
||||
:options="deptData"
|
||||
:props="{ checkStrictly: true,emitPath: false, value: 'deptId', label: 'deptName' }"
|
||||
:props="{ checkStrictly: true, emitPath: false, value: 'deptId', label: 'deptName' }"
|
||||
placeholder="请选择部门"
|
||||
clearable
|
||||
class="w100"
|
||||
@@ -60,43 +55,45 @@
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="性别" prop="sex">
|
||||
<el-select v-model="ruleForm.sex" placeholder="请选择" clearable class="w100">
|
||||
<el-option
|
||||
v-for="gender in genderData"
|
||||
:key="'gender-'+gender.value"
|
||||
:label="gender.label"
|
||||
:value="gender.value"></el-option>
|
||||
<el-option v-for="gender in genderData" :key="'gender-' + gender.value" :label="gender.label" :value="gender.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- 新增租户 -->
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="租户" prop="tenantId">
|
||||
<el-select v-model="ruleForm.tenantId" placeholder="请选择租户" clearable class="w100" :disabled="ruleForm.userId !== 0">
|
||||
<el-option v-for="tenant in tenantList" :key="'tenant-' + tenant.id" :label="tenant.name" :value="tenant.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="岗位" prop="postIds">
|
||||
<el-select v-model="ruleForm.postIds" placeholder="请选择" clearable class="w100" multiple>
|
||||
<el-option
|
||||
v-for="post in postList"
|
||||
:key="'post-'+post.postId"
|
||||
:label="post.postName"
|
||||
:value="post.postId">
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-select v-model="ruleForm.postIds" placeholder="请选择" clearable class="w100" multiple>
|
||||
<el-option v-for="post in postList" :key="'post-' + post.postId" :label="post.postName" :value="post.postId"> </el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="用户状态">
|
||||
<el-switch v-model="ruleForm.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁"></el-switch>
|
||||
<el-switch
|
||||
v-model="ruleForm.status"
|
||||
inline-prompt
|
||||
:active-value="1"
|
||||
:inactive-value="0"
|
||||
active-text="启"
|
||||
inactive-text="禁"
|
||||
></el-switch>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="用户类型">
|
||||
<el-radio-group v-model="ruleForm.isAdmin">
|
||||
<el-radio :label="1">后台管理员</el-radio>
|
||||
<el-radio :label="0">前台用户</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="用户类型">
|
||||
<el-radio-group v-model="ruleForm.isAdmin">
|
||||
<el-radio
|
||||
:label="1"
|
||||
>后台管理员</el-radio>
|
||||
<el-radio
|
||||
:label="0"
|
||||
>前台用户</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
|
||||
<el-form-item label="用户描述">
|
||||
<el-input v-model="ruleForm.remark" type="textarea" placeholder="请输入用户描述" maxlength="150"></el-input>
|
||||
@@ -107,7 +104,7 @@
|
||||
<template #footer>
|
||||
<span class="dialog-footer">
|
||||
<el-button @click="onCancel" size="default">取 消</el-button>
|
||||
<el-button type="primary" @click="onSubmit" size="default">{{ruleForm.userId!==0?'修 改':'添 加'}}</el-button>
|
||||
<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.userId !== 0 ? '修 改' : '添 加' }}</el-button>
|
||||
</span>
|
||||
</template>
|
||||
</el-dialog>
|
||||
@@ -115,98 +112,93 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { reactive, toRefs, onMounted, defineComponent,ref,unref } from 'vue';
|
||||
import {getParams, addUser, editUser, getEditUser} from "/@/api/system/user";
|
||||
import {ElMessage} from "element-plus";
|
||||
|
||||
import { reactive, toRefs, onMounted, defineComponent, ref, unref } from 'vue';
|
||||
import { getParams, addUser, editUser, getEditUser } from '/@/api/system/user';
|
||||
import { ElMessage } from 'element-plus';
|
||||
|
||||
export default defineComponent({
|
||||
name: 'systemEditUser',
|
||||
props:{
|
||||
deptData:{
|
||||
type:Array,
|
||||
default:()=>[]
|
||||
},
|
||||
genderData:{
|
||||
type:Array,
|
||||
default:()=>[]
|
||||
}
|
||||
},
|
||||
setup(prop,{emit}) {
|
||||
const roleList = ref([]);
|
||||
const postList = ref([]);
|
||||
const formRef = ref<HTMLElement | null>(null);
|
||||
props: {
|
||||
deptData: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
genderData: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
},
|
||||
setup(prop, { emit }) {
|
||||
const roleList = ref([]);
|
||||
const postList = ref([]);
|
||||
const tenantList = ref([]); // 新增租户列表
|
||||
const formRef = ref<HTMLElement | null>(null);
|
||||
const state = reactive({
|
||||
isShowDialog: false,
|
||||
ruleForm: {
|
||||
userId: 0,
|
||||
deptId: 0,
|
||||
userName: '',
|
||||
nickName: '',
|
||||
password: '',
|
||||
mobile:'',
|
||||
email: '',
|
||||
sex: '',
|
||||
status: 1,
|
||||
remark: '',
|
||||
postIds: [],
|
||||
roleIds: [],
|
||||
isAdmin:0,
|
||||
userId: 0,
|
||||
deptId: 0,
|
||||
userName: '',
|
||||
nickName: '',
|
||||
password: '',
|
||||
mobile: '',
|
||||
email: '',
|
||||
sex: '',
|
||||
status: 1,
|
||||
remark: '',
|
||||
postIds: [],
|
||||
roleIds: [],
|
||||
isAdmin: 0,
|
||||
tenantId: '', // 新增租户ID字段
|
||||
},
|
||||
//表单校验
|
||||
rules: {
|
||||
userName: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
|
||||
nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
|
||||
deptId: [{ required: true, message: '归属部门不能为空', trigger: 'blur' }],
|
||||
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
|
||||
tenantId: [{ required: true, message: '请选择租户', trigger: 'change' }], // 新增租户校验
|
||||
email: [
|
||||
{
|
||||
type: 'email',
|
||||
message: "'请输入正确的邮箱地址",
|
||||
trigger: ['blur', 'change'],
|
||||
},
|
||||
],
|
||||
mobile: [
|
||||
{ required: true, message: '手机号码不能为空', trigger: 'blur' },
|
||||
{
|
||||
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
|
||||
message: '请输入正确的手机号码',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
//表单校验
|
||||
rules: {
|
||||
userName: [
|
||||
{ required: true, message: "用户名称不能为空", trigger: "blur" }
|
||||
],
|
||||
nickName: [
|
||||
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
|
||||
],
|
||||
deptId: [
|
||||
{ required: true, message: "归属部门不能为空", trigger: "blur" }
|
||||
],
|
||||
password: [
|
||||
{ required: true, message: "用户密码不能为空", trigger: "blur" }
|
||||
],
|
||||
email: [
|
||||
{
|
||||
type: "email",
|
||||
message: "'请输入正确的邮箱地址",
|
||||
trigger: ["blur", "change"]
|
||||
}
|
||||
],
|
||||
mobile: [
|
||||
{ required: true, message: "手机号码不能为空", trigger: "blur" },
|
||||
{
|
||||
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
|
||||
message: "请输入正确的手机号码",
|
||||
trigger: "blur"
|
||||
}
|
||||
]
|
||||
}
|
||||
});
|
||||
// 打开弹窗
|
||||
const openDialog = (row?:any) => {
|
||||
resetForm()
|
||||
if(row) {
|
||||
getEditUser(row.id).then((res:any)=>{
|
||||
const user = res.data.user;
|
||||
state.ruleForm = {
|
||||
userId: user.id,
|
||||
deptId: user.deptId,
|
||||
userName: user.userName,
|
||||
nickName: user.userNickname,
|
||||
password: '-',
|
||||
mobile:user.mobile,
|
||||
email: user.userEmail,
|
||||
sex: String(user.sex),
|
||||
status: user.userStatus,
|
||||
remark: user.remark,
|
||||
postIds: res.data.checkedPosts??[],
|
||||
roleIds: res.data.checkedRoleIds??[],
|
||||
isAdmin:user.isAdmin,
|
||||
};
|
||||
})
|
||||
}
|
||||
const openDialog = (row?: any) => {
|
||||
resetForm();
|
||||
if (row) {
|
||||
getEditUser(row.id).then((res: any) => {
|
||||
const user = res.data.user;
|
||||
state.ruleForm = {
|
||||
userId: user.id,
|
||||
deptId: user.deptId,
|
||||
userName: user.userName,
|
||||
nickName: user.userNickname,
|
||||
password: '-',
|
||||
mobile: user.mobile,
|
||||
email: user.userEmail,
|
||||
sex: String(user.sex),
|
||||
status: user.userStatus,
|
||||
remark: user.remark,
|
||||
postIds: res.data.checkedPosts ?? [],
|
||||
roleIds: res.data.checkedRoleIds ?? [],
|
||||
isAdmin: user.isAdmin,
|
||||
tenantId: user.tenantId || '', // 设置租户ID
|
||||
};
|
||||
});
|
||||
}
|
||||
state.isShowDialog = true;
|
||||
};
|
||||
// 关闭弹窗
|
||||
@@ -217,67 +209,88 @@ export default defineComponent({
|
||||
const onCancel = () => {
|
||||
closeDialog();
|
||||
};
|
||||
|
||||
// 新增
|
||||
const onSubmit = () => {
|
||||
const formWrap = unref(formRef) as any;
|
||||
if (!formWrap) return;
|
||||
formWrap.validate((valid: boolean) => {
|
||||
if (valid) {
|
||||
if(state.ruleForm.userId===0){
|
||||
//添加
|
||||
addUser(state.ruleForm).then(()=>{
|
||||
ElMessage.success('用户添加成功');
|
||||
closeDialog(); // 关闭弹窗
|
||||
emit('getUserList')
|
||||
});
|
||||
}else{
|
||||
//修改
|
||||
editUser(state.ruleForm).then(()=>{
|
||||
ElMessage.success('用户修改成功');
|
||||
closeDialog(); // 关闭弹窗
|
||||
emit('getUserList')
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
const formWrap = unref(formRef) as any;
|
||||
if (!formWrap) return;
|
||||
formWrap.validate((valid: boolean) => {
|
||||
if (valid) {
|
||||
if (state.ruleForm.userId === 0) {
|
||||
// 新增用户 - 包含租户信息
|
||||
addUser(state.ruleForm)
|
||||
.then(() => {
|
||||
ElMessage.success('用户添加成功');
|
||||
closeDialog(); // 关闭弹窗
|
||||
emit('getUserList');
|
||||
})
|
||||
.catch((error) => {
|
||||
ElMessage.error('用户添加失败：' + (error.message || '未知错误'));
|
||||
});
|
||||
} else {
|
||||
// 修改用户 - 根据需求决定是否包含租户信息
|
||||
const editData = { ...state.ruleForm };
|
||||
// 如果修改时不允许修改租户，可以删除tenantId字段
|
||||
// delete editData.tenantId;
|
||||
|
||||
editUser(editData)
|
||||
.then(() => {
|
||||
ElMessage.success('用户修改成功');
|
||||
closeDialog(); // 关闭弹窗
|
||||
emit('getUserList');
|
||||
})
|
||||
.catch((error) => {
|
||||
ElMessage.error('用户修改失败：' + (error.message || '未知错误'));
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
// 初始化部门数据
|
||||
const initTableData = () => {
|
||||
//获取角色岗位选项
|
||||
getParams().then((res:any)=>{
|
||||
roleList.value = res.data.roleList??[];
|
||||
postList.value = res.data.posts??[];
|
||||
});
|
||||
//获取角色岗位选项
|
||||
getParams()
|
||||
.then((res: any) => {
|
||||
roleList.value = res.data.roleList ?? [];
|
||||
postList.value = res.data.posts ?? [];
|
||||
tenantList.value = res.data.tenantList ?? []; // 获取租户列表
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('获取参数失败：', error);
|
||||
ElMessage.error('获取初始化数据失败');
|
||||
});
|
||||
};
|
||||
// 页面加载时
|
||||
onMounted(() => {
|
||||
initTableData();
|
||||
});
|
||||
const resetForm = ()=>{
|
||||
state.ruleForm = {
|
||||
userId: 0,
|
||||
deptId: 0,
|
||||
userName: '',
|
||||
nickName: '',
|
||||
password: '',
|
||||
mobile:'',
|
||||
email: '',
|
||||
sex: '',
|
||||
status: 1,
|
||||
remark: '',
|
||||
postIds: [],
|
||||
roleIds: [],
|
||||
isAdmin:0,
|
||||
}
|
||||
};
|
||||
const resetForm = () => {
|
||||
state.ruleForm = {
|
||||
userId: 0,
|
||||
deptId: 0,
|
||||
userName: '',
|
||||
nickName: '',
|
||||
password: '',
|
||||
mobile: '',
|
||||
email: '',
|
||||
sex: '',
|
||||
status: 1,
|
||||
remark: '',
|
||||
postIds: [],
|
||||
roleIds: [],
|
||||
isAdmin: 0,
|
||||
tenantId: '', // 重置租户ID
|
||||
};
|
||||
};
|
||||
return {
|
||||
openDialog,
|
||||
closeDialog,
|
||||
onCancel,
|
||||
onSubmit,
|
||||
roleList,
|
||||
postList,
|
||||
formRef,
|
||||
roleList,
|
||||
postList,
|
||||
tenantList, // 返回租户列表
|
||||
formRef,
|
||||
...toRefs(state),
|
||||
};
|
||||
},
|
||||
|
||||
@@ -1,159 +1,155 @@
|
||||
<template>
|
||||
<div class="system-user-container">
|
||||
<el-row :gutter="10" style="width: 100%;">
|
||||
<el-col :span="4">
|
||||
<el-card shadow="hover">
|
||||
<el-aside>
|
||||
<el-scrollbar>
|
||||
<el-input :prefix-icon="search" v-model="filterText" placeholder="请输入部门名称" clearable size="default" style="width: 80%;"/>
|
||||
<el-tree
|
||||
ref="treeRef"
|
||||
class="filter-tree"
|
||||
:data="deptData"
|
||||
:props="deptProps"
|
||||
default-expand-all
|
||||
:filter-node-method="deptFilterNode"
|
||||
@node-click="handleNodeClick"
|
||||
/>
|
||||
</el-scrollbar>
|
||||
</el-aside>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="20">
|
||||
<el-card shadow="hover">
|
||||
<div class="system-user-search mb15">
|
||||
<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
|
||||
<el-form-item label="关键字" prop="keyWords">
|
||||
<el-input
|
||||
v-model="tableData.param.keyWords"
|
||||
placeholder="请输入用户账号或姓名"
|
||||
clearable
|
||||
size="default"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="userList"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="手机号码" prop="mobile">
|
||||
<el-input
|
||||
v-model="tableData.param.mobile"
|
||||
placeholder="请输入手机号码"
|
||||
clearable
|
||||
size="default"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="userList"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status" style="width: 200px;">
|
||||
<el-select
|
||||
v-model="tableData.param.status"
|
||||
placeholder="用户状态"
|
||||
clearable
|
||||
size="default"
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option label="启用" :value="1"/>
|
||||
<el-option label="禁用" :value="0"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" prop="dateRange">
|
||||
<el-date-picker
|
||||
v-model="tableData.param.dateRange"
|
||||
size="default"
|
||||
style="width: 240px"
|
||||
value-format="YYYY-MM-DD"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button size="default" type="primary" class="ml10" @click="userList">
|
||||
<el-icon>
|
||||
<ele-Search />
|
||||
</el-icon>
|
||||
查询
|
||||
</el-button>
|
||||
<el-button size="default" @click="resetQuery(queryRef)">
|
||||
<el-icon>
|
||||
<ele-Refresh />
|
||||
</el-icon>
|
||||
重置
|
||||
</el-button>
|
||||
<el-button size="default" type="success" class="ml10" @click="onOpenAddUser">
|
||||
<el-icon>
|
||||
<ele-FolderAdd />
|
||||
</el-icon>
|
||||
新增用户
|
||||
</el-button>
|
||||
<el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
|
||||
<el-icon>
|
||||
<ele-Delete />
|
||||
</el-icon>
|
||||
删除用户
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column type="index" label="序号" width="60" />
|
||||
<el-table-column prop="userName" label="账户名称" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="userNickname" label="用户昵称" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="dept.deptName" label="部门" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="角色" align="center" prop="roleInfo" :show-overflow-tooltip="true" >
|
||||
<template #default="scope">
|
||||
<span v-for="(item,index) of scope.row.roleInfo" :key="'role-'+index"> {{item.name+' '}} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="mobile" label="手机号" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="userStatus" label="用户状态" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.userStatus"
|
||||
inline-prompt
|
||||
:active-value="1"
|
||||
:inactive-value="0"
|
||||
active-text="启"
|
||||
inactive-text="禁"
|
||||
@change="handleStatusChange(scope.row)">
|
||||
</el-switch>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="createdAt" label="创建时间" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="200">
|
||||
<template #default="scope">
|
||||
<el-button size="small" text type="primary" @click="onOpenEditUser(scope.row)">修改</el-button>
|
||||
<el-button size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
|
||||
<el-button size="small" text type="primary" @click="handleResetPwd(scope.row)">重置</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="tableData.total>0"
|
||||
:total="tableData.total"
|
||||
v-model:page="tableData.param.pageNum"
|
||||
v-model:limit="tableData.param.pageSize"
|
||||
@pagination="userList"
|
||||
/>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<EditUser ref="editUserRef" :dept-data="deptData" :gender-data="sys_user_sex" @getUserList="userList"/>
|
||||
<el-row :gutter="10" style="width: 100%">
|
||||
<el-col :span="4">
|
||||
<el-card shadow="hover">
|
||||
<el-aside>
|
||||
<el-scrollbar>
|
||||
<el-input :prefix-icon="search" v-model="filterText" placeholder="请输入部门名称" clearable size="default" style="width: 80%" />
|
||||
<el-tree
|
||||
ref="treeRef"
|
||||
class="filter-tree"
|
||||
:data="deptData"
|
||||
:props="deptProps"
|
||||
default-expand-all
|
||||
:filter-node-method="deptFilterNode"
|
||||
@node-click="handleNodeClick"
|
||||
/>
|
||||
</el-scrollbar>
|
||||
</el-aside>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="20">
|
||||
<el-card shadow="hover">
|
||||
<div class="system-user-search mb15">
|
||||
<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
|
||||
<el-form-item label="关键字" prop="keyWords">
|
||||
<el-input
|
||||
v-model="tableData.param.keyWords"
|
||||
placeholder="请输入用户账号或姓名"
|
||||
clearable
|
||||
size="default"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="userList"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="手机号码" prop="mobile">
|
||||
<el-input
|
||||
v-model="tableData.param.mobile"
|
||||
placeholder="请输入手机号码"
|
||||
clearable
|
||||
size="default"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="userList"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status" style="width: 200px">
|
||||
<el-select v-model="tableData.param.status" placeholder="用户状态" clearable size="default" style="width: 240px">
|
||||
<el-option label="启用" :value="1" />
|
||||
<el-option label="禁用" :value="0" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" prop="dateRange">
|
||||
<el-date-picker
|
||||
v-model="tableData.param.dateRange"
|
||||
size="default"
|
||||
style="width: 240px"
|
||||
value-format="YYYY-MM-DD"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button size="default" type="primary" class="ml10" @click="userList">
|
||||
<el-icon>
|
||||
<ele-Search />
|
||||
</el-icon>
|
||||
查询
|
||||
</el-button>
|
||||
<el-button size="default" @click="resetQuery(queryRef)">
|
||||
<el-icon>
|
||||
<ele-Refresh />
|
||||
</el-icon>
|
||||
重置
|
||||
</el-button>
|
||||
<el-button size="default" type="success" class="ml10" @click="onOpenAddUser">
|
||||
<el-icon>
|
||||
<ele-FolderAdd />
|
||||
</el-icon>
|
||||
新增用户
|
||||
</el-button>
|
||||
<el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
|
||||
<el-icon>
|
||||
<ele-Delete />
|
||||
</el-icon>
|
||||
删除用户
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column type="index" label="序号" width="60" />
|
||||
<el-table-column prop="userName" label="账户名称" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="userNickname" label="用户昵称" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="dept.deptName" label="部门" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="TenantId" label="租户" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="角色" align="center" prop="roleInfo" :show-overflow-tooltip="true">
|
||||
<template #default="scope">
|
||||
<span v-for="(item, index) of scope.row.roleInfo" :key="'role-' + index"> {{ item.name + ' ' }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="mobile" label="手机号" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="userStatus" label="用户状态" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.userStatus"
|
||||
inline-prompt
|
||||
:active-value="1"
|
||||
:inactive-value="0"
|
||||
active-text="启"
|
||||
inactive-text="禁"
|
||||
@change="handleStatusChange(scope.row)"
|
||||
>
|
||||
</el-switch>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="createdAt" label="创建时间" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="200">
|
||||
<template #default="scope">
|
||||
<el-button size="small" text type="primary" @click="onOpenEditUser(scope.row)">修改</el-button>
|
||||
<el-button size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
|
||||
<el-button size="small" text type="primary" @click="handleResetPwd(scope.row)">重置</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="tableData.total > 0"
|
||||
:total="tableData.total"
|
||||
v-model:page="tableData.param.pageNum"
|
||||
v-model:limit="tableData.param.pageSize"
|
||||
@pagination="userList"
|
||||
/>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<EditUser ref="editUserRef" :dept-data="deptData" :gender-data="sys_user_sex" @getUserList="userList" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import {toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance} from 'vue';
|
||||
import {ElMessageBox, ElMessage, ElTree,FormInstance} from 'element-plus';
|
||||
import { Search } from '@element-plus/icons-vue'
|
||||
import { toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance } from 'vue';
|
||||
import { ElMessageBox, ElMessage, ElTree, FormInstance } from 'element-plus';
|
||||
import { Search } from '@element-plus/icons-vue';
|
||||
import EditUser from '/@/views/system/user/component/editUser.vue';
|
||||
import {getUserList, getDeptTree, resetUserPwd, changeUserStatus, deleteUser} from '/@/api/system/user/index';
|
||||
import { getUserList, getDeptTree, resetUserPwd, changeUserStatus, deleteUser } from '/@/api/system/user/index';
|
||||
|
||||
interface TableDataState {
|
||||
ids:number[];
|
||||
deptProps:{};
|
||||
deptData:any[];
|
||||
ids: number[];
|
||||
deptProps: {};
|
||||
deptData: any[];
|
||||
tableData: {
|
||||
data: any[];
|
||||
total: number;
|
||||
@@ -161,11 +157,11 @@ interface TableDataState {
|
||||
param: {
|
||||
pageNum: number;
|
||||
pageSize: number;
|
||||
deptId:string;
|
||||
mobile:string;
|
||||
status:string;
|
||||
keyWords:string;
|
||||
dateRange: string[];
|
||||
deptId: string;
|
||||
mobile: string;
|
||||
status: string;
|
||||
keyWords: string;
|
||||
dateRange: string[];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -174,103 +170,103 @@ export default defineComponent({
|
||||
name: 'systemUser',
|
||||
components: { EditUser },
|
||||
setup() {
|
||||
const {proxy} = <any>getCurrentInstance();
|
||||
const {sys_user_sex} = proxy.useDict('sys_user_sex')
|
||||
const { proxy } = <any>getCurrentInstance();
|
||||
const { sys_user_sex } = proxy.useDict('sys_user_sex');
|
||||
const editUserRef = ref();
|
||||
const queryRef = ref();
|
||||
const filterText = ref('');
|
||||
const treeRef = ref<InstanceType<typeof ElTree>>();
|
||||
const search = Search
|
||||
const filterText = ref('');
|
||||
const treeRef = ref<InstanceType<typeof ElTree>>();
|
||||
const search = Search;
|
||||
const state = reactive<TableDataState>({
|
||||
ids:[],
|
||||
deptProps:{
|
||||
id:"deptId",
|
||||
children: "children",
|
||||
label: "deptName"
|
||||
},
|
||||
deptData:[
|
||||
{
|
||||
label: '集团总部',
|
||||
children: [
|
||||
{
|
||||
label: '曲靖分部',
|
||||
children: [
|
||||
{
|
||||
label: '总经办',
|
||||
},
|
||||
{
|
||||
label: '市场部',
|
||||
},
|
||||
{
|
||||
label: '研发部',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
ids: [],
|
||||
deptProps: {
|
||||
id: 'deptId',
|
||||
children: 'children',
|
||||
label: 'deptName',
|
||||
},
|
||||
deptData: [
|
||||
{
|
||||
label: '集团总部',
|
||||
children: [
|
||||
{
|
||||
label: '曲靖分部',
|
||||
children: [
|
||||
{
|
||||
label: '总经办',
|
||||
},
|
||||
{
|
||||
label: '市场部',
|
||||
},
|
||||
{
|
||||
label: '研发部',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
tableData: {
|
||||
data: [],
|
||||
total: 0,
|
||||
loading: false,
|
||||
param: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
deptId:'',
|
||||
mobile:'',
|
||||
status:'',
|
||||
keyWords:'',
|
||||
dateRange:[]
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
deptId: '',
|
||||
mobile: '',
|
||||
status: '',
|
||||
keyWords: '',
|
||||
dateRange: [],
|
||||
},
|
||||
},
|
||||
});
|
||||
// 初始化表格数据
|
||||
const initTableData = () => {
|
||||
getDeptTree().then((res:any)=>{
|
||||
state.deptData = res.data.deps
|
||||
})
|
||||
userList();
|
||||
getDeptTree().then((res: any) => {
|
||||
state.deptData = res.data.deps;
|
||||
});
|
||||
userList();
|
||||
};
|
||||
const userList = () => {
|
||||
getUserList(state.tableData.param).then((res: any) => {
|
||||
state.tableData.data = res.data.userList ?? [];
|
||||
state.tableData.total = res.data.total;
|
||||
});
|
||||
};
|
||||
const userList = ()=>{
|
||||
getUserList(state.tableData.param).then((res:any)=>{
|
||||
state.tableData.data = res.data.userList??[];
|
||||
state.tableData.total = res.data.total;
|
||||
});
|
||||
};
|
||||
// 打开新增用户弹窗
|
||||
const onOpenAddUser = () => {
|
||||
editUserRef.value.openDialog();
|
||||
editUserRef.value.openDialog();
|
||||
};
|
||||
// 打开修改用户弹窗
|
||||
const onOpenEditUser = (row:any) => {
|
||||
const onOpenEditUser = (row: any) => {
|
||||
editUserRef.value.openDialog(row);
|
||||
};
|
||||
// 删除用户
|
||||
const onRowDel = (row:any) => {
|
||||
let msg = '你确定要删除所选用户？';
|
||||
let ids:number[] = [] ;
|
||||
if(row){
|
||||
msg = `此操作将永久删除用户：“${row.userName}”，是否继续?`
|
||||
ids = [row.id]
|
||||
}else{
|
||||
ids = state.ids
|
||||
}
|
||||
if(ids.length===0){
|
||||
ElMessage.error('请选择要删除的数据。');
|
||||
return
|
||||
}
|
||||
ElMessageBox.confirm(msg, '提示', {
|
||||
confirmButtonText: '确认',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
})
|
||||
.then(() => {
|
||||
deleteUser(ids).then(()=>{
|
||||
ElMessage.success('删除成功');
|
||||
userList();
|
||||
})
|
||||
})
|
||||
.catch(() => {});
|
||||
const onRowDel = (row: any) => {
|
||||
let msg = '你确定要删除所选用户？';
|
||||
let ids: number[] = [];
|
||||
if (row) {
|
||||
msg = `此操作将永久删除用户：“${row.userName}”，是否继续?`;
|
||||
ids = [row.id];
|
||||
} else {
|
||||
ids = state.ids;
|
||||
}
|
||||
if (ids.length === 0) {
|
||||
ElMessage.error('请选择要删除的数据。');
|
||||
return;
|
||||
}
|
||||
ElMessageBox.confirm(msg, '提示', {
|
||||
confirmButtonText: '确认',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
})
|
||||
.then(() => {
|
||||
deleteUser(ids).then(() => {
|
||||
ElMessage.success('删除成功');
|
||||
userList();
|
||||
});
|
||||
})
|
||||
.catch(() => {});
|
||||
};
|
||||
// 分页改变
|
||||
const onHandleSizeChange = (val: number) => {
|
||||
@@ -284,77 +280,82 @@ export default defineComponent({
|
||||
onMounted(() => {
|
||||
initTableData();
|
||||
});
|
||||
watch(filterText, (val) => {
|
||||
treeRef.value!.filter(val)
|
||||
});
|
||||
const deptFilterNode = (value: string, data:any) => {
|
||||
if (!value) return true;
|
||||
return data.deptName.includes(value)
|
||||
};
|
||||
// 多选框选中数据
|
||||
const handleSelectionChange = (selection:any[])=> {
|
||||
state.ids = selection.map(item => item.id)
|
||||
};
|
||||
// 节点单击事件
|
||||
const handleNodeClick = (data:any) => {
|
||||
state.tableData.param.deptId = data.deptId;
|
||||
userList();
|
||||
};
|
||||
/** 重置密码按钮操作 */
|
||||
const handleResetPwd = (row:any)=> {
|
||||
ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消"
|
||||
}).then(({ value }) => {
|
||||
if(!value || value==''){
|
||||
ElMessage.success('密码不能为空');
|
||||
return
|
||||
}
|
||||
resetUserPwd(row.id, value).then(() => {
|
||||
ElMessage.success("修改成功，新密码是：" + value);
|
||||
});
|
||||
}).catch(() => {});
|
||||
};
|
||||
// 用户状态修改
|
||||
const handleStatusChange = (row:any)=> {
|
||||
let text = row.userStatus === 1 ? "启用" : "停用";
|
||||
ElMessageBox.confirm('确认要"' + text + '"："' + row.userName + '"用户吗?', "警告", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(function() {
|
||||
return changeUserStatus(row.id, row.userStatus);
|
||||
}).then(() => {
|
||||
ElMessage.success(text + "成功");
|
||||
}).catch(function() {
|
||||
row.userStatus =row.userStatus === 0 ?1 : 0;
|
||||
});
|
||||
};
|
||||
/** 重置按钮操作 */
|
||||
const resetQuery = (formEl: FormInstance | undefined) => {
|
||||
if (!formEl) return
|
||||
formEl.resetFields()
|
||||
userList()
|
||||
};
|
||||
watch(filterText, (val) => {
|
||||
treeRef.value!.filter(val);
|
||||
});
|
||||
const deptFilterNode = (value: string, data: any) => {
|
||||
if (!value) return true;
|
||||
return data.deptName.includes(value);
|
||||
};
|
||||
// 多选框选中数据
|
||||
const handleSelectionChange = (selection: any[]) => {
|
||||
state.ids = selection.map((item) => item.id);
|
||||
};
|
||||
// 节点单击事件
|
||||
const handleNodeClick = (data: any) => {
|
||||
state.tableData.param.deptId = data.deptId;
|
||||
userList();
|
||||
};
|
||||
/** 重置密码按钮操作 */
|
||||
const handleResetPwd = (row: any) => {
|
||||
ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
})
|
||||
.then(({ value }) => {
|
||||
if (!value || value == '') {
|
||||
ElMessage.success('密码不能为空');
|
||||
return;
|
||||
}
|
||||
resetUserPwd(row.id, value).then(() => {
|
||||
ElMessage.success('修改成功，新密码是：' + value);
|
||||
});
|
||||
})
|
||||
.catch(() => {});
|
||||
};
|
||||
// 用户状态修改
|
||||
const handleStatusChange = (row: any) => {
|
||||
let text = row.userStatus === 1 ? '启用' : '停用';
|
||||
ElMessageBox.confirm('确认要"' + text + '"："' + row.userName + '"用户吗?', '警告', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
})
|
||||
.then(function () {
|
||||
return changeUserStatus(row.id, row.userStatus);
|
||||
})
|
||||
.then(() => {
|
||||
ElMessage.success(text + '成功');
|
||||
})
|
||||
.catch(function () {
|
||||
row.userStatus = row.userStatus === 0 ? 1 : 0;
|
||||
});
|
||||
};
|
||||
/** 重置按钮操作 */
|
||||
const resetQuery = (formEl: FormInstance | undefined) => {
|
||||
if (!formEl) return;
|
||||
formEl.resetFields();
|
||||
userList();
|
||||
};
|
||||
return {
|
||||
queryRef,
|
||||
queryRef,
|
||||
editUserRef,
|
||||
onOpenAddUser,
|
||||
onOpenEditUser,
|
||||
onRowDel,
|
||||
onHandleSizeChange,
|
||||
onHandleCurrentChange,
|
||||
deptFilterNode,
|
||||
filterText,
|
||||
treeRef,
|
||||
search,
|
||||
sys_user_sex,
|
||||
userList,
|
||||
handleSelectionChange,
|
||||
handleNodeClick,
|
||||
handleResetPwd,
|
||||
handleStatusChange,
|
||||
resetQuery,
|
||||
deptFilterNode,
|
||||
filterText,
|
||||
treeRef,
|
||||
search,
|
||||
sys_user_sex,
|
||||
userList,
|
||||
handleSelectionChange,
|
||||
handleNodeClick,
|
||||
handleResetPwd,
|
||||
handleStatusChange,
|
||||
resetQuery,
|
||||
...toRefs(state),
|
||||
};
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user