kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

Browse Source
This commit is contained in:
花有清香月有阴
2021-12-24 19:44:44 +08:00
parent 2aabf97bd0 9ac4b84ccb
commit 9f55d3a6ee
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/apps/AppResidentDocument/DetailCard.vue
View File

@@ -27,8 +27,8 @@
<div class="rightTop-lefts"> <div class="rightTop-lefts">
<span class="names">{{ item.name }}</span> <span class="names">{{ item.name }}</span>
<span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span> <span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span>
<span class="householdNames" v-if="item.householdName == 1">户主</span>
<span class="householdNames"> <span class="householdNames" v-else>
{{ $dict.getLabel('householdRelation', item.householdRelation) }} {{ $dict.getLabel('householdRelation', item.householdRelation) }}
</span> </span>
</div> </div>

6
src/apps/AppResidentDocument/DetailPeople.vue
View File

@@ -9,8 +9,8 @@
<div class="right"> <div class="right">
<div class="rightTop"> <div class="rightTop">
<span class="names">{{ data.resident && data.resident.name }}</span> <span class="names">{{ data.resident && data.resident.name }}</span>
<span class="householdNames" v-if="data.resident.householdName == 1">户主</span>
<span class="householdNames"> <span class="householdNames" v-else>
{{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }} {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
</span> </span>
</div> </div>
@@ -37,7 +37,7 @@
<div class="item"> <div class="item">
<span>民族</span> <span>民族</span>
<span v-if="data.resident && data.resident.householdName"> {{ $dict.getLabel('nation', data.resident.householdName) }}</span> <span v-if="data.resident && data.resident.nation"> {{ $dict.getLabel('nation', data.resident.nation) }}</span>
</div> </div>
<div class="item"> <div class="item">