diff --git a/src/pages/src/views/organization/details/UserMaterial.vue b/src/pages/src/views/organization/details/UserMaterial.vue
index 724956bf2..54d3e49fc 100644
--- a/src/pages/src/views/organization/details/UserMaterial.vue
+++ b/src/pages/src/views/organization/details/UserMaterial.vue
@@ -118,6 +118,20 @@
{{passwordValidDays}}
+
+
{{$t('创建时间')}}
+
:
+
+ {{currentProfile.create_time}}
+
+
+
+
{{$t('最近一次登录时间')}}
+
:
+
+ {{currentProfile.update_time}}
+
+
diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue
index e88efd222..bd2d300b1 100644
--- a/src/pages/src/views/organization/index.vue
+++ b/src/pages/src/views/organization/index.vue
@@ -325,6 +325,7 @@ import PullUser from './table/PullUser';
import DetailsBar from './details/DetailsBar';
import SetDepartment from '@/components/organization/SetDepartment';
+import moment from 'moment';
export default {
components: {
@@ -548,6 +549,14 @@ export default {
{
key: 'departments',
name: 'departments',
+ },
+ {
+ key: 'create_time',
+ name: 'create_time',
+ },
+ {
+ key: 'update_time',
+ name: 'update_time',
}
);
this.userMessage.tableHeardList = tableHeardList;
@@ -873,6 +882,8 @@ export default {
// 查看当前用户的信息
viewDetails(item) {
+ item.create_time = moment(item.create_time).format('YYYY-MM-DD HH:mm:ss');
+ item.update_time = moment(item.update_time).format('YYYY-MM-DD HH:mm:ss');
this.currentProfile = item;
this.detailsBarInfo.type = 'view';
this.detailsBarInfo.title = this.currentProfile.display_name;
diff --git a/src/pages/src/views/organization/table/UserTable.vue b/src/pages/src/views/organization/table/UserTable.vue
index d5c8df9c1..f2f366453 100644
--- a/src/pages/src/views/organization/table/UserTable.vue
+++ b/src/pages/src/views/organization/table/UserTable.vue
@@ -148,7 +148,7 @@ export default {
},
computed: {
activeTableHeardList() {
- const arr = ['id', 'isCheck', 'departments'];
+ const arr = ['id', 'isCheck', 'departments', 'create_time', 'update_time'];
return this.userMessage.tableHeardList.filter(item => arr.indexOf(item.key) === -1);
},
enumInfo() {
diff --git a/src/pages/src/views/organization/tree/TreeSearch.vue b/src/pages/src/views/organization/tree/TreeSearch.vue
index 54e1a105b..5e6f6e764 100644
--- a/src/pages/src/views/organization/tree/TreeSearch.vue
+++ b/src/pages/src/views/organization/tree/TreeSearch.vue
@@ -74,8 +74,15 @@
:key="'department' + index"
:class="{ 'active': (activeType === 'department' && activeIndex === index) }"
@click="handleSelect(item)">
-
- {{ item.username + '(' + item.display_name + ') ' }}
- {{item.category_name}}
-
-
+
+ {{ item.username + '(' + item.display_name + ') ' }}
+ {{item.category_name}}
+
+
{{ getUserDetail(item) }}
+
+