From e1398efc4cc228df8f316e1b1736d68573fc2012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=8B=A5=E6=99=A8?= <974220104@qq.com>
Date: Fri, 27 Oct 2023 15:30:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cpts/family/modules/EnjoyService.vue      | 69 +++++++++++++++----
 src/views/dataBoard/cpts/resi-details.vue     |  2 +-
 2 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/src/views/dataBoard/cpts/family/modules/EnjoyService.vue b/src/views/dataBoard/cpts/family/modules/EnjoyService.vue
index ce020c199..9f16cc661 100644
--- a/src/views/dataBoard/cpts/family/modules/EnjoyService.vue
+++ b/src/views/dataBoard/cpts/family/modules/EnjoyService.vue
@@ -1,17 +1,55 @@
 <template>
   <div class="table">
-    <el-table v-if="list.length > 0" :data="list" max-height="390px" height="390px">
+    <el-table
+      v-if="list.length > 0"
+      :data="list"
+      max-height="390px"
+      height="390px"
+    >
       <el-table-column label="序号" type="index" width="80" />
       <el-table-column label="变更人" prop="resiName" width="140" />
       <el-table-column label="变更类型" prop="typeName" width="" />
-      <el-table-column label="变更前" prop="beforeChange" width="120" />
-      <el-table-column label="变更后" prop="afterChange" width="120" />
+      <el-table-column label="变更前" prop="beforeChange" width="120">
+        <template slot-scope="scope">
+          <div>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="scope.row.beforeChange"
+              placement="top-start"
+            >
+              <span>{{ scope.row.beforeChange }}</span>
+            </el-tooltip>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="变更后" prop="afterChange" width="120" >
+        <template slot-scope="scope">
+          <div>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="scope.row.afterChange"
+              placement="top-start"
+            >
+              <span>{{ scope.row.afterChange }}</span>
+            </el-tooltip>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作人" prop="operatorName" width="120" />
       <el-table-column label="调整时间" prop="changeTime" width="190" />
     </el-table>
 
-    <div v-else style="width: 100%; height: 100%; text-align: center; padding-top: 120px">
-      <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
+    <div
+      v-else
+      style="width: 100%; height: 100%; text-align: center; padding-top: 120px"
+    >
+      <img
+        width="268px"
+        height="128px"
+        src="~@/assets/images/overview/zanwu.png"
+      />
       <div style="color: #fff">暂无数据</div>
     </div>
   </div>
@@ -53,15 +91,20 @@ export default {
         1: "已回访",
       };
       // 省满意度列表
-      this.$http.get("/actual/base/peopleRoomOverview/houseResidentChangeRecord?houseId=" + this.houseId).then(({ data: res }) => {
-        this.list = res.data.map((item) => {
-          return {
-            ...item,
-            completeFlag: completeFlags[item.completeFlag],
-          };
+      this.$http
+        .get(
+          "/actual/base/peopleRoomOverview/houseResidentChangeRecord?houseId=" +
+            this.houseId
+        )
+        .then(({ data: res }) => {
+          this.list = res.data.map((item) => {
+            return {
+              ...item,
+              completeFlag: completeFlags[item.completeFlag],
+            };
+          });
+          this.total = res.data.length;
         });
-        this.total = res.data.length;
-      });
     },
   },
 };
diff --git a/src/views/dataBoard/cpts/resi-details.vue b/src/views/dataBoard/cpts/resi-details.vue
index 1bf43f4c0..e9f33a27e 100644
--- a/src/views/dataBoard/cpts/resi-details.vue
+++ b/src/views/dataBoard/cpts/resi-details.vue
@@ -52,7 +52,7 @@
           </div>
           <div class="item">
             <div class="field">证件号：</div>
-            <div class="value">{{ info.idcard ? info.idcard : "" }}</div>
+            <div class="value">{{ info.idcard ? $sensitive(info.idcard, 0, 14) : "" }}</div>
           </div>
           <div class="item">
             <div class="field">备注：</div>