From c37b69637fd2b8187da1615b94ddac2c31b59ffc Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 5 Jul 2022 10:13:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BC=81=E5=BE=AE=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E5=91=98=E5=8F=AA=E8=83=BD=E6=B7=BB=E5=8A=A0=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppMonitoringObject.vue                   | 41 +++++++++++++------
 .../MonitorFamilySituation.vue                |  6 +--
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/apps/AppMonitoringObject/AppMonitoringObject.vue b/src/apps/AppMonitoringObject/AppMonitoringObject.vue
index 114a097e..10d86b3d 100644
--- a/src/apps/AppMonitoringObject/AppMonitoringObject.vue
+++ b/src/apps/AppMonitoringObject/AppMonitoringObject.vue
@@ -2,18 +2,13 @@
   <div class="AppMonitoringObject">
     <div v-if="isAdmin">
       <AiTopFixed>
-        <!-- <div class="area">
-          <i>可选范围</i>
-          <span class="separat">/</span>
-          <AiAreaPicker ref="area" class="aiArea" :value="areaId" :areaId="user.areaId" :name.sync="areaName" mode="custom"
-                        @select="seachObj">
-            <span class="label" v-if="areaName">{{ areaName }}</span>
-            <i v-else>请选择</i>
-          </AiAreaPicker>
-        </div>
-        <div class="line"></div> -->
         <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bar-width="150" @change="change"></u-tabs>
-        <div class="seach-obj">
+        <div class="search-obj">
+          <div class="selectBox" @click="showType = true" v-if="currentTabs == 0">
+            <span v-if="!status">全部类型</span>
+            <span v-else>{{ $dict.getLabel('fpPrtpStatus', status)}}</span>
+            <u-icon name="arrow-down"></u-icon>
+          </div>
           <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/身份证号" :show-action="false" bg-color="#F5F5F5"
                     search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch" @clear="handerClear">
           </u-search>
@@ -38,6 +33,10 @@
         </div>
       </div>
       <AiEmpty class="emptyWrap" v-else></AiEmpty>
+
+      <u-select v-model="showType" :list="typelist" label-name="dictName" value-name="dictValue"
+            @confirm="confirmTypeSelect"/>
+
       <AiFixedBtn v-if="checkType == 1">
         <div class="addBtn iconfont iconfont-iconfangda" @tap="toAdd" v-if="$permissions('app_apppreventionreturntopoverty_edit')"></div>
       </AiFixedBtn>
@@ -73,7 +72,10 @@ export default {
       areaId: '',
       areaName: '',
       isAdmin: false,
-      checkType: ''
+      checkType: '',
+      showType: false,
+      typelist: [],
+      status: ''
     }
   },
   computed: {
@@ -85,7 +87,10 @@ export default {
     this.areaName = this.user.areaName
     this.$dict.load('fpPrtpStatus').then(() => {
       this.isGirdUser()
+      this.typelist = this.$dict.getDict('fpPrtpStatus').filter((e) => e.dictValue != 5)
+      this.typelist.unshift({ dictName: '全部类型', dictValue: ''})
     })
+    
     uni.$on('reload', () => {
       this.getListInit()
     })
@@ -104,6 +109,10 @@ export default {
       })
     },
 
+    confirmTypeSelect(val) {
+      console.log(val);
+    },
+
     getListInit() {
       this.current = 1
       this.list = []
@@ -201,11 +210,17 @@ export default {
     background: #f5f5f5;
   }
 
-  .seach-obj {
+  .search-obj {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     border-bottom: 2px solid #f5f5f5;
     border-top: 2px solid #f5f5f5;
     padding: 20px 32px;
     background: #fff;
+    .selectBox {
+      margin-right: 30px;
+    }
   }
 
   ::v-deep .u-form {
diff --git a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
index 3e220b2d..3c8b10b2 100644
--- a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
+++ b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
@@ -2,7 +2,7 @@
   <div class="add">
     <div class="form-group">
       <p>生活条件</p>
-      <div class="form-item">
+      <!-- <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
             <i></i>
@@ -12,7 +12,7 @@
             <AiSelect dict="fpHouseType" v-model="form.houseType"></AiSelect>
           </div>
         </div>
-      </div>
+      </div> -->
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
@@ -280,7 +280,7 @@ export default {
   data() {
     return {
       form: {
-        houseType: '',
+        houseType: '1',
         dilapidatedHousehold: '',
         drinkingWaterSafety: '',
         move: '',