zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
weiwei committed 2025-03-13 19:57:06 +08:00
1 parent 866cb60801
commit 7fca37e2a6
3 files changed
+35 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/admin/system/user/form.vue
+5 -8
View File
@@ -28,14 +28,14 @@
<el-input clearable placeholder="请输入手机号" v-model="dataForm.phone"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="!roleCodes.includes('DEPT_ADMIN') && !roleCodes.includes('ROLE_ADMIN')" class="mb20">
<el-col :span="12" v-if="!roleCodes.includes('DEPT_ADMIN')" class="mb20">
<el-form-item :label="$t('sysuser.role')" prop="role">
<el-select clearable multiple placeholder="请选择角色" v-model="dataForm.role">
<el-option :key="item.roleId" :label="item.roleName" :value="item.roleId" v-for="item in roleData" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="!roleCodes.includes('DEPT_ADMIN') && !roleCodes.includes('ROLE_ADMIN')" class="mb20">
<el-col :span="12" v-if="!roleCodes.includes('DEPT_ADMIN')" class="mb20">
<el-form-item :label="$t('sysuser.post')" prop="post">
<el-select clearable multiple placeholder="请选择岗位" v-model="dataForm.post">
<el-option :key="item.postId" :label="item.postName" :value="item.postId" v-for="item in postData" />
@@ -171,10 +171,7 @@ const dataRules = ref({
{ validator: rule.chinese, trigger: "blur" },
],
deptId: [{ required: true, message: "部门不能为空", trigger: "blur" }],
role:
roleCodes.includes("DEPT_ADMIN") || roleCodes.includes("ROLE_ADMIN")
? []
: [{ required: true, message: "角色不能为空", trigger: "blur" }],
role: roleCodes.includes("DEPT_ADMIN") ? [] : [{ required: true, message: "角色不能为空", trigger: "blur" }],
// post: [{ required: true, message: '岗位不能为空', trigger: 'blur' }],
// 手机号校验，不能为空、新增的时不能重复校验
phone: [
@@ -288,7 +285,7 @@ const getPostData = () => {
postList().then((res) => {
postData.value = res.data
// 默认选择第一个
if (!roleCodes.includes("DEPT_ADMIN") && !roleCodes.includes("ROLE_ADMIN") && !dataForm.userId) {
if (!roleCodes.includes("DEPT_ADMIN") && !dataForm.userId) {
dataForm.post = [res.data[0].postId]
}
})
@@ -298,7 +295,7 @@ const getRoleData = () => {
roleList().then((res) => {
roleData.value = res.data
// 默认选择第一个
if (!roleCodes.includes("DEPT_ADMIN") && !roleCodes.includes("ROLE_ADMIN") && !dataForm.userId) {
if (!roleCodes.includes("DEPT_ADMIN") && !dataForm.userId) {
dataForm.role = [res.data[0].roleId]
}
})
src/views/admin/system/user/index.vue
+9 -8
View File
@@ -75,16 +75,16 @@
>
<el-table-column :selectable="handleSelectable" type="selection" width="40" />
<el-table-column label="#" type="index" width="60" fixed="left" />
<el-table-column label="用户名" prop="username" fixed="left" show-overflow-tooltip></el-table-column>
<el-table-column label="姓名" prop="name" show-overflow-tooltip></el-table-column>
<el-table-column label="手机号" prop="phone" show-overflow-tooltip></el-table-column>
<el-table-column label="部门" prop="deptName" show-overflow-tooltip />
<el-table-column label="角色" show-overflow-tooltip>
<el-table-column label="用户名" prop="username" fixed="left" show-overflow-tooltip min-width="150" />
<el-table-column label="姓名" prop="name" show-overflow-tooltip min-width="150" />
<el-table-column label="手机号" prop="phone" show-overflow-tooltip min-width="150" />
<el-table-column label="部门" prop="deptName" show-overflow-tooltip min-width="150" />
<el-table-column label="角色" show-overflow-tooltip min-width="150">
<template #default="scope">
<el-tag v-for="(item, index) in scope.row.roleList" :key="index">{{ item.roleName }}</el-tag>
</template>
</el-table-column>
<el-table-column label="启用" show-overflow-tooltip>
<el-table-column label="启用" show-overflow-tooltip min-width="150">
<template #default="scope">
<el-switch
:disabled="!auth('sys_user_edit')"
@@ -115,11 +115,12 @@
<el-table-column
v-auths="['sys_user_edit', 'userFace_sysUserFace_view', 'sys_user_del']"
label="操作"
min-width="370"
width="380"
fixed="right"
show-overflow-tooltip
>
<template #default="scope">
<div style="display: flex">
<div style="display: flex; justify-content: center">
<!-- 重置密码 -->
<popover-input v-model="inputPassword" @confirm="changePassword(scope.row)">
<template #default>