健康上报

src/project/pingchang/AppHealthReport/Detail.vue

@@ -82,11 +82,17 @@
       <div class="title">风险处置记录</div>
       <div class="error-list">
         <div class="item" v-for="(item, index) in info.handleLogs" :key="index">
+          <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>
       <div style="height:16px;"></div>
     </div>

src/project/pingchang/AppHealthReport/ErrorInfo.vue

@@ -29,18 +29,24 @@
       <div class="title">风险处置意见</div>
       <div class="error-list">
         <div class="item" v-for="(item, index) in info.handleLogs" :key="index">
+          <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>
       <div style="height:16px;"></div>
     </div>
     <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);
           }
         })