BJ_ZTEITS-Developers / parking-cloud-yudao

Commit c8c6e349ae8d8e441e4d7ae30a70c41b233feff2

Authored by xingyu4j
1 parent 843e5211

fix: role bugs

Inline Side-by-side
Showing 1 changed file with 9 additions and 7 deletions
yudao-ui-admin-vue3/src/views/system/role/index.vue
  View file @c8c6e34
@@ -92,9 +92,9 @@ @@ -92,9 +92,9 @@
92 <el-select v-model="dataScopeForm.dataScope"> 92 <el-select v-model="dataScopeForm.dataScope">
93 <el-option 93 <el-option
94 v-for="item in dataScopeDictDatas" 94 v-for="item in dataScopeDictDatas"
95 - :key="parseInt(item.value)" 95 + :key="item.value"
96 :label="item.label" 96 :label="item.label"
97 - :value="parseInt(item.value)" 97 + :value="item.value"
98 /> 98 />
99 </el-select> 99 </el-select>
100 </el-form-item> 100 </el-form-item>
@@ -166,7 +166,7 @@ import { useMessage } from &#39;@/hooks/web/useMessage&#39; @@ -166,7 +166,7 @@ import { useMessage } from &#39;@/hooks/web/useMessage&#39;
166 import { useVxeGrid } from '@/hooks/web/useVxeGrid' 166 import { useVxeGrid } from '@/hooks/web/useVxeGrid'
167 import { handleTree, defaultProps } from '@/utils/tree' 167 import { handleTree, defaultProps } from '@/utils/tree'
168 import { SystemDataScopeEnum } from '@/utils/constants' 168 import { SystemDataScopeEnum } from '@/utils/constants'
169 -import { DICT_TYPE, getDictOptions } from '@/utils/dict' 169 +import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
170 import { rules, allSchemas } from './role.data' 170 import { rules, allSchemas } from './role.data'
171 import * as RoleApi from '@/api/system/role' 171 import * as RoleApi from '@/api/system/role'
172 import { listSimpleMenusApi } from '@/api/system/menu' 172 import { listSimpleMenusApi } from '@/api/system/menu'
@@ -301,18 +301,20 @@ const handleScope = async (type: string, row: RoleApi.RoleVO) =&gt; { @@ -301,18 +301,20 @@ const handleScope = async (type: string, row: RoleApi.RoleVO) =&gt; {
301 } 301 }
302 // 保存权限 302 // 保存权限
303 const submitScope = async () => { 303 const submitScope = async () => {
304 - const keys = treeRef.value!.getCheckedKeys(false) as unknown as Array<number>  
305 if ('data' === actionScopeType.value) { 304 if ('data' === actionScopeType.value) {
306 const data = ref<PermissionApi.PermissionAssignRoleDataScopeReqVO>({ 305 const data = ref<PermissionApi.PermissionAssignRoleDataScopeReqVO>({
307 roleId: dataScopeForm.id, 306 roleId: dataScopeForm.id,
308 dataScope: dataScopeForm.dataScope, 307 dataScope: dataScopeForm.dataScope,
309 - dataScopeDeptIds: dataScopeForm.dataScope !== SystemDataScopeEnum.DEPT_CUSTOM ? [] : keys 308 + dataScopeDeptIds:
  309 + dataScopeForm.dataScope !== SystemDataScopeEnum.DEPT_CUSTOM
  310 + ? []
  311 + : (treeRef.value!.getCheckedKeys(false) as unknown as Array<number>)
310 }) 312 })
311 await PermissionApi.assignRoleDataScopeApi(data.value) 313 await PermissionApi.assignRoleDataScopeApi(data.value)
312 } else if ('menu' === actionScopeType.value) { 314 } else if ('menu' === actionScopeType.value) {
313 const data = ref<PermissionApi.PermissionAssignRoleMenuReqVO>({ 315 const data = ref<PermissionApi.PermissionAssignRoleMenuReqVO>({
314 roleId: dataScopeForm.id, 316 roleId: dataScopeForm.id,
315 - menuIds: keys 317 + menuIds: treeRef.value!.getCheckedKeys(false) as unknown as Array<number>
316 }) 318 })
317 await PermissionApi.assignRoleMenuApi(data.value) 319 await PermissionApi.assignRoleMenuApi(data.value)
318 } 320 }
@@ -320,7 +322,7 @@ const submitScope = async () =&gt; { @@ -320,7 +322,7 @@ const submitScope = async () =&gt; {
320 dialogScopeVisible.value = false 322 dialogScopeVisible.value = false
321 } 323 }
322 const init = () => { 324 const init = () => {
323 - dataScopeDictDatas.value = getDictOptions(DICT_TYPE.SYSTEM_DATA_SCOPE) 325 + dataScopeDictDatas.value = getIntDictOptions(DICT_TYPE.SYSTEM_DATA_SCOPE)
324 } 326 }
325 // ========== 初始化 ========== 327 // ========== 初始化 ==========
326 onMounted(() => { 328 onMounted(() => {