This commit is contained in:
liuye
2022-03-18 11:28:52 +08:00
parent 5f60e1e1da
commit eee2cd7985
2 changed files with 2 additions and 3 deletions

View File

@@ -56,6 +56,7 @@
</u-row> </u-row>
</div> </div>
<div class="footer cancel" v-if="detail.status == 2 && data.joinStatus == 0">签到</div>
<div class="footer cancel" v-if="detail.status==1 && detail.createUserId == user.id" @click="handleCancel">取消会议</div> <div class="footer cancel" v-if="detail.status==1 && detail.createUserId == user.id" @click="handleCancel">取消会议</div>
<template v-else> <template v-else>
@@ -68,8 +69,6 @@
</div> </div>
<div @click="updateStatus(1)">确认会议</div> <div @click="updateStatus(1)">确认会议</div>
</div> </div>
<div class="footer cancel" v-else>签到</div>
<!-- <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus!=0">--> <!-- <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus!=0">-->
<!-- <label>{{ detail.joinStatus|transform }}</label>--> <!-- <label>{{ detail.joinStatus|transform }}</label>-->
<!-- <img :src="$cdn + tag(detail.joinStatus)" alt="">--> <!-- <img :src="$cdn + tag(detail.joinStatus)" alt="">-->

View File

@@ -8,7 +8,7 @@
<div class="right"> <div class="right">
<div class="rightTop"> <div class="rightTop">
<span class="names">{{ data.resident && data.resident.name }}<span class="fileStatuss" v-if="data.fileStatus == 1">已注销</span></span> <span class="names">{{ data.resident && data.resident.name }}<span class="fileStatuss" v-if="data.resident.fileStatus == 1">已注销</span></span>
<span class="householdNames" v-if="data.resident && data.resident.householdName == 1">户主</span> <span class="householdNames" v-if="data.resident && data.resident.householdName == 1">户主</span>
<span class="householdNames" v-else> <span class="householdNames" v-else>
{{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }} {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}