From dd8df8165592cfa122f9a44d82eb0b5f2efbe3c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Wed, 28 Aug 2024 18:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/volunteer/VolManage/integral.vue  |   4 +-
 .../activityArchive/Administration.vue        |   9 +-
 .../volunteer/activityArchive/Points.vue      | 122 ++++++------
 .../volunteer/activityArchive/enclosure.vue   | 176 ++++++++++++++++++
 .../volunteer/activityArchive/index.vue       |   3 +-
 .../volunteer/pointsRedemption/record.vue     |   1 +
 6 files changed, 254 insertions(+), 61 deletions(-)
 create mode 100644 src/views/modules/volunteer/activityArchive/enclosure.vue

diff --git a/src/views/modules/volunteer/VolManage/integral.vue b/src/views/modules/volunteer/VolManage/integral.vue
index 94f0b4f77..5fa37266e 100644
--- a/src/views/modules/volunteer/VolManage/integral.vue
+++ b/src/views/modules/volunteer/VolManage/integral.vue
@@ -81,10 +81,10 @@
         </el-table-column>
         <el-table-column prop="pointsClass" header-align="center" align="center" label="积分">
         </el-table-column>
-        <!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="核销时间">
+        <el-table-column prop="ActivityCount" header-align="center" align="center" label="核销时间">
                 </el-table-column>
                 <el-table-column prop="ActivityCount" header-align="center" align="center" label="状态">
-                </el-table-column> -->
+                </el-table-column>
         <!-- <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
             <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
diff --git a/src/views/modules/volunteer/activityArchive/Administration.vue b/src/views/modules/volunteer/activityArchive/Administration.vue
index 0f0a2d4af..72a24d314 100644
--- a/src/views/modules/volunteer/activityArchive/Administration.vue
+++ b/src/views/modules/volunteer/activityArchive/Administration.vue
@@ -26,7 +26,7 @@
                 </el-form-item>
         
             </el-form>
-            <div style="display: flex; justify-content: flex-end; margin:0 0 10px 30px;">
+            <div style="margin:0 0 10px 30px;">
                     <el-button   type="primary" @click="handleSearch" style="margin: 20rpx;">查询</el-button>
                 </div>
         </div>
@@ -74,6 +74,7 @@ export default {
         total:0,
         labelPosition: 'right',
         tableData: [],
+        formData:[],
         pageNo: 1,
         pageSize:20,
     };
