From 021bf725ca25695d6b060f3ce435643220758bf0 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 11 Oct 2022 11:59:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E8=AF=81=E6=98=8E=201?=
 =?UTF-8?q?=E5=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pingchang/AppCommunityManagement/Add.vue  |  2 +-
 .../AppReturnHomeReporting/ErrorInfo.vue      | 24 +++++++++++++++----
 .../AppReturnHomeReporting/RiskContent.vue    | 11 +++++++--
 .../AppReturnHomeReporting/UserInfo.vue       |  2 +-
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/project/pingchang/AppCommunityManagement/Add.vue b/src/project/pingchang/AppCommunityManagement/Add.vue
index 9f666509..bc3f5cd0 100644
--- a/src/project/pingchang/AppCommunityManagement/Add.vue
+++ b/src/project/pingchang/AppCommunityManagement/Add.vue
@@ -108,7 +108,7 @@
         </div>
       </div>
       <div style="padding-right: 16px;">
-        <AiUploader :def.sync="form.proveFileList" multiple placeholder="上传核酸阴性证明" :limit="9" action="/admin/file/add2"></AiUploader>
+        <AiUploader :def.sync="form.proveFileList" multiple placeholder="上传核酸阴性证明" :limit="1" action="/admin/file/add2"></AiUploader>
       </div>
     </div>
     <div class="btn-height"></div>
diff --git a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
index a4366593..4c78c6fa 100644
--- a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
+++ b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="ErrorInfo">
     <div class="info">
-      <div class="title">基本信息<span class="title-right-btn" @click="show = true">新增风险记录</span></div>
+      <div class="title">基本信息<span class="title-right-btn" @click="showText(7)">新增风险记录</span></div>
       <div class="item-flex">
         <div class="label">姓名</div>
         <div class="value">{{info.name}}</div>
@@ -37,11 +37,11 @@
     <div class="bg-line"></div>
     <div class="footer">
       <div class="add" @click="toContent">社区初排</div>
-      <div class="confirm" @click="cancel()">解除风险</div>
+      <div class="confirm" @click="showText(5)">解除风险</div>
     </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" maxlength="1000" />
+        <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">
@@ -63,7 +63,8 @@ export default {
       show: false,
       value: '',
       id: '',
-      info: {}
+      info: {},
+      handleType: '', //5解除风险 7新增风险记录
     }
   },
   computed: {
@@ -79,6 +80,10 @@ export default {
     })
   },
   methods: {
+    showText(status) {
+      this.handleType = status
+      this.show = true
+    },
     getDetail() {
       this.$http.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
@@ -89,8 +94,12 @@ export default {
       })
     },
     cancel() {
+      if(!this.value) {
+        return this.$u.toast('请输入风险解除说明')
+      }
       this.$confirm(`是否解除该条风险信息？`).then(() => {
         var params = {
+          "remarks": this.value,
           "handleType": 5,
           "registerId": this.id,
           "registerIdNumber": this.info.idNumber,
@@ -108,6 +117,13 @@ export default {
       })
     },
     confirm() {
+      if(this.handleType == 5) { //解除风险
+        this.cancel()
+      }else {
+        this.addConfirm()
+      }
+    },
+    addConfirm() {
       if(!this.value) {
         return this.$u.toast('请输入风险情况')
       }
diff --git a/src/project/pingchang/AppReturnHomeReporting/RiskContent.vue b/src/project/pingchang/AppReturnHomeReporting/RiskContent.vue
index 886db65b..f778fd00 100644
--- a/src/project/pingchang/AppReturnHomeReporting/RiskContent.vue
+++ b/src/project/pingchang/AppReturnHomeReporting/RiskContent.vue
@@ -242,13 +242,20 @@ export default {
         return this.$u.toast('请选择隔离策略')
       }
 
-      this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal?homeQuarantineOperation=2`, this.form).then((res) => {
+      if(!this.form.quarantineBeginTime) {
+        this.form.quarantineBeginTime = null
+        this.form.quarantineEndTime = null
+      }
+      this.form.registerId = this.info.id
+	    this.form.registerIdNumber = this.info.idNumber
+      this.form.handleType = 7
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/cmAdvanceDisposal`, this.form).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
           uni.$emit('updateDetail')
           uni.$emit('updateList')
           setTimeout(() => {
-            uni.navigateTo({ url: './AppCheckpointRegistration' })
+            uni.navigateBack({delta: 2})
           }, 600)
         }
       }).catch((err) => {
diff --git a/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
index a4816888..0583e339 100644
--- a/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
+++ b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue
@@ -110,7 +110,7 @@
       </div>
     </div>
     <div class="line-bg"></div>
-    <div class="info" v-if="info.handleType != 0 && info.riskDisposalList.length">
+    <div class="info" v-if="info.handleType != 0 && info.riskDisposalList && info.riskDisposalList.length">
       <div class="title">风险处置记录</div>
       <div class="error-list">
         <div class="item" v-for="(item, index) in info.riskDisposalList" :key="index">