diff --git a/src/views/system/department/components/ToolToShowUserPicker.vue b/src/views/system/department/components/ToolToShowUserPicker.vue index 9f499ff..bd909ad 100644 --- a/src/views/system/department/components/ToolToShowUserPicker.vue +++ b/src/views/system/department/components/ToolToShowUserPicker.vue @@ -1,6 +1,6 @@ diff --git a/src/views/system/department/edit.vue b/src/views/system/department/edit.vue index d084b20..3d3bccd 100644 --- a/src/views/system/department/edit.vue +++ b/src/views/system/department/edit.vue @@ -82,7 +82,7 @@ const getInfo = async () => { const formatIdsToNames = (ids, infoList, key, viewKey) => { const resArr = [] - if(!ids.length) return '--' + if(!ids?.length) return ids.forEach(item=>{ infoList.forEach(v=>{ item == v[key] && resArr.push(v[viewKey]) diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue index 10cdf82..b063ea9 100644 --- a/src/views/system/department/index.vue +++ b/src/views/system/department/index.vue @@ -35,7 +35,7 @@ diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index bdf3eee..843176f 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -135,14 +135,14 @@ const tableConfig = reactive({ showOverflowTooltip: false, currentRender: ({row, index}) => { let btn = [{label: '修改', auth: auths.edit, func: ()=>handleEdit(row) , type: 'primary'}] - btn.push( - { - label: '分配用户', - auth: auths.edit, - func: ()=>handleAssign(row), - type: 'primary' - } - ) + // btn.push( + // { + // label: '分配用户', + // auth: auths.edit, + // func: ()=>handleAssign(row), + // type: 'primary' + // } + // ) if(authStore.roles.includes('superAdmin')) { btn.push({label: '删除', auth: auths.edit, func: ()=>handleDel(row) , type: 'danger'}) } else if(!row.template) { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 9ed57b2..45b2763 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -119,10 +119,10 @@ const tableConfig = reactive({ currentRender: ({row, index}) => { return (
- handleEdit(row)}>编辑 + handleEdit(row)} v-perm={['admin:user:edit']}>编辑 { row.userType != 0 ? - handleDel(row)}>删除 : + handleDel(row)} v-perm={['admin:user:del']}>删除 : null }