@@ -88,7 +89,7 @@ export default {
            //查询
            handleSearch(){
           console.log("this.long");
-          console.log(this.formData,"this.long");
+  
           this.getTableData()
            },
     handleCurrentChange(val) {
@@ -110,8 +111,8 @@ export default {
           name:this.name,
           mobile:this.mobile,
           pageNo: this.pageNo,
-          // activityId:this.list.id,
-          activityId:"1826111922849996802",
+          activityId:this.list.id,
+          // activityId:"1826111922849996802",
           pageSize:this.pageSize,
      
       }
diff --git a/src/views/modules/volunteer/activityArchive/Points.vue b/src/views/modules/volunteer/activityArchive/Points.vue
index 1690f13ec..b1601c3d9 100644
--- a/src/views/modules/volunteer/activityArchive/Points.vue
+++ b/src/views/modules/volunteer/activityArchive/Points.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="g-main" style="padding: 30px;">
-        <div class="f-flex" style="">
-            <!-- <div class="f-flex" style="align-items: center;">
+  <div class="g-main" style="padding: 30px;">
+    <div class="f-flex" style="">
+      <!-- <div class="f-flex" style="align-items: center;">
                 <div>是否发放积分</div>
                 <el-select v-model="formData.whether" placeholder="请选择" clearable >
                     <el-option v-for="item in formData.options" :key="item.value" :label="item.label" :value="item.value">
@@ -22,68 +22,72 @@
             <div>
                 <el-button type="primary"  @click="handleSearch">查询</el-button>
             </div> -->
-            <el-form :inline="true" :model="formData" class="demo-form-inline" style="" >
-                <el-form-item label="是否发放积分">
-                  <el-select v-model="formData.whether" placeholder="请选择" clearable >
-                    <el-option v-for="item in formData.options" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select>
-                </el-form-item>
-                <el-form-item label="姓名"  label-width="80px">
-                    <el-input placeholder="请输入内容" v-model="formData.name" style="width: 150px" clearable>
-                    </el-input>
-                </el-form-item>
-                <el-form-item label="手机号"  label-width="120px">
-                 <el-input placeholder="请输入内容" v-model="formData.mobile" style="width: 150px" clearable>
-                    </el-input>
-                </el-form-item>
-                <div style="display: flex; justify-content: flex-end; margin:0 0 10px 0;">
-                    <el-button  type="primary" @click="handleSearch" style="margin: 20rpx;">查询</el-button>
-                </div>
-            </el-form>
+      <el-form :inline="true" :model="formData" class="demo-form-inline" style="">
+        <el-form-item label="是否发放积分">
+          <el-select v-model="formData.whether" placeholder="请选择" clearable>
+            <el-option v-for="item in formData.options" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="姓名" label-width="80px">
+          <el-input placeholder="请输入内容" v-model="formData.name" style="width: 150px" clearable>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="手机号" label-width="120px">
+          <el-input placeholder="请输入内容" v-model="formData.mobile" style="width: 150px" clearable>
+          </el-input>
+        </el-form-item>
+        <div style="display: flex; justify-content: flex-end; margin:0 0 10px 0;">
+          <el-button type="primary" @click="handleSearch" style="margin: 20rpx;">查询</el-button>
         </div>
-        <div>
-            <el-table :data="tableData" border>
-                <el-table-column label="序号" width="80" header-align="center" align="center"
-                    type="index"></el-table-column>
-                <el-table-column prop="realName" header-align="center" align="center" label="姓名">
-                </el-table-column>
-                <el-table-column prop="nickName" header-align="center" align="center" label="昵称">
-                </el-table-column>
-                <el-table-column prop="mobile" header-align="center" align="center" label="手机号">
-                </el-table-column>
-                . <el-table-column prop="idCard" header-align="center" align="center" label="证件号">
-                </el-table-column>
-                <el-table-column prop="ActivityCount" header-align="center" align="center" label="打卡次数">
-                </el-table-column>
-                <el-table-column prop="whether" header-align="center" align="center" label="是否发放积分">
-                </el-table-column>
-                <el-table-column prop="points" header-align="center" align="center" label="积分">
-                </el-table-column>
-                <!-- <el-table-column label="操作" fixed="right" header-align="center" align="center" class="operate">
-                    <template slot-scope="scope">
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
-                            @click="handleDetail(scope.row)">查看</el-button>
-                    </template>
-                </el-table-column> -->
-            </el-table>
-            <div>
-                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                    :current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize"
-                    layout="sizes, prev, pager, next, total" :total="total">
-                </el-pagination>
-            </div>
+      </el-form>
+    </div>
+    <div>
+      <el-table :data="tableData" border>
+        <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
+        <el-table-column prop="realName" header-align="center" align="center" label="姓名">
+        </el-table-column>
+        <el-table-column prop="nickName" header-align="center" align="center" label="昵称">
+        </el-table-column>
+        <el-table-column prop="mobile" header-align="center" align="center" label="手机号">
+        </el-table-column>
+        . <el-table-column prop="idCard" header-align="center" align="center" label="证件号">
+        </el-table-column>
+        <el-table-column prop="ActivityCount" header-align="center" align="center" label="打卡次数">
+        </el-table-column>
+        <el-table-column prop="whether" header-align="center" align="center" label="是否发放积分">
+        </el-table-column>
+        <el-table-column prop="points" header-align="center" align="center" label="积分">
+        </el-table-column>
+        <el-table-column label="附件" fixed="right" header-align="center" align="center" class="operate">
+          <template slot-scope="scope">
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog :visible.sync="info" :close-on-click-modal="false" :close-on-press-escape="false" title="附件详情"
+          width="1000px" top="10vh" class="dialog-h" @closed="AddClose" v-if="add">
+          <enclosure :list="fmData" @AddClose="AddClose" />
+        </el-dialog>
+      <div>
+      
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+          :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
+        </el-pagination>
+      </div>
 
-        </div>
     </div>
+  </div>
 </template>
 <script>
     import { requestPost,requestGet } from "@/js/dai/request";
+    // import { enclosure } from "./enclosure.vue";
 export default {
     
    name: "see",
     data() {
     return {
+      showadd:false,
       searchData:[],
         labelPosition: 'right',
         tableData: [],
@@ -110,6 +114,12 @@ export default {
     }
   },
   methods: {
+    handleDetail(row){
+          console.log(row,"row");
+          this.add=true
+          this.fmData=row
+  
+        },
     handleSizeChange(val) {
         console.log(`每页 ${val} 条`);
         this.pageSize = val;
@@ -125,6 +135,7 @@ export default {
         handleSearch(){
           console.log("this.long");
           console.log(this.formData,"this.long");
+          this.pageNo=1
           this.getTableData()
           
         },
@@ -159,6 +170,9 @@ export default {
     this.getTableData()
 
   },
+  // components:{
+  //   enclosure
+  // }
 }
 
 </script>
diff --git a/src/views/modules/volunteer/activityArchive/enclosure.vue b/src/views/modules/volunteer/activityArchive/enclosure.vue
new file mode 100644
index 000000000..31fcf68fc
--- /dev/null
+++ b/src/views/modules/volunteer/activityArchive/enclosure.vue
@@ -0,0 +1,176 @@
+<template>
+    <div class="g-main" style="padding: 30px;">
+      <div class="f-flex" style="">
+        <!-- <div class="f-flex" style="align-items: center;">
+                  <div>是否发放积分</div>
+                  <el-select v-model="formData.whether" placeholder="请选择" clearable >
+                      <el-option v-for="item in formData.options" :key="item.value" :label="item.label" :value="item.value">
+                      </el-option>
+                  </el-select>
+  
+              </div>
+              <div class="f-flex" style="align-items: center;">
+                  <div>姓名</div>
+                  <el-input placeholder="请输入内容" v-model="formData.name" style="width: 200px" clearable>
+                  </el-input>
+              </div>
+              <div class="f-flex" style="align-items: center;">
+                  <div>手机号</div>
+                  <el-input placeholder="请输入内容" v-model="formData.mobile" style="width: 200px" clearable>
+                  </el-input>
+              </div>
+              <div>
+                  <el-button type="primary"  @click="handleSearch">查询</el-button>
+              </div> -->
+        <el-form :inline="true" :model="formData" class="demo-form-inline" style="">
+          <el-form-item label="是否发放积分">
+            <el-select v-model="formData.whether" placeholder="请选择" clearable>
+              <el-option v-for="item in formData.options" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="姓名" label-width="80px">
+            <el-input placeholder="请输入内容" v-model="formData.name" style="width: 150px" clearable>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="手机号" label-width="120px">
+            <el-input placeholder="请输入内容" v-model="formData.mobile" style="width: 150px" clearable>
+            </el-input>
+          </el-form-item>
+          <div style="display: flex; justify-content: flex-end; margin:0 0 10px 0;">
+            <el-button type="primary" @click="handleSearch" style="margin: 20rpx;">查询</el-button>
+          </div>
+        </el-form>
+      </div>
+      <div>
+        <el-table :data="tableData" border>
+          <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
+          <el-table-column prop="realName" header-align="center" align="center" label="姓名">
+          </el-table-column>
+          <el-table-column prop="nickName" header-align="center" align="center" label="昵称">
+          </el-table-column>
+          <el-table-column prop="mobile" header-align="center" align="center" label="手机号">
+          </el-table-column>
+          . <el-table-column prop="idCard" header-align="center" align="center" label="证件号">
+          </el-table-column>
+          <el-table-column prop="ActivityCount" header-align="center" align="center" label="打卡次数">
+          </el-table-column>
+          <el-table-column prop="whether" header-align="center" align="center" label="是否发放积分">
+          </el-table-column>
+          <el-table-column prop="points" header-align="center" align="center" label="积分">
+          </el-table-column>
+          <el-table-column label="附件" fixed="right" header-align="center" align="center" class="operate">
+            <template slot-scope="scope">
+              <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div>
+          <el-dialog :visible.sync="info" :close-on-click-modal="false" :close-on-press-escape="false" title="附件详情"
+            width="1000px" top="10vh" class="dialog-h" @closed="AddClose" v-if="add">
+            <add :list="fmData" @AddClose="AddClose" />
+          </el-dialog>
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+            :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
+          </el-pagination>
+        </div>
+  
+      </div>
+    </div>
+  </template>
+  <script>
+      import { requestPost,requestGet } from "@/js/dai/request";
+  export default {
+      
+     name: "see",
+      data() {
+      return {
+        showadd:false,
+        searchData:[],
+          labelPosition: 'right',
+          tableData: [],
+          pageSize: 10,
+          pageNo: 1,
+          total: 0,
+          formData:{ 
+              whether:"",
+              name:"",
+              mobile:"",
+              options:[
+                  {value:1,label:"已发放"},
+                  {value:0,label:"未发放"},
+              ]
+          }
+         
+          
+      };
+    },
+    props:{
+      list:{
+        type: Object,
+        default: () => {}
+      }
+    },
+    methods: {
+      handleDetail(row){
+            console.log(row,"row");
+            this.add=true
+            this.fmData=row
+    
+          },
+      handleSizeChange(val) {
+          console.log(`每页 ${val} 条`);
+          this.pageSize = val;
+          window.localStorage.setItem("pageSize", val);
+          this.getlist();
+        },
+        handleCurrentChange(val) {
+          console.log(`当前页: ${val}`);
+          this.pageNo = val;
+          this.getlist();
+        },
+          //查询
+          handleSearch(){
+            console.log("this.long");
+            console.log(this.formData,"this.long");
+            this.pageNo=1
+            this.getTableData()
+            
+          },
+          //活动列表
+          async getTableData() {
+          // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+          const url = "/voluntary/activitySignIn/list";
+          let params = {
+            pageNo: this.pageNo,
+            whether:this.formData.whether,
+            name:this.formData.name,
+            pageSize:this.pageSize,
+            mobile:this.formData.mobile,
+            activityId:this.list.id,
+              // activityId:"1826111922849996802",
+        }
+        requestGet(url, params).then((res) => {
+          if (res.code == 0) {
+            this.total = res.data.total || 0;
+            this.tableData = res.data.list;
+            console.log(this.tableData, "this.tableData");
+          } else {
+            this.$message.error(res.msg);
+          }
+        });
+  
+        },
+  
+    },
+    created() {
+      console.log(this.list,"list");
+      this.getTableData()
+  
+    },
+  }
+  
+  </script>
+  <style lang="scss" scoped>
+    @import "@/assets/scss/modules/management/list-main.scss";
+  </style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index 37149c6db..bdfb00a85 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -127,7 +127,7 @@
     import realselect from "./realselect.vue"
 
     export default {
-      components: {add,ActivityCountshow,Points,realselect },
+      components: {add,ActivityCountshow,Points,realselect,selecthande },
     
       data() {
         return {
@@ -212,6 +212,7 @@
         handleSearch(){
           console.log("this.long");
           console.log(this.formData,"this.long");
+          this.pageNo=1
           this.getTableData()
           
         },
diff --git a/src/views/modules/volunteer/pointsRedemption/record.vue b/src/views/modules/volunteer/pointsRedemption/record.vue
index 4ef4e29c1..e536163d6 100644
--- a/src/views/modules/volunteer/pointsRedemption/record.vue
+++ b/src/views/modules/volunteer/pointsRedemption/record.vue
@@ -142,6 +142,7 @@ export default {
             this.getTableData();
           },
     handleSeach(){
+        this.pageNo = 1;
         console.log(this.SearchName);
         this.getTableData()