From fea1bac7eea5f51971c7597b8ea38bdc7844f8fc Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 10 Oct 2022 11:24:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E9=99=A4=E9=A3=8E=E9=99=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCheckpointRegistration/ManagementHistory.vue |  2 +-
 .../AppCheckpointRegistration/RiskContent.vue       |  4 ++++
 .../pingchang/AppReturnHomeReporting/ErrorInfo.vue  | 13 ++++++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
index a2dd0b09..58ebda2e 100644
--- a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
@@ -131,7 +131,7 @@ export default {
   },
   computed: { ...mapState(['user']) },
   onShow() {
-    document.title = '居家隔离确认'
+    document.title = '风险处置'
   },
   onLoad(option) {
     this.form = uni.getStorageSync('checkPointContent')
diff --git a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
index 4af46194..32d4b458 100644
--- a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
@@ -243,6 +243,10 @@ export default {
         return this.$u.toast('请选择隔离策略')
       }
 
+      if(this.form.communityHandleType == 2) { //风险解除
+        this.form.handleType = 5
+      }
+
       this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal?homeQuarantineOperation=2`, this.form).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
diff --git a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
index 950df7bf..6a833408 100644
--- a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
+++ b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
@@ -25,12 +25,13 @@
       <div class="title">异常情况记录</div>
       <div class="error-list">
         <div class="item" v-for="(item, index) in info.riskDisposalList" :key="index">
-          <p>{{item.content}}</p>
+          <p>{{item.remarks}}</p>
           <div>{{item.createTime}}
             <span>{{item.createUserName}}</span>
           </div>
         </div>
       </div>
+      <div style="height:16px;"></div>
     </div>
     <div class="bg-line"></div>
     <div class="footer">
@@ -87,8 +88,13 @@ export default {
       })
     },
     cancel() {
-      this.$confirm(`是否解除该条异常信息？`).then(() => {
-        this.$http.post("/app/appepidemicbackhomerecord/release", {id: this.id}).then(res => {
+      this.$confirm(`是否解除该条风险信息？`).then(() => {
+        var params = {
+          "handleType": 5,
+          "registerId": this.id,
+          "registerIdNumber": this.info.idNumber,
+        }
+        this.$http.post("/app/appepidemicpreventionregisterinfo/riskDisposal", params).then(res => {
           if (res.code == 0) {
             this.$u.toast("解除成功!")
             uni.$emit('updateDetail')
@@ -109,6 +115,7 @@ export default {
         "remarks": this.value,
         "registerId": this.id,
 	      "registerIdNumber": this.info.idNumber,
+        "handleType": 7
       }
       this.$http.post("/app/appepidemicpreventionregisterinfo/riskDisposal", params).then(res => {
         if (res.code == 0) {