From 7c71fc4c3adbf4a8c3bdb914ef43ffc20c90215a Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 12 Jan 2022 09:59:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?=
 =?UTF-8?q?=E7=A0=81=E8=84=B1=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppEpidemicSituation/BackUserList.vue | 5 ++++-
 src/apps/AppEpidemicSituation/ErrorInfo.vue    | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppEpidemicSituation/BackUserList.vue b/src/apps/AppEpidemicSituation/BackUserList.vue
index 119cc288..8c6d5b22 100644
--- a/src/apps/AppEpidemicSituation/BackUserList.vue
+++ b/src/apps/AppEpidemicSituation/BackUserList.vue
@@ -64,7 +64,7 @@ export default {
   computed: { ...mapState(['user']) },
   onShow() {
     this.areaId = this.user.areaId
-    document.title = '疫情防控'
+    document.title = '返乡人员信息'
     this.getList()
     this.getTotal()
     uni.$on('updateList', () => {
@@ -92,6 +92,9 @@ export default {
       this.$http.post(`/app/appepidemicbackhomerecord/list?current=${this.current}&size=10&status=${status}&name=${this.name}&arriveAreaId=${this.areaId}`)
       .then((res) => {
         if (res.code == 0) {
+          res.data.records.map((item) => {
+            item.idNumber = item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+          })
           this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
         }
       })
diff --git a/src/apps/AppEpidemicSituation/ErrorInfo.vue b/src/apps/AppEpidemicSituation/ErrorInfo.vue
index 5ab5373d..18a685a2 100644
--- a/src/apps/AppEpidemicSituation/ErrorInfo.vue
+++ b/src/apps/AppEpidemicSituation/ErrorInfo.vue
@@ -76,6 +76,7 @@ export default {
     getDetail() {
       this.$http.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
+          res.data.idNumber = res.data.idNumber.replace(/(.{10}).*(.{4})/,"$1****$2")
           this.info = res.data
           this.info.health = this.info.health.split(',')
         }

From 36058977690635297baf83963d3c52e45815d828 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 12 Jan 2022 10:04:21 +0800
Subject: [PATCH 2/2] bug

---
 src/apps/AppEpidemicSituation/BackUserList.vue | 2 +-
 src/apps/AppEpidemicSituation/ErrorInfo.vue    | 6 +++---
 src/apps/AppEpidemicSituation/UserInfo.vue     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppEpidemicSituation/BackUserList.vue b/src/apps/AppEpidemicSituation/BackUserList.vue
index 8c6d5b22..280c6f1d 100644
--- a/src/apps/AppEpidemicSituation/BackUserList.vue
+++ b/src/apps/AppEpidemicSituation/BackUserList.vue
@@ -39,7 +39,7 @@
         <p class="color-999">{{item.idNumber}}</p>
         <p><img src="./components/img/blue-icon.png" alt="">{{item.startAreaName}}</p>
         <p><img src="./components/img/org-icon.png" alt="">{{item.arriveAreaName}}</p>
-        <p><img src="./components/img/time-icon.png" alt="">{{item.checkTime}}</p>
+        <p><img src="./components/img/time-icon.png" alt="">{{item.createTime}}</p>
       </div>
       <AiEmpty v-if="!list.length"></AiEmpty>
     </div>
diff --git a/src/apps/AppEpidemicSituation/ErrorInfo.vue b/src/apps/AppEpidemicSituation/ErrorInfo.vue
index 18a685a2..adc68edc 100644
--- a/src/apps/AppEpidemicSituation/ErrorInfo.vue
+++ b/src/apps/AppEpidemicSituation/ErrorInfo.vue
@@ -26,11 +26,11 @@
     </div>
     <u-popup v-model="show" mode="bottom">
       <div class="textarea">
-        <u-input v-model="value" type="textarea" :height="120" :auto-height="true" placeholder="异常情况记录" :clearable="false" />
-        <p>字数0/1000</p>
+        <u-input v-model="value" type="textarea" :height="120" :auto-height="true" placeholder="异常情况记录" :clearable="false" maxlength="1000" />
+        <p>字数{{value.length}}/1000</p>
       </div>
       <div class="btn">
-        <span>清空内容</span>
+        <span @click="value=''">清空内容</span>
         <span class="confirm" @click="confirm">保存</span>
       </div>
     </u-popup>
diff --git a/src/apps/AppEpidemicSituation/UserInfo.vue b/src/apps/AppEpidemicSituation/UserInfo.vue
index c4f0303b..90d93883 100644
--- a/src/apps/AppEpidemicSituation/UserInfo.vue
+++ b/src/apps/AppEpidemicSituation/UserInfo.vue
@@ -26,7 +26,7 @@
       </div>
       <div class="item-flex">
         <div class="label">人员类别</div>
-        <div class="value" style="color:#42D784;">{{$dict.getLabel('epidemicMemberType', info.type)}}</div>
+        <div class="value" :style="info.type == 0 ? 'color:#42D784;' : 'color:#f46;'">{{$dict.getLabel('epidemicMemberType', info.type)}}</div>
       </div>
     </div>
     <div class="line-bg"></div>