From 1b9fea7d4af68d8f933b2dc42bf6084b9646f64c Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Tue, 04 Mar 2025 08:39:55 +0800
Subject: [PATCH] 修改作业等级名称
---
src/views/system/user/component/userDialog.vue | 149 ++++++++++++++++++++++++++++++-------------------
1 files changed, 92 insertions(+), 57 deletions(-)
diff --git a/src/views/system/user/component/userDialog.vue b/src/views/system/user/component/userDialog.vue
index 86cffbd..1570fce 100644
--- a/src/views/system/user/component/userDialog.vue
+++ b/src/views/system/user/component/userDialog.vue
@@ -4,74 +4,74 @@
<el-form :model="userForm" size="default" ref="userRef" :rules="userFormRules" label-width="90px">
<el-row :gutter="35">
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="disabled">
- <el-form-item label="用户名">
+ <el-form-item label="用户名" prop="username">
<el-input v-model.trim="userForm.username" :disabled="disabled" placeholder="" 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="realName">
- <el-input v-model.trim="userForm.realName" placeholder="请输入真实姓名" clearable></el-input>
+ <el-input v-model.trim="userForm.realName" :disabled="allDisabled" placeholder="请输入真实姓名" 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="roleId">
- <el-select v-model="userForm.roleId" placeholder="请选择" clearable class="w100">
+ <el-form-item label="关联角色" prop="roleIds">
+ <el-select v-model="userForm.roleIds" placeholder="请选择" clearable class="w100" multiple :disabled="allDisabled">
<el-option v-for="item in roleData" :key="item.roleId" :label="item.roleName" :value="item.roleId"> </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="depId">
- <el-cascader :options="departmentData" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable class="w100" v-model="userForm.depId"> </el-cascader>
+ <el-cascader :options="departmentData" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable class="w100" v-model="userForm.depId" :disabled="allDisabled"> </el-cascader>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
- <el-form-item label="职务" prop="positionId">
- <el-select v-model="userForm.positionId" placeholder="请选择" clearable class="w100">
- <el-option v-for="item in dutyData" :key="item.positionId" :label="item.positionName" :value="item.positionId"> </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="phone">
- <el-input v-model.trim="userForm.phone" placeholder="请输入手机号" 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="身份证">
- <el-input v-model.trim="userForm.identify" placeholder="请输入身份证" 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="邮箱">
- <el-input v-model.trim="userForm.email" placeholder="请输入" 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="gender">
- <el-select v-model="userForm.gender" placeholder="请选择" clearable class="w100">
- <el-option v-for="item in sexList" :key="item.id" :value="item.id" :label="item.name"> </el-option>
+ <el-form-item label="职务" prop="positionIds">
+ <el-select v-model="userForm.positionIds" placeholder="请选择" clearable class="w100" multiple :disabled="allDisabled">
+ <el-option v-for="item in dutyData" :key="item.positionId" :label="item.positionName" :value="item.positionId"> </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="expireTime">
- <el-date-picker v-model="userForm.expireTime" type="date" placeholder="请选择" class="w100"> </el-date-picker>
+ <el-form-item label="手机号" prop="phone">
+ <el-input v-model.trim="userForm.phone" placeholder="请输入手机号" clearable :disabled="allDisabled"></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="身份证">
+ <el-input v-model.trim="userForm.identify" placeholder="请输入身份证" clearable :disabled="allDisabled"></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="邮箱">
+ <el-input v-model.trim="userForm.email" placeholder="请输入" clearable :disabled="allDisabled"></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="gender">
+ <el-select v-model="userForm.gender" placeholder="请选择" clearable class="w100" :disabled="allDisabled">
+ <el-option v-for="item in sexList" :key="item.id" :value="item.id" :label="item.name"> </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="expireTime">-->
+<!-- <el-date-picker v-model="userForm.expireTime" type="date" placeholder="请选择" class="w100"> </el-date-picker>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="!disabled">
<el-form-item label="账户密码" prop="password">
<el-input v-model.trim="userForm.password" placeholder="请输入" type="password" show-password>
</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="type">
- <el-select v-model="userForm.type" placeholder="请选择" clearable class="w100">
- <el-option v-for="item in userTypeList.filter(item => userForm.type === 1 ? item.id === 1 : item.id !== 1)" :key="item.id" :label="item.name" :value="item.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="type">
+ <el-select v-model="userForm.type" placeholder="请选择" clearable class="w100" :disabled="allDisabled">
+ <el-option v-for="item in userTypeList.filter(item => userForm.type === 1 ? item.id === 1 : item.id !== 1)" :key="item.id" :label="item.name" :value="item.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="用户状态">-->
<!-- <el-switch v-model="userForm.status" inline-prompt active-value = 1 inactive-value= 0 active-text="启" inactive-text="禁"></el-switch>-->
@@ -82,7 +82,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowUserDialog = !isShowUserDialog" size="default">取 消</el-button>
- <el-button type="primary" v-throttle @click="onSubmit" size="default">确 定</el-button>
+ <el-button type="primary" v-throttle @click="onSubmit" size="default" v-if="!allDisabled">确 定</el-button>
</span>
</template>
</el-dialog>
@@ -93,6 +93,7 @@
import { reactive, toRefs, onMounted, defineComponent, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import { userApi } from '/@/api/systemManage/user';
+import {verifyPhone, verifyPwd} from "/@/utils/toolsValidate";
// 定义接口来定义对象的类型
interface DeptData {}
@@ -103,19 +104,19 @@
interface UserState {
title: string;
disabled: boolean;
+ allDisabled: boolean;
isShowUserDialog: boolean;
userForm: {
username: string;
realName: string;
- roleId: number | null;
+ roleIds: Array<number>
depId: number | null;
- positionId: number | null;
+ positionIds: Array<number>
phone: string;
email: string;
gender: number | null;
type: number | null;
password: string;
- expireTime: string;
status: number;
identify: string;
};
@@ -133,36 +134,56 @@
name: 'user',
setup(props, context) {
const userRef = ref()
+ const checkPhone = (rule: any, value: any, callback: any) => {
+ if (value == '') {
+ return callback(new Error('该内容不能为空'))
+ }
+ setTimeout(() => {
+ if (!verifyPhone(value)) {
+ callback(new Error('手机号格式不正确'))
+ }else callback();
+ }, 400)
+ }
+ let validatePwd = (rule: any, value: any, callback: any)=>{
+ if(value === ''){
+ callback(new Error('请输入密码'))
+ }else{
+ if(!verifyPwd(value)){
+ callback(new Error('密码须包含字母、数字、特殊字符，长度在6-16之间'))
+ }else{
+ callback()
+ }
+ }
+ }
const state = reactive<UserState>({
title: '',
disabled: false,
+ allDisabled: false,
isShowUserDialog: false,
userForm: {
username: '', // 账户名称
realName: '', // 用户昵称
- roleId: null, // 关联角色
+ roleIds: [], // 关联角色
depId: null, // 部门
phone: '', // 手机号
email: '', // 邮箱
identify: '',
gender: null, // 性别
password: '', // 账户密码
- positionId: null, // 岗位
+ positionIds: [], // 岗位
type: null, // 用户类型
- expireTime: '', // 账户过期
status: 1 // 用户状态
},
userFormRules:{
username: [{ required: true, message: '请填写用户名', trigger: 'blur' }],
realName: [{ required: true, message: '请填写真实姓名', trigger: 'blur' }],
- roleId: [{ required: true, message: '请选择用户角色', trigger: 'change' }],
+ roleIds: [{ required: true, message: '请选择用户角色', trigger: 'change' }],
depId: [{ required: true, message: '请选择部门', trigger: 'change' }],
- positionId: [{ required: true, message: '请选择职务', trigger: 'change' }],
- phone: [{ required: true, message: '请填写手机号', trigger: 'blur' }],
+ positionIds: [{ required: true, message: '请选择职务', trigger: 'change' }],
+ phone: [{ required: true, validator: checkPhone, trigger: 'blur' }],
type: [{ required: true, message: '请填写用户类型', trigger: 'blur' }],
gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
- expireTime: [{ required: true, message: '请输入账户过期时间', trigger: 'blur' }],
- password: [{ required: true, message: '请输入账户密码', trigger: 'blur' }],
+ password: [{ required: true, validator: validatePwd, trigger: 'blur' }],
},
departmentData: [], // 部门数据
roleData: [], //角色数据
@@ -175,8 +196,9 @@
{ id: 1, name: '超级管理员' },
{ id: 2, name: '管理员' },
{ id: 3, name: '普通员工' }
- ]
+ ],
});
+
// 打开弹窗
const openDialog = (type: string, value: any, departmentList: [], roleList: [], dutyList:[]) => {
state.isShowUserDialog = true;
@@ -185,26 +207,38 @@
state.dutyData = dutyList
if (type === '新增') {
state.disabled = false
+ state.allDisabled = false
state.title = '新增用户';
state.userForm = {
username: '',
realName: '',
- roleId: null,
+ roleIds: [],
depId: null,
phone: '',
email: '',
identify: '',
- positionId: null,
+ positionIds: [],
gender: null,
type: null,
password: '',
- expireTime: '',
status: 1
};
- } else {
+ } else{
+ if(type === '修改'){
state.disabled = true
+ state.allDisabled = false
state.title = '修改用户';
state.userForm = JSON.parse(JSON.stringify(value));
+ state.userForm.roleIds = JSON.parse(JSON.stringify(value)).roles?.map(obj=>obj.roleId)
+ state.userForm.positionIds = JSON.parse(JSON.stringify(value)).positions?.map(obj=>obj.positionId)
+ }else{
+ state.disabled = true
+ state.allDisabled = true
+ state.title = '查看';
+ state.userForm = JSON.parse(JSON.stringify(value));
+ state.userForm.roleIds = JSON.parse(JSON.stringify(value)).roles?.map(obj=>obj.roleId)
+ state.userForm.positionIds = JSON.parse(JSON.stringify(value)).positions?.map(obj=>obj.positionId)
+ }
}
};
@@ -229,7 +263,8 @@
});
}
} else {
- let res = await userApi().modUser(state.userForm);
+ const { roles, positions, ...data} = state.userForm
+ let res = await userApi().modUser(data);
if (res.data.code === '200') {
ElMessage({
type: 'success',
--
Gitblit v1.9.2