From 08f8739a8026bf4471fd4a7c18226c63db6e14d9 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 13 Jun 2022 16:03:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E8=BF=94=E8=B4=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/work/AppHelpedResident/hrAdd.vue  | 12 +++++++++---
 packages/work/AppHelpedResident/hrList.vue |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/work/AppHelpedResident/hrAdd.vue b/packages/work/AppHelpedResident/hrAdd.vue
index 02f227da..7c312d2f 100644
--- a/packages/work/AppHelpedResident/hrAdd.vue
+++ b/packages/work/AppHelpedResident/hrAdd.vue
@@ -118,9 +118,9 @@
                 <el-form-item label="住房面积(m²)">
                   <el-input v-model="form.houseArea" placeholder="请输入" :maxlength="8"/>
                 </el-form-item>
-                <el-form-item label="户类型">
+                <!-- <el-form-item label="户类型">
                   <ai-select v-model="form.houseType" :selectList="dict.getDict('fpHouseType')"/>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="与村主干路距离(公里)">
                   <el-input v-model="form.trunkRoadDistance" placeholder="请输入" :maxlength="8"/>
                 </el-form-item>
@@ -187,7 +187,12 @@
           <ai-card title="家庭风险情况">
             <template slot="content">
               <div flex class="half wrap">
-                <el-form-item label="监测对象类型" prop="objectType">
+                <el-form-item label="户类型" prop="houseType">
+                  <el-radio v-model="form.houseType" label="0">脱贫户</el-radio>
+                  <el-radio v-model="form.houseType" label="1">监测对象</el-radio>
+                  <!-- <ai-select v-model="form.houseType" :selectList="dict.getDict('fpHouseType')"/> -->
+                </el-form-item>
+                <el-form-item label="监测对象类型" :prop="form.houseType == 0? 'objectType':''">
                   <ai-select v-model="form.objectType" :selectList="dict.getDict('fpType')"/>
                 </el-form-item>
                 <el-form-item label="是否军烈属">
@@ -355,6 +360,7 @@ export default {
         householdIdNumber: [{required: true, message: "请选择户主证件号"}],
         riskType: [{required: true, message: "请选择风险因素"}],
         objectType: [{required: true, message: "请选择监测对象类型"}],
+        houseType: [{required: true, message: "请选择户类型"}],
       }
     },
     rootArea() {
diff --git a/packages/work/AppHelpedResident/hrList.vue b/packages/work/AppHelpedResident/hrList.vue
index 4048f4b3..2921c27c 100644
--- a/packages/work/AppHelpedResident/hrList.vue
+++ b/packages/work/AppHelpedResident/hrList.vue
@@ -13,6 +13,7 @@
         <ai-search-bar>
           <template #left>
             <ai-select placeholder="档案状态" v-model="search.status" :selectList="dict.getDict('fpPrtpStatus')" @change="page.current=1,getTableData()"/>
+            <ai-select placeholder="户类型" v-model="search.houseType" :selectList="dict.getDict('fpHouseType')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="监测对象类型" v-model="search.objectType" :selectList="dict.getDict('fpType')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="风险因素" v-model="search.riskType" :selectList="dict.getDict('fpRiskType')" @change="page.current=1,getTableData()"/>
             <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthStart" type="date" size="small" unlink-panels placeholder="选择出生开始日期"
@@ -104,7 +105,7 @@ export default {
   },
   data() {
     return {
-      search: {name: '', objectType: '', riskType: '', isHousehold: 1},
+      search: {status: '',houseType: '', objectType: '', riskType: '', birthStart: 1, birthEnd:'',sex: '' },
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       ids: [],