Merge remote-tracking branch 'origin/dev' into dev

src/project/police/AppPeopleList/DetailPeople.vue

@@ -10,33 +10,12 @@
       <div class="right">
         <div class="rightTop">
           <span class="names">{{ data.resident && data.resident.name }}<span v-if="data.resident.fileStatus == 1" class="fileStatuss"> 已注销 </span></span>
-          <span class="householdNames" v-if="data.resident && data.resident.householdName == 1">户主</span>
-          <span class="householdNames" v-else>
-            {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
-          </span>
         </div>
-
         <div class="rightBottom" v-if="data.resident && data.resident.phone">{{ data.resident.phone }}</div>
       </div>
     </div>
 
     <div class="line"></div>
-
-    <div class="tab-list">
-      <div v-for="(item, index) in tabList" :key="index" :class="tabIndex == index ? 'tab-item active' : 'tab-item' " @click="tabIndex=index">
-        <div v-if="index == 0">
-          <img :src="item.activeIcon" alt="" v-if="tabIndex==0">
-          <img :src=" item.icon" alt="" v-if="tabIndex!=0">
-        </div>
-        <div v-if="index != 0">
-          <img src="./components/img/tsrq备份@2x.png" alt="" v-if="tabIndex==index && index != 0">
-          <img src="./components/img/tsrq@2x.png" alt="" v-if="tabIndex!=index && index != 0">
-        </div>
-        
-        <p v-if="index==0">{{item.name}}</p>
-        <p v-else class="type">{{item.applicationName}}</p>
-      </div>
-    </div>
     <!-- 基本信息 -->
     <div v-if="tabIndex == 0">
       <div class="middle">
@@ -50,7 +29,22 @@
 
         <div class="item">
           <span>身份证号</span>
-          <span>{{ data.resident && data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
+          <span>{{ data.resident.idNumber}}</span>
+        </div>
+
+        <div class="item">
+          <span>性别</span>
+          <span v-if="data.resident && data.resident.sex"> {{ $dict.getLabel('sex', data.resident.sex) }}</span>
+        </div>
+
+        <div class="item">
+          <span>出生日期</span>
+          <span v-if="data.resident && data.resident.birthDate"> {{ data.resident.birthDate }}</span>
+        </div>
+
+        <div class="item">
+          <span>年龄</span>
+          <span v-if="data.resident && data.resident.age"> {{ data.resident.age }}</span>
         </div>
 
         <div class="item">
@@ -111,16 +105,6 @@
           <span class="value" v-if="data.resident && data.resident.currentAddressGroup">{{ data.resident.currentAddressGroup }}组{{ data.resident.currentAddressNo }}户</span>
         </div>
 
-        <div class="item">
-          <span class="label">户籍地址</span>
-          <span class="value" v-if="data.resident && data.resident.householdAreaName">{{ data.resident.householdAreaName }}</span>
-        </div>
-
-        <div class="item">
-          <span class="label">户籍详细地址</span>
-          <span class="value" v-if="data.resident && data.resident.householdAddress">{{ data.resident.householdAddress }}</span>
-        </div>
-
         <div class="item" v-if="type == 1 && data.resident.auditStatus != 0">
           <span class="label">处理结果</span>
           <span class="value">{{ data.resident.auditStatus == 1 ? '通过' : '不通过' }}</span>
@@ -167,8 +151,6 @@ export default {
       tabIndex: 0,
     }
   },
-  computed: {},
-  watch: {},
   onLoad(o) {
     this.id = o.id
     this.type = o.type
@@ -180,7 +162,7 @@ export default {
     })
   },
   onShow() {
-    document.title = '家庭成员信息'
+    document.title = '居民详情'
   },
   methods: {
     getDetail() {