diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 85ab77d7..fc9dd154 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -3,22 +3,30 @@
     <ai-detail>
       <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>
+          <el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit"
+                     v-if="$permissions('app_apppreventionreturntopoverty_edit')">编辑
+          </el-button>
           <template v-if="isGridAdmin">
             <template v-if="detail.status == 0 || detail.status == 4">
-              <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="girdAdminApplyStatus != 1">纳入监测</el-button>
-              <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="girdAdminApplyStatus == 1">纳入监测审批</el-button>
+              <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="girdAdminApplyStatus != 1">纳入监测
+              </el-button>
+              <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="girdAdminApplyStatus == 1">纳入监测审批
+              </el-button>
             </template>
             <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 3">纳入监测</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>
           </template>
           <template v-if="user.info.girdCheckType == 1">
-            <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 4 || detail.status == 3">申请纳入监测</el-button>
+            <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)"
+                       v-if="detail.status == 4 || detail.status == 3">申请纳入监测
+            </el-button>
             <el-button type="primary" @click="applyMonitor('申请解除风险', 3)" v-if="detail.status == 1">申请解除风险</el-button>
           </template>
           <template v-if="detail.status == 3 || detail.status == 4">
-            <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && user.info.girdCheckType != 0" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
+            <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && user.info.girdCheckType != 0"
+                       icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除
+            </el-button>
           </template>
         </template>
       </ai-title>
@@ -30,96 +38,123 @@
                 <template #content>
                   <div flex class="flex-start">
                     <div flex class="half wrap fill">
