From aaf1d114072b54cb0c8f8a079352bc807149769e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 24 Dec 2021 09:33:49 +0800
Subject: [PATCH] 25832

---
 src/apps/AppResidentDocument/DetailCard.vue   |  6 +--
 src/apps/AppResidentDocument/DetailPeople.vue | 39 +++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue
index 7a8afb9f..42a506b7 100644
--- a/src/apps/AppResidentDocument/DetailCard.vue
+++ b/src/apps/AppResidentDocument/DetailCard.vue
@@ -12,7 +12,7 @@
     </div>
 
     <div class="bottom">
-      <div class="hints">家庭成员 {{ data.family.length }}人</div>
+      <div class="hints">家庭成员 {{ data.family && data.family.length }}人</div>
 
       <div v-if="data.family && data.family.length > 0">
         <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">
@@ -26,8 +26,8 @@
               <div class="rightTop-lefts">
                 <span class="names">{{ item.name }}</span>
                 <span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span>
-                <span class="householdNames" v-if="item.householdRelation == 1">户主</span>
-                <span class="householdNames" v-else>
+
+                <span class="householdNames">
                   {{ $dict.getLabel('householdRelation', item.householdRelation) }}
                 </span>
               </div>
diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue
index fcbf24d7..ad49a3a3 100644
--- a/src/apps/AppResidentDocument/DetailPeople.vue
+++ b/src/apps/AppResidentDocument/DetailPeople.vue
@@ -2,21 +2,20 @@
   <div class="DetailPeople">
     <div class="top">
       <div class="photos">
-        <img :src="data.resident.photo" alt="" v-if="data.resident.photo" />
+        <img :src="data.resident.photo" alt="" v-if="data.resident && data.resident.photo" />
         <img src="./components/img/44.png" alt="" v-else />
       </div>
 
       <div class="right">
         <div class="rightTop">
-          <span class="names">{{ data.resident.name }}</span>
+          <span class="names">{{ data.resident && data.resident.name }}</span>
 
-          <span class="householdNames" v-if="data.resident.householdRelation == 1">户主</span>
-          <span class="householdNames" v-else>
-            {{ $dict.getLabel('householdRelation', data.resident.householdRelation) }}
+          <span class="householdNames">
+            {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
           </span>
         </div>
 
-        <div class="rightBottom">{{ data.resident.phone }}</div>
+        <div class="rightBottom" v-if="data.resident && data.resident.phone">{{ data.resident.phone }}</div>
       </div>
     </div>
 
@@ -28,47 +27,47 @@
       <div class="contents">
         <div class="item">
           <span>籍贯</span>
-          <span>{{ data.resident.birthplaceAreaName }}</span>
+          <span>{{ data.resident && data.resident.birthplaceAreaName }}</span>
         </div>
 
         <div class="item">
           <span>身份证号</span>
-          <span>{{ data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
+          <span>{{ data.resident && data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
         </div>
 
         <div class="item">
           <span>民族</span>
-          <span> {{ $dict.getLabel('nation', data.resident.householdName) }}</span>
+          <span v-if="data.resident && data.resident.householdName"> {{ $dict.getLabel('nation', data.resident.householdName) }}</span>
         </div>
 
         <div class="item">
           <span>文化程度</span>
-          <span>{{ $dict.getLabel('education', data.resident.education) }}</span>
+          <span v-if="data.resident && data.resident.education">{{ $dict.getLabel('education', data.resident.education) }}</span>
         </div>
 
         <div class="item">
           <span>婚姻状况</span>
-          <span>{{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }}</span>
+          <span v-if="data.resident && data.resident.maritalStatus">{{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }}</span>
         </div>
 
         <div class="item">
           <span>政治面貌</span>
-          <span>{{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }}</span>
+          <span v-if="data.resident && data.resident.politicsStatus">{{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }}</span>
         </div>
 
         <div class="item">
           <span>兵役状况</span>
-          <span>{{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }}</span>
+          <span v-if="data.resident && data.resident.militaryStatus">{{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }}</span>
         </div>
 
         <div class="item">
           <span>宗教信仰</span>
-          <span>{{ $dict.getLabel('faithType', data.resident.faithType) }}</span>
+          <span v-if="data.resident && data.resident.faithType">{{ $dict.getLabel('faithType', data.resident.faithType) }}</span>
         </div>
 
         <div class="item">
           <span>职业</span>
-          <span>{{ $dict.getLabel('job', data.resident.job) }}</span>
+          <span v-if="data.resident && data.resident.job">{{ $dict.getLabel('job', data.resident.job) }}</span>
         </div>
       </div>
     </div>
@@ -81,27 +80,27 @@
       <div class="contents">
         <div class="item">
           <span>联系方式</span>
-          <span class="phones" @click="callPhone(data.resident.phone)">{{ data.resident.phone }}</span>
+          <span class="phones" v-if="data.resident && data.resident.phone" @click="callPhone(data.resident.phone)">{{ data.resident.phone }}</span>
         </div>
 
         <div class="item">
           <span>现住址</span>
-          <span>{{ data.resident.currentAreaName }}</span>
+          <span v-if="data.resident && data.resident.currentAreaName">{{ data.resident.currentAreaName }}</span>
         </div>
 
         <div class="item">
           <span>现住详细地址</span>
-          <span>{{ data.resident.currentAddress }}</span>
+          <span v-if="data.resident && data.resident.currentAddress">{{ data.resident.currentAddress }}</span>
         </div>
 
         <div class="item">
           <span>户籍地址</span>
-          <span>{{ data.resident.householdAreaName }}</span>
+          <span v-if="data.resident && data.resident.householdAreaName">{{ data.resident.householdAreaName }}</span>
         </div>
 
         <div class="item">
           <span>户籍详细地址</span>
-          <span>{{ data.resident.householdAddress }}</span>
+          <span v-if="data.resident && data.resident.householdAddress">{{ data.resident.householdAddress }}</span>
         </div>
       </div>
     </div>