From 6586a57e6fb284cd878e6e8e4a31f6aa0f17e304 Mon Sep 17 00:00:00 2001
From: v_yutyi <v_yutyi@tencent.com>
Date: Fri, 29 Oct 2021 14:36:01 +0800
Subject: [PATCH] =?UTF-8?q?featrue:=20=E6=81=A2=E5=A4=8D=E5=B7=B2=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=94=A8=E6=88=B7=20#73?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/src/store/modules/organization.js   |  5 +++
 .../views/organization/details/DetailsBar.vue |  1 +
 .../organization/details/UserMaterial.vue     | 34 ++++++++++-----
 src/pages/src/views/organization/index.vue    | 43 ++++++++++++++++++-
 .../views/organization/table/UserTable.vue    |  1 +
 .../views/organization/tree/TreeSearch.vue    |  2 +
 6 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/src/pages/src/store/modules/organization.js b/src/pages/src/store/modules/organization.js
index c9e258ac0..1e77be6d3 100644
--- a/src/pages/src/store/modules/organization.js
+++ b/src/pages/src/store/modules/organization.js
@@ -113,5 +113,10 @@ export default {
     getProfileById(context, params, config = {}) {
       return http.get(`api/v2/profiles/${params.id}/`);
     },
+    // 恢复删除用户
+    postProfilesRestoration(context, params, config = {}) {
+      const { id } = params;
+      return http.post(`/api/v2/profiles/${id}/restoration/`);
+    },
   },
 };
diff --git a/src/pages/src/views/organization/details/DetailsBar.vue b/src/pages/src/views/organization/details/DetailsBar.vue
index 852aa12db..573ac2e70 100644
--- a/src/pages/src/views/organization/details/DetailsBar.vue
+++ b/src/pages/src/views/organization/details/DetailsBar.vue
@@ -30,6 +30,7 @@
       :fields-list="fieldsList"
       @editProfile="editProfile"
       @deleteProfile="$emit('deleteProfile')"
+      @restoreProfile="$emit('restoreProfile')"
       @getTableData="$emit('getTableData')"
       @showBarLoading="$emit('showBarLoading')"
       @closeBarLoading="$emit('closeBarLoading')" />
diff --git a/src/pages/src/views/organization/details/UserMaterial.vue b/src/pages/src/views/organization/details/UserMaterial.vue
index 54d3e49fc..5c7a7eaea 100644
--- a/src/pages/src/views/organization/details/UserMaterial.vue
+++ b/src/pages/src/views/organization/details/UserMaterial.vue
@@ -22,24 +22,31 @@
 <template>
   <div :class="['look-user-info-wrapper',{ 'forbid-operate': isForbid }]">
     <div class="action-btn-wrapper" v-if="currentCategoryType === 'local'">
-      <bk-button theme="primary" class="editor-btn" @click="editProfile">
+      <bk-button :disabled="isStatus" theme="primary" class="editor-btn" @click="editProfile">
         {{$t('编辑')}}
       </bk-button>
-      <bk-button theme="default" :class="['editor-btn',{ 'forbidMark': isForbid }]" @click="changeStatus">
-        {{!isForbid ? $t('禁用') : $t('启用')}}
-      </bk-button>
-      <template v-if="isAdmin">
-        <bk-button theme="default" class="editor-btn" disabled>
-          {{$t('删除')}}
+      <template v-if="!isStatus">
+        <bk-button theme="default" :class="['editor-btn',{ 'forbidMark': isForbid }]" @click="changeStatus">
+          {{!isForbid ? $t('禁用') : $t('启用')}}
         </bk-button>
+        <template v-if="isAdmin">
+          <bk-button theme="default" class="editor-btn" disabled>
+            {{$t('删除')}}
+          </bk-button>
+        </template>
+        <template v-else>
+          <bk-button theme="default" :class="['editor-btn',{ 'forbidMark': isForbid }]" @click="deleteProfile">
+            {{$t('删除')}}
+          </bk-button>
+        </template>
       </template>
       <template v-else>
-        <bk-button theme="default" :class="['editor-btn',{ 'forbidMark': isForbid }]" @click="deleteProfile">
-          {{$t('删除')}}
+        <bk-button theme="default" @click="restoreProfile">
+          {{$t('恢复')}}
         </bk-button>
       </template>
       <div class="reset">
-        <bk-button theme="default" @click="showResetDialog">
+        <bk-button :disabled="isStatus" theme="default" @click="showResetDialog">
           {{$t('重置密码')}}
         </bk-button>
         <div class="reset-dialog" v-if="isShowReset" v-click-outside="closeResetDialog">
