|
|
@ -21,7 +21,7 @@ const admin = ref({ |
|
|
|
}) |
|
|
|
// 角色搜索 |
|
|
|
const role = ref({ |
|
|
|
name:'' |
|
|
|
name: '' |
|
|
|
}) |
|
|
|
// 搜索对象 |
|
|
|
const getObj = ref({ |
|
|
@ -63,7 +63,8 @@ const addRole = ref({ |
|
|
|
roleName: '', |
|
|
|
parentId: null, |
|
|
|
checkedKeys: [], |
|
|
|
grade: '' |
|
|
|
grade: '', |
|
|
|
market:'' |
|
|
|
}) |
|
|
|
// 新增角色的权限列表 |
|
|
|
const permissionSelect = ref() |
|
|
@ -319,18 +320,25 @@ const closeUserEditVisible = function () { |
|
|
|
userEditVisible.value = false |
|
|
|
} |
|
|
|
// 编辑用户权限初始化 |
|
|
|
const permissionEditInit = function (row) { |
|
|
|
console.log('row',row) |
|
|
|
const permissionEditInit = async function (row) { |
|
|
|
console.log('row', row) |
|
|
|
permissionEditObj.value = {} |
|
|
|
permissionEditObj.value.id = row.id |
|
|
|
permissionEditObj.value.account = row.account |
|
|
|
permissionEditObj.value.name = row.name |
|
|
|
permissionEditObj.value.market = row.market |
|
|
|
permissionEditObj.value.postiton = row.postiton |
|
|
|
permissionEditObj.value.roleId = row.roleId |
|
|
|
const result = await request({ |
|
|
|
url: '/role/selectFather', |
|
|
|
data: row.roleId |
|
|
|
}) |
|
|
|
permissionEditObj.value.parentId = result.data?.fatherId |
|
|
|
permissionEditObj.value.parentName = result.data?.fatherName |
|
|
|
|
|
|
|
|
|
|
|
permissionEditObj.value.permission = row.permission |
|
|
|
permissionEditObj.value.roleId = row.roleId |
|
|
|
//permissionEditObj.value.permission = row.permission |
|
|
|
|
|
|
|
permissionEditObj.value.roleName = row.roleName |
|
|
|
console.log('编辑用户权限', permissionEditObj.value) |
|
|
|
openUserEditVisible() |
|
|
@ -411,7 +419,8 @@ const handleAddRole = async function () { |
|
|
|
"roleName": addRole.value.roleName, |
|
|
|
"menuIds": addRole.value.checkedKeys, |
|
|
|
"priority": addRole.value.grade, |
|
|
|
"fatherId": addRole.value.parentName |
|
|
|
"fatherId": addRole.value.parentName, |
|
|
|
"market":addRole.value.market |
|
|
|
} |
|
|
|
}) |
|
|
|
console.log('成功了,看看addRole', addRole.value) |
|
|
@ -492,10 +501,10 @@ const handleCheckChange = (checkedNodes, { checkedKeys }) => { |
|
|
|
<template> |
|
|
|
<div style="margin-bottom:20px"> |
|
|
|
<el-button-group> |
|
|
|
<el-button :type="checkTab === 'admin' ? 'primary' : 'default'" @click="checkTab = 'admin'" > |
|
|
|
<el-button :type="checkTab === 'admin' ? 'primary' : 'default'" @click="checkTab = 'admin'"> |
|
|
|
用户管理 |
|
|
|
</el-button> |
|
|
|
<el-button :type="checkTab === 'role' ? 'primary' : 'default'" @click="checkTab = 'role'" > |
|
|
|
<el-button :type="checkTab === 'role' ? 'primary' : 'default'" @click="checkTab = 'role'"> |
|
|
|
角色管理 |
|
|
|
</el-button> |
|
|
|
</el-button-group> |
|
|
@ -599,8 +608,8 @@ const handleCheckChange = (checkedNodes, { checkedKeys }) => { |
|
|
|
</el-card> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
</div> |
|
|
|
<div v-show="checkTab === 'role'"> |
|
|
|
</div> |
|
|
|
<div v-show="checkTab === 'role'"> |
|
|
|
<!-- 角色搜索 --> |
|
|
|
<el-card style="margin-bottom: 20px"> |
|
|
|
<div class="head-card"> |
|
|
@ -665,7 +674,7 @@ const handleCheckChange = (checkedNodes, { checkedKeys }) => { |
|
|
|
@current-change="handleCurrentChange"></el-pagination> |
|
|
|
</div> |
|
|
|
</el-card> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<!-- 新增用户权限 --> |
|
|
|
<el-dialog v-model="userAddVisible" title="新增用户权限" width="800px" :close-on-click-modal="false"> |
|
|
|
<template #footer> |
|
|
@ -771,6 +780,11 @@ const handleCheckChange = (checkedNodes, { checkedKeys }) => { |
|
|
|
<el-form-item prop="roleName" label="角色名称:" required> |
|
|
|
<el-input v-model="addRole.roleName" placeholder="请输入用户名" style="width: 220px" /> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item prop="market" label="所属地区:" required> |
|
|
|
<el-select v-model="addRole.market" placeholder="请选择所属地区" style="width: 240px" clearable> |
|
|
|
<el-option v-for="item in market" :key="item" :label="item" :value="item" /> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item prop="parentName" label="上级角色:"> |
|
|
|
<el-select v-model="addRole.parentId" placeholder="请选择上级角色" style="width: 220px" @change="getLists" clearable> |
|
|
|
<el-option v-for="item in permissionList" :key="item.value" :label="item.label" |
|
|
|