diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue index 81c1b10c..58b75ba4 100644 --- a/src/views/system/user/list/index.vue +++ b/src/views/system/user/list/index.vue @@ -55,9 +55,9 @@ {{ Array.isArray(scope.row.UserRoleList) && scope.row.UserRoleList.length > 0 - ? scope.row.UserRoleList.map((item) => item.UserTypeShortName).join( - ', ' - ) + ? scope.row.UserRoleList.filter((item) => !item.IsUserRoleDisabled) + .map((item) => item.UserTypeShortName) + .join(', ') : '' }} @@ -396,13 +396,13 @@ export default { label: this.$t('common:button:search'), type: 'primary', emitKey: 'search', - icon: 'el-icon-search' + icon: 'el-icon-search', }, { label: this.$t('common:button:reset'), type: 'primary', emitKey: 'reset', - icon: 'el-icon-refresh-left' + icon: 'el-icon-refresh-left', }, { label: this.$t('common:button:new'),