-                      <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="联系电话">{{ 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>
+                      <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>
+                    <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="残疾办证年度">{{dict.getLabel("fpYear", detail.disabilityCertificateYear)}}</el-form-item>
+                    <el-form-item label="残疾类别">{{ dict.getLabel("fpDisabilityType", detail.disabilityType) }}
+                    </el-form-item>
+                    <el-form-item label="残疾办证年度">{{ dict.getLabel("fpYear", detail.disabilityCertificateYear) }}
+                    </el-form-item>
                   </div>
                   <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>
-                    <el-form-item label="就业渠道">{{dict.getLabel("fpEmploymentChannels", 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>
+                    <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>
+                    <el-form-item label="就业渠道">{{ dict.getLabel("fpEmploymentChannels", 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 label="务工所在地">{{ detail.foreignWorkersAddress }}
                   </el-form-item>
-                  <el-form-item label="现住址">{{currentFullAddress}}</el-form-item>
+                  <el-form-item label="现住址">{{ currentFullAddress }}</el-form-item>
                 </template>
               </ai-card>
               <ai-card title="生产生活条件">
                 <template slot="content">
                   <div flex class="half wrap">
-                    <el-form-item label="住房面积(m²)">{{detail.houseArea}}</el-form-item>
-                    <el-form-item label="户类型">{{ dict.getLabel("fpHouseType", 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>
+                    <el-form-item label="住房面积(m²)">{{ detail.houseArea }}</el-form-item>
+                    <el-form-item label="户类型">{{ dict.getLabel("fpHouseType", 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>
               <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="脱贫年度">{{ dict.getLabel("fpYear", 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>
+                    <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="脱贫年度">{{ dict.getLabel("fpYear", 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.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>
@@ -129,45 +164,46 @@
               <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>
+                    <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="风险消除情况" v-if="detail.status == 3">
                 <template slot="content">
                   <div flex class="half wrap">
-                    <el-form-item label="工资性收入情况">{{detail.fxxcIncome1}}</el-form-item>
-                    <el-form-item label="生产经营性收入情况">{{detail.fxxcIncome2}}</el-form-item>
-                    <el-form-item label="财产性收入情况">{{detail.fxxcIncome3}}</el-form-item>
-                    <el-form-item label="转移性收入情况">{{detail.fxxcIncome4}}</el-form-item>
-                    <el-form-item label="理赔收入情况">{{detail.fxxcIncome5}}</el-form-item>
-                    <el-form-item label="生产经营性支出情况">{{detail.fxxcIncome6}}</el-form-item>
-                    <el-form-item label="合规自然收支情况">{{detail.fxxcIncome7}}</el-form-item>
-                    <el-form-item label="家庭纯收入情况">{{detail.fxxcIncome8}}</el-form-item>
-                    <el-form-item label="家庭人均纯收入情况">{{detail.fxxcIncome9}}</el-form-item>
+                    <el-form-item label="工资性收入情况">{{ detail.fxxcIncome1 }}</el-form-item>
+                    <el-form-item label="生产经营性收入情况">{{ detail.fxxcIncome2 }}</el-form-item>
+                    <el-form-item label="财产性收入情况">{{ detail.fxxcIncome3 }}</el-form-item>
+                    <el-form-item label="转移性收入情况">{{ detail.fxxcIncome4 }}</el-form-item>
+                    <el-form-item label="理赔收入情况">{{ detail.fxxcIncome5 }}</el-form-item>
+                    <el-form-item label="生产经营性支出情况">{{ detail.fxxcIncome6 }}</el-form-item>
+                    <el-form-item label="合规自然收支情况">{{ detail.fxxcIncome7 }}</el-form-item>
+                    <el-form-item label="家庭纯收入情况">{{ detail.fxxcIncome8 }}</el-form-item>
+                    <el-form-item label="家庭人均纯收入情况">{{ detail.fxxcIncome9 }}</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>
+                  <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">
@@ -183,116 +219,133 @@
               </ai-card>
               <div style="height:20px;"></div>
             </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" />
+            <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"/>
             </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">
+        <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-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="phone">
-                  <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit />
+                  <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
                 </el-form-item>
                 <el-form-item label="证件号码" prop="idNumber">
-                  <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="18" :disabled="isEdit || isSelectUser" @change="handleIdNumberAutocomplete" />
+                  <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 />
+                <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="householdRelation">
-                <ai-select v-model="form.householdRelation" :selectList="dict.getDict('fpRelationship')" />
+                <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> -->
               <el-form-item label="民族">
-                <ai-select v-model="form.nation" :selectList="dict.getDict('fpNation')" />
+                <ai-select v-model="form.nation" :selectList="dict.getDict('fpNation')"/>
               </el-form-item>
               <el-form-item label="文化程度">
-                <ai-select v-model="form.education" :selectList="dict.getDict('fpEducation')" />
+                <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')" />
+                <ai-select v-model="form.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')"/>
               </el-form-item>
               <el-form-item label="在校生状况">
-                <ai-select v-model="form.schoolStatus" :selectList="dict.getDict('fpStudentsInSchool')" />
+                <ai-select v-model="form.schoolStatus" :selectList="dict.getDict('fpStudentsInSchool')"/>
               </el-form-item>
             </div>
             <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 :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="请选择" />
+                <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-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 :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 :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')" />
+                <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="请选择" />
+                <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择"/>
               </el-form-item>
               <el-form-item label="务工时间(月)">
-                <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable @input="numberInput('workeMonths')" />
+                <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable
+                          @input="numberInput('workeMonths')"/>
               </el-form-item>
               <el-form-item label="就业渠道">
-                <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')" />
+                <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')"/>
               </el-form-item>
               <el-form-item label="务工企业名称">
-                <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable />
+                <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable/>
               </el-form-item>
               <el-form-item label="公益性岗位">
-                <el-input v-model="form.publicWelfarePosts" placeholder="请输入" clearable />
+                <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="请选择" />
+                <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择"/>
               </el-form-item>
               <el-form-item label="公益性岗位(月数)">
-                <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable @input="numberInput('publicWelfarePostsMonths')" />
+                <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable
+                          @input="numberInput('publicWelfarePostsMonths')"/>
               </el-form-item>
             </div>
             <el-form-item label="务工所在地">
-              <el-input v-model="form.foreignWorkersAddress" placeholder="请输入" clearable maxlength="30" show-word-limit />
+              <el-input v-model="form.foreignWorkersAddress" placeholder="请输入" clearable maxlength="30"
+                        show-word-limit/>
             </el-form-item>
             <el-form-item label="现住址" prop="currentAreaId">
-              <ai-area-get :instance="instance" v-model="form.currentAreaId" :root="rootArea" valueLevel="5" />
+              <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-input v-model="form.currentAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable/>
               </el-form-item>
             </el-form-item>
           </el-form>
@@ -301,66 +354,72 @@
           <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="联系电话">{{ 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="联系电话">{{ 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="年龄" 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("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>
+                <el-form-item label="民族">{{ dict.getLabel("fpNation", familyInfo.nation) }}</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" />
+              <ai-avatar :instance="instance" v-model="familyInfo.photo" :editable="false"/>
             </div>
             <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>
+              <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>
+              <el-form-item label="残疾类别">{{ dict.getLabel("fpDisabilityType", familyInfo.disabilityType) }}</el-form-item>
+              <el-form-item label="残疾办证年度">{{ dict.getLabel("fpYear", 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="就业渠道">{{dict.getLabel("fpEmploymentChannels", 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>
+              <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="就业渠道">{{ dict.getLabel("fpEmploymentChannels", 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>
-            <el-form-item label="现住址">{{currentFullAddressFamily}}</el-form-item>
+            <el-form-item label="务工所在地">{{ familyInfo.foreignWorkersAddress }}</el-form-item>
+            <el-form-item label="现住址">{{ currentFullAddressFamily }}</el-form-item>
           </el-form>
           <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">
+        <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">
@@ -379,16 +438,18 @@
           </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;" />
+            <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">
@@ -400,7 +461,8 @@
                 </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">
@@ -416,7 +478,7 @@
             <p>审核成功</p>
           </div>
           <template slot="footer" v-if="examineStep != 3">
-            <el-button @click="cancelExamine">{{examineStep == 2 ? '上一步' : '取消'}}</el-button>
+            <el-button @click="cancelExamine">{{ examineStep == 2 ? '上一步' : '取消' }}</el-button>
             <el-button type="primary" @click="examineNext">下一步</el-button>
           </template>
           <template slot="footer" v-if="examineStep == 3">
@@ -429,13 +491,13 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
+import {mapState} from "vuex";
 import HrMeasure from "./detail/hrMeasure";
 import HrLog from "./detail/hrLog";
 
 export default {
   name: "hrDetail",
-  components: { HrLog, HrMeasure },
+  components: {HrLog, HrMeasure},
   props: {
     instance: Function,
     dict: Object,
@@ -450,47 +512,47 @@ export default {
           prop: "householdRelation",
           dict: "fpRelationship",
         },
-        { label: "姓名", prop: "name" },
-        { label: "性别", prop: "sex", dict: "sex" },
-        { label: "年龄", prop: "age" },
+        {label: "姓名", prop: "name"},
+        {label: "性别", prop: "sex", dict: "sex"},
+        {label: "年龄", prop: "age"},
         {
           label: "证件号",
-          render: (h, { row }) =>
-            h("p", null, this.idCardNoUtil.hideId(row.idNumber)),
+          render: (h, {row}) =>
+              h("p", null, this.idCardNoUtil.hideId(row.idNumber)),
         },
-        { slot: "options" },
+        {slot: "options"},
       ];
     },
     isGridAdmin() {
       return this.user.info.girdCheckType == 2;
     },
     currentFullAddress() {
-      let { countyName, townName, villageName, currentAddress } = this.detail;
+      let {countyName, townName, villageName, currentAddress} = this.detail;
       return [countyName, townName, villageName, currentAddress].join("");
     },
     currentFullAddressFamily() {
-      let { countyName, townName, villageName, currentAddress } = this.familyInfo;
+      let {countyName, townName, villageName, currentAddress} = this.familyInfo;
       return [countyName, townName, villageName, currentAddress].join("");
     },
     rules() {
       return {
-        idNumber: [{ required: true, message: "请输入证件号" }],
-        name: [{ required: true, message: "请输入姓名" }],
-        sex: [{ required: true, message: "请选择性别" }],
-        phone: [{ required: true, message: "请输入联系方式" }],
+        idNumber: [{required: true, message: "请输入证件号"}],
+        name: [{required: true, message: "请输入姓名"}],
+        sex: [{required: true, message: "请选择性别"}],
+        phone: [{required: true, message: "请输入联系方式"}],
         currentAreaId: [
-          { required: true, message: "请选择现住址" },
-          { pattern: /[^0]0{0,2}$/, message: "请选择到村/社区" },
+          {required: true, message: "请选择现住址"},
+          {pattern: /[^0]0{0,2}$/, message: "请选择到村/社区"},
         ],
-        isHousehold: [{ required: true, message: "请选择是否户主" }],
-        householdRelation: [{ required: true, message: "请选择与户主关系" }],
-        householdIdNumber: [{ required: true, message: "请选择户主证件号" }],
+        isHousehold: [{required: true, message: "请选择是否户主"}],
+        householdRelation: [{required: true, message: "请选择与户主关系"}],
+        householdIdNumber: [{required: true, message: "请选择户主证件号"}],
       };
     },
     rulesApply() {
       return {
-        riskType: [{ required: true, message: "请选择风险因素" }],
-        riskEliminationMethod: [{ required: true, message: "请选择风险消除方式" }],
+        riskType: [{required: true, message: "请选择风险因素"}],
+        riskEliminationMethod: [{required: true, message: "请选择风险消除方式"}],
       };
     },
     rootArea() {
@@ -522,7 +584,7 @@ export default {
       detail: {},
       currentTab: "",
       isShowAdd: false,
-      form: { healthyStatusList: [], basicsList: [], guaranteeList: [] },
+      form: {healthyStatusList: [], basicsList: [], guaranteeList: []},
       isEdit: false,
       isShowDetail: false,
       familyInfo: {},
@@ -533,7 +595,7 @@ export default {
       isShowExamine: false,
       examineInfo: {},
       examineStep: 1, //审批步骤
-      examineFrom: { pass: 1 },
+      examineFrom: {pass: 1},
       applyFileList: [],
       examineFileList: [],
       changeStatus: 0,  //操作状态 0:申请纳入监测 1:纳入监测 2:纳入监测审批 3:申请解除风险 4:解除风险 5:解除风险审批
@@ -579,7 +641,7 @@ export default {
       if (row && row.guaranteeCheck) {
         row.guaranteeList = row.guaranteeCheck.split(',')
       }
-      this.form = { ...row }
+      this.form = {...row}
       this.isShowAdd = true
     },
     viewFamily(row) {
@@ -595,7 +657,7 @@ export default {
       if (row.guaranteeCheck) {
         row.guaranteeList = row.guaranteeCheck.split(',')
       }
-      this.familyInfo = { ...row }
+      this.familyInfo = {...row}
       this.isShowDetail = true
     },
     delFamily(row) {
@@ -612,8 +674,8 @@ export default {
       })
     },
     handleIdNumberAutocomplete(v) {
-      let { birthday: birthDate, sex } = this.idCardNoUtil.getIdCardInfo(v);
-      this.form = { ...this.form, birthDate, sex, age: this.$calcAge(v) };
+      let {birthday: birthDate, sex} = this.idCardNoUtil.getIdCardInfo(v);
+      this.form = {...this.form, birthDate, sex, age: this.$calcAge(v)};
     },
     onConfirm() {
       this.$refs.ruleForm.validate((v) => {
@@ -629,19 +691,19 @@ export default {
           if (this.form.guaranteeList.length) {
             this.form.guaranteeCheck = this.form.basicsList.join(',')
           }
-          this.checkInit('jcbxCxyiliao',this.form.basicsList, '0')
-          this.checkInit('jcbxCzyiliao',this.form.basicsList, '1')
-          this.checkInit('jcbxDabing',this.form.basicsList, '2')
-          this.checkInit('jcbxShangye',this.form.basicsList, '3')
-          this.checkInit('jcbxCxyanglao',this.form.basicsList, '4')
-          this.checkInit('jcbxCzyanglao',this.form.basicsList, '5')
-          this.checkInit('jcbxRenshenyiwai',this.form.basicsList, '6')
+          this.checkInit('jcbxCxyiliao', this.form.basicsList, '0')
+          this.checkInit('jcbxCzyiliao', this.form.basicsList, '1')
+          this.checkInit('jcbxDabing', this.form.basicsList, '2')
+          this.checkInit('jcbxShangye', this.form.basicsList, '3')
+          this.checkInit('jcbxCxyanglao', this.form.basicsList, '4')
+          this.checkInit('jcbxCzyanglao', this.form.basicsList, '5')
+          this.checkInit('jcbxRenshenyiwai', this.form.basicsList, '6')
 
-          this.checkInit('bzcsNongcundibao',this.form.guaranteeList, '0')
-          this.checkInit('bzcsTekungongyang',this.form.guaranteeList, '1')
-          this.checkInit('bzcsWubaohu',this.form.guaranteeList, '2')
-          this.checkInit('bzcsYiliaojiuzhu',this.form.guaranteeList, '3')
-          this.checkInit('bzcsQita',this.form.guaranteeList, '4')
+          this.checkInit('bzcsNongcundibao', this.form.guaranteeList, '0')
+          this.checkInit('bzcsTekungongyang', this.form.guaranteeList, '1')
+          this.checkInit('bzcsWubaohu', this.form.guaranteeList, '2')
+          this.checkInit('bzcsYiliaojiuzhu', this.form.guaranteeList, '3')
+          this.checkInit('bzcsQita', this.form.guaranteeList, '4')
           this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
             if (res.code == 0) {
               this.getDetail()
@@ -653,9 +715,9 @@ export default {
       });
     },
     checkInit(formName, list, value) {
-      if(list.includes(value)) {
+      if (list.includes(value)) {
         this.form[formName] = '01'
-      }else {
+      } else {
         this.form[formName] = '02'
       }
     },
@@ -666,42 +728,42 @@ export default {
       this.$router.push({});
     },
     getDetail() {
-      let { id } = this.$route.query;
+      let {id} = this.$route.query;
       id &&
-        this.instance
-          .post("/app/apppreventionreturntopoverty/queryDetailById", null, {
-            params: { id },
-          })
-          .then((res) => {
-            if (res?.data) {
-              this.detail = res.data;
-              this.detail.family?.map((e) => {
-                e.householdRelation = e.householdRelation || "户主";
-              });
-
-              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) {
-                this.instance.post(`/app/apppreventionreturntopoverty/popup?id=${this.detail.id}`).then(res => {
-                  if (res.code == 0 && res.data) { //纳入监测审批
-                    this.girdAdminApplyStatus = 1
-                  }
-                })
-              }
-            }
+      this.instance
+      .post("/app/apppreventionreturntopoverty/queryDetailById", null, {
+        params: {id},
+      })
+      .then((res) => {
+        if (res?.data) {
+          this.detail = res.data;
+          this.detail.family?.map((e) => {
+            e.householdRelation = e.householdRelation || "户主";
           });
+
+          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) {
+            this.instance.post(`/app/apppreventionreturntopoverty/popup?id=${this.detail.id}`).then(res => {
+              if (res.code == 0 && res.data) { //纳入监测审批
+                this.girdAdminApplyStatus = 1
+              }
+            })
+          }
+        }
+      });
     },
     gotoEdit() {
-      let { query } = this.$route;
-      this.$router.push({ query, hash: "#add" });
+      let {query} = this.$route;
+      this.$router.push({query, hash: "#add"});
     },
     applyMonitor(title, status) {
       this.dialogTitle = title
@@ -768,7 +830,7 @@ export default {
         for (let key in this.examineFrom) {
           fromData.append(key, this.examineFrom[key])
         }
-        this.instance.post(url, fromData ).then(res => {
+        this.instance.post(url, fromData).then(res => {
           if (res.code == 0) {
             this.getDetail()
             this.$message.success('提交成功!');
@@ -777,7 +839,7 @@ export default {
       }
       if (this.examineStep == 3) {
         this.isShowExamine = false
-        this.examineFrom = { pass: 1 }
+        this.examineFrom = {pass: 1}
         return
       }
       this.examineStep++
@@ -790,7 +852,7 @@ export default {
     },
     handleDelete(ids) {
       this.$confirm("是否要删除监测对象").then(() => {
-        this.instance.post("/app/apppreventionreturntopoverty/delete", null, { params: { ids: ids?.toString() }, }).then((res) => {
+        this.instance.post("/app/apppreventionreturntopoverty/delete", null, {params: {ids: ids?.toString()},}).then((res) => {
           if (res?.code == 0) {
             this.$message.success("删除成功!");
             this.back();
@@ -799,7 +861,7 @@ export default {
       })
     },
     numberInput(name) {
-      if(!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])){
+      if (!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])) {
         this.form[name] = ''
         return this.$message.error('请输入正整数')
       }
@@ -838,10 +900,12 @@ export default {
   .success {
     text-align: center;
     padding-top: 20px;
+
     .el-icon-success {
       color: rgb(46, 162, 34);
       font-size: 100px;
     }
+
     p {
       text-align: center;
       font-size: 16px;
@@ -866,16 +930,20 @@ export default {
   ::v-deep .el-step__icon {
     border-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 .is-finish {
     color: #26f !important;
   }
+
   ::v-deep .is-finish .el-step__icon {
     border-color: #26f !important;
   }