From 32f8f3ec793e08214c24916cd22fb55779a9ef17 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 1 Jul 2022 17:54:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/heart/heartForm.vue        |  1 +
 .../communityParty/heart/heartList.vue        |  7 ++--
 .../communityParty/heart/heartPerson.vue      | 35 +++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue
index 6d0d71a6..967072c6 100644
--- a/src/views/modules/communityParty/heart/heartForm.vue
+++ b/src/views/modules/communityParty/heart/heartForm.vue
@@ -293,6 +293,7 @@
             </div>
           </div>
         </el-form-item>
+
         <el-form-item v-if="formData.summaryFlag"
                       label="活动回顾"
                       prop="summaryContentHtml"
diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue
index 8df10ade..37c2f935 100644
--- a/src/views/modules/communityParty/heart/heartList.vue
+++ b/src/views/modules/communityParty/heart/heartList.vue
@@ -278,11 +278,12 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'查看人员'"
-               width="1350px"
+               width="1550px"
                top="5vh"
                class="dialog-h"
                @closed="personDiaClose">
-      <heart-person ref="ref_person"></heart-person>
+      <heart-person ref="ref_person"
+                    :status="status"></heart-person>
     </el-dialog>
 
     <!-- 活动结束弹出框 -->
@@ -394,6 +395,7 @@ export default {
       actStartTime: '',
       actEndTime: '',
       reward: null,
+      status: '',
 
       cancelReason: '',
       cancleShow: false,//活动取消
@@ -514,6 +516,7 @@ export default {
       })
     },
     handlePerson (row) {
+      this.status = row.status
       this.personShow = true
       this.$nextTick(() => {
         this.$refs.ref_person.initTable(row.actId)
diff --git a/src/views/modules/communityParty/heart/heartPerson.vue b/src/views/modules/communityParty/heart/heartPerson.vue
index f2043e1d..0acab6d6 100644
--- a/src/views/modules/communityParty/heart/heartPerson.vue
+++ b/src/views/modules/communityParty/heart/heartPerson.vue
@@ -75,6 +75,23 @@
                          label="报名时间"
                          width="180">
 
+        </el-table-column>
+
+        <el-table-column v-if="status==='finished'"
+                         prop="signInFlagShow"
+                         header-align="center"
+                         align="center"
+                         label="是否签到"
+                         width="100">
+
+        </el-table-column>
+        <el-table-column v-if="status==='finished'"
+                         prop="rewardFlagShow"
+                         header-align="center"
+                         align="center"
+                         label="是否给分"
+                         width="100">
+
         </el-table-column>
         <el-table-column prop="statusShow"
                          header-align="center"
@@ -168,6 +185,18 @@ export default {
               item.statusShow = ''
             }
 
+            if (item.rewardFlag === 'agree') {
+              item.rewardFlagShow = '已发放'
+            } else {
+              item.rewardFlagShow = '未发放'
+            }
+
+            if (item.signInFlag === 'signed_in') {
+              item.signInFlagShow = '是'
+            } else {
+              item.signInFlagShow = '否'
+            }
+
           });
 
           this.tableData = [...data.list]
@@ -220,6 +249,12 @@ export default {
   },
   props: {
 
+
+    status: {
+      type: String,
+      default: ''
+    },
+
   }
 }
 </script>