From c1fe26df1a8dedf574fff1ce74158fcc21585487 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Tue, 28 Jun 2022 16:06:12 +0800
Subject: [PATCH] zx

---
 src/views/MemberManage/_levelManage/index.vue   | 16 ++++++++++++----
 src/views/ReviewManage/_accountReview/index.vue |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/views/MemberManage/_levelManage/index.vue b/src/views/MemberManage/_levelManage/index.vue
index a44f791..74e5d2c 100644
--- a/src/views/MemberManage/_levelManage/index.vue
+++ b/src/views/MemberManage/_levelManage/index.vue
@@ -66,8 +66,9 @@
        </el-dialog>
        <el-drawer v-model="drawerVisible" :title="drawerData.activeType==1?'查看部门':'查看员工'">
             <el-table :data="drawerData.data" size="default">
+                <el-table-column v-if="drawerData.activeType == 2" prop="userName" label="员工名"></el-table-column>
                 <el-table-column prop="departmentName" label="部门"></el-table-column>
-                <el-table-column prop="action" label="操作" fixed="right" width="240">
+                <el-table-column v-if="drawerData.activeType == 1" prop="action" label="操作" fixed="right" width="240">
                    <template #default="scope">
                         <el-link type="danger" @click="delDepartmentInDetail(scope.row.departmentId)">删除</el-link>
                    </template>
@@ -198,9 +199,16 @@ export default defineComponent({
             }).catch(() => {});
         },
         employeeDetail(value) {
-            this.drawerData.activeType = 2;
-            this.drawerData.activeId = value;
-            this.drawerVisible = true;
+            this.proxy.$post("/user/departmentGroupDet2", {id: value}).then(res => {
+                if(res.code == 200) {
+                    this.drawerData.data = res.data;
+                    this.drawerData.activeType = 2;
+                    this.drawerData.activeId = value;
+                    this.drawerVisible = true;
+                } else {
+                    this.$message.error(res.msg)
+                }
+            }).catch(() => {});
         },
         ///
         handlerEdit(id) {
diff --git a/src/views/ReviewManage/_accountReview/index.vue b/src/views/ReviewManage/_accountReview/index.vue
index c7d20ff..0ee234c 100644
--- a/src/views/ReviewManage/_accountReview/index.vue
+++ b/src/views/ReviewManage/_accountReview/index.vue
@@ -24,10 +24,10 @@
        </div>
        <div class="area-table">
            <el-table :data="tableData.data" size="default" border :header-cell-style="{background: '#EEE'}">
-               <el-table-column prop="name" label="申请人" width="200"></el-table-column>
+               <el-table-column prop="userName" label="申请人" width="200"></el-table-column>
                <el-table-column prop="departmentName" label="部门" width="200"></el-table-column>
                <el-table-column prop="platform" label="第三方平台" width="240" :formatter="statusFormatter"></el-table-column>
-               <el-table-column prop="userName" label="昵称" width="200"></el-table-column>
+               <el-table-column prop="name" label="昵称" width="200"></el-table-column>
                <el-table-column prop="tel" label="手机号" width="200"></el-table-column>
                <el-table-column prop="validImg" label="截图" width="200">
                    <template #default="scope">