From c9b26d13d4cdc112412cc2fc227772c28fb59421 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 29 Mar 2022 11:19:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E5=AF=B9=E8=B1=A1=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMonitoringObject/Detail.vue | 35 ++++++++++++++++++-------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index a9c1a720..37367a8a 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -209,16 +209,33 @@
       <div class="addBtn iconfont iconfont-iconfangda" @tap="toAddLog"></div>
     </AiFixedBtn>
      <!-- 0：待纳入、1：监测中、2：待解除、3：已解除、4：已驳回 -->
-    <div class="footer-btn" v-if="currIndex != 1 && checkType == 2 && info.status == 2">
-      <div @click="examine('您确认要驳回此居民的监测对象申请吗？', 0)">驳回申请</div>
-      <div class="confirm-btn" @click="examine('您确认要将此居民纳入监测对象吗？', 1)">纳入监测</div>
+    <div v-if="checkType == 1 && currIndex != 1"> 
+      <div class="footer-btn" v-if="info.status == 4">
+        <div @click="del">删除人员</div>
+      </div>
+      <div class="footer-btn" v-if="info.status == 1">
+        <div class="confirm-btn" @click="remove('您确认要申请解除此监测对象的风险吗？', '')">申请解除风险</div>
+      </div>
     </div>
-    <div class="footer-btn" v-if="currIndex != 1 && info.status == 3">
-      <div @click="del">删除人员</div>
-      <div class="confirm-btn" @click="remove('您确认要解除此监测对象的风险吗？', 1)" v-if="checkType == 2">消除风险</div>
-    </div>
-    <div class="footer-btn" v-if="currIndex != 1 && checkType == 1 && info.status == 1">
-      <div class="confirm-btn" @click="remove('您确认要申请解除此监测对象的风险吗？', '')">申请解除风险</div>
+
+    <div v-if="checkType == 2 && currIndex != 1"> 
+      <div class="footer-btn" v-if="info.status == 0">
+        <div @click="examine('您确认要驳回此居民的监测对象申请吗？', 0)">驳回申请</div>
+        <div class="confirm-btn" @click="examine('您确认要将此居民纳入监测对象吗？', 1)">纳入监测</div>
+      </div>
+      <div class="footer-btn" v-if="info.status == 2">
+        <div @click="examine('您确认要继续监测该居民？', 0)">继续监测</div>
+        <div class="confirm-btn" @click="remove('您确认要解除此监测对象的风险吗？', 1)">消除风险</div>
+      </div>
+      <div class="footer-btn" v-if="info.status == 3">
+        <div @click="del">删除人员</div>
+        <div class="confirm-btn" @click="examine('您确认要将此居民纳入监测对象吗？', 1)">纳入监测</div>
+      </div>
+      <div class="footer-btn" v-if="info.status == 4">
+        <div @click="del">删除人员</div>
+        <div class="confirm-btn" @click="remove('您确认要解除此监测对象的风险吗？', 1)">消除风险</div>
+      </div>
+      
     </div>
   </div>
 </template>