From 126964c5a7284ee577cbad3804f925226e8448bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Wed, 12 Jan 2022 17:37:11 +0800
Subject: [PATCH] 26654

---
 src/apps/AppEpidemicSituation/ErrorDetail.vue |  2 +-
 .../AppEpidemicSituation/HealthDetail.vue     |  2 +-
 src/apps/AppEpidemicSituation/UserDetail.vue  | 89 +++++++++++++++++++
 3 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppEpidemicSituation/ErrorDetail.vue b/src/apps/AppEpidemicSituation/ErrorDetail.vue
index ddd58163..962af8e1 100644
--- a/src/apps/AppEpidemicSituation/ErrorDetail.vue
+++ b/src/apps/AppEpidemicSituation/ErrorDetail.vue
@@ -290,7 +290,7 @@ export default {
         box-sizing: border-box;
         margin-bottom: 16px;
 
-        p {
+        span {
           font-size: 28px;
           font-family: PingFangSC-Regular, PingFang SC;
           color: #343d65;
diff --git a/src/apps/AppEpidemicSituation/HealthDetail.vue b/src/apps/AppEpidemicSituation/HealthDetail.vue
index 5323590b..90cdaa01 100644
--- a/src/apps/AppEpidemicSituation/HealthDetail.vue
+++ b/src/apps/AppEpidemicSituation/HealthDetail.vue
@@ -133,7 +133,7 @@ export default {
 
     toUserDetail(item) {
       uni.navigateTo({
-        url: `./UserDetail?id=${item.id}&temperature=${item.temperature}&touchInFourteen=${item.touchInFourteen}&health=${item.health}&checkTime=${item.checkTime}&checkResult=${item.checkResult}&checkPhoto=${item.checkPhoto}&status=${item.status}&memberId=${this.id}&vaccine=${item.vaccine}&healthCode=${item.healthCode}`,
+        url: `./UserDetail?id=${item.id}&temperature=${item.temperature}&touchInFourteen=${item.touchInFourteen}&health=${item.health}&checkTime=${item.checkTime}&checkResult=${item.checkResult}&checkPhoto=${item.checkPhoto}&status=${item.status}&memberId=${this.id}&vaccine=${item.vaccine}&healthCode=${item.healthCode}&releaseName=${this.userList.releaseName ? this.userList.releaseName : ''}&releaseTime=${this.userList.releaseTime ? this.userList.releaseTime : ''}`,
       })
     },
 
diff --git a/src/apps/AppEpidemicSituation/UserDetail.vue b/src/apps/AppEpidemicSituation/UserDetail.vue
index f74ce70d..a0cd149a 100644
--- a/src/apps/AppEpidemicSituation/UserDetail.vue
+++ b/src/apps/AppEpidemicSituation/UserDetail.vue
@@ -82,6 +82,39 @@
         <img :src="item.url" alt="" v-for="(item, index) in userList.checkPhoto" :key="index" @click="previewImage(userList.checkPhoto, item.url)" />
       </div>
     </div>
+
+    <div class="line-bg" v-if="userList.releaseName"></div>
+    <div class="info" v-if="userList.releaseName">
+      <div class="title">异常处理情况</div>
+
+      <div class="item-record">
+        <div class="label">异常情况记录</div>
+        <div class="error-list" v-if="datas.length">
+          <div class="records" v-for="(item, index) in datas" :key="index">
+            <p>{{ item.content }}</p>
+
+            <div>
+              <span>{{ item.createTime }}</span>
+              <span class="names">{{ item.createUserName }}</span>
+            </div>
+          </div>
+        </div>
+
+        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+      </div>
+
+      <div class="item-flex">
+        <div class="label">异常解除人</div>
+        <div class="value">{{ userList.releaseName }}</div>
+      </div>
+
+      <div class="item-flex">
+        <div class="label">异常解除时间</div>
+        <div class="value">{{ userList.releaseTime && userList.releaseTime.substring(0, 10) }}</div>
+      </div>
+    </div>
+
+    <div class="line-bg"></div>
   </div>
 </template>
 
@@ -97,6 +130,7 @@ export default {
       id: '',
       userList: {},
       data: [],
+      datas: [],
     }
   },
   computed: {
@@ -110,7 +144,11 @@ export default {
       this.userList.checkPhoto = JSON.parse(o.checkPhoto)
       this.userList.health = o.health.split(',')
 
+      this.userList.releaseName = o.releaseName
       this.getUser()
+      if (this.userList.releaseName) {
+        this.getRecord()
+      }
     })
   },
   onShow() {
@@ -134,6 +172,24 @@ export default {
         })
     },
 
+    // 异常情况记录
+    getRecord() {
+      this.$loading()
+      this.$http
+        .post(`/app/appepidemicunusuallog/list?recordId=${this.userList.memberId}`)
+        .then((res) => {
+          if (res.code == 0) {
+            this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+            this.$hideLoading()
+          } else {
+            this.$hideLoading()
+          }
+        })
+        .catch(() => {
+          this.$hideLoading()
+        })
+    },
+
     callPhone(phone) {
       uni.makePhoneCall({ phoneNumber: phone })
     },
@@ -187,6 +243,38 @@ export default {
         }
       }
     }
+    .error-list {
+      background-color: #fff !important;
+      padding-bottom: 24px;
+      margin-top: 10px;
+      border-bottom: 1px solid #ddd;
+      .records {
+        background: #f4f7fe;
+        border-radius: 8px;
+        padding: 24px 24px 18px 24px;
+        box-sizing: border-box;
+        margin-bottom: 16px;
+
+        p {
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #343d65;
+          line-height: 40px;
+          word-break: break-all;
+          margin-bottom: 12px;
+        }
+        div {
+          font-size: 24px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #666;
+          line-height: 34px;
+          span:last-child {
+            display: inline-block;
+            margin-left: 32px;
+          }
+        }
+      }
+    }
     .item-flexs {
       display: flex;
       justify-content: space-between;
@@ -213,6 +301,7 @@ export default {
       border-bottom: 0;
     }
   }
+
   .line-bg {
     width: 100%;
     height: 24px;