diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue index bb962f7a4..ff690da46 100755 --- a/resources/assets/js/components/UserAvatar.vue +++ b/resources/assets/js/components/UserAvatar.vue @@ -8,7 +8,7 @@
{{$L('昵称')}}: {{user.nickname}}{{$L('已删除')}}{{$L('已离职')}}
-{{$L('部门')}}: {{user.department_name || '-'}}
+{{$L('部门')}}: {{user.department_name || '-'}}
{{$L('职位/职称')}}: {{user.profession || '-'}}
{{$L('删除时间')}}: {{user.delete_at}}
{{$L('离职时间')}}: {{user.disable_at}}
diff --git a/resources/assets/sass/components/user-avatar.scss b/resources/assets/sass/components/user-avatar.scss index 3b822bec5..4226f408e 100755 --- a/resources/assets/sass/components/user-avatar.scss +++ b/resources/assets/sass/components/user-avatar.scss @@ -80,6 +80,12 @@ line-height: 1.5; > p { padding: 1px 2px; + &.department-name { + max-width: 220px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } > em { font-style: normal; &.disabled,