lisang
/
vue3-element-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/youlaiorg/vue3-element-admin

This commit is contained in:
郝先瑞 2023-10-10 21:00:31 +08:00
parent 8fbf8aa3d4 399197e759
commit be60776ca5
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.vscode/settings.json vendored
View File

@ -4,7 +4,11 @@
"editor.tabSize": 2, "editor.tabSize": 2,
"editor.formatOnSave": true, "editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode", "editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.quickSuggestions": {
"other": true,
"comments": true,
"strings": true
},
"editor.codeActionsOnSave": { "editor.codeActionsOnSave": {
"source.fixAll": true, "source.fixAll": true,
"source.fixAll.eslint": true, "source.fixAll.eslint": true,

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

@ -28,7 +28,7 @@ const queryFormRef = ref(ElForm); // 查询表单
const userFormRef = ref(ElForm); // 用户表单 const userFormRef = ref(ElForm); // 用户表单
const uploadRef = ref<UploadInstance>(); // 上传组件 const uploadRef = ref<UploadInstance>(); // 上传组件
const loading = ref(false); // 加载状态 用于分页 const loading = ref(false); // 加载状态
const removeIds = ref([]); // 删除用户ID集合 用于批量删除 const removeIds = ref([]); // 删除用户ID集合 用于批量删除
const queryParams = reactive<UserQuery>({ const queryParams = reactive<UserQuery>({
pageNum: 1, pageNum: 1,
@ -64,9 +64,7 @@ const rules = reactive({
username: [{ required: true, message: "用户名不能为空", trigger: "blur" }], username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }], nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
deptId: [{ required: true, message: "所属部门不能为空", trigger: "blur" }], deptId: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
roleIds: [ roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
{ required: true, message: "用户角色不能为空", trigger: "blur" },
],
email: [ email: [
{ {
pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/, pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
@ -577,11 +575,7 @@ onMounted(() => {
</el-form-item> </el-form-item>
<el-form-item label="角色" prop="roleIds"> <el-form-item label="角色" prop="roleIds">
<el-select <el-select v-model="formData.roleIds" multiple placeholder="请选择">
v-model="formData.roleIds"
multiple
placeholder="请选择"
>
<el-option <el-option
v-for="item in roleList" v-for="item in roleList"
:key="item.value" :key="item.value"