Web/admin-govern
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理

Browse Source
This commit is contained in:
仲么了
2024-01-22 14:21:31 +08:00
parent 08e0e9e013
commit 0bf750e5ae
13 changed files with 432 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/views/auth/userlist/index.vue → src/views/auth/userList/index.vue
View File

@@ -1,48 +1,50 @@
<template>
<div class="default-main">
<div class='default-main'>
<TableHeader>
<template v-slot:select>
<el-form-item label="用户状态">
<el-select v-model="tableStore.table.params.searchState" placeholder="选择用户状态">
<el-form-item label='用户状态'>
<el-select v-model='tableStore.table.params.searchState' placeholder='选择用户状态'>
<el-option
v-for="(item, index) in userState"
:label="item.label"
:key="index"
:value="item.value"
v-for='(item, index) in userState'
:label='item.label'
:key='index'
:value='item.value'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="用户类型:">
<el-select v-model="tableStore.table.params.casualUser" placeholder="选择用户类型">
<el-form-item label='用户类型:'>
<el-select v-model='tableStore.table.params.casualUser' placeholder='选择用户类型'>
<el-option
v-for="(item, index) in casualUser"
:label="item.label"
:key="index"
:value="item.value"
v-for='(item, index) in casualUser'
:label='item.label'
:key='index'
:value='item.value'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关键词:">
<el-form-item label='关键词:'>
<el-input
style="width: 240px"
v-model="tableStore.table.params.searchValue"
style='width: 240px'
v-model='tableStore.table.params.searchValue'
clearable
placeholder="仅根据用户名/登录名"
placeholder='仅根据用户名/登录名'
/>
</el-form-item>
</template>
<template v-slot:operation>
<el-button :icon="Plus" type="primary" @click="addUser">添加</el-button>
<el-button :icon='Plus' type='primary' @click='addUser'>添加</el-button>
</template>
</TableHeader>
<Table ref="tableRef" />
<PopupEdit ref="popupEditRef"></PopupEdit>
<PopupPwd ref="popupPwdRef"></PopupPwd>
<Table ref='tableRef' />
<PopupEdit ref='popupEditRef'></PopupEdit>
<PopupPwd ref='popupPwdRef'></PopupPwd>
</div>
</template>
<script setup lang="ts">
<script setup lang='ts'>
import { Plus } from '@element-plus/icons-vue'
import { ref, onMounted, provide } from 'vue'
import { ElMessageBox, ElMessage } from 'element-plus'
import { activateUser, deluser, passwordConfirm } from '@/api/user-boot/user'
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
@@ -60,9 +62,9 @@ const tableStore = new TableStore({
column: [
{ title: '用户名称', field: 'name', minWidth: '130' },
{ title: '登录名', field: 'loginName', minWidth: '130' },
{ title: '角色', field: 'role', minWidth: '130' },
{ title: '角色', field: 'roleName', minWidth: '130' },
{ title: '部门', field: 'deptName', minWidth: '200' },
{ title: '电话', field: 'phone', minWidth: '100' },
{ title: '电话', field: 'phoneShow', minWidth: '100' },
{ title: '注册时间', field: 'registerTime', minWidth: '130' },
{ title: '登录时间', field: 'loginTime', minWidth: '130' },
{ title: '类型', field: 'casualUserName', minWidth: '80' },
@@ -96,7 +98,7 @@ const tableStore = new TableStore({
return row.state !== 1
},
click: row => {
popupPwdRef.value.open('修改密码', row)
popupPwdRef.value.open(row.id)
}
},
{
@@ -108,7 +110,14 @@ const tableStore = new TableStore({
disabled: row => {
return row.state !== 2 && row.state !== 5 && row.state !== 0 && row.state !== 4
},
click: row => {}
click: row => {
activateUser({
id: row.id
}).then(() => {
ElMessage.success('激活成功')
tableStore.index()
})
}
},
{
name: 'edit',
@@ -119,7 +128,23 @@ const tableStore = new TableStore({
disabled: row => {
return row.state !== 1 && row.state !== 3
},
click: row => {}
click: row => {
ElMessageBox.prompt('二次校验密码确认', '注销用户', {
confirmButtonText: '确认',
cancelButtonText: '取消',
inputType: 'password'
})
.then(({ value }) => {
passwordConfirm(value).then(res => {
deluser({
id: row.id
}).then(() => {
ElMessage.success('注销成功')
tableStore.index()
})
})
})
}
}
]
}
@@ -128,6 +153,8 @@ const tableStore = new TableStore({
loadCallback: () => {
tableStore.table.data.forEach((item: any) => {
item.deptName = item.deptName || '/'
item.phoneShow = item.phone || '/'
item.roleName = item.role.length ? item.role : '/'
switch (item.casualUser) {
case 0:
item.casualUserName = '临时用户'

147
src/views/auth/userlist/popupEdit.vue → src/views/auth/userList/popupEdit.vue
View File

@@ -1,95 +1,96 @@
<template>
<el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
<el-dialog class='cn-operate-dialog' v-model='dialogVisible' :title='title'>
<el-scrollbar>
<el-form :inline="true" :model="form" label-width="120px" :rules="rules">
<el-form-item label="用户名" prop="name">
<el-input v-model="form.name" placeholder="请输入昵称" />
<el-form :inline='true' :model='form' label-width='120px' :rules='rules'>
<el-form-item label='用户名' prop='name'>
<el-input v-model='form.name' placeholder='请输入昵称' />
</el-form-item>
<el-form-item label="登录名" prop="loginName">
<el-input v-model="form.loginName" placeholder="请输入登录名" />
<el-form-item label='登录名' prop='loginName'>
<el-input v-model='form.loginName' placeholder='请输入登录名' />
</el-form-item>
<el-form-item label="默认密码" prop="password" v-if="form.id">
<el-input v-model="form.password" placeholder="请输入密码" />
<el-form-item label='默认密码' prop='password' v-if="title === '新增用户'">
<el-input v-model='form.password' placeholder='请输入密码' disabled />
</el-form-item>
<el-form-item label="权限类型" prop="type">
<el-form-item label='权限类型' prop='type'>
<el-select
style="width: 100%"
v-model="form.type"
@change="changeValue"
style='width: 100%'
v-model='form.type'
@change='changeValue'
disabled
placeholder="请选择权限类型"
placeholder='请选择权限类型'
>
<el-option
v-for="(item, index) in UserTypeOption"
:label="item.label"
:value="item.value"
:key="index"
v-for='(item, index) in UserTypeOption'
:label='item.label'
:value='item.value'
:key='index'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="用户类型" prop="casualUser">
<el-select style="width: 100%" v-model="form.casualUser" placeholder="请选择权限类型">
<el-form-item label='用户类型' prop='casualUser'>
<el-select style='width: 100%' v-model='form.casualUser' placeholder='请选择权限类型'>
<el-option
v-for="(item, index) in TypeOptions"
:label="item.label"
:value="item.value"
:key="index"
v-for='(item, index) in TypeOptions'
:label='item.label'
:value='item.value'
:key='index'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属部门" prop="deptName">
<Area style="width: 100%" v-model="form.deptName" />
<el-form-item label='所属部门' prop='deptId'>
<Area style='width: 100%' v-model='form.deptId' />
</el-form-item>
<el-form-item label="角色" prop="role">
<el-select style="width: 100%" v-model="form.role" placeholder="请选择角色">
<el-form-item label='角色' prop='role'>
<el-select style='width: 100%' v-model='form.role' placeholder='请选择角色' multiple collapse-tags>
<el-option
v-for="(item, index) in roleOptions"
:label="item.label"
:value="item.value"
:key="index"
v-for='(item, index) in roleOptions'
:label='item.label'
:value='item.value'
:key='index'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" />
<el-form-item label='手机号' prop='phone'>
<el-input v-model='form.phone' placeholder='请输入手机号' />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入描述" />
<el-form-item label='邮箱' prop='email'>
<el-input v-model='form.email' placeholder='请输入描述' />
</el-form-item>
<el-form-item label="起始IP" prop="limitIpStart">
<el-input v-model="form.limitIpStart" placeholder="请输入描述" />
<el-form-item label='起始IP' prop='limitIpStart'>
<el-input v-model='form.limitIpStart' placeholder='请输入描述' />
</el-form-item>
<el-form-item label="结束IP" prop="limitIpEnd">
<el-input v-model="form.limitIpEnd" placeholder="请输入描述" />
<el-form-item label='结束IP' prop='limitIpEnd'>
<el-input v-model='form.limitIpEnd' placeholder='请输入描述' />
</el-form-item>
<el-form-item label="时间段" prop="limitTime">
<el-slider v-model="form.limitTime" range show-stops :max="24" />
<el-form-item label='时间段' prop='limitTime'>
<el-slider v-model='form.limitTime' range show-stops :max='24' />
</el-form-item>
<el-form-item label="短信通知" prop="smsNotice">
<el-radio-group v-model="form.smsNotice">
<el-radio-button :label="0">是</el-radio-button>
<el-radio-button :label="1">否</el-radio-button>
<el-form-item label='短信通知' prop='smsNotice'>
<el-radio-group v-model='form.smsNotice'>
<el-radio-button :label='0'>是</el-radio-button>
<el-radio-button :label='1'>否</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="邮件通知" prop="emailNotice">
<el-radio-group v-model="form.emailNotice">
<el-radio-button :label="0">是</el-radio-button>
<el-radio-button :label="1">否</el-radio-button>
<el-form-item label='邮件通知' prop='emailNotice'>
<el-radio-group v-model='form.emailNotice'>
<el-radio-button :label='0'>是</el-radio-button>
<el-radio-button :label='1'>否</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="用户ID">
<div style="display: flex; width: 100%">
<el-radio-group v-model="useId">
<el-radio-button :label="1">是</el-radio-button>
<el-radio-button :label="0">否</el-radio-button>
<el-form-item label='用户ID'>
<div style='display: flex; width: 100%'>
<el-radio-group v-model='useId'>
<el-radio-button :label='1'>是</el-radio-button>
<el-radio-button :label='0'>否</el-radio-button>
</el-radio-group>
<el-input
v-model="form.id"
placeholder="请输入用户id"
v-if="useId"
style="flex: 1"
class="ml10"
:disabled="title !== '新增用户'"
v-model='form.id'
placeholder='请输入用户id'
v-if='useId'
style='flex: 1'
class='ml10'
></el-input>
</div>
</el-form-item>
@@ -97,14 +98,14 @@
</el-scrollbar>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="submit">确认</el-button>
<span class='dialog-footer'>
<el-button @click='dialogVisible = false'>取消</el-button>
<el-button type='primary' @click='submit'>确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
<script lang='ts' setup>
import { ref, inject } from 'vue'
import { reactive } from 'vue'
import TableStore from '@/utils/tableStore'
@@ -113,6 +114,7 @@ import { roleList } from '@/api/user-boot/role'
import { add, edit } from '@/api/user-boot/user'
import { useAdminInfo } from '@/stores/adminInfo'
import Area from '@/components/form/area/index.vue'
import { de } from 'element-plus/es/locale'
const adminInfo = useAdminInfo()
const tableStore = inject('tableStore') as TableStore
@@ -140,7 +142,6 @@ const rules = {
role: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
loginName: [{ required: true, message: '登录名不能为空', trigger: 'blur' }],
deptId: [{ required: true, message: '归属部门不能为空', trigger: 'blur' }],
casualUser: [{ required: true, message: '用户类型不能为空', trigger: 'blur' }],
smsNotice: [{ required: true, message: '短信通知不能为空', trigger: 'blur' }],
emailNotice: [{ required: true, message: '邮件通知不能为空', trigger: 'blur' }],
@@ -148,7 +149,7 @@ const rules = {
{ required: false, message: '邮箱不能为空', trigger: 'blur' },
{
type: 'email',
message: "'请输入正确的邮箱地址",
message: '\'请输入正确的邮箱地址',
trigger: ['blur', 'change']
}
],
@@ -228,30 +229,33 @@ const open = (text: string, data?: anyObj) => {
for (let key in form) {
form[key] = data[key]
}
form.role = data.roleList.length ? data.roleList[0] : ''
form.limitTime = data.limitTime.split('-')
form.role = data.roleList
} else {
for (let key in form) {
form[key] = ''
}
form.casualUser = 1
form.limitTime = [0, 24]
form.limitTime = [0, 23]
form.role = []
form.smsNotice = 0
form.emailNotice = 0
useId.value = 1
form.id = ''
form.limitIpStart = '0.0.0.0'
form.limitIpEnd = '255.255.255.255'
form.password = '123456'
}
form.type = adminInfo.$state.userType + 1
}
const submit = async () => {
let obj = JSON.parse(JSON.stringify(form))
obj.limitTime = obj.limitTime.join('-')
obj.type = adminInfo.$state.userType + 1
obj.role = [obj.role]
delete obj.password
if (form.id) {
await edit(obj)
ElMessage.success('修改成功')
} else {
delete obj.id
form.type = adminInfo.$state.userType + 1
await add(obj)
ElMessage.success('新增成功')
@@ -260,6 +264,7 @@ const submit = async () => {
dialogVisible.value = false
}
const changeValue = () => {}
const changeValue = () => {
}
defineExpose({ open })
</script>

122
src/views/auth/userList/popupPwd.vue Normal file
View File

@@ -0,0 +1,122 @@
<template>
<el-dialog class='cn-operate-dialog' v-model='dialogVisible' title='修改密码'>
<el-scrollbar>
<el-form :inline='false' :model='form' label-width='120px' :rules='rules' ref='formRef'>
<el-form-item label='校验密码' prop='password'>
<el-input v-model='form.password' type='password' placeholder='请输入校验密码' show-password />
</el-form-item>
<el-form-item label='新密码' prop='newPwd'>
<el-input v-model='form.newPwd' type='password' placeholder='请输入新密码' show-password />
</el-form-item>
<el-form-item label='确认密码' prop='confirmPwd'>
<el-input v-model='form.confirmPwd' type='password' placeholder='请输入确认密码' show-password />
</el-form-item>
</el-form>
</el-scrollbar>
<template #footer>
<span class='dialog-footer'>
<el-button @click='dialogVisible = false'>取消</el-button>
<el-button type='primary' @click='submit'>确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script lang='ts' setup>
import { ref, inject } from 'vue'
import { reactive } from 'vue'
import TableStore from '@/utils/tableStore'
import { ElMessage } from 'element-plus'
import { validatePwd } from '@/utils/common'
import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
const formRef = ref()
const tableStore = inject('tableStore') as TableStore
const form = reactive({
id: '',
password: '',
newPwd: '',
confirmPwd: ''
})
const rules = {
password: [
{ required: true, message: '请输入校验密码', trigger: 'blur' },
{
min: 6,
max: 16,
message: '长度在 6 到 16 个字符',
trigger: 'blur'
},
{
validator: (rule: any, value: string, callback: any) => {
if (value === '') {
callback(new Error('请输入旧密码'))
} else {
passwordConfirm(value).then(res => {
callback()
}).catch(() => {
callback(new Error('旧密码不正确'))
})
}
}, trigger: 'blur'
}
],
newPwd: [
{ required: true, message: '请输入密码', trigger: 'blur' },
{
min: 6,
max: 16,
message: '长度在 6 到 16 个字符',
trigger: 'blur'
},
{ validator: validatePwd, trigger: 'blur' }
],
confirmPwd: [
{ required: true, message: '请确认密码', trigger: 'blur' },
{
min: 6,
max: 16,
message: '长度在 6 到 16 个字符',
trigger: 'blur'
},
{
validator: (rule: any, value: string, callback: any) => {
if (value === '') {
callback(new Error('请再次输入密码'))
} else if (value !== form.newPwd) {
callback(new Error('两次输入密码不一致!'))
} else {
callback()
}
},
trigger: 'blur',
required: true
}
]
}
const dialogVisible = ref(false)
const title = ref('新增菜单')
const open = (id: string) => {
form.id = id
form.password = ''
form.newPwd = ''
form.confirmPwd = ''
dialogVisible.value = true
}
const submit = async () => {
formRef.value.validate((valid) => {
if (valid) {
updatePassword({
id: form.id,
newPassword: form.newPwd
}).then((res: any) => {
ElMessage.success('密码修改成功')
dialogVisible.value = false
})
}
})
}
defineExpose({ open })
</script>

75
src/views/auth/userlist/popupPwd.vue
View File

@@ -1,75 +0,0 @@
<template>
<el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
<el-scrollbar>
<el-form :inline="false" :model="form" label-width="120px" :rules="rules">
<el-form-item label="角色名称">
<el-input v-model="form.name" placeholder="请输入菜单名称" />
</el-form-item>
<el-form-item label="角色编码">
<el-input v-model="form.code" placeholder="请输入菜单名称" />
</el-form-item>
<el-form-item label="角色描述">
<el-input v-model="form.remark" :rows="2" type="textarea" placeholder="请输入描述" />
</el-form-item>
</el-form>
</el-scrollbar>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="submit">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
import { ref, inject } from 'vue'
import { reactive } from 'vue'
import TableStore from '@/utils/tableStore'
import { ElMessage } from 'element-plus'
import { add, update } from '@/api/user-boot/role'
import { useAdminInfo } from '@/stores/adminInfo'
const adminInfo = useAdminInfo()
const tableStore = inject('tableStore') as TableStore
// do not use same name with ref
const form = reactive({
code: '',
name: '',
remark: '',
id: '',
type: 0
})
const rules = {
name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
code: [{ required: true, message: '角色编码不能为空', trigger: 'blur' }]
}
const dialogVisible = ref(false)
const title = ref('新增菜单')
const open = (text: string, data?: anyObj) => {
title.value = text
dialogVisible.value = true
if (data) {
for (let key in form) {
form[key] = data[key]
}
} else {
for (let key in form) {
form[key] = ''
}
}
}
const submit = async () => {
if (form.id) {
await update(form)
} else {
form.type = adminInfo.$state.userType + 1
await add(form)
}
ElMessage.success('保存成功')
tableStore.index()
dialogVisible.value = false
}
defineExpose({ open })
</script>