From c78a75718a86a1bcce93d9906116abfc439f6a38 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 27 Apr 2022 09:48:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jianping/AppHelpedResident/hrDetail.vue     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 6cd74347..7c813f63 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -15,7 +15,7 @@
             <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 0 && girdAdminApplyStatus == 1">纳入监测审批</el-button>
             <el-button type="primary" @click="applyMonitor('解除风险', 4)" v-if="detail.status == 1">解除风险</el-button>
             <el-button type="primary" @click="examine('解除风险审批', 5)" v-if="detail.status == 2">解除风险审批</el-button>
-            <el-button type="primary" @click="applyMonitor('继续监测', 1)" v-if="detail.status == 3">继续监测</el-button>
+            <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 3">纳入监测</el-button>
             <el-button icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
           </template>
 
@@ -658,7 +658,7 @@
             <ai-wrapper label-width="120px" :columnsNumber="1">
               <ai-info-item label="备注说明" :value="examineInfo.detail"/>
             </ai-wrapper>
-            <ai-uploader v-model="examineInfo.files" disabled style="padding-left:60px;" />
+            <ai-uploader v-model="examineInfo.files" disabled style="padding-left:150px;" />
           </div>
           <div class="form" v-if="examineStep == 2">
             <el-form :model="examineFrom" size="small" label-width="80px">
@@ -685,9 +685,12 @@
             <i class="el-icon-success"></i>
             <p>审核成功</p>
           </div>
-          <template slot="footer">
+          <template slot="footer" v-if="examineStep != 3">
             <el-button @click="cancelExamine">{{examineStep == 2 ? '上一步' : '取消'}}</el-button>
-            <el-button type="primary" @click="examineNext">{{examineStep == 3 ? '确定' : '下一步'}}</el-button>
+            <el-button type="primary" @click="examineNext">下一步</el-button>
+          </template>
+          <template slot="footer" v-if="examineStep == 3">
+            <el-button @click="back">关闭</el-button>
           </template>
         </ai-dialog>
       </template>
@@ -1086,6 +1089,10 @@ export default {
     }
   }
 
+  ::v-deep .ai-dialog__content--wrapper{
+    overflow-y: hidden!important;
+  }
+
   ::v-deep .AiPersonSelect .el-button {
     color: #fff;
   }
