From 84f60ce32f6c25ce2bb8b202d9fae5aefdcff16b Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 28 Mar 2022 16:33:45 +0800
Subject: [PATCH] BUG 28576

---
 .../jianping/AppHelpedResident/hrDetail.vue   | 47 +++++++++++++++----
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 21656f68..7bf5e26b 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -83,7 +83,7 @@
               <ai-card title="联络信息">
                 <template slot="content">
                   <el-form-item label="联系方式" prop="phone">{{ detail.phone }}</el-form-item>
-                  <el-form-item label="现住址">{{ detail.currentAreaName }}{{ detail.currentAddress }}</el-form-item>
+                  <el-form-item label="现住址">{{ currentFullAddress }}</el-form-item>
                 </template>
               </ai-card>
               <ai-card title="家庭情况">
@@ -127,21 +127,44 @@
                 <ai-card title="帮扶情况">
                   <template slot="content">
                     <div flex class="half wrap">
-                      <el-form-item label="产业帮扶">{{ dict.getLabel('fpIndustrialAssistance', detail.industrialAssistance) }}</el-form-item>
-                      <el-form-item label="健康帮扶">{{ dict.getLabel('fpHealthAssistance', detail.healthAssistance) }}</el-form-item>
-                      <el-form-item label="就业帮扶">{{ dict.getLabel('fpEmploymentAssistance', detail.employmentAssistance) }}</el-form-item>
-                      <el-form-item label="教育帮扶">{{ dict.getLabel('fpEducationalAssistance', detail.educationalAssistance) }}</el-form-item>
-                      <el-form-item label="金融帮扶">{{ dict.getLabel('fpFnancialAssistance', detail.financialAssistance) }}</el-form-item>
-                      <el-form-item label="社会帮扶">{{ dict.getLabel('fpSocialAssistance', detail.socialAssistance) }}</el-form-item>
-                      <el-form-item label="公益岗帮扶">{{ dict.getLabel('fpPublicWelfarePostAssistance', detail.publicWelfarePostAssistance) }}</el-form-item>
-                      <el-form-item label="是否风险消除">{{ dict.getLabel('fpYesOrNo', detail.riskEliminated) }}</el-form-item>
+                      <el-form-item label="产业帮扶">{{
+                          dict.getLabel('fpIndustrialAssistance', detail.industrialAssistance)
+                        }}
+                      </el-form-item>
+                      <el-form-item label="健康帮扶">{{
+                          dict.getLabel('fpHealthAssistance', detail.healthAssistance)
+                        }}
+                      </el-form-item>
+                      <el-form-item label="就业帮扶">{{
+                          dict.getLabel('fpEmploymentAssistance', detail.employmentAssistance)
+                        }}
+                      </el-form-item>
+                      <el-form-item label="教育帮扶">
+                        {{ dict.getLabel('fpEducationalAssistance', detail.educationalAssistance) }}
+                      </el-form-item>
+                      <el-form-item label="金融帮扶">{{
+                          dict.getLabel('fpFnancialAssistance', detail.financialAssistance)
+                        }}
+                      </el-form-item>
+                      <el-form-item label="社会帮扶">{{
+                          dict.getLabel('fpSocialAssistance', detail.socialAssistance)
+                        }}
+                      </el-form-item>
+                      <el-form-item label="公益岗帮扶">
+                        {{ dict.getLabel('fpPublicWelfarePostAssistance', detail.publicWelfarePostAssistance) }}
+                      </el-form-item>
+                      <el-form-item label="是否风险消除">{{
+                          dict.getLabel('fpYesOrNo', detail.riskEliminated)
+                        }}
+                      </el-form-item>
                       <el-form-item label="风险消除日期">{{ detail.riskEliminatedTime }}</el-form-item>
                     </div>
                   </template>
                 </ai-card>
                 <ai-card title="家庭成员">
                   <template #content>
-                    <ai-table :tableData="detail.family" :colConfigs="colConfigs" :dict="dict" :isShowPagination="false">
+                    <ai-table :tableData="detail.family" :colConfigs="colConfigs" :dict="dict"
+                              :isShowPagination="false">
                       <el-table-column slot="options" label="操作" align="center">
                         <template slot-scope="{row}">
                           <el-button type="text" @click="$router.push({query:{id:row.id}})">详情</el-button>
@@ -219,6 +242,10 @@ export default {
     },
     isGridAdmin() {
       return this.user.info.girdCheckType == 2
+    },
+    currentFullAddress() {
+      let {countyName, townName, villageName, currentAddress} = this.detail
+      return [countyName, townName, villageName, currentAddress].join("")
     }
   },
   watch: {