From eee2cd79854ceff6b6f6a3831182d10eae78e661 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 18 Mar 2022 11:28:52 +0800
Subject: [PATCH] 28322

---
 src/apps/AppMeetingNotice/detail.vue          | 3 +--
 src/saas/AppResidentDocument/DetailPeople.vue | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppMeetingNotice/detail.vue b/src/apps/AppMeetingNotice/detail.vue
index 58eb8cd0..ca4b2df0 100644
--- a/src/apps/AppMeetingNotice/detail.vue
+++ b/src/apps/AppMeetingNotice/detail.vue
@@ -56,6 +56,7 @@
         </u-row>
       </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>
       
       <template v-else>
@@ -68,8 +69,6 @@
           </div>
           <div @click="updateStatus(1)">确认会议</div>
         </div>
-        <div class="footer cancel" v-else>签到</div>
-
         <!--        <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus!=0">-->
         <!--          <label>{{ detail.joinStatus|transform }}</label>-->
         <!--          <img :src="$cdn + tag(detail.joinStatus)" alt="">-->
diff --git a/src/saas/AppResidentDocument/DetailPeople.vue b/src/saas/AppResidentDocument/DetailPeople.vue
index 5251a3ce..edeaf906 100644
--- a/src/saas/AppResidentDocument/DetailPeople.vue
+++ b/src/saas/AppResidentDocument/DetailPeople.vue
@@ -8,7 +8,7 @@
 
       <div class="right">
         <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-else>
             {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}