@@ -1101,7 +1108,7 @@ export default {
   ::v-deep .el-step__line{
     background-color: #ccc!important;
   }
-  ::v-deep .el-step__title, .is-wait{
+  ::v-deep .el-step__title, ::v-deep .is-wait{
     color: #666!important;
   }
   ::v-deep .is-finish{

From 11eda3d90becdaef65479842aca12d7a9c3e8f25 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 27 Apr 2022 17:53:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppHelpedResident/AppHelpedResident.vue   |   3 +-
 .../AppHelpedResident/detail/hrLog.vue        |   1 +
 .../AppHelpedResident/detail/hrMeasure.vue    |   6 +-
 packages/jianping/AppHelpedResident/hrAdd.vue | 393 +++++---
 .../jianping/AppHelpedResident/hrDetail.vue   | 949 +++++++-----------
 5 files changed, 604 insertions(+), 748 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/AppHelpedResident.vue b/packages/jianping/AppHelpedResident/AppHelpedResident.vue
index e7c40fd1..5e146579 100644
--- a/packages/jianping/AppHelpedResident/AppHelpedResident.vue
+++ b/packages/jianping/AppHelpedResident/AppHelpedResident.vue
@@ -29,7 +29,8 @@ export default {
     this.dict.load("sex", "fpNation", "fpPrtpStatus", "fpHealth", "fpStudentsInSchool", 'fpYesOrNo', "fpRelationship",
       "yesOrNo", "fpLaborSkills", "fpEducation", "fpType", "fpPoliticalOutlook","fpType", "fpRiskType", "fpAssistanceMeasures",
       "fpPublicWelfarePostAssistance","fpHealthAssistance","fpFnancialAssistance","fpEmploymentAssistance","fpEducationalAssistance",
-      "fpIndustrialAssistance","fpSocialAssistance", "fpRiskEliminationMethod")
+      "fpIndustrialAssistance","fpSocialAssistance", "fpRiskEliminationMethod", "fpNaturalDisaster", "fpHouseType", "fpHouseRoadType",
+      "fpFuelType", "fpDisabilityType",)
   }
 }
 </script>
diff --git a/packages/jianping/AppHelpedResident/detail/hrLog.vue b/packages/jianping/AppHelpedResident/detail/hrLog.vue
index e103aafe..6d1735b9 100644
--- a/packages/jianping/AppHelpedResident/detail/hrLog.vue
+++ b/packages/jianping/AppHelpedResident/detail/hrLog.vue
@@ -86,6 +86,7 @@ export default {
             type: 0
           }).then(res => {
             if (res.code == 0) {
+              this.form = {}
               this.$message.success('提交成功!');
               this.dialog = false
               this.getTableData()
diff --git a/packages/jianping/AppHelpedResident/detail/hrMeasure.vue b/packages/jianping/AppHelpedResident/detail/hrMeasure.vue
index adbcc7f2..183d023d 100644
--- a/packages/jianping/AppHelpedResident/detail/hrMeasure.vue
+++ b/packages/jianping/AppHelpedResident/detail/hrMeasure.vue
@@ -24,10 +24,7 @@
     <ai-dialog :visible.sync="dialog" :title="addTitle" @closed="form={}" @onConfirm="submit" width="600px">
       <el-form :model="form" :rules="rules" ref="DialogForm" size="small" label-width="80px">
         <el-form-item label="帮扶类型" prop="operationDesc">
-          <ai-select
-            v-model="form.operationDesc"
-            :selectList="dict.getDict('fpAssistanceMeasures')"
-          />
+          <ai-select v-model="form.operationDesc" :selectList="dict.getDict('fpAssistanceMeasures')"/>
         </el-form-item>
         <el-form-item label="帮扶措施">
           <el-input type="textarea" v-model="form.detail" placeholder="请输入" maxlength="500" show-word-limit rows="5"/>
@@ -91,6 +88,7 @@ export default {
             type: 1
           }).then(res => {
             if (res.code == 0) {
+              this.form = {}
               this.$message.success('提交成功!');
               this.dialog = false
               this.getTableData()
diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index 84efe8ac..68545dbf 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -3,87 +3,113 @@
     <ai-detail>
       <ai-title slot="title" :title="addTitle" isShowBottomBorder isShowBack @onBackClick="back"/>
       <template #content>
-        <el-form :model="form" ref="ruleForm" :rules="rules" label-width="130px" label-position="right" size="small">
+        <el-form :model="form" ref="ruleForm" :rules="rules" label-width="160px" label-position="right" size="small">
           <ai-card title="基本信息">
             <template #content>
               <div flex class="half wrap">
                 <div flex class="column">
                   <el-form-item label="户主姓名" prop="name">
-                    <!-- <el-input v-model="form.name" placeholder="请输入姓名" maxlength="20" show-word-limit
-                              :disabled="isEdit"/> -->
                     <el-input size="small" class="user-selecter" v-model="form.name" placeholder="请输入姓名" clearable :disabled="isEdit || isSelectUser">
                       <template slot="append">
                         <ai-person-select :instance="instance" @selectPerson="checkName" :url="'/app/appresident/list?auditStatus=1&householdName=1&areaId='+user.info.areaId"></ai-person-select>
                       </template>
                     </el-input>
                   </el-form-item>
-                  <el-form-item label="身份证号" prop="idNumber">
-                    <el-input v-model="form.idNumber" placeholder="请输入身份证号" :maxlength="18" :disabled="isEdit || isSelectUser"
-                              @change="handleIdNumberAutocomplete"/>
+                  <el-form-item label="联系方式" prop="phone">
+                    <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
                   </el-form-item>
-                  <el-form-item label="性别" prop="sex">
-                    <ai-select v-model="form.sex" :selectList="dict.getDict('sex')" disabled/>
+                  <el-form-item label="证件号码" prop="idNumber">
+                    <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="18" :disabled="isEdit || isSelectUser" @change="handleIdNumberAutocomplete"/>
                   </el-form-item>
                 </div>
                 <el-form-item label="个人照片" prop="photo">
                   <ai-avatar :instance="instance" v-model="form.photo"/>
                 </el-form-item>
+                <el-form-item label="性别" prop="sex">
+                  <ai-select v-model="form.sex" :selectList="dict.getDict('sex')" disabled/>
+                </el-form-item>
                 <el-form-item label="出生日期" prop="birthDate">
-                  <el-date-picker disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"
-                                  v-model="form.birthDate" type="date" placeholder="选择日期"/>
+                  <el-date-picker disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="form.birthDate" type="date" placeholder="选择日期"/>
                 </el-form-item>
-                <el-form-item label="年龄" prop="age">
+                <!-- <el-form-item label="年龄" prop="age">
                   <el-input disabled v-model="form.age" placeholder="请输入年龄" type="number"/>
-                </el-form-item>
-                <el-form-item label="文化程度" prop="education">
-                  <ai-select v-model="form.education" :selectList="dict.getDict('fpEducation')"/>
-                </el-form-item>
-                <el-form-item label="民族" prop="nation">
+                </el-form-item> -->
+                <el-form-item label="民族">
                   <ai-select v-model="form.nation" :selectList="dict.getDict('fpNation')"/>
                 </el-form-item>
-                <el-form-item label="政治面貌" prop="politicsStatus">
+                <el-form-item label="文化程度">
+                  <ai-select v-model="form.education" :selectList="dict.getDict('fpEducation')"/>
+                </el-form-item>
+                <el-form-item label="政治面貌">
                   <ai-select v-model="form.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')"/>
                 </el-form-item>
-                <el-form-item label="在校生状况" prop="schoolStatus">
+                <el-form-item label="在校生状况">
                   <ai-select v-model="form.schoolStatus" :selectList="dict.getDict('fpStudentsInSchool')"/>
                 </el-form-item>
-                <el-form-item label="务工时间(月)" prop="workeMonths">
-                  <el-input v-model="form.workeMonths" placeholder="请输入" clearable/>
-                </el-form-item>
-                <el-form-item label="劳动技能" prop="labourStatus">
-                  <ai-select v-model="form.labourStatus" :selectList="dict.getDict('fpLaborSkills')"/>
-                </el-form-item>
-                <el-form-item label="务工区域" prop="workArea">
-                  <el-input v-model="form.workArea" placeholder="请输入" clearable maxlength="30" show-word-limit/>
-                </el-form-item>
-                <el-form-item label="是否参加大病保险" prop="seriousIllnessInsurance">
-                  <ai-select v-model="form.seriousIllnessInsurance" :selectList="dict.getDict('fpYesOrNo')"/>
-                </el-form-item>
-                <el-form-item label="是否参加基本医保" prop="basicMedicalTreatment">
-                  <ai-select v-model="form.basicMedicalTreatment" :selectList="dict.getDict('fpYesOrNo')"/>
-                </el-form-item>
-                <el-form-item label="享受最低生活保障" prop="subsistenceAllowance">
-                  <ai-select v-model="form.subsistenceAllowance" :selectList="dict.getDict('fpYesOrNo')"/>
-                </el-form-item>
-                <el-form-item label="是否参加养老保险" prop="endowmentInsurance">
-                  <ai-select v-model="form.endowmentInsurance" :selectList="dict.getDict('fpYesOrNo')"/>
-                </el-form-item>
-                <el-form-item label="是否特困供养" prop="specialPovertySupport">
-                  <ai-select v-model="form.specialPovertySupport" :selectList="dict.getDict('fpYesOrNo')"/>
-                </el-form-item>
               </div>
-              <el-form-item label="健康状况" prop="healthyStatusList">
+              <el-form-item label="健康状况">
                 <el-checkbox-group v-model="form.healthyStatusList">
                   <el-checkbox :label="item.dictValue" v-for="(item, index) in dict.getDict('fpHealth')" :key="index">{{item.dictName}}</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
-            </template>
-          </ai-card>
-          <ai-card title="联络信息">
-            <template slot="content">
-              <el-form-item label="联系方式" prop="phone">
-                <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
+              <div flex class="half wrap">
+                <el-form-item label="残疾类别">
+                  <ai-select v-model="form.disabilityType" :selectList="dict.getDict('fpDisabilityType')" placeholder="请选择" />
+                </el-form-item>
+                <el-form-item label="残疾办证年度">
+                  <el-date-picker v-model="form.disabilityCertificateYear" type="year" placeholder="请选择"/>
+                </el-form-item>
+              </div>
+              <el-form-item label="基础保险">
+                <el-checkbox-group v-model="form.basicsList">
+                  <el-checkbox :label="item.value" v-for="(item, index) in basicsCheckList" :key="index">{{item.label}}</el-checkbox>
+                </el-checkbox-group>
               </el-form-item>
+              <el-form-item label="保障措施">
+                <el-checkbox-group v-model="form.guaranteeList">
+                  <el-checkbox :label="item.value" v-for="(item, index) in guaranteeCheckList" :key="index">{{item.label}}</el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+              <div flex class="half wrap">
+                <el-form-item label="劳动技能">
+                  <ai-select v-model="form.labourStatus" :selectList="dict.getDict('fpLaborSkills')"/>
+                </el-form-item>
+                <el-form-item label="是否会讲普通话">
+                  <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
+                </el-form-item>
+                <el-form-item label="务工时间(月)">
+                  <el-input v-model="form.workeMonths" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="就业渠道">
+                  <el-input v-model="form.employmentChannels" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="务工企业名称">
+                  <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="公益性岗位">
+                  <el-input v-model="form.publicWelfarePosts" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="是否国外务工">
+                  <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
+                </el-form-item>
+                <el-form-item label="公益性岗位(月数)">
+                  <el-input v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable/>
+                </el-form-item>
+              </div>
+              <el-form-item label="务工所在地">
+                <el-input v-model="form.foreignWorkersAddress" placeholder="请输入" clearable maxlength="30" show-word-limit/>
+              </el-form-item>
+              <div flex class="half wrap">
+                <el-form-item label="判刑收监年度">
+                  <el-date-picker v-model="form.sentencingYear" type="year" placeholder="请选择"/>
+                </el-form-item>
+                <el-form-item label="刑满释放">
+                  <el-date-picker v-model="form.releaseFromPrisonYear" type="year" placeholder="请选择"/>
+                </el-form-item>
+                <el-form-item label="死亡年度">
+                  <el-date-picker v-model="form.deathYear" type="year" placeholder="请选择"/>
+                </el-form-item>
+              </div>
               <el-form-item label="现住址" prop="currentAreaId">
                 <ai-area-get :instance="instance" v-model="form.currentAreaId" :root="rootArea" valueLevel="5"/>
                 <el-form-item prop="currentAddress">
@@ -92,47 +118,105 @@
               </el-form-item>
             </template>
           </ai-card>
-          <ai-card title="户籍信息">
+          <ai-card title="生产生活条件">
             <template slot="content">
               <div flex class="half wrap">
-                <!-- <el-form-item label="是否户主" prop="isHousehold">
-                  <ai-select v-model="form.isHousehold" :selectList="dict.getDict('yesOrNo')"
-                             @change="form.householdRelation=null"/>
-                </el-form-item> -->
-                
-                <el-form-item label="监测对象类型" prop="objectType">
-                  <ai-select v-model="form.objectType" :selectList="dict.getDict('fpType')"/>
+                <el-form-item label="住房面积(m²)">
+                  <el-input v-model="form.houseArea" placeholder="请输入" :maxlength="8"/>
                 </el-form-item>
-                <el-form-item label="是否危房" prop="dilapidatedHousehold">
+                <el-form-item label="户类型">
+                  <ai-select v-model="form.houseType" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="与村主干路距离(公里)">
+                  <el-input v-model="form.trunkRoadDistance" placeholder="请输入" :maxlength="8"/>
+                </el-form-item>
+                <el-form-item label="入户路类型">
+                  <ai-select v-model="form.houseRoadType" :selectList="dict.getDict('fpHouseRoadType')"/>
+                </el-form-item>
+                <el-form-item label="是否危房">
                   <ai-select v-model="form.dilapidatedHousehold" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
-                <el-form-item label="是否饮用水安全" prop="drinkingWaterSafety">
+                <el-form-item label="是否住房损耗">
+                  <ai-select v-model="form.houseDamage" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="是否解决安全饮水">
                   <ai-select v-model="form.drinkingWaterSafety" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
-                <el-form-item label="是否搬迁" prop="move">
-                  <ai-select v-model="form.move" :selectList="dict.getDict('fpYesOrNo')"/>
+                <el-form-item label="是否饮水设施损坏">
+                  <ai-select v-model="form.drinkingWaterDamage" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="是否有卫生厕所">
+                  <ai-select v-model="form.toilet" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="主要燃料类型">
+                  <ai-select v-model="form.fuelType" :selectList="dict.getDict('fpFuelType')"/>
+                </el-form-item>
+                <el-form-item label="是否通生活用电">
+                  <ai-select v-model="form.electric" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="是否通广播电视">
+                  <ai-select v-model="form.television" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="耕地面积(亩)">
+                  <el-input v-model="form.cultivatedLandArea" placeholder="请输入" :maxlength="8"/>
+                </el-form-item>
+                <el-form-item label="林地面积(亩)">
+                  <el-input v-model="form.woodlandArea" placeholder="请输入" :maxlength="8"/>
+                </el-form-item>
+                <el-form-item label="林果面积(亩)">
+                  <el-input v-model="form.orchardArea" placeholder="请输入" :maxlength="8"/>
+                </el-form-item>
+                <el-form-item label="退耕还林面积(亩)">
+                  <el-input v-model="form.grainForGreenArea" placeholder="请输入" :maxlength="8"/>
+                </el-form-item>
+                <el-form-item label="牧草地面积(亩)">
+                  <el-input v-model="form.grazingGrasslandArea" placeholder="请输入" :maxlength="8"/>
+                </el-form-item>
+                <el-form-item label="水面面积(亩)">
+                  <el-input v-model="form.watersArea" placeholder="请输入" :maxlength="8"/>
+                </el-form-item>
+                <el-form-item label="是否加入农民专业合作社">
+                  <ai-select v-model="form.nongheshe" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="是否有龙头企业带动">
+                  <ai-select v-model="form.longtouqiye" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="是否有创业致富人带头人带动">
+                  <ai-select v-model="form.cyzfdtr" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="是否通生产通电">
+                  <ai-select v-model="form.produceElectric" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
-                <!-- <template v-if="form.isHousehold==0">
-                  <el-form-item label="与户主关系" prop="householdRelation">
-                    <ai-select v-model="form.householdRelation" :selectList="dict.getDict('fpRelationship')"/>
-                  </el-form-item>
-                  <el-form-item label="户主身份证号" prop="householdIdNumber">
-                    <el-input v-model="form.householdIdNumber" placeholder="请输入户主身份证号" :maxlength="18" clearable/>
-                  </el-form-item>
-                </template> -->
               </div>
             </template>
           </ai-card>
-
-          <ai-card title="情况描述">
+          <ai-card title="家庭风险情况">
             <template slot="content">
-              <el-form-item label="风险因素" prop="riskType">
-                <ai-select v-model="form.riskType" :selectList="dict.getDict('fpRiskType')"/>
+              <div flex class="half wrap">
+                <el-form-item label="监测对象类型" prop="objectType">
+                  <ai-select v-model="form.objectType" :selectList="dict.getDict('fpType')"/>
+                </el-form-item>
+                <el-form-item label="是否军烈属">
+                  <ai-select v-model="form.militaryMartyrs" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="风险因素" prop="riskType">
+                  <ai-select v-model="form.riskType" :selectList="dict.getDict('fpRiskType')"/>
+                </el-form-item>
+                <el-form-item label="脱贫年度">
+                  <el-date-picker v-model="form.povertyYear" type="year" placeholder="请选择"/>
+                </el-form-item>
+                <el-form-item label="因自然灾害子项">
+                  <ai-select v-model="form.naturalDisasterType" :selectList="dict.getDict('fpNaturalDisaster')"/>
+                </el-form-item>
+                <el-form-item label="是否义务阶段失学辍学">
+                  <ai-select v-model="form.dropOutOfSchool" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+              </div>
+              <el-form-item label="义务阶段未上学原因">
+                <el-input v-model="form.dropOutOfSchoolReason" placeholder="请输入" maxlength="30" show-word-limit clearable/>
               </el-form-item>
               <el-form-item label="备注说明">
-                <el-form-item>
-                  <el-input v-model="form.detail" placeholder="备注说明" maxlength="500" show-word-limit clearable type="textarea" />
-                </el-form-item>
+                <el-input v-model="form.detail" placeholder="请输入" maxlength="30" show-word-limit clearable/>
               </el-form-item>
               <el-form-item label="图片（最多9张）" >
                 <ai-uploader
@@ -147,73 +231,57 @@
               </el-form-item>
             </template>
           </ai-card>
-          <template v-if="/[123]/.test(form.status)">
-            <ai-card title="收入情况(单位:元)">
-              <template slot="content">
-                <div flex class="half wrap">
-                  <el-form-item label="工资收入">
-                    <el-input v-model="form.income1" placeholder="请输入" clearable/>
-                  </el-form-item>
-                  <el-form-item label="生产经营收入">
-                    <el-input v-model="form.income2" placeholder="请输入" clearable/>
-                  </el-form-item>
-                  <el-form-item label="财产性收入">
-                    <el-input v-model="form.income3" placeholder="请输入" clearable/>
-                  </el-form-item>
-                  <el-form-item label="转移性收入">
-                    <el-input v-model="form.income4" placeholder="请输入" clearable/>
-                  </el-form-item>
-                  <el-form-item label="理赔收入">
-                    <el-input v-model="form.income5" placeholder="请输入" clearable/>
-                  </el-form-item>
-                  <el-form-item label="生产经营支出">
-                    <el-input v-model="form.income6" placeholder="请输入" clearable/>
-                  </el-form-item>
-                  <el-form-item label="合规自然支出">
-                    <el-input v-model="form.income7" placeholder="请输入" clearable/>
-                  </el-form-item>
-                  <el-form-item label="家庭人均纯收入">
-                    <el-input v-model="form.income8" placeholder="请输入" clearable/>
-                  </el-form-item>
-                </div>
-              </template>
-            </ai-card>
-            <ai-card title="帮扶情况">
-              <template slot="content">
-                <div flex class="half wrap">
-                  <el-form-item label="产业帮扶">
-                    <ai-select v-model="form.industrialAssistance"
-                               :selectList="dict.getDict('fpIndustrialAssistance')"/>
-                  </el-form-item>
-                  <el-form-item label="健康帮扶">
-                    <ai-select v-model="form.healthAssistance" :selectList="dict.getDict('fpHealthAssistance')"/>
-                  </el-form-item>
-                  <el-form-item label="就业帮扶">
-                    <ai-select v-model="form.employmentAssistance"
-                               :selectList="dict.getDict('fpEmploymentAssistance')"/>
-                  </el-form-item>
-                  <el-form-item label="教育帮扶">
-                    <ai-select v-model="form.educationalAssistance"
-                               :selectList="dict.getDict('fpEducationalAssistance')"/>
-                  </el-form-item>
-                  <el-form-item label="金融帮扶">
-                    <ai-select v-model="form.financialAssistance" :selectList="dict.getDict('fpFnancialAssistance')"/>
-                  </el-form-item>
-                  <el-form-item label="社会帮扶">
-                    <ai-select v-model="form.socialAssistance" :selectList="dict.getDict('fpSocialAssistance')"/>
-                  </el-form-item>
-                  <el-form-item label="公益岗帮扶">
-                    <ai-select v-model="form.publicWelfarePostAssistance"
-                               :selectList="dict.getDict('fpPublicWelfarePostAssistance')"/>
-                  </el-form-item>
-                  <el-form-item label="是否风险消除">
-                    <ai-select disabled v-model="form.riskEliminated" :selectList="dict.getDict('fpYesOrNo')"/>
-                  </el-form-item>
-                  <el-form-item label="风险消除日期">{{ form.riskEliminatedTime }}</el-form-item>
-                </div>
-              </template>
-            </ai-card>
-          </template>
+          <ai-card title="家庭收支情况">
+            <template slot="content">
+              <div flex class="half wrap">
+                <el-form-item label="纳入监测对象的收入参考范围">
+                  <el-input v-model="form.income1" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="纳入监测对象的人均收入参考范围">
+                  <el-input v-model="form.income2" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="工资性收入(元)">
+                  <el-input v-model="form.income3" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="生产经营性收入(元)">
+                  <el-input v-model="form.income4" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="计划生育金(元)">
+                  <el-input v-model="form.income5" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="资产收益扶贫分红收入">
+                  <el-input v-model="form.income6" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="低保金(元)">
+                  <el-input v-model="form.income7" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="特困供养金(元)">
+                  <el-input v-model="form.income8" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="养老保险金(元)">
+                  <el-input v-model="form.income9" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="生态补偿金(元)">
+                  <el-input v-model="form.income10" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="转移性收入(元)">
+                  <el-input v-model="form.income11" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="其它转移性收入(元)">
+                  <el-input v-model="form.income12" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="财产性收入(元)">
+                  <el-input v-model="form.income13" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="其它财产收入(元)">
+                  <el-input v-model="form.income14" placeholder="请输入" clearable/>
+                </el-form-item>
+                <el-form-item label="生产经营性支出(元)">
+                  <el-input v-model="form.income15" placeholder="请输入" clearable/>
+                </el-form-item>
+              </div>
+            </template>
+          </ai-card>
         </el-form>
       </template>
       <template #footer>
@@ -257,11 +325,32 @@ export default {
         householdRelation: [{required: true, message: "请选择与户主关系"}],
         householdIdNumber: [{required: true, message: "请选择户主身份证号"}],
         riskType: [{required: true, message: "请选择风险因素"}],
+        objectType: [{required: true, message: "请选择监测对象类型"}],
       }
     },
     rootArea() {
       return this.user.info?.areaId?.replace(/(\d{6})\d+/g, '$1' + Array(7).join("0")) || ""
-    }
+    },
+    guaranteeCheckList() {
+      return [
+        {label: '享受农村最低生活保障', value: 0},
+        {label: '是否特困供养人员', value: 1},
+        {label: '分散供养五保户转集中供养（减少）', value: 2},
+        {label: '是否接受医疗救助', value: 3},
+        {label: '是否接受其它健康扶贫', value: 4},
+      ]
+    },
+    basicsCheckList() {
+      return [
+        {label: '城乡居民基本医疗保险', value: 0},
+        {label: '城镇职工基本医疗保险', value: 1},
+        {label: '大病保险', value: 2},
+        {label: '商业补充医疗保险', value: 3},
+        {label: '城乡居民基本养老保险', value: 4},
+        {label: '城镇职工基本养老保险', value: 5},
+        {label: '享受人身意外保险补贴', value: 6},
+      ]
+    },
   },
   data() {
     return {
@@ -269,6 +358,8 @@ export default {
         householdRelation: "",
         healthyStatus: '',
         healthyStatusList: [],
+        guaranteeList: [],
+        basicsList: [],
         file: [], 
       },
       isSelectUser: false, //是否选择人员
@@ -306,9 +397,17 @@ export default {
       }).then(res => {
         if (res?.data) {
           res.data.healthyStatusList = []
+          res.data.basicsList = []
+          res.data.guaranteeList = []
           if(res.data.healthyStatus) {
             res.data.healthyStatusList = res.data.healthyStatus.split(',')
           }
+          if(res.data.basicsCheck) {
+             res.data.basicsList = res.data.basicsCheck.split(',')
+          }
+          if(res.data.guaranteeCheck) {
+             res.data.guaranteeList = res.data.guaranteeCheck.split(',')
+          }
           this.form = {...res.data}
         }
       })
@@ -328,6 +427,12 @@ export default {
           if(this.user.info.girdCheckType == 1) {
             this.form.girdId = this.user.info.girdId
           }
+          if(this.form.basicsList.length) {
+            this.form.basicsCheck = this.form.basicsList.join(',')
+          }
+          if(this.form.guaranteeList.length) {
+            this.form.guaranteeCheck = this.form.basicsList.join(',')
+          }
           this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功!');
diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 7c813f63..c48a9b05 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -1,13 +1,7 @@
 <template>
   <section class="hrDetail">
     <ai-detail>
-      <ai-title
-        slot="title"
-        title="监测对象详情"
-        isShowBottomBorder
-        isShowBack
-        @onBackClick="back"
-      >
+      <ai-title slot="title" title="监测对象详情" isShowBottomBorder isShowBack @onBackClick="back">
         <template #rightBtn>
           <el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit" v-if="$permissions('app_apppreventionreturntopoverty_edit')">编辑</el-button>
           <template v-if="isGridAdmin">
@@ -16,621 +10,329 @@
             <el-button type="primary" @click="applyMonitor('解除风险', 4)" v-if="detail.status == 1">解除风险</el-button>
             <el-button type="primary" @click="examine('解除风险审批', 5)" v-if="detail.status == 2">解除风险审批</el-button>
             <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 3">纳入监测</el-button>
-            <el-button icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
           </template>
-
           <template v-else>
             <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 3">申请纳入监测</el-button>
             <el-button type="primary" @click="applyMonitor('申请解除风险', 3)" v-if="detail.status == 1">申请解除风险</el-button>
           </template>
-
-          <!-- <template v-if="/2/.test(detail.status) && isGridAdmin">
-            <el-button type="primary" @click="applyMonitor('解除风险', 4)">解除风险</el-button>
-            <el-button type="primary" @click="handleRelieve(0)">继续监测</el-button>
-          </template>
-          <template v-if="/3/.test(detail.status) && isGridAdmin">
-            <el-button type="primary" @click="handleAccept(1)"
-              >纳入监测</el-button
-            >
-            <el-button
-              v-if="isGridAdmin"
-              icon="iconfont iconDelete"
-              @click="handleDelete(detail.id)"
-              >删除</el-button
-            >
-          </template>
-            <template v-if="/1/.test(detail.status)">
-            <el-button
-              type="primary"
-              @click="handleRelieve(1)"
-              v-if="isGridAdmin"
-              >解除风险</el-button
-            >
-            <el-button type="primary" @click="handleRelieve()" v-else
-              >申请解除风险</el-button
-            >
-            <el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit"
-              >编辑</el-button
-            >
-            <el-button
-              v-if="isGridAdmin"
-              icon="iconfont iconDelete"
-              @click="handleDelete(detail.id)"
-              >删除</el-button
-            >
-          </template>
-          <template v-if="/5/.test(detail.status)">
-            <el-button
-              v-if="isGridAdmin"
-              type="primary"
-              @click="handleAccept(1)"
-              >纳入监测</el-button
-            >
-            <el-button v-else type="primary" @click="applyMonitor('申请纳入监测')"
-              >申请纳入监测</el-button
-            >
-            <el-button
-              v-if="isGridAdmin"
-              icon="iconfont iconDelete"
-              @click="handleDelete(detail.id)"
-              >删除</el-button
-            >
-          </template> -->
-          
-          <el-button
-            v-if="$permissions('app_apppreventionreturntopoverty_del') && /4/g.test(detail.status)"
-            icon="iconfont iconDelete"
-            @click="handleDelete(detail.id)"
-          >
-            删除
-          </el-button>
+          <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && /4/g.test(detail.status)" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
         </template>
       </ai-title>
       <template #content>
-        <el-form
-          :model="detail"
-          label-width="130px"
-          label-position="right"
-          size="small"
-        >
+        <el-form :model="detail" label-width="160px" label-position="right" size="small">
           <el-tabs tabPosition="left" v-model="currentTab">
             <el-tab-pane label="基本信息" lazy>
               <ai-card :title="detail.name || '无名氏'">
                 <template #content>
                   <div flex class="flex-start">
                     <div flex class="half wrap fill">
-                      <el-form-item label="身份证号" prop="name">{{
-                        detail.idNumber
-                      }}</el-form-item>
-                      <el-form-item label="性别" prop="sex">{{
-                        dict.getLabel("sex", detail.sex)
-                      }}</el-form-item>
-                      <el-form-item label="出生日期">{{
-                        detail.birthDate
-                      }}</el-form-item>
-                      <el-form-item label="年龄" prop="age">{{
-                        detail.age
-                      }}</el-form-item>
-                      <el-form-item label="文化程度">{{
-                        dict.getLabel("fpEducation", detail.education)
-                      }}</el-form-item>
-                      <el-form-item label="民族">{{
-                        dict.getLabel("fpNation", detail.nation)
-                      }}</el-form-item>
-                      <el-form-item label="政治面貌"
-                        >{{
-                          dict.getLabel(
-                            "fpPoliticalOutlook",
-                            detail.politicsStatus
-                          )
-                        }}
-                      </el-form-item>
-                      <el-form-item label="在校生状况"
-                        >{{
-                          dict.getLabel(
-                            "fpStudentsInSchool",
-                            detail.schoolStatus
-                          )
-                        }}
-                      </el-form-item>
-                      <!-- <el-form-item label="健康状况">{{ dict.getLabel('fpHealth', detail.healthyStatus) }}</el-form-item> -->
-                      <el-form-item label="务工时间(月)" prop="idNumber">{{
-                        detail.workeMonths
-                      }}</el-form-item>
-                      <el-form-item label="劳动技能"
-                        >{{
-                          dict.getLabel("fpLaborSkills", detail.labourStatus)
-                        }}
-                      </el-form-item>
-                      <el-form-item label="务工区域" prop="idNumber">{{
-                        detail.workArea
-                      }}</el-form-item>
-                      <el-form-item label="是否参加大病保险"
-                        >{{
-                          dict.getLabel(
-                            "fpYesOrNo",
-                            detail.seriousIllnessInsurance
-                          )
-                        }}
-                      </el-form-item>
-                      <el-form-item label="是否参加基本医保"
-                        >{{
-                          dict.getLabel(
-                            "fpYesOrNo",
-                            detail.basicMedicalTreatment
-                          )
-                        }}
-                      </el-form-item>
-                      <el-form-item label="享受最低生活保障"
-                        >{{
-                          dict.getLabel(
-                            "fpYesOrNo",
-                            detail.subsistenceAllowance
-                          )
-                        }}
-                      </el-form-item>
-                      <el-form-item label="是否参加养老保险"
-                        >{{
-                          dict.getLabel("fpYesOrNo", detail.endowmentInsurance)
-                        }}
-                      </el-form-item>
-                      <el-form-item label="是否特困供养"
-                        >{{
-                          dict.getLabel(
-                            "fpYesOrNo",
-                            detail.specialPovertySupport
-                          )
-                        }}
-                      </el-form-item>
+                      <el-form-item label="联系电话">{{ detail.phone}}</el-form-item>
+                      <el-form-item label="身份证号">{{ detail.idNumber}}</el-form-item>
+                      <el-form-item label="性别" prop="sex">{{ dict.getLabel("sex", detail.sex)}}</el-form-item>
+                      <el-form-item label="出生日期">{{ detail.birthDate}}</el-form-item>
+                      <!-- <el-form-item label="年龄" prop="age">{{ detail.age}}</el-form-item> -->
+                      <el-form-item label="民族">{{dict.getLabel("fpNation", detail.nation)}}</el-form-item>
+                      <el-form-item label="文化程度">{{ dict.getLabel("fpEducation", detail.education)}}</el-form-item>
+                      <el-form-item label="政治面貌">{{dict.getLabel("fpPoliticalOutlook",detail.politicsStatus)}}</el-form-item>
+                      <el-form-item label="在校生状况">{{dict.getLabel( "fpStudentsInSchool", detail.schoolStatus)}}</el-form-item>
                     </div>
-                    <ai-avatar
-                      :instance="instance"
-                      v-model="detail.photo"
-                      :editable="false"
-                    />
+                    <ai-avatar :instance="instance" v-model="detail.photo" :editable="false" />
                   </div>
                   <el-form-item label="健康状况">
                     <span v-for="(item, index) in detail.healthyStatusList" :key="index"><span v-if="index > 0">,</span>{{dict.getLabel("fpHealth", item)}}</span>
                   </el-form-item>
+                  <div flex class="half wrap">
+                    <el-form-item label="残疾类别">{{dict.getLabel("fpDisabilityType", detail.disabilityType)}}</el-form-item>
+                    <el-form-item label="残疾办证年度">{{detail.disabilityCertificateYear}}</el-form-item>
+                  </div>
+                  <el-form-item label="基础保险">
+                    <el-checkbox-group v-model="detail.basicsList" disabled>
+                      <el-checkbox :label="item.value" v-for="(item, index) in basicsCheckList" :key="index">{{item.label}}</el-checkbox>
+                    </el-checkbox-group>
+                  </el-form-item>
+                  <el-form-item label="保障措施">
+                    <el-checkbox-group v-model="detail.guaranteeList" disabled>
+                      <el-checkbox :label="item.value" v-for="(item, index) in guaranteeCheckList" :key="index">{{item.label}}</el-checkbox>
+                    </el-checkbox-group>
+                  </el-form-item>
+                  <div flex class="half wrap">
+                    <el-form-item label="劳动技能">{{dict.getLabel("fpLaborSkills", detail.labourStatus)}}</el-form-item>
+                    <el-form-item label="是否会讲普通话">{{dict.getLabel("fpYesOrNo", detail.mandarin)}}</el-form-item>
+                    <el-form-item label="务工时间(月)">{{detail.workeMonths}}</el-form-item>
+                    <el-form-item label="就业渠道">{{detail.employmentChannels}}</el-form-item>
+                    <el-form-item label="务工企业名称">{{detail.migrantEnterprises}}</el-form-item>
+                    <el-form-item label="公益性岗位">{{detail.publicWelfarePosts}}</el-form-item>
+                    <el-form-item label="是否国外务工">{{dict.getLabel("fpYesOrNo", detail.foreignWorkers)}}</el-form-item>
+                    <el-form-item label="公益性岗位(月数)">{{detail.publicWelfarePostsMonths}}</el-form-item>
+                  </div>
+                  <el-form-item label="务工所在地">{{detail.foreignWorkersAddress}}
+                  </el-form-item>
+                  <div flex class="half wrap">
+                    <el-form-item label="判刑收监年度">{{detail.sentencingYear}} </el-form-item>
+                    <el-form-item label="刑满释放">{{detail.releaseFromPrisonYear}}</el-form-item>
+                    <el-form-item label="死亡年度">{{detail.deathYear}}</el-form-item>
+                  </div>
+                  <el-form-item label="现住址">{{currentFullAddress}}</el-form-item>
                 </template>
               </ai-card>
-              <ai-card title="联络信息">
-                <template slot="content">
-                  <el-form-item label="联系方式" prop="phone">{{
-                    detail.phone
-                  }}</el-form-item>
-                  <el-form-item label="现住址">{{
-                    currentFullAddress
-                  }}</el-form-item>
-                </template>
-              </ai-card>
-              <ai-card title="家庭情况">
+              <ai-card title="生产生活条件">
                 <template slot="content">
                   <div flex class="half wrap">
-                    <el-form-item label="档案状态">{{
-                      dict.getLabel("fpPrtpStatus", detail.status)
-                    }}</el-form-item>
-                    <el-form-item label="监测对象类型">{{
-                      dict.getLabel("fpType", detail.objectType)
-                    }}</el-form-item>
-                    <el-form-item label="是否危房">
-                      {{
-                        dict.getLabel("fpYesOrNo", detail.dilapidatedHousehold)
-                      }}
-                    </el-form-item>
-                    <el-form-item label="是否饮用水安全">
-                      {{
-                        dict.getLabel("fpYesOrNo", detail.drinkingWaterSafety)
-                      }}
-                    </el-form-item>
-                    <el-form-item label="是否搬迁">{{
-                      dict.getLabel("fpYesOrNo", detail.move)
-                    }}</el-form-item>
-                    <el-form-item label="风险因素">{{
-                      dict.getLabel("fpYesOrNo", detail.move)
-                    }}</el-form-item>
-                    <el-form-item label="风险消除方式">{{
-                      dict.getLabel("fpYesOrNo", detail.move)
-                    }}</el-form-item>
+                    <el-form-item label="住房面积(m²)">{{detail.houseArea}}</el-form-item>
+                    <el-form-item label="户类型">{{ dict.getLabel("fpYesOrNo", detail.houseType)}}</el-form-item>
+                    <el-form-item label="与村主干路距离(公里)">{{ detail.trunkRoadDistance}}</el-form-item>
+                    <el-form-item label="入户路类型">{{ dict.getLabel("fpHouseRoadType", detail.houseRoadType)}}</el-form-item>
+                    <el-form-item label="是否危房">{{ dict.getLabel("fpYesOrNo", detail.dilapidatedHousehold)}}</el-form-item>
+                    <el-form-item label="是否住房损耗">{{ dict.getLabel("fpYesOrNo", detail.houseDamage)}}</el-form-item>
+                    <el-form-item label="是否解决安全饮水">{{ dict.getLabel("fpYesOrNo", detail.drinkingWaterSafety)}}</el-form-item>
+                    <el-form-item label="是否饮水设施损坏">{{ dict.getLabel("fpYesOrNo", detail.drinkingWaterDamage)}}</el-form-item>
+                    <el-form-item label="是否有卫生厕所">{{ dict.getLabel("fpYesOrNo", detail.toilet)}}</el-form-item>
+                    <el-form-item label="主要燃料类型">{{ dict.getLabel("fpFuelType", detail.fuelType)}}</el-form-item>
+                    <el-form-item label="是否通生活用电">{{ dict.getLabel("fpYesOrNo", detail.electric)}}</el-form-item>
+                    <el-form-item label="是否通广播电视">{{ dict.getLabel("fpYesOrNo", detail.television)}}</el-form-item>
+                    <el-form-item label="耕地面积(亩)">{{detail.cultivatedLandArea}}</el-form-item>
+                    <el-form-item label="林地面积(亩)">{{detail.woodlandArea}}</el-form-item>
+                    <el-form-item label="林果面积(亩)">{{detail.orchardArea}}</el-form-item>
+                    <el-form-item label="退耕还林面积(亩)">{{detail.grainForGreenArea}}</el-form-item>
+                    <el-form-item label="牧草地面积(亩)">{{detail.grazingGrasslandArea}}</el-form-item>
+                    <el-form-item label="水面面积(亩)">{{detail.watersArea}}</el-form-item>
+                    <el-form-item label="是否加入农民专业合作社">{{ dict.getLabel("fpYesOrNo", detail.nongheshe)}}</el-form-item>
+                    <el-form-item label="是否有龙头企业带动">{{ dict.getLabel("fpYesOrNo", detail.longtouqiye)}}</el-form-item>
+                    <el-form-item label="是否有创业致富人带头人带动">{{ dict.getLabel("fpYesOrNo", detail.cyzfdtr)}}</el-form-item>
+                    <el-form-item label="是否通生产通电">{{ dict.getLabel("fpYesOrNo", detail.produceElectric)}}</el-form-item>
                   </div>
                 </template>
               </ai-card>
-              <template>
-                <ai-card title="收入情况(单位:元)">
-                  <template slot="content">
-                    <div flex class="half wrap">
-                      <el-form-item label="工资收入">{{
-                        detail.income1
-                      }}</el-form-item>
-                      <el-form-item label="生产经营收入">{{
-                        detail.income2
-                      }}</el-form-item>
-                      <el-form-item label="财产性收入">{{
-                        detail.income3
-                      }}</el-form-item>
-                      <el-form-item label="转移性收入">{{
-                        detail.income4
-                      }}</el-form-item>
-                      <el-form-item label="理赔收入">{{
-                        detail.income5
-                      }}</el-form-item>
-                      <el-form-item label="生产经营支出">{{
-                        detail.income6
-                      }}</el-form-item>
-                      <el-form-item label="合规自然支出">{{
-                        detail.income7
-                      }}</el-form-item>
-                      <el-form-item label="家庭人均纯收入">{{
-                        detail.income8
-                      }}</el-form-item>
-                    </div>
-                  </template>
-                </ai-card>
-                <ai-card title="家庭成员">
-                  <template #right>
-                    <span
-                      style="
-                        color: #2266ff;
-                        margin-left: 16px;
-                        cursor: pointer;
-                        font-size: 12px;
-                      "
-                      @click="addFamily({})"
-                      >添加</span
-                    >
-                  </template>
-                  <template #content>
-                    <ai-table
-                      :tableData="detail.family"
-                      :colConfigs="colConfigs"
-                      :dict="dict"
-                      :isShowPagination="false"
-                    >
-                      <el-table-column
-                        slot="options"
-                        label="操作"
-                        align="center"
-                        width="200px"
-                      >
-                        <template slot-scope="{ row }">
-                          <el-button type="text" @click="viewFamily(row)"
-                            >详情</el-button
-                          >
-                          <el-button type="text" @click="addFamily(row)"
-                            >编辑</el-button
-                          >
-                          <el-button type="text" @click="delFamily(row)"
-                            >删除</el-button
-                          >
-                        </template>
-                      </el-table-column>
-                    </ai-table>
-                  </template>
-                </ai-card>
-              </template>
+              <ai-card title="家庭风险情况">
+                <template slot="content">
+                  <div flex class="half wrap">
+                    <el-form-item label="监测对象类型" prop="objectType">{{ dict.getLabel("fpType", detail.objectType)}}</el-form-item>
+                    <el-form-item label="是否军烈属">{{ dict.getLabel("fpYesOrNo", detail.militaryMartyrs)}}</el-form-item>
+                    <el-form-item label="风险因素" prop="riskType">{{ dict.getLabel("fpRiskType", detail.riskType)}} </el-form-item>
+                    <el-form-item label="脱贫年度">{{detail.povertyYear}} </el-form-item>
+                    <el-form-item label="因自然灾害子项">{{ dict.getLabel("fpNaturalDisaster", detail.naturalDisasterType)}}</el-form-item>
+                    <el-form-item label="是否义务阶段失学辍学">{{ dict.getLabel("fpYesOrNo", detail.dropOutOfSchool)}}</el-form-item>
+                    <el-form-item label="识别监测时间">{{ detail.createTime}}</el-form-item>
+                    <el-form-item label="风险是否已消除">{{ dict.getLabel("fpYesOrNo", detail.riskEliminated)}}</el-form-item>
+                    <el-form-item label="是否有家庭成员未参加医疗保险">{{ dict.getLabel("fpYesOrNo", detail.notCoveredMedicalInsurance)}}</el-form-item>
+                    <el-form-item label="信息采集人">{{detail.updateUserName}}</el-form-item>
+                    <el-form-item label="信息采集人联系电话">{{ detail.updateUserPhone}}</el-form-item>
+                  </div>
+                  <el-form-item label="义务阶段未上学原因">{{detail.dropOutOfSchoolReason}}</el-form-item>
+                  <el-form-item label="备注说明">{{detail.detail}}</el-form-item>
+                  <el-form-item label="图片" ><ai-uploader disabled v-model="detail.files"></ai-uploader></el-form-item>
+                </template>
+              </ai-card>
+              <ai-card title="家庭收支情况">
+                <template slot="content">
+                  <div flex class="half wrap">
+                    <el-form-item label="纳入监测对象的收入参考范围">{{detail.income1}}</el-form-item>
+                    <el-form-item label="纳入监测对象的人均收入参考范围">{{detail.income2}}</el-form-item>
+                    <el-form-item label="工资性收入(元)">{{detail.income3}}</el-form-item>
+                    <el-form-item label="生产经营性收入(元)">{{detail.income4}}</el-form-item>
+                    <el-form-item label="计划生育金(元)">{{detail.income5}}</el-form-item>
+                    <el-form-item label="资产收益扶贫分红收入">{{detail.income6}}</el-form-item>
+                    <el-form-item label="低保金(元)">{{detail.income7}}</el-form-item>
+                    <el-form-item label="特困供养金(元)">{{detail.income8}}</el-form-item>
+                    <el-form-item label="养老保险金(元)">{{detail.income9}}</el-form-item>
+                    <el-form-item label="生态补偿金(元)">{{detail.income10}}</el-form-item>
+                    <el-form-item label="转移性收入(元)">{{detail.income11}}</el-form-item>
+                    <el-form-item label="其它转移性收入(元)">{{detail.income12}}</el-form-item>
+                    <el-form-item label="财产性收入(元)">{{detail.income13}}</el-form-item>
+                    <el-form-item label="其它财产收入(元)">{{detail.income14}}</el-form-item>
+                    <el-form-item label="生产经营性支出(元)">{{detail.income15}}</el-form-item>
+                    <el-form-item label="年收入(元)">{{detail.income16}}</el-form-item>
+                    <el-form-item label="家庭纯收入(元)">{{detail.familyIncome}}</el-form-item>
+                    <el-form-item label="人均纯收入(元)">{{detail.perCapitaIncome}}</el-form-item>
+                  </div>
+                </template>
+              </ai-card>
+              <ai-card title="家庭成员">
+                <template #right>
+                  <span style=" color: #2266ff; margin-left: 16px;cursor: pointer;font-size: 12px;" @click="addFamily({})">添加</span>
+                </template>
+                <template #content>
+                  <ai-table :tableData="detail.family" :colConfigs="colConfigs" :dict="dict" :isShowPagination="false">
+                    <el-table-column slot="options" label="操作" align="center" width="200px">
+                      <template slot-scope="{ row }">
+                        <el-button type="text" @click="viewFamily(row)">详情</el-button>
+                        <el-button type="text" @click="addFamily(row)">编辑</el-button>
+                        <el-button type="text" @click="delFamily(row)">删除</el-button>
+                      </template>
+                    </el-table-column>
+                  </ai-table>
+                </template>
+              </ai-card>
             </el-tab-pane>
             <el-tab-pane label="走访日志" lazy name="HrLog" v-if="$permissions('app_apppreventionreturntopovertylog_detail')">
-              <hr-log
-                v-if="currentTab == 'HrLog'"
-                :instance="instance"
-                :dict="dict"
-                :permissions="permissions"
-              />
+              <hr-log v-if="currentTab == 'HrLog'" :instance="instance" :dict="dict" :permissions="permissions" />
             </el-tab-pane>
             <el-tab-pane label="帮扶措施" lazy name="HrMeasure">
-              <hr-measure
-                v-if="currentTab == 'HrMeasure'"
-                :instance="instance"
-                :dict="dict"
-                :permissions="permissions"
-              />
+              <hr-measure v-if="currentTab == 'HrMeasure'" :instance="instance" :dict="dict" :permissions="permissions" />
             </el-tab-pane>
           </el-tabs>
         </el-form>
-        <ai-dialog
-          :visible.sync="isShowAdd"
-          width="1000px"
-          height="500px"
-          title="添加家庭成员"
-          @close="onClose"
-          @onConfirm="onConfirm"
-        >
-          <el-form
-            :model="form"
-            ref="ruleForm"
-            :rules="rules"
-            label-width="130px"
-            label-position="right"
-            size="small"
-          >
+        <ai-dialog :visible.sync="isShowAdd" width="1000px" height="500px" title="添加家庭成员" @close="onClose" @onConfirm="onConfirm">
+          <el-form :model="form" ref="ruleForm" :rules="rules" label-width="130px" label-position="right" size="small">
             <div flex class="half wrap">
               <div flex class="column">
-                <el-form-item label="姓名" prop="name">
-                  <el-input
-                    size="small"
-                    class="user-selecter"
-                    v-model="form.name"
-                    placeholder="请输入姓名"
-                    clearable
-                    :disabled="isEdit || isSelectUser"
-                  >
+                <el-form-item label="户主姓名" prop="name">
+                  <el-input size="small" class="user-selecter" v-model="form.name" placeholder="请输入姓名" clearable :disabled="isEdit || isSelectUser">
                     <template slot="append">
-                      <ai-person-select
-                        :instance="instance"
-                        @selectPerson="checkName"
-                        :url="'/app/appresident/list?auditStatus=1&areaId='+user.info.areaId"
-                      >
-                      </ai-person-select>
+                      <ai-person-select :instance="instance" @selectPerson="checkName" :url="'/app/appresident/list?auditStatus=1&areaId='+user.info.areaId"></ai-person-select>
                     </template>
                   </el-input>
                 </el-form-item>
-                <el-form-item label="身份证号" prop="idNumber">
-                  <el-input
-                    v-model="form.idNumber"
-                    placeholder="请输入身份证号"
-                    :maxlength="18"
-                     :disabled="isEdit || isSelectUser"
-                    @change="handleIdNumberAutocomplete"
-                  />
+                <el-form-item label="联系方式" prop="phone">
+                  <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
                 </el-form-item>
-                <el-form-item label="性别" prop="sex">
-                  <ai-select
-                    v-model="form.sex"
-                    :selectList="dict.getDict('sex')"
-                    disabled
-                  />
+                <el-form-item label="证件号码" prop="idNumber">
+                  <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="18" :disabled="isEdit || isSelectUser" @change="handleIdNumberAutocomplete"/>
                 </el-form-item>
               </div>
               <el-form-item label="个人照片" prop="photo">
-                <ai-avatar :instance="instance" v-model="form.photo" />
+                <ai-avatar :instance="instance" v-model="form.photo"/>
+              </el-form-item>
+              <el-form-item label="性别" prop="sex">
+                <ai-select v-model="form.sex" :selectList="dict.getDict('sex')" disabled/>
               </el-form-item>
               <el-form-item label="出生日期" prop="birthDate">
-                <el-date-picker
-                  disabled
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  format="yyyy-MM-dd"
-                  v-model="form.birthDate"
-                  type="date"
-                  placeholder="选择日期"
-                />
+                <el-date-picker disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="form.birthDate" type="date" placeholder="选择日期"/>
               </el-form-item>
-              <el-form-item label="年龄" prop="age">
-                <el-input
-                  disabled
-                  v-model="form.age"
-                  placeholder="请输入年龄"
-                  type="number"
-                />
+              <!-- <el-form-item label="年龄" prop="age">
+                <el-input disabled v-model="form.age" placeholder="请输入年龄" type="number"/>
+              </el-form-item> -->
+              <el-form-item label="民族">
+                <ai-select v-model="form.nation" :selectList="dict.getDict('fpNation')"/>
               </el-form-item>
-              <el-form-item label="联系方式" prop="phone">
-                <el-input
-                  v-model="form.phone"
-                  placeholder="请输入联系方式"
-                  :maxlength="11"
-                  show-word-limit
-                />
+              <el-form-item label="文化程度">
+                <ai-select v-model="form.education" :selectList="dict.getDict('fpEducation')"/>
               </el-form-item>
-              <el-form-item label="与户主关系" prop="householdRelation">
-                <ai-select
-                  v-model="form.householdRelation"
-                  :selectList="dict.getDict('fpRelationship')"
-                />
+              <el-form-item label="政治面貌">
+                <ai-select v-model="form.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')"/>
               </el-form-item>
-              <el-form-item label="文化程度" prop="education">
-                <ai-select
-                  v-model="form.education"
-                  :selectList="dict.getDict('fpEducation')"
-                />
-              </el-form-item>
-              <el-form-item label="民族" prop="nation">
-                <ai-select
-                  v-model="form.nation"
-                  :selectList="dict.getDict('fpNation')"
-                />
-              </el-form-item>
-              <el-form-item label="政治面貌" prop="politicsStatus">
-                <ai-select
-                  v-model="form.politicsStatus"
-                  :selectList="dict.getDict('fpPoliticalOutlook')"
-                />
-              </el-form-item>
-              <el-form-item label="在校生状况" prop="schoolStatus">
-                <ai-select
-                  v-model="form.schoolStatus"
-                  :selectList="dict.getDict('fpStudentsInSchool')"
-                />
-              </el-form-item>
-              <el-form-item label="务工时间(月)" prop="workeMonths">
-                <el-input
-                  v-model="form.workeMonths"
-                  placeholder="请输入"
-                  clearable
-                />
-              </el-form-item>
-              <el-form-item label="劳动技能" prop="labourStatus">
-                <ai-select
-                  v-model="form.labourStatus"
-                  :selectList="dict.getDict('fpLaborSkills')"
-                />
-              </el-form-item>
-              <el-form-item label="务工区域" prop="workArea">
-                <el-input
-                  v-model="form.workArea"
-                  placeholder="请输入"
-                  clearable
-                  maxlength="30"
-                  show-word-limit
-                />
-              </el-form-item>
-              <el-form-item
-                label="是否参加大病保险"
-                prop="seriousIllnessInsurance"
-              >
-                <ai-select
-                  v-model="form.seriousIllnessInsurance"
-                  :selectList="dict.getDict('fpYesOrNo')"
-                />
-              </el-form-item>
-              <el-form-item
-                label="是否参加基本医保"
-                prop="basicMedicalTreatment"
-              >
-                <ai-select
-                  v-model="form.basicMedicalTreatment"
-                  :selectList="dict.getDict('fpYesOrNo')"
-                />
-              </el-form-item>
-              <el-form-item
-                label="享受最低生活保障"
-                prop="subsistenceAllowance"
-              >
-                <ai-select
-                  v-model="form.subsistenceAllowance"
-                  :selectList="dict.getDict('fpYesOrNo')"
-                />
-              </el-form-item>
-              <el-form-item label="是否参加养老保险" prop="endowmentInsurance">
-                <ai-select
-                  v-model="form.endowmentInsurance"
-                  :selectList="dict.getDict('fpYesOrNo')"
-                />
-              </el-form-item>
-              <el-form-item label="是否特困供养" prop="specialPovertySupport">
-                <ai-select
-                  v-model="form.specialPovertySupport"
-                  :selectList="dict.getDict('fpYesOrNo')"
-                />
+              <el-form-item label="在校生状况">
+                <ai-select v-model="form.schoolStatus" :selectList="dict.getDict('fpStudentsInSchool')"/>
               </el-form-item>
             </div>
-            <el-form-item label="现住址" prop="currentAreaId">
-              <ai-area-get
-                :instance="instance"
-                v-model="form.currentAreaId"
-                :root="rootArea"
-                valueLevel="5"
-              />
-              <el-form-item prop="currentAddress">
-                <el-input
-                  v-model="form.currentAddress"
-                  placeholder="详细地址"
-                  maxlength="30"
-                  show-word-limit
-                  clearable
-                />
-              </el-form-item>
-            </el-form-item>
-            <el-form-item label="健康状况" prop="healthyStatusList">
+            <el-form-item label="健康状况">
               <el-checkbox-group v-model="form.healthyStatusList">
                 <el-checkbox :label="item.dictValue" v-for="(item, index) in dict.getDict('fpHealth')" :key="index">{{item.dictName}}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
+            <div flex class="half wrap">
+              <el-form-item label="残疾类别">
+                <ai-select v-model="form.disabilityType" :selectList="dict.getDict('fpDisabilityType')" placeholder="请选择" />
+              </el-form-item>
+              <el-form-item label="残疾办证年度">
+                <el-date-picker v-model="form.disabilityCertificateYear" type="year" placeholder="请选择"/>
+              </el-form-item>
+            </div>
+            <el-form-item label="基础保险">
+              <el-checkbox-group v-model="form.basicsList">
+                <el-checkbox :label="item.value" v-for="(item, index) in basicsCheckList" :key="index">{{item.label}}</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+            <el-form-item label="保障措施">
+              <el-checkbox-group v-model="form.guaranteeList">
+                <el-checkbox :label="item.value" v-for="(item, index) in guaranteeCheckList" :key="index">{{item.label}}</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+            <div flex class="half wrap">
+              <el-form-item label="劳动技能">
+                <ai-select v-model="form.labourStatus" :selectList="dict.getDict('fpLaborSkills')"/>
+              </el-form-item>
+              <el-form-item label="是否会讲普通话">
+                <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
+              </el-form-item>
+              <el-form-item label="务工时间(月)">
+                <el-input v-model="form.workeMonths" placeholder="请输入" clearable/>
+              </el-form-item>
+              <el-form-item label="就业渠道">
+                <el-input v-model="form.employmentChannels" placeholder="请输入" clearable/>
+              </el-form-item>
+              <el-form-item label="务工企业名称">
+                <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable/>
+              </el-form-item>
+              <el-form-item label="公益性岗位">
+                <el-input v-model="form.publicWelfarePosts" placeholder="请输入" clearable/>
+              </el-form-item>
+              <el-form-item label="是否国外务工">
+                <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
+              </el-form-item>
+              <el-form-item label="公益性岗位(月数)">
+                <el-input v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable/>
+              </el-form-item>
+            </div>
+            <el-form-item label="务工所在地">
+              <el-input v-model="form.foreignWorkersAddress" placeholder="请输入" clearable maxlength="30" show-word-limit/>
+            </el-form-item>
+            <div flex class="half wrap">
+              <el-form-item label="判刑收监年度">
+                <el-date-picker v-model="form.sentencingYear" type="year" placeholder="请选择"/>
+              </el-form-item>
+              <el-form-item label="刑满释放">
+                <el-date-picker v-model="form.releaseFromPrisonYear" type="year" placeholder="请选择"/>
+              </el-form-item>
+              <el-form-item label="死亡年度">
+                <el-date-picker v-model="form.deathYear" type="year" placeholder="请选择"/>
+              </el-form-item>
+            </div>
+            <el-form-item label="现住址" prop="currentAreaId">
+              <ai-area-get :instance="instance" v-model="form.currentAreaId" :root="rootArea" valueLevel="5"/>
+              <el-form-item prop="currentAddress">
+                <el-input v-model="form.currentAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable/>
+              </el-form-item>
+            </el-form-item>
           </el-form>
         </ai-dialog>
-        <ai-dialog customFooter
-          :visible.sync="isShowDetail"
-          width="1000px"
-          height="500px"
-          title="家庭成员详情"
-        >
-          <el-form
-            :model="detail"
-            label-width="130px"
-            label-position="right"
-            size="small"
-          >
+        <ai-dialog customFooter :visible.sync="isShowDetail" width="1000px" height="500px" title="家庭成员详情">
+          <el-form :model="detail" label-width="130px" label-position="right" size="small">
             <div flex class="flex-start">
               <div flex class="half wrap fill">
-                <el-form-item label="身份证号" prop="name">{{
-                  familyInfo.name
-                }}</el-form-item>
-                <el-form-item label="身份证号" prop="name"><ai-id mode="show" :value="familyInfo.idNumber" right-btn /></el-form-item>
-                <el-form-item label="性别" prop="sex">{{
-                  dict.getLabel("sex", familyInfo.sex)
-                }}</el-form-item>
-                <el-form-item label="出生日期">{{
-                  familyInfo.birthDate
-                }}</el-form-item>
-                <el-form-item label="年龄" prop="age">{{
-                  familyInfo.age
-                }}</el-form-item>
+                <el-form-item label="身份证号" prop="name">{{familyInfo.name}}</el-form-item>
+                <el-form-item label="身份证号" prop="name">
+                  <ai-id mode="show" :value="familyInfo.idNumber" right-btn />
+                </el-form-item>
+                <el-form-item label="性别" prop="sex">{{dict.getLabel("sex", familyInfo.sex)}}</el-form-item>
+                <el-form-item label="出生日期">{{familyInfo.birthDate}}</el-form-item>
+                <el-form-item label="年龄" prop="age">{{familyInfo.age}}</el-form-item>
                 <el-form-item label="联系方式">{{familyInfo.phone}}</el-form-item>
-                <el-form-item label="与户主关系">{{
-                  dict.getLabel("fpRelationship", familyInfo.householdRelation)
-                }}</el-form-item>
-                <el-form-item label="文化程度">{{
-                  dict.getLabel("fpEducation", familyInfo.education)
-                }}</el-form-item>
-                <el-form-item label="民族">{{
-                  dict.getLabel("fpNation", familyInfo.nation)
-                }}</el-form-item>
-                <el-form-item label="政治面貌"
-                  >{{
-                    dict.getLabel("fpPoliticalOutlook", familyInfo.politicsStatus)
-                  }}
-                </el-form-item>
-                <el-form-item label="在校生状况"
-                  >{{ dict.getLabel("fpStudentsInSchool", familyInfo.schoolStatus) }}
-                </el-form-item>
-                <el-form-item label="务工时间(月)" prop="idNumber">{{
-                  familyInfo.workeMonths
-                }}</el-form-item>
-                <el-form-item label="劳动技能"
-                  >{{ dict.getLabel("fpLaborSkills", familyInfo.labourStatus) }}
-                </el-form-item>
-                <el-form-item label="务工区域" prop="idNumber">{{
-                  familyInfo.workArea
-                }}</el-form-item>
-                <el-form-item label="是否参加大病保险"
-                  >{{
-                    dict.getLabel("fpYesOrNo", familyInfo.seriousIllnessInsurance)
-                  }}
-                </el-form-item>
-                <el-form-item label="是否参加基本医保"
-                  >{{ dict.getLabel("fpYesOrNo", familyInfo.basicMedicalTreatment) }}
-                </el-form-item>
-                <el-form-item label="享受最低生活保障"
-                  >{{ dict.getLabel("fpYesOrNo", familyInfo.subsistenceAllowance) }}
-                </el-form-item>
-                <el-form-item label="是否参加养老保险"
-                  >{{ dict.getLabel("fpYesOrNo", familyInfo.endowmentInsurance) }}
-                </el-form-item>
-                <el-form-item label="是否特困供养"
-                  >{{ dict.getLabel("fpYesOrNo", familyInfo.specialPovertySupport) }}
-                </el-form-item>
+                <el-form-item label="与户主关系">{{dict.getLabel("fpRelationship", familyInfo.householdRelation)}}</el-form-item>
+                <el-form-item label="文化程度">{{dict.getLabel("fpEducation", familyInfo.education)}}</el-form-item>
+                <el-form-item label="民族">{{dict.getLabel("fpNation", familyInfo.nation)}}</el-form-item>
+                <el-form-item label="政治面貌">{{ dict.getLabel("fpPoliticalOutlook", familyInfo.politicsStatus)}}</el-form-item>
+                <el-form-item label="在校生状况">{{ dict.getLabel("fpStudentsInSchool", familyInfo.schoolStatus) }}</el-form-item>
+                <el-form-item label="务工时间(月)" prop="idNumber">{{familyInfo.workeMonths}}</el-form-item>
+                <el-form-item label="劳动技能">{{ dict.getLabel("fpLaborSkills", familyInfo.labourStatus) }}</el-form-item>
+                <el-form-item label="务工区域" prop="idNumber">{{familyInfo.workArea}}</el-form-item>
+                <el-form-item label="是否参加大病保险">{{dict.getLabel("fpYesOrNo", familyInfo.seriousIllnessInsurance)}}</el-form-item>
+                <el-form-item label="是否参加基本医保">{{ dict.getLabel("fpYesOrNo", familyInfo.basicMedicalTreatment) }} </el-form-item>
+                <el-form-item label="享受最低生活保障">{{ dict.getLabel("fpYesOrNo", familyInfo.subsistenceAllowance) }} </el-form-item>
+                <el-form-item label="是否参加养老保险">{{ dict.getLabel("fpYesOrNo", familyInfo.endowmentInsurance) }}</el-form-item>
+                <el-form-item label="是否特困供养">{{ dict.getLabel("fpYesOrNo", familyInfo.specialPovertySupport) }}</el-form-item>
               </div>
-              <ai-avatar
-                :instance="instance"
-                v-model="familyInfo.photo"
-                :editable="false"
-              />
+              <ai-avatar :instance="instance" v-model="familyInfo.photo" :editable="false" />
             </div>
-            <el-form-item label="现住址">{{
-              currentFullAddressFamily
-            }}</el-form-item>
+            <el-form-item label="现住址">{{currentFullAddressFamily}}</el-form-item>
             <el-form-item label="健康状况">
               <span v-for="(item, index) in familyInfo.healthyStatusList" :key="index"><span v-if="index > 0">,</span>{{dict.getLabel("fpHealth", item)}}</span>
             </el-form-item>
           </el-form>
-           <template slot="footer">
+          <template slot="footer">
             <el-button @click="isShowDetail=false">关闭</el-button>
           </template>
         </ai-dialog>
         <ai-dialog :visible.sync="isShowApply" :title="dialogTitle" @closed="applyInfo={},applyFileList=[]" @onConfirm="submitApply" width="600px">
           <el-form :model="applyInfo" :rules="rulesApply" ref="dialogApplyInfo" size="small" label-width="120px">
             <el-form-item label="风险因素" prop="riskType" v-if="changeStatus == 0 || changeStatus == 1">
-              <ai-select
-                v-model="applyInfo.riskType"
-                :selectList="dict.getDict('fpRiskType')"
-              />
+              <ai-select v-model="applyInfo.riskType" :selectList="dict.getDict('fpRiskType')" />
             </el-form-item>
             <el-form-item label="风险消除方式" prop="riskEliminationMethod" v-if="changeStatus == 3 || changeStatus == 4">
-              <ai-select
-                v-model="applyInfo.riskEliminationMethod"
-                :selectList="dict.getDict('fpRiskEliminationMethod')"
-              />
+              <ai-select v-model="applyInfo.riskEliminationMethod" :selectList="dict.getDict('fpRiskEliminationMethod')" />
             </el-form-item>
             <el-form-item label="备注说明">
-              <el-input type="textarea" v-model="applyInfo.opinion" placeholder="请输入" maxlength="500" show-word-limit rows="5"/>
+              <el-input type="textarea" v-model="applyInfo.opinion" placeholder="请输入" maxlength="500" show-word-limit rows="5" />
             </el-form-item>
             <el-form-item label="图片">
               <ai-uploader v-model="applyFileList" :instance="instance" acceptType=".jpg,.jpeg,.png">
@@ -649,14 +351,14 @@
           </el-steps>
           <div class="info" v-if="examineStep == 1">
             <ai-wrapper label-width="120px" :columnsNumber="2" style="margin-top: 16px;">
-              <ai-info-item label="操作类型" :value="changeStatus == 2 ? '申请纳入监测' : '申请解除风险' "/>
-              <ai-info-item label="风险因素" :value="dict.getLabel('fpRiskType', examineInfo.bizDictValue)" v-if="changeStatus == 2"/>
-              <ai-info-item label="风险消除方式" :value="dict.getLabel('fpRiskEliminationMethod', examineInfo.bizDictValue)" v-if="changeStatus == 5"/>
-              <ai-info-item label="申请人" :value="examineInfo.operationUserName"/>
-              <ai-info-item label="申请时间" :value="examineInfo.createTime"/>
+              <ai-info-item label="操作类型" :value="changeStatus == 2 ? '申请纳入监测' : '申请解除风险' " />
+              <ai-info-item label="风险因素" :value="dict.getLabel('fpRiskType', examineInfo.bizDictValue)" v-if="changeStatus == 2" />
+              <ai-info-item label="风险消除方式" :value="dict.getLabel('fpRiskEliminationMethod', examineInfo.bizDictValue)" v-if="changeStatus == 5" />
+              <ai-info-item label="申请人" :value="examineInfo.operationUserName" />
+              <ai-info-item label="申请时间" :value="examineInfo.createTime" />
             </ai-wrapper>
             <ai-wrapper label-width="120px" :columnsNumber="1">
-              <ai-info-item label="备注说明" :value="examineInfo.detail"/>
+              <ai-info-item label="备注说明" :value="examineInfo.detail" />
             </ai-wrapper>
             <ai-uploader v-model="examineInfo.files" disabled style="padding-left:150px;" />
           </div>
@@ -670,7 +372,7 @@
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="备注说明">
-                <el-input type="textarea" v-model="examineFrom.opinion" placeholder="请输入" maxlength="500" show-word-limit rows="5"/>
+                <el-input type="textarea" v-model="examineFrom.opinion" placeholder="请输入" maxlength="500" show-word-limit rows="5" />
               </el-form-item>
               <el-form-item label="图片">
                 <ai-uploader v-model="examineFileList" :instance="instance" acceptType=".jpg,.jpeg,.png">
@@ -765,14 +467,34 @@ export default {
     },
     rootArea() {
       return this.user.info?.areaId?.replace(/(\d{6})\d+/g, '$1' + Array(7).join("0")) || ""
-    }
+    },
+    guaranteeCheckList() {
+      return [
+        {label: '享受农村最低生活保障', value: 0},
+        {label: '是否特困供养人员', value: 1},
+        {label: '分散供养五保户转集中供养（减少）', value: 2},
+        {label: '是否接受医疗救助', value: 3},
+        {label: '是否接受其它健康扶贫', value: 4},
+      ]
+    },
+    basicsCheckList() {
+      return [
+        {label: '城乡居民基本医疗保险', value: 0},
+        {label: '城镇职工基本医疗保险', value: 1},
+        {label: '大病保险', value: 2},
+        {label: '商业补充医疗保险', value: 3},
+        {label: '城乡居民基本养老保险', value: 4},
+        {label: '城镇职工基本养老保险', value: 5},
+        {label: '享受人身意外保险补贴', value: 6},
+      ]
+    },
   },
   data() {
     return {
       detail: {},
       currentTab: "",
       isShowAdd: false,
-      form: {healthyStatusList: []},
+      form: { healthyStatusList: [],basicsList: [], guaranteeList: []},
       isEdit: false,
       isShowDetail: false,
       familyInfo: {},
@@ -783,7 +505,7 @@ export default {
       isShowExamine: false,
       examineInfo: {},
       examineStep: 1, //审批步骤
-      examineFrom: {pass: 1},
+      examineFrom: { pass: 1 },
       applyFileList: [],
       examineFileList: [],
       changeStatus: 0,  //操作状态 0:申请纳入监测 1:纳入监测 2:纳入监测审批 3:申请解除风险 4:解除风险 5:解除风险审批
@@ -792,14 +514,14 @@ export default {
   },
   methods: {
     checkName(e) {
-      if(!e) {
+      if (!e) {
         this.isSelectUser = false
         this.form.name = ''
         this.form.idNumber = ''
-        this.form.phone =''
+        this.form.phone = ''
         this.form.areaId = ''
-        this.form.birthDate = '' 
-        this.form.sex = '' 
+        this.form.birthDate = ''
+        this.form.sex = ''
         this.form.age = ''
         this.form.currentAreaId = ''
         this.form.currentAddress = ''
@@ -814,26 +536,42 @@ export default {
       this.isSelectUser = true
     },
     addFamily(row) {
-      if(row && row.id) {
+      if (row && row.id) {
         this.isEdit = true
       }
       row.healthyStatusList = []
-      if(row && row.healthyStatus) {
+      row.basicsList = []
+      row.guaranteeList = []
+      if (row && row.healthyStatus) {
         row.healthyStatusList = row.healthyStatus.split(',')
       }
+      if (row && row.basicsCheck) {
+        row.basicsList = row.basicsCheck.split(',')
+      }
+      if (row && row.guaranteeCheck) {
+        row.guaranteeList = row.guaranteeCheck.split(',')
+      }
       this.form = { ...row }
       this.isShowAdd = true
     },
     viewFamily(row) {
       row.healthyStatusList = []
-      if(row.healthyStatus) {
+      row.basicsList = []
+      row.guaranteeList = []
+      if (row.healthyStatus) {
         row.healthyStatusList = row.healthyStatus.split(',')
       }
-      this.familyInfo = {...row}
+      if (row.basicsCheck) {
+        row.basicsList = row.basicsCheck.split(',')
+      }
+      if (row.guaranteeCheck) {
+        row.guaranteeList = row.guaranteeCheck.split(',')
+      }
+      this.familyInfo = { ...row }
       this.isShowDetail = true
     },
     delFamily(row) {
-      if(row.isHousehold == 1) {
+      if (row.isHousehold == 1) {
         return this.$message.error('户主信息不允许删除');
       }
       this.$confirm("是否删除该家庭成员").then(() => {
@@ -857,6 +595,12 @@ export default {
           if (this.form.healthyStatusList.length) {
             this.form.healthyStatus = this.form.healthyStatusList.join(',')
           }
+          if(this.form.basicsList.length) {
+            this.form.basicsCheck = this.form.basicsList.join(',')
+          }
+          if(this.form.guaranteeList.length) {
+            this.form.guaranteeCheck = this.form.basicsList.join(',')
+          }
           this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
             if (res.code == 0) {
               this.getDetail()
@@ -887,11 +631,17 @@ export default {
                 e.householdRelation = e.householdRelation || "户主";
               });
 
-              if(this.detail.healthyStatus) {
+              if (this.detail.healthyStatus) {
                 this.detail.healthyStatusList = this.detail.healthyStatus.split(',')
               }
+              if(this.detail.basicsCheck) {
+                this.detail.basicsList = this.detail.basicsCheck.split(',')
+              }
+              if(this.detail.guaranteeCheck) {
+                this.detail.guaranteeList = this.detail.guaranteeCheck.split(',')
+              }
 
-              if(this.detail.status == 0 && this.isGridAdmin) {
+              if (this.detail.status == 0 && this.isGridAdmin) {
                 this.instance.post(`/app/apppreventionreturntopoverty/popup?id=${this.detail.id}`).then(res => {
                   if (res.code == 0 && res.data) { //纳入监测审批
                     this.girdAdminApplyStatus = 1
@@ -914,32 +664,32 @@ export default {
       this.$refs.dialogApplyInfo.validate((v) => {
         if (v) {
           this.applyInfo.id = this.detail.id
-          if(this.changeStatus == 1 || this.changeStatus == 4) { //网格长直接纳入监测/解除风险
+          if (this.changeStatus == 1 || this.changeStatus == 4) { //网格长直接纳入监测/解除风险
             this.applyInfo.pass = 1
           }
-          var url = '' 
-          if(this.changeStatus == 0 || this.changeStatus == 1) { //纳入监测
+          var url = ''
+          if (this.changeStatus == 0 || this.changeStatus == 1) { //纳入监测
             url = `/app/apppreventionreturntopoverty/examine`
           }
 
-          if(this.changeStatus == 3 || this.changeStatus == 4) { //解除风险
+          if (this.changeStatus == 3 || this.changeStatus == 4) { //解除风险
             url = `/app/apppreventionreturntopoverty/relieve`
           }
 
-          if(this.applyFileList.length) {
+          if (this.applyFileList.length) {
             var ids = this.applyFileList.map((item) => {
               return item.id
             })
             this.applyInfo.files = ids.join(',')
           }
-          this.instance.post(url, null, {params: this.applyInfo}).then(res => {
+          this.instance.post(url, null, { params: this.applyInfo }).then(res => {
             if (res.code == 0) {
               this.getDetail()
               this.$message.success('提交成功!');
               this.isShowApply = false
             }
           })
-          
+
         }
       });
     },
@@ -954,31 +704,31 @@ export default {
       })
     },
     examineNext() {
-      if(this.examineStep == 2) { //审批操作
-        if(this.examineFileList.length) {
+      if (this.examineStep == 2) { //审批操作
+        if (this.examineFileList.length) {
           var ids = this.examineFileList.map((item) => {
             return item.id
           })
           this.examineFrom.files = ids.join(',')
         }
         this.examineFrom.id = this.detail.id
-        this.instance.post(`/app/apppreventionreturntopoverty/relieve`, null, {params: this.examineFrom}).then(res => {
+        this.instance.post(`/app/apppreventionreturntopoverty/relieve`, null, { params: this.examineFrom }).then(res => {
           if (res.code == 0) {
             this.getDetail()
             this.$message.success('提交成功!');
           }
         })
       }
-      if(this.examineStep == 3) { 
+      if (this.examineStep == 3) {
         this.isShowExamine = false
-        this.examineFrom = {pass: 1}
+        this.examineFrom = { pass: 1 }
         return
       }
-      this.examineStep ++
+      this.examineStep++
     },
     cancelExamine() {
-      if(this.examineStep == 2) {
-        return this.examineStep --
+      if (this.examineStep == 2) {
+        return this.examineStep--
       }
       this.isShowExamine = false
     },
@@ -1003,9 +753,9 @@ export default {
     },
     handleAccept(pass) {
       let msg =
-          pass == 0
-            ? "是否驳回纳入监测对象申请?"
-            : `是否${isNaN(pass) ? "(申请)" : ""}纳入监测对象?`,
+        pass == 0
+          ? "是否驳回纳入监测对象申请?"
+          : `是否${isNaN(pass) ? "(申请)" : ""}纳入监测对象?`,
         { id } = this.detail;
       this.$confirm(msg)
         .then(() => {
@@ -1078,19 +828,19 @@ export default {
   .success {
     text-align: center;
     padding-top: 20px;
-    .el-icon-success{
+    .el-icon-success {
       color: rgb(46, 162, 34);
       font-size: 100px;
     }
-    p{
+    p {
       font-size: 16px;
       padding-top: 20px;
       color: #000;
     }
   }
 
-  ::v-deep .ai-dialog__content--wrapper{
-    overflow-y: hidden!important;
+  ::v-deep .ai-dialog__content--wrapper {
+    overflow-y: hidden !important;
   }
 
   ::v-deep .AiPersonSelect .el-button {
@@ -1102,20 +852,21 @@ export default {
     overflow-y: auto;
   }
 
-  ::v-deep .el-step__icon{
-    border-color: #ccc!important;
+  ::v-deep .el-step__icon {
+    border-color: #ccc !important;
   }
-  ::v-deep .el-step__line{
-    background-color: #ccc!important;
+  ::v-deep .el-step__line {
+    background-color: #ccc !important;
   }
-  ::v-deep .el-step__title, ::v-deep .is-wait{
-    color: #666!important;
+  ::v-deep .el-step__title,
+  ::v-deep .is-wait {
+    color: #666 !important;
   }
-  ::v-deep .is-finish{
-    color: #26f!important;
+  ::v-deep .is-finish {
+    color: #26f !important;
   }
-  ::v-deep .is-finish .el-step__icon{
-    border-color: #26f!important;
+  ::v-deep .is-finish .el-step__icon {
+    border-color: #26f !important;
   }
 }
 </style>

From 2f612a074c73f1c5972eb1be4806ae5b07a0bac3 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 27 Apr 2022 18:08:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jianping/AppHelpedResident/hrDetail.vue   | 89 ++++++++++++-------
 1 file changed, 58 insertions(+), 31 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index c48a9b05..ff7ef4c0 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -45,17 +45,19 @@
                     <el-form-item label="残疾类别">{{dict.getLabel("fpDisabilityType", detail.disabilityType)}}</el-form-item>
                     <el-form-item label="残疾办证年度">{{detail.disabilityCertificateYear}}</el-form-item>
                   </div>
-                  <el-form-item label="基础保险">
-                    <el-checkbox-group v-model="detail.basicsList" disabled>
-                      <el-checkbox :label="item.value" v-for="(item, index) in basicsCheckList" :key="index">{{item.label}}</el-checkbox>
-                    </el-checkbox-group>
-                  </el-form-item>
-                  <el-form-item label="保障措施">
-                    <el-checkbox-group v-model="detail.guaranteeList" disabled>
-                      <el-checkbox :label="item.value" v-for="(item, index) in guaranteeCheckList" :key="index">{{item.label}}</el-checkbox>
-                    </el-checkbox-group>
-                  </el-form-item>
                   <div flex class="half wrap">
+                    <el-form-item label="城乡居民基本医疗保险">{{dict.getLabel("fpYesOrNo", detail.jcbxCxyiliao)}}</el-form-item>
+                    <el-form-item label="城镇职工基本医疗保险">{{dict.getLabel("fpYesOrNo", detail.jcbxCzyiliao)}}</el-form-item>
+                    <el-form-item label="大病保险">{{dict.getLabel("fpYesOrNo", detail.jcbxDabing)}}</el-form-item>
+                    <el-form-item label="商业补充医疗保险">{{dict.getLabel("fpYesOrNo", detail.jcbxShangye)}}</el-form-item>
+                    <el-form-item label="城乡居民基本养老保险">{{dict.getLabel("fpYesOrNo", detail.jcbxCxyanglao)}}</el-form-item>
+                    <el-form-item label="城镇职工基本养老保险">{{dict.getLabel("fpYesOrNo", detail.jcbxCzyanglao)}}</el-form-item>
+                    <el-form-item label="享受人身意外保险补贴">{{dict.getLabel("fpYesOrNo", detail.jcbxRenshenyiwai)}}</el-form-item>
+                    <el-form-item label="享受农村最低生活保障">{{dict.getLabel("fpYesOrNo", detail.bzcsNongcundibao)}}</el-form-item>
+                    <el-form-item label="是否特困供养人员">{{dict.getLabel("fpYesOrNo", detail.bzcsTekungongyang)}}</el-form-item>
+                    <el-form-item label="分散供养五保户转集中供养（减少）">{{dict.getLabel("fpYesOrNo", detail.bzcsWubaohu)}}</el-form-item>
+                    <el-form-item label="是否接受医疗救助">{{dict.getLabel("fpYesOrNo", detail.bzcsYiliaojiuzhu)}}</el-form-item>
+                    <el-form-item label="是否接受其它健康扶贫">{{dict.getLabel("fpYesOrNo", detail.bzcsQita)}}</el-form-item>
                     <el-form-item label="劳动技能">{{dict.getLabel("fpLaborSkills", detail.labourStatus)}}</el-form-item>
                     <el-form-item label="是否会讲普通话">{{dict.getLabel("fpYesOrNo", detail.mandarin)}}</el-form-item>
                     <el-form-item label="务工时间(月)">{{detail.workeMonths}}</el-form-item>
@@ -199,6 +201,9 @@
               <el-form-item label="出生日期" prop="birthDate">
                 <el-date-picker disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="form.birthDate" type="date" placeholder="选择日期"/>
               </el-form-item>
+              <el-form-item label="与户主关系" prop="householdRelation">
+                <ai-select v-model="form.householdRelation" :selectList="dict.getDict('fpRelationship')"/>
+              </el-form-item>
               <!-- <el-form-item label="年龄" prop="age">
                 <el-input disabled v-model="form.age" placeholder="请输入年龄" type="number"/>
               </el-form-item> -->
@@ -287,37 +292,59 @@
           </el-form>
         </ai-dialog>
         <ai-dialog customFooter :visible.sync="isShowDetail" width="1000px" height="500px" title="家庭成员详情">
-          <el-form :model="detail" label-width="130px" label-position="right" size="small">
+          <el-form :model="familyInfo" label-width="160px" label-position="right" size="small">
             <div flex class="flex-start">
               <div flex class="half wrap fill">
-                <el-form-item label="身份证号" prop="name">{{familyInfo.name}}</el-form-item>
-                <el-form-item label="身份证号" prop="name">
-                  <ai-id mode="show" :value="familyInfo.idNumber" right-btn />
-                </el-form-item>
-                <el-form-item label="性别" prop="sex">{{dict.getLabel("sex", familyInfo.sex)}}</el-form-item>
-                <el-form-item label="出生日期">{{familyInfo.birthDate}}</el-form-item>
-                <el-form-item label="年龄" prop="age">{{familyInfo.age}}</el-form-item>
-                <el-form-item label="联系方式">{{familyInfo.phone}}</el-form-item>
+                <el-form-item label="联系电话">{{ familyInfo.phone}}</el-form-item>
+                <el-form-item label="身份证号">{{ familyInfo.idNumber}}</el-form-item>
+                <el-form-item label="性别" prop="sex">{{ dict.getLabel("sex", familyInfo.sex)}}</el-form-item>
+                <el-form-item label="出生日期">{{ familyInfo.birthDate}}</el-form-item>
                 <el-form-item label="与户主关系">{{dict.getLabel("fpRelationship", familyInfo.householdRelation)}}</el-form-item>
-                <el-form-item label="文化程度">{{dict.getLabel("fpEducation", familyInfo.education)}}</el-form-item>
+                <!-- <el-form-item label="年龄" prop="age">{{ familyInfo.age}}</el-form-item> -->
                 <el-form-item label="民族">{{dict.getLabel("fpNation", familyInfo.nation)}}</el-form-item>
-                <el-form-item label="政治面貌">{{ dict.getLabel("fpPoliticalOutlook", familyInfo.politicsStatus)}}</el-form-item>
-                <el-form-item label="在校生状况">{{ dict.getLabel("fpStudentsInSchool", familyInfo.schoolStatus) }}</el-form-item>
-                <el-form-item label="务工时间(月)" prop="idNumber">{{familyInfo.workeMonths}}</el-form-item>
-                <el-form-item label="劳动技能">{{ dict.getLabel("fpLaborSkills", familyInfo.labourStatus) }}</el-form-item>
-                <el-form-item label="务工区域" prop="idNumber">{{familyInfo.workArea}}</el-form-item>
-                <el-form-item label="是否参加大病保险">{{dict.getLabel("fpYesOrNo", familyInfo.seriousIllnessInsurance)}}</el-form-item>
-                <el-form-item label="是否参加基本医保">{{ dict.getLabel("fpYesOrNo", familyInfo.basicMedicalTreatment) }} </el-form-item>
-                <el-form-item label="享受最低生活保障">{{ dict.getLabel("fpYesOrNo", familyInfo.subsistenceAllowance) }} </el-form-item>
-                <el-form-item label="是否参加养老保险">{{ dict.getLabel("fpYesOrNo", familyInfo.endowmentInsurance) }}</el-form-item>
-                <el-form-item label="是否特困供养">{{ dict.getLabel("fpYesOrNo", familyInfo.specialPovertySupport) }}</el-form-item>
+                <el-form-item label="文化程度">{{ dict.getLabel("fpEducation", familyInfo.education)}}</el-form-item>
+                <el-form-item label="政治面貌">{{dict.getLabel("fpPoliticalOutlook",familyInfo.politicsStatus)}}</el-form-item>
+                <el-form-item label="在校生状况">{{dict.getLabel( "fpStudentsInSchool", familyInfo.schoolStatus)}}</el-form-item>
               </div>
               <ai-avatar :instance="instance" v-model="familyInfo.photo" :editable="false" />
             </div>
-            <el-form-item label="现住址">{{currentFullAddressFamily}}</el-form-item>
             <el-form-item label="健康状况">
               <span v-for="(item, index) in familyInfo.healthyStatusList" :key="index"><span v-if="index > 0">,</span>{{dict.getLabel("fpHealth", item)}}</span>
             </el-form-item>
+            <div flex class="half wrap">
+              <el-form-item label="残疾类别">{{dict.getLabel("fpDisabilityType", familyInfo.disabilityType)}}</el-form-item>
+              <el-form-item label="残疾办证年度">{{familyInfo.disabilityCertificateYear}}</el-form-item>
+            </div>
+            <div flex class="half wrap">
+              <el-form-item label="城乡居民基本医疗保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxCxyiliao)}}</el-form-item>
+              <el-form-item label="城镇职工基本医疗保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxCzyiliao)}}</el-form-item>
+              <el-form-item label="大病保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxDabing)}}</el-form-item>
+              <el-form-item label="商业补充医疗保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxShangye)}}</el-form-item>
+              <el-form-item label="城乡居民基本养老保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxCxyanglao)}}</el-form-item>
+              <el-form-item label="城镇职工基本养老保险">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxCzyanglao)}}</el-form-item>
+              <el-form-item label="享受人身意外保险补贴">{{dict.getLabel("fpYesOrNo", familyInfo.jcbxRenshenyiwai)}}</el-form-item>
+              <el-form-item label="享受农村最低生活保障">{{dict.getLabel("fpYesOrNo", familyInfo.bzcsNongcundibao)}}</el-form-item>
+              <el-form-item label="是否特困供养人员">{{dict.getLabel("fpYesOrNo", familyInfo.bzcsTekungongyang)}}</el-form-item>
+              <el-form-item label="分散供养五保户转集中供养（减少）">{{dict.getLabel("fpYesOrNo", familyInfo.bzcsWubaohu)}}</el-form-item>
+              <el-form-item label="是否接受医疗救助">{{dict.getLabel("fpYesOrNo", familyInfo.bzcsYiliaojiuzhu)}}</el-form-item>
+              <el-form-item label="是否接受其它健康扶贫">{{dict.getLabel("fpYesOrNo", familyInfo.bzcsQita)}}</el-form-item>
+              <el-form-item label="劳动技能">{{dict.getLabel("fpLaborSkills", familyInfo.labourStatus)}}</el-form-item>
+              <el-form-item label="是否会讲普通话">{{dict.getLabel("fpYesOrNo", familyInfo.mandarin)}}</el-form-item>
+              <el-form-item label="务工时间(月)">{{familyInfo.workeMonths}}</el-form-item>
+              <el-form-item label="就业渠道">{{familyInfo.employmentChannels}}</el-form-item>
+              <el-form-item label="务工企业名称">{{familyInfo.migrantEnterprises}}</el-form-item>
+              <el-form-item label="公益性岗位">{{familyInfo.publicWelfarePosts}}</el-form-item>
+              <el-form-item label="是否国外务工">{{dict.getLabel("fpYesOrNo", familyInfo.foreignWorkers)}}</el-form-item>
+              <el-form-item label="公益性岗位(月数)">{{familyInfo.publicWelfarePostsMonths}}</el-form-item>
+            </div>
+            <el-form-item label="务工所在地">{{familyInfo.foreignWorkersAddress}}
+            </el-form-item>
+            <div flex class="half wrap">
+              <el-form-item label="判刑收监年度">{{familyInfo.sentencingYear}} </el-form-item>
+              <el-form-item label="刑满释放">{{familyInfo.releaseFromPrisonYear}}</el-form-item>
+              <el-form-item label="死亡年度">{{familyInfo.deathYear}}</el-form-item>
+            </div>
+            <el-form-item label="现住址">{{currentFullAddressFamily}}</el-form-item>
           </el-form>
           <template slot="footer">
             <el-button @click="isShowDetail=false">关闭</el-button>