gitadmin/wms-elevue
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理

Browse Source
This commit is contained in:
陈红丽 2024-07-09 18:34:42 +08:00
parent 31f3d32e77
commit a1bde6dca0
5 changed files with 183 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/system/user.ts
View File

@ -116,6 +116,16 @@ export function userUpdate(data:any) {
data
});
}
/**
* @description: 重置密码
*/
export function resetPwd(data:any) {
return http.request({
url: '/user/resetPwd',
method: 'PUT',
data
});
}
/**
* @description: 删除用户
*/
@ -147,12 +157,9 @@ export function userExport() {
/**
* @description: 城市列表
*/
export function getCityByList(params:any) {
export function getCityByList(pid:any) {
return http.request({
url: '/city/list',
url: '/city/getCityList/'+pid,
method: 'get',
params:{
...params
}
});
}

2
src/components/ChinaArea/index.vue
View File

@ -36,7 +36,7 @@ const cascaderProps: CascaderProps = {
}
const getCityList= (pid:any, level:any, resolve:any)=> {
getCityByList({pid}).then(data => {
getCityByList(pid).then(data => {
for (let i = 0; i < data.length; i++) {
data[i].areaCode = parseInt(data[i].areaCode)
data[i].hasChild = level >= props.type-1 ? true : false

2
src/components/Upload/src/BasicUpload.vue
View File

@ -176,7 +176,7 @@
//成功
if (code === ResultEnum.SUCCESS) {
fileList.value = getResponseImgUrls(resFileList);
emit('uploadChange', fileList.value);
emit('uploadChange', res.data);
} else {
ElMessage({
message: msg,

283
src/views/system/user/edit.vue
View File

@ -1,237 +1,107 @@
<template>
<el-dialog
v-model="props.visible"
:title="props.userId?'编辑':'新增'"
width="700"
:close-on-click-modal="false"
:before-close="dialogClose"
>
<el-form
ref="formRef"
:model="formData"
label-width="84px"
>
<el-dialog v-model="props.visible" :title="props.userId ? '编辑' : '新增'" width="700" :close-on-click-modal="false"
:before-close="dialogClose">
<el-form ref="formRef" :model="formData" label-width="84px">
<div class="flex">
<el-form-item
label="账号"
prop="username"
class="flex-1"
:rules="{ required: true, message: '请输入账号', trigger: 'blur' }"
>
<el-input
:disabled="isRoot"
v-model="formData.username"
placeholder="请输入账号"
clearable
/>
<el-form-item label="账号" prop="username" class="flex-1"
:rules="{ required: true, message: '请输入账号', trigger: 'blur' }">
<el-input :disabled="isRoot" v-model="formData.username" placeholder="请输入账号" clearable />
</el-form-item>
<el-form-item
label="名称"
prop="realname"
class="flex-1"
:rules="{ required: true, message: '请输入名称', trigger: 'blur' }"
>
<el-input
v-model="formData.realname"
placeholder="请输入名称"
clearable
/>
<el-form-item label="密码" prop="password" class="flex-1"
:rules="{ required: props.userId ? false : true, message: '请输入密码', trigger: 'blur' }">
<el-input v-model.trim="formData.password" show-password autocomplete="new-password" clearable
placeholder="请输入密码" />
</el-form-item>
</div>
<div class="flex">
<el-form-item label="名称" prop="realname" class="flex-1"
:rules="{ required: true, message: '请输入名称', trigger: 'blur' }">
<el-input v-model="formData.realname" placeholder="请输入名称" clearable />
</el-form-item>
<el-form-item label="性别" prop="sex" class="flex-1">
<el-radio-group v-model="formData.gender" name="gender">
<el-space>
<el-radio :value="1">男</el-radio>
<el-radio :value="2">女</el-radio>
<el-radio :value="3">保密</el-radio>
</el-space>
</el-radio-group>
</el-form-item>
<el-form-item
label="角色"
prop="roleIds"
class="flex-1"
:rules="{ required: true, message: '请选择角色', trigger: 'change' }"
>
<el-select
v-model="formData.roleIds"
:disabled="isRoot"
multiple
class="flex-1"
clearable
placeholder="请选择角色"
>
</div>
<div class="flex">
<el-form-item label="角色" prop="roles" class="flex-1"
:rules="{ required: true, message: '请选择角色', trigger: 'change' }">
<el-select v-model="formData.roles" :disabled="isRoot" multiple class="flex-1" clearable placeholder="请选择角色">
<el-option v-if="isRoot" label="系统管理员" value="0" />
<el-option
v-for="(item, index) in optionData.roleList"
:key="index"
:label="item.name"
:value="item.id"
/>
<el-option v-for="(item, index) in optionData.roleList" :key="index" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</div>
<div class="flex">
<el-form-item
label="手机号码"
prop="mobile"
class="flex-1"
:rules="{ required: true, message: '请输入手机号码', trigger: 'blur' }"
>
<el-input
v-model="formData.mobile"
placeholder="请输入手机号码"
clearable
/>
</el-form-item>
<el-form-item
label="邮箱地址"
prop="email"
class="flex-1"
:rules="{ required: true, message: '请输入邮箱地址', trigger: 'blur' }"
>
<el-input
v-model="formData.email"
placeholder="请输入邮箱地址"
clearable
/>
</el-form-item>
</div>
<div class="flex">
<el-form-item
label="部门"
prop="deptId"
class="flex-1"
>
<el-form-item label="部门" prop="deptId" class="flex-1">
<!-- <el-tree-select
v-model="formData.deptId"
:data="optionData.deptList"
:render-after-expand="false"
/> -->
<el-select
v-model="formData.deptId"
multiple
class="flex-1"
clearable
placeholder="请选择角色"
>
<el-option
v-for="(item, index) in optionData.deptList"
:key="index"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item
label="职级"
prop="levelId"
class="flex-1"
>
<el-select
v-model="formData.levelId"
multiple
class="flex-1"
clearable
placeholder="请选择角色"
>
<el-option
v-for="(item, index) in optionData.levelList"
:key="index"
:label="item.name"
:value="item.id"
/>
<el-select v-model="formData.deptId" class="flex-1" clearable placeholder="请选择部门">
<el-option v-for="(item, index) in optionData.deptList" :key="index" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</div>
<div class="flex">
<el-form-item
label="岗位"
prop="positionId"
class="flex-1"
>
<el-select
v-model="formData.positionId"
multiple
class="flex-1"
clearable
placeholder="请选择角色"
>
<el-option
v-for="(item, index) in optionData.positionList"
:key="index"
:label="item.name"
:value="item.id"
/>
<el-form-item label="职级" prop="levelId" class="flex-1">
<el-select v-model="formData.levelId" class="flex-1" clearable placeholder="请选择职级">
<el-option v-for="(item, index) in optionData.levelList" :key="index" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="岗位" prop="positionId" class="flex-1">
<el-select v-model="formData.positionId" class="flex-1" clearable placeholder="请选择岗位">
<el-option v-for="(item, index) in optionData.positionList" :key="index" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</div>
<div class="flex">
<el-form-item label="手机号码" prop="mobile" class="flex-1"
:rules="{ required: true, message: '请输入手机号码', trigger: 'blur' }">
<el-input v-model="formData.mobile" placeholder="请输入手机号码" clearable />
</el-form-item>
<el-form-item label="邮箱地址" prop="email" class="flex-1"
:rules="{ type: 'email', message: '请输入正确邮箱地址', trigger: 'blur'}">
<el-input v-model="formData.email" placeholder="请输入邮箱地址" clearable />
</el-form-item>
</div>
<div class="flex">
<el-form-item label="所属区域" class="flex-1">
<chinaArea style="width: 100%" :type="4" v-model="formData.cityCode"></chinaArea>
<chinaArea style="width: 100%" :type="4" v-model="formData.city"></chinaArea>
</el-form-item>
<el-form-item label="详细地址" class="flex-1">
<el-input
v-model="formData.address"
placeholder="请输入详细地址"
clearable
/>
<el-input v-model="formData.address" placeholder="请输入详细地址" clearable />
</el-form-item>
</div>
<div class="flex">
<el-form-item
label="密码"
prop="password"
class="flex-1"
:rules="{ required: props.userId?false:true, message: '请输入密码', trigger: 'blur' }"
>
<el-input
v-model.trim="formData.password"
show-password
autocomplete="new-password"
clearable
placeholder="请输入密码"
/>
<el-form-item label="用户状态" prop="status" class="flex-1">
<el-radio-group v-model="formData.status" name="status">
<el-radio :value="1">正常</el-radio>
<el-radio :value="2">禁用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="排序" prop="sort" class="flex-1">
<el-input-number v-model="formData.sort" :max="9999" />
</el-form-item>
</div>
<div class="flex">
<el-form-item label="简介" prop="intro" class="flex-1">
<el-input v-model="formData.intro" type="textarea" placeholder="请输入简介" clearable />
</el-form-item>
</div>
<div class="flex">
<el-form-item label="备注" prop="note" class="flex-1">
<el-input v-model="formData.note" type="textarea" placeholder="请输入备注" clearable />
</el-form-item>
<el-form-item
label="确认密码"
prop="passwordConfirm"
class="flex-1"
:rules="[{ required: props.userId?false:true, message: '请输入密码', trigger: 'blur' },{validator: props.userId?void(0):passwordConfirmValidator,trigger: 'blur'}]"
>
<el-input
v-model.trim="formData.passwordConfirm"
autocomplete="new-password"
show-password
clearable
placeholder="请输入确认密码"
/>
</el-form-item>
</div>
<div class="flex">
<el-form-item label="管理员状态" v-if="!isRoot">
<el-switch
v-model="formData.userStatus"
active-value="enable"
inactive-value="disable"
/>
</el-form-item>
</div>
<div class="flex"></div>
<el-form-item label="头像" prop="images">
<BasicUpload
:action="`${uploadUrl}/api/upload/uploadFile`"
v-model:list="fileList"
:headers="uploadHeaders"
:data="{ name: 'avatar' }"
:limit="1"
@upload-change="uploadChange"
/>
<BasicUpload :action="`${uploadUrl}/api/upload/uploadFile`" :list="formData.avatar?[{name:'avatar',url:formData.avatar}]:[]" :headers="uploadHeaders"
:data="{ name: 'avatar' }" :limit="1" @upload-change="uploadChange" />
</el-form-item>
</el-form>
<template #footer>
@ -281,18 +151,22 @@ const uploadHeaders = reactive({
authorization: useUserStore().getToken
});
const formData = reactive({
userId: 0,
id: 0,
email: '',
username: "",
realname: "",
mobile: '',
gender: 1,
roleIds: [],
roles: [],
deptId: '',
levelId: '',
positionId: '',
address: '',
cityCode:'',
status: 1,
note: '',
intro: '',
sort: 0,
city: [],
avatar: "",
password: "",
passwordConfirm: "",
@ -323,9 +197,17 @@ const setFormData = async (row: any) => {
const data = await getUserDetail(row.userId);
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
if(key=='city'){
if(data.city.length>0){
formData[key] = [parseInt(data.city[0]),parseInt(data.city[1]),parseInt(data.city[2]),parseInt(data.city[3])];
}else{
formData[key] =''
}
}else{
formData[key] = data[key];
}
}
}
};
const handleSubmit = async () => {
@ -344,9 +226,8 @@ const optionData = reactive({
positionList: []
});
function uploadChange(list: string[]) {
console.log('🚀 ~ file: index.vue ~ line 118 ~ uploadChange ~ list', list);
formData.avatar = unref(list);
function uploadChange(data: string[]) {
formData.avatar = data.fileUrl;
}
const getAllDict = async () => {

42
src/views/system/user/index.vue
View File

@ -87,12 +87,7 @@
import { columns } from './columns';
import { schemas } from './querySchemas';
import { useUserStore } from '@/store/modules/user';
import {
downloadByUrl,
downloadByData,
downloadByBase64,
downloadByOnlineUrl,
} from '@/utils/file/download';
import {downloadByData} from '@/utils/file/download';
const userId = ref(0);
const basicTableRef = ref();
const editVisible = ref(false)
@ -120,7 +115,7 @@ const uploadHeaders = reactive({
});
const actionColumn = reactive({
width: 240,
width: 250,
label: '操作',
prop: 'action',
fixed: 'right',
@ -139,20 +134,25 @@ const uploadHeaders = reactive({
type: 'warning',
onClick: handleEdit.bind(null, record),
},
],
dropDownActions: [
{
label: '启用',
key: 'enabled',
},
{
label: '禁用',
key: 'disabled',
label: '重置密码',
type: 'warning',
onClick: handleResetPassWord.bind(null, record),
},
],
select: (key) => {
ElMessage.info(`您点击了，${key} 按钮`);
},
// dropDownActions: [
// {
// label: '启用',
// key: 'enabled',
// },
// {
// label: '禁用',
// key: 'disabled',
// },
// ],
// select: (key) => {
// ElMessage.info(`您点击了，${key} 按钮`);
// },
});
},
});
@ -172,6 +172,12 @@ const uploadHeaders = reactive({
await nextTick();
editVisible.value=true
}
async function handleResetPassWord(record: Recordable) {
userId.value=record.row.id
await nextTick();
editVisible.value=true
}
async function handleDelete(record: Recordable) {
await confirm('确定要删除？');