@@ -203,6 +210,9 @@ export default {
       // 这里先根据唯一字段 username 判断是否是 admin 用户
       return this.currentProfile.username === 'admin';
     },
+    isStatus() {
+      return this.currentProfile.status === 'DELETED';
+    },
   },
   mounted() {
     this.$nextTick(() => {
@@ -259,6 +269,10 @@ export default {
     deleteProfile() {
       this.$emit('deleteProfile');
     },
+    // 恢复已删除用户
+    restoreProfile() {
+      this.$emit('restoreProfile');
+    },
     // 禁用/启用
     async changeStatus() {
       try {
diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue
index bd2d300b1..1b00fa24a 100644
--- a/src/pages/src/views/organization/index.vue
+++ b/src/pages/src/views/organization/index.vue
@@ -207,7 +207,8 @@
               :no-search-or-search-department="noSearchOrSearchDepartment"
               @viewDetails="viewDetails"
               @showTableLoading="showTableLoading"
-              @closeTableLoading="closeTableLoading" />
+              @closeTableLoading="closeTableLoading"
+              @updateTableData="updateTableData" />
             <div class="table-pagination" v-if="noSearchOrSearchDepartment && paginationConfig.count > 0">
               <div class="table-pagination-left">{{$t('共计')}}
                 {{Math.ceil(paginationConfig.count / paginationConfig.limit)}} {{$t('页')}}，
@@ -251,7 +252,8 @@
           @updateUserInfor="updateUserInfor"
           @editProfile="editProfile"
           @handleCancelEdit="handleCancelEdit"
-          @deleteProfile="deleteProfile" />
+          @deleteProfile="deleteProfile"
+          @restoreProfile="restoreProfile" />
       </div>
     </bk-sideslider>
     <!-- 弹窗操作 -->
@@ -891,6 +893,9 @@ export default {
       this.detailsBarInfo.basicLoading = false;
       this.detailsBarInfo.quickClose = true;
     },
+    updateTableData(item) {
+      this.tableData = item;
+    },
     // 侧边栏 点击保存 更新列表 userMessage.userInforList
     async updateUserInfor() {
       if (this.treeSearchResult && this.treeSearchResult.groupType !== 'department') {
@@ -1144,6 +1149,40 @@ export default {
         },
       });
     },
+    // 恢复某一条用户信息
+    restoreProfile() {
+      this.clickSecond = true;
+      this.hideBar();
+      this.$store.dispatch('organization/postProfilesRestoration', {
+        id: this.currentProfile.id,
+      }).then((res) => {
+        if (res.result === true) {
+          this.$bkMessage({
+            message: this.$t('恢复成功'),
+            theme: 'success',
+          });
+          this.currentProfile.status = 'NORMAL';
+        }
+        this.detailsBarInfo.isShow = false;
+        setTimeout(() => {
+          this.isHideBar = false;
+        }, 500);
+        if (this.treeSearchResult && this.treeSearchResult.groupType !== 'department') {
+          // 搜索个人信息下删除 profile 关闭搜索
+          this.basicLoading = false;
+          this.$refs.searchChild.closeSearch();
+        } else {
+          this.getTableData();
+        }
+      })
+        .catch((e) => {
+          console.warn(e);
+          this.showBar();
+        })
+        .finally(() => {
+          this.clickSecond = false;
+        });
+    },
     // 点击某个树节点
     handleClickTreeNode(item, isSearchProfile = false) {
       if (isSearchProfile) {
diff --git a/src/pages/src/views/organization/table/UserTable.vue b/src/pages/src/views/organization/table/UserTable.vue
index b19db7464..0856c74c2 100644
--- a/src/pages/src/views/organization/table/UserTable.vue
+++ b/src/pages/src/views/organization/table/UserTable.vue
@@ -183,6 +183,7 @@ export default {
   },
   methods: {
     handleOriginList(value) {
+      this.$emit('updateTableData', value);
       if (this.isAllChecked) {
         this.isAllChecked = false;
       }
diff --git a/src/pages/src/views/organization/tree/TreeSearch.vue b/src/pages/src/views/organization/tree/TreeSearch.vue
index 068576400..09a8362ee 100644
--- a/src/pages/src/views/organization/tree/TreeSearch.vue
+++ b/src/pages/src/views/organization/tree/TreeSearch.vue
@@ -177,6 +177,8 @@ export default {
           return this.$t('已冻结');
         case 'DISABLED':
           return this.$t('已禁用');
+        case 'DELETED':
+          return this.$t('已删除');
       }
     },
     dealDepartmentPath(path) {