diff --git a/src/views/system/role/add.vue b/src/views/system/role/add.vue index 6a9c8c5..f988177 100644 --- a/src/views/system/role/add.vue +++ b/src/views/system/role/add.vue @@ -154,7 +154,11 @@ const filterMenu = (value, data) => { } const checkChange = (data) => { - return menuTree.value.getCheckedKeys() + // 获取已选 + const checkedKeys = menuTree.value.getCheckedKeys() + // 获取半选 + const halfCheckedKeys = menuTree.value.getHalfCheckedKeys() + return [...checkedKeys, ...halfCheckedKeys] } const checkBoxChange = (val) => { diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 4decb41..0e0247b 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -109,10 +109,10 @@ const tableConfig = reactive({ align: 'center' }, { - prop: 'dataScope', - label: '数据范围', + prop: 'template', + label: '是否为模版角色', align: 'center', - currentRender: ({row, index}) => ({formatDataScope(row.dataScope)}) + currentRender: ({row, index}) => () }, { prop: 'roleSort', @@ -154,7 +154,7 @@ const tableConfig = reactive({ btn.push({label: '删除', auth: auths.edit, func: ()=>handleDel(row) , type: 'danger'}) } return ( -
+
{ btn.map(item=>(