From 9477eed0897402414fd5d3837605c8fd0fcab907 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 27 Apr 2022 14:27:10 +0800
Subject: [PATCH] 29353

---
 src/apps/AppMonitoringObject/Add.vue    |  9 +++++----
 src/apps/AppMonitoringObject/Detail.vue | 19 ++++++++-----------
 src/apps/AppMonitoringObject/List.vue   |  1 -
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index 0d7fe903..0c1de4e5 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -88,7 +88,7 @@
             </div>
             <div class="right">
               <!-- :areaId="user.areaId"   v-model="form.currentAreaId"-->
-              <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName"  :root="user.areaId" @select="onAreaChange">
+              <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :root="user.areaId" @select="onAreaChange">
                   <div class="aiArea">
                     <span class="label" v-if="form.currentAreaName">{{ form.currentAreaName }}</span>
                     <i v-else>请选择</i>
@@ -181,8 +181,8 @@
           </div>
           <div class="right">
 
-            <!-- <AiSelect dict="fpHealth" v-model="form.healthyStatus"></AiSelect> -->
-            <u-checkbox-group>
+            <AiSelect dict="fpHealth" v-model="form.healthyStatus"></AiSelect>
+            <!-- <u-checkbox-group>
               <u-checkbox
                   v-model="e.checked"
                   v-for="(e, i) in fpHealth" :key="i"
@@ -190,7 +190,7 @@
                   @change="checkboxChange(indexs, index, i)"
               >{{ e.dictName }}
               </u-checkbox>
-            </u-checkbox-group>
+            </u-checkbox-group> -->
           </div>
         </div>
       </div>
@@ -404,6 +404,7 @@ export default {
         this.flag = true
         this.id = query.id
         this.getInfo(this.id)
+        // this.photo = this.form.files[0].url
       }else {
         this.form.currentAreaId = this.user.areaId
       }
diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index d0707ed3..1f9b6bb8 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -209,7 +209,7 @@
               </div>
               <div class="right">
                 <span>{{ item.createTime }}</span>
-                <u-icon name="list" color="#999" size="28" @click="edit(item.id)" style="margin-left:16px;" v-if="item.createUserId == user.id"></u-icon>
+                <u-icon name="list" color="#999" size="28" @click="edit(item.id)" style="margin-left:16px;" v-if="item.createUserId == user.id && item.operationDesc == '走访排查'"></u-icon>
               </div>
             </div>
             <p style="color: #999999;">操作类型：{{ item.operationDesc }}</p>
@@ -239,23 +239,20 @@
       </div>
     </div>
 
-    <div v-if="checkType == 2 && currIndex != 1"> 
-      <div class="footer-btn" v-if="info.status == 0">
-        <!-- <div @click="toRemove('您确认要驳回此居民的监测对象申请吗？', 0)">驳回申请</div> -->
+    <div v-if="checkType == 2 && currIndex != 1">
+
+      <div class="footer-btn" v-if="info.status == 0 || info.status == 3">
         <div class="confirm-btn" @click="toRemove('您确认要将此居民纳入监测对象吗？', 1)">纳入监测</div>
       </div>
+
       <div class="footer-btn" v-if="info.status == 1">
-        <!-- <div @click="del">删除人员</div> -->
         <div class="confirm-btn" @click="toRemove('您确认要解除此监测对象的风险吗？', 1)">消除风险</div>
       </div>
+
       <div class="footer-btn" v-if="info.status == 2">
-        <!-- <div @click="toRemove('您确认要继续监测该居民？', 0)">继续监测</div> -->
-        <div class="confirm-btn" @click="toRemove('您确认要解除此监测对象的风险吗？', 1)">消除风险</div>
-      </div>
-      <div class="footer-btn" v-if="info.status == 3">
-        <!-- <div @click="del">删除人员</div> -->
-        <div class="confirm-btn" @click="toRemove('您确认要将此居民纳入监测对象吗？', 1)">纳入监测</div>
+        <div class="confirm-btn" @click="toRemove('您确认要解除此监测对象的风险吗？', '')">消除风险审批</div>
       </div>
+
       <div class="footer-btn" v-if="info.status == 4">
         <div @click="del">删除人员</div>
       </div> 
diff --git a/src/apps/AppMonitoringObject/List.vue b/src/apps/AppMonitoringObject/List.vue
index 96c214cf..639f46f3 100644
--- a/src/apps/AppMonitoringObject/List.vue
+++ b/src/apps/AppMonitoringObject/List.vue
@@ -45,7 +45,6 @@
     <div v-else class="empty">
       <img src="https://cdn.cunwuyun.cn/dvcp/h5/no-admin.png" alt="">
       <p>没有网格员权限<br />无法查看监测信息哦~</p>
-      <!-- <div class="add-btn" @click="linkTo('./AddUser')">网格员信息申报</div> -->
     </div>
   </div>
 </template>