diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue index 5298be2..16d2c64 100644 --- a/src/views/permissions/permission.vue +++ b/src/views/permissions/permission.vue @@ -92,8 +92,6 @@ const getRolePermission = async function(){ viewRole.value = collectIds(result.data) console.log('result111',viewRole.value); } - - // 编辑用户权限对象 const permissionEditObj = ref({ checkedKeys: [], @@ -724,7 +722,7 @@ const getLists = async function () { data: { id: roleId } }) data.value = res.data - if(addRole.value.roleId ==null ||addRole.value.roleId ==undefined){ + if(addRole.value.parentId ==null ||addRole.value.parentId ==undefined){ data.value = data.value }else if (addRole.value.parentId != 2) { data.value = data.value.filter(item => item.id !== 9); @@ -739,11 +737,14 @@ const getLists = async function () { if (result.code == 200) { if (typeof result.data === 'string' && result.data) { addRoleMarket.value = result.data.split(','); + addRole.value.market = '' } else if (Array.isArray(result.data)) { addRoleMarket.value = result.data + addRole.value.market = '' } else { addRoleMarket.value = []; + addRole.value.market = '' } } else { ElMessage.error('该上级角色无所属地区') @@ -754,11 +755,14 @@ const getLists = async function () { } else { if (typeof adminData.value.markets === 'string' && adminData.value.markets) { addRoleMarket.value = adminData.value.markets.split(','); + addRole.value.market = '' } else if (Array.isArray(adminData.value.markets)) { addRoleMarket.value = adminData.value.markets + addRole.value.market = '' } else { addRoleMarket.value = []; + addRole.value.market = '' } } @@ -1427,17 +1431,17 @@ onMounted(async function () { - - - - - - + + + + + +