From cb723cc3373d81d0cb19b1b29b378d2a32c6016d Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Sun, 26 Sep 2021 09:45:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E4=B8=8E=E6=B4=BB=E5=8A=A8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/volunteer-act-record.vue     | 68 +++++++++++++++++++
 src/views/modules/user/volunteerinfo.vue      | 22 +++++-
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 src/views/modules/user/volunteer-act-record.vue

diff --git a/src/views/modules/user/volunteer-act-record.vue b/src/views/modules/user/volunteer-act-record.vue
new file mode 100644
index 0000000..b407e2b
--- /dev/null
+++ b/src/views/modules/user/volunteer-act-record.vue
@@ -0,0 +1,68 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    title="参与活动记录"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <el-form :inline="true" :model="dataForm" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '100px' : '80px'">
+      <el-form-item label="活动标题">
+          <el-input v-model.trim="dataForm.title"
+                    placeholder="活动标题"
+                    style="width:300px"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+    </el-form>
+    <el-table  v-loading="dataListLoading" :data="dataList" border style="width: 100%;">
+      <el-table-column type="index" width="50" label="序号"></el-table-column>
+      <el-table-column prop="title" label="活动标题" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="actPeriodStartTime" label="开始时间" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="actPeriodEndTime" label="结束时间" width="160" header-align="center" align="center"></el-table-column>
+    </el-table>
+    <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+  </el-dialog>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/heart/actperioduser/getParticipatedActRecordByUserId',
+        getDataListIsPage: true
+      },
+      visible: false,
+      dataForm: {
+        userId: '',
+        title: ''
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.dataForm.title = ''
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.userId) {
+          this.getDataList()
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
index 50aa501..6fa692e 100644
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -133,6 +133,11 @@
                          size="small"
                          @click="pointsLogs(scope.row.userId)">积分记录</el-button>
             </div>
+            <div>
+              <el-button type="text"
+                         size="small"
+                         @click="actRecordHandle(scope.row.userId)">参与活动记录</el-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -163,6 +168,10 @@
       <volunteer-points-log v-if="volunteerPointsLogVisible"
                             ref="volunteerPointsLog"
                             @refreshDataList="getDataList"></volunteer-points-log>
+      <!-- 参与活动记录 -->
+      <volunteer-act-record v-if="volunteerActRecordVisible"
+                            ref="volunteerActRecord"
+                            @refreshDataList="getDataList"></volunteer-act-record>
     </div>
   </el-card>
 </template>
@@ -174,6 +183,7 @@ import volunteerinfoDetail from './volunteerinfo-detail'
 import volunteerinfoPointsAdjust from '../points/volunteerinfo-points-adjust'
 import volunteerPointsLog from '../points/volunteer-points-log'
 import volunteerinfoCheck from './volunteerinfo-check'
+import volunteerActRecord from './volunteer-act-record'
 import Cookies from 'js-cookie'
 import qs from 'qs'
 export default {
@@ -218,6 +228,7 @@ export default {
       volunteerinfoPointsAdjustVisible: false,
       volunteerPointsLogVisible: false,
       volunteerinfoCheckVisible: false,
+      volunteerActRecordVisible: false,
       volunteerDepts: []
     }
   },
@@ -303,6 +314,14 @@ export default {
         this.$refs.volunteerPointsLog.init()
       })
     },
+    // 参与活动记录
+    actRecordHandle (userId) {
+      this.volunteerActRecordVisible = true
+      this.$nextTick(() => {
+        this.$refs.volunteerActRecord.dataForm.userId = userId
+        this.$refs.volunteerActRecord.init()
+      })
+    },
     // 性别状态转换
     sexState: function (row, column) {
       let state = row.sex
@@ -353,7 +372,8 @@ export default {
     volunteerinfoDetail,
     volunteerinfoPointsAdjust,
     volunteerinfoCheck,
-    volunteerPointsLog
+    volunteerPointsLog,
+    volunteerActRecord
   }
 }
 </script>