From af1eaffbe218f690ce8c286af251bc89f02badcc Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 12 Oct 2022 16:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pingchang/AppHealthReport/Detail.vue      | 12 ++++++++---
 .../pingchang/AppHealthReport/ErrorInfo.vue   | 20 ++++++++++---------
 .../AppReturnHomeReporting/UserInfo.vue       |  2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/project/pingchang/AppHealthReport/Detail.vue b/src/project/pingchang/AppHealthReport/Detail.vue
index 34f7ea93..1ba81fd4 100644
--- a/src/project/pingchang/AppHealthReport/Detail.vue
+++ b/src/project/pingchang/AppHealthReport/Detail.vue
@@ -82,9 +82,15 @@
       <div class="title">风险处置记录</div>
       <div class="error-list">
         <div class="item" v-for="(item, index) in info.handleLogs" :key="index">
-          <p>{{item.content}}</p>
-          <div>{{item.createTime}}
-            <span>{{item.createUserName}}</span>
+          <div v-if="!item.riskRelief">
+            <p>{{item.content}}</p>
+            <div>{{item.createTime}}
+              <span>{{item.createUserName}}</span>
+            </div>
+          </div>
+          <div v-else>
+            <p>风险解除人：{{item.createUserName}}</p>
+            <div>解除时间：{{item.createTime}}</div>
           </div>
         </div>
       </div>
diff --git a/src/project/pingchang/AppHealthReport/ErrorInfo.vue b/src/project/pingchang/AppHealthReport/ErrorInfo.vue
index e267ac87..01d09973 100644
--- a/src/project/pingchang/AppHealthReport/ErrorInfo.vue
+++ b/src/project/pingchang/AppHealthReport/ErrorInfo.vue
@@ -29,9 +29,15 @@
       <div class="title">风险处置意见</div>
       <div class="error-list">
         <div class="item" v-for="(item, index) in info.handleLogs" :key="index">
-          <p>{{item.content}}</p>
-          <div>{{item.createTime}}
-            <span>{{item.createUserName}}</span>
+          <div v-if="!item.riskRelief">
+            <p>{{item.content}}</p>
+            <div>{{item.createTime}}
+              <span>{{item.createUserName}}</span>
+            </div>
+          </div>
+          <div v-else>
+            <p>风险解除人：{{item.createUserName}}</p>
+            <div>解除时间：{{item.createTime}}</div>
           </div>
         </div>
       </div>
@@ -40,7 +46,7 @@
     <div class="bg-line"></div>
     <div class="footer">
       <div :class="info.status != 1 ? 'confirm' : 'add'" @click="showText(7)">新增记录</div>
-      <div class="confirm" @click="showText(5)" v-if="info.status == 1">解除风险</div>
+      <div class="confirm" @click="cancel" v-if="info.status == 1">解除风险</div>
     </div>
     <u-popup v-model="show" mode="bottom">
       <div class="textarea">
@@ -102,12 +108,8 @@ export default {
       })
     },
     cancel() {
-      if(!this.value) {
-        return this.$u.toast('请输入风险解除说明')
-      }
       this.$confirm(`是否解除该条风险信息？`).then(() => {
         var params = {
-          "content": this.value,
           "riskRelief": true,
           "reportUserId": this.id,
         }
@@ -117,7 +119,7 @@ export default {
             uni.$emit('updateDetail')
             uni.$emit('updateList')
             setTimeout(() => {
-              uni.navigateBack()
+              uni.navigateBack({delta: 2})
             }, 600);
           }
         })
diff --git a/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
index 980a65f9..9892da22 100644
--- a/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
+++ b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
@@ -39,7 +39,7 @@
       <div class="item-flex">
         <div class="label">出行方式</div>
         <div class="value">
-           <span v-for="(item, index) in info.travelTypeList" :key="index"><span v-if="index>0">;</span>{{$dict.getLabel('EP_travelType',item)}}</span>
+          <span v-for="(item, index) in info.travelTypeList" :key="index"><span v-if="index>0">;</span>{{$dict.getLabel('EP_travelType',item)}}</span>
         </div>
       </div>
       <div class="item-flex border-none" v-if="info.trainNo">