From 1b2eaf4fac0dfe83210153d542ebf8852a8c5df5 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, 21 Aug 2024 19:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/volunteet.scss    | 124 +++++++++
 .../volunteer/VolManage/activeRecord.vue      | 142 +++++++---
 .../modules/volunteer/VolManage/index.vue     | 209 +++++++++-----
 .../modules/volunteer/VolManage/integral.vue  |  88 ++++--
 src/views/modules/volunteer/VolManage/see.vue |  28 +-
 .../volunteer/activityArchive/index.vue       |   2 +-
 .../volunteer/pointsRedemption/Select.vue     |  77 ++++++
 .../volunteer/pointsRedemption/add.vue        | 256 +++++++++++++-----
 .../volunteer/pointsRedemption/index.vue      | 214 ++++++---------
 .../volunteer/pointsRedemption/record.vue     |  72 +++--
 10 files changed, 855 insertions(+), 357 deletions(-)
 create mode 100644 src/assets/scss/modules/management/volunteet.scss
 create mode 100644 src/views/modules/volunteer/pointsRedemption/Select.vue

diff --git a/src/assets/scss/modules/management/volunteet.scss b/src/assets/scss/modules/management/volunteet.scss
new file mode 100644
index 000000000..6b2409580
--- /dev/null
+++ b/src/assets/scss/modules/management/volunteet.scss
@@ -0,0 +1,124 @@
+.g-main{
+    padding: 30px 0 0 30px;
+    width: 100%;
+ }
+ .flex{
+    display: flex;
+    .flex1{
+      flex: 1;
+    }
+    &-1{
+      flex: 1;
+    }
+    &-y{
+        flex-direction: column;
+    }
+    &-x{
+      flex-direction: row;
+  }
+    &-center1{
+      justify-content: center;
+    }
+    &-center2{
+      align-items: center;
+    }
+    &-center3{
+      align-items: flex-start;
+    }
+    //
+    &-mean{
+      justify-content: space-around;
+    }
+    //两端对齐
+    &-end{
+      justify-content: space-between;
+    }
+    //水平轴右对齐
+    &-fend{
+      justify-content: flex-end;
+    }
+    // 允许子元素换行
+    &-wrap{
+      flex-wrap: wrap;
+    }
+  }
+.m{
+    &-left12{
+      margin-left: 12px;
+    }
+    &-left5{
+      margin-left: 12px;
+    }
+    &-left012{
+      margin-left: -5px;
+    }
+    &-left18{
+      margin-left: 18px;
+    }
+    &-right12{
+      margin-right: 12px;
+    }
+    &-right7{
+      margin-right: 7px;
+    }
+    &-top12{
+      margin-top: 12px;
+    }
+    &-top5{
+      margin-top: 5px;
+    }
+    &-bottom5{
+      margin-bottom: 5px;
+    }
+    &-bottom10{
+      margin-bottom: 10px;
+    }
+    &-right10{
+      margin-right: 10px;
+    }
+    &-right26{
+      margin-right: 26px;
+    }
+    
+    &-top15{
+      margin-top: 15px;
+    }
+    &-top10{
+      margin-top: 10px;
+    }
+    &-top18{
+      margin-top: 18px;
+    }
+    &-bot50{
+      margin-bottom: 50px;
+    }
+    &-bot10{
+      margin-bottom:10px;
+    }
+    &-top16{
+      margin-top:16px;
+    }
+  }
+  
+  .p{
+    &-18{
+      padding: 0 18px;
+    }
+    &-12{
+      padding: 12px;
+    }
+  }
+.el-form-item{
+    margin-bottom: 10px;
+ }
+ .bto_btn{
+  display: block;
+  position: fixed;
+  bottom: 5px;
+  left: 0;
+  background: #ffffff;
+  width: 100%;
+  padding: 6px 26px;
+  box-sizing: border-box;
+  text-align: right;
+}
\ No newline at end of file
diff --git a/src/views/modules/volunteer/VolManage/activeRecord.vue b/src/views/modules/volunteer/VolManage/activeRecord.vue
index d1231a7a8..0b6d722cf 100644
--- a/src/views/modules/volunteer/VolManage/activeRecord.vue
+++ b/src/views/modules/volunteer/VolManage/activeRecord.vue
@@ -1,32 +1,34 @@
 <template>
-    <div class="g-main"  style="margin: 30px;">
-        <div class="f-flex"  >
-                    <div class="f-flex" style="align-items: center;">
-                    <div>活动查询：</div>
-                    <el-input  placeholder="请输入内容" v-model="input"  style="width: 200px"  clearable>
-                    </el-input>
-                    </div>
-                   <div class="f-flex" style="align-items: center;">
-                    <div>状态：</div>
-                    <el-input placeholder="请输入内容" v-model="input" style="width: 200px" clearable>
-                    </el-input>
-                   </div>
-                   <div>
-                    <el-button type="primary">查询</el-button>
-                   </div>
-        </div>
-        <div >
-      <el-table :data="tableData" border style="width: 700px" >
-        <el-table-column label="序号" width="80" header-align="center" align="center" type="index" ></el-table-column>
-        <el-table-column prop="Community" header-align="center" align="center" label="主办方" >
+  <div class="g-main ">
+    <div class="flex flex-mean m-bottom10" >
+      <div class="flex flex-center1 flex-center2 ">
+        <div>活动查询：</div>
+        <el-input placeholder="请输入内容" v-model="SearchForm.content" style="width: 200px" clearable>
+        </el-input>
+      </div>
+      <div class="flex" style="align-items: center;">
+        <div>状态：</div>
+        <el-select v-model="SearchForm.Stutas" placeholder="请选择">
+          <el-option v-for="item in optionsStatus" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+      <div>
+        <el-button type="primary" @click="handleSearch">查询</el-button>
+      </div>
+    </div>
+    <div class="m-bot50">
+      <el-table :data="tableData" border style="width: 700px">
+        <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
+        <el-table-column prop="Community" 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 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 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 prop="ActivityCount" header-align="center" align="center" label="状态">
         </el-table-column>
         <!-- <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
@@ -43,19 +45,15 @@
           :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
         </el-pagination>
       </div>
-      <el-dialog :visible.sync="Record" :close-on-click-modal="false" :close-on-press-escape="false" title="活动记录"
-      width="750px" top="10vh" class="dialog-h" @closed="diaClose">
-        <Record :list="fmData"/>
-    </el-dialog>
-    <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
-      width="750px" top="10vh" class="dialog-h" @closed="diaClose">
-        <see :list="fmData"/>
-    </el-dialog>
+
     </div>
+    <div class="flex flex-center1 flex-center2 m-top">
+      <el-button type="danger" round>确定</el-button>
     </div>
+  </div>
 </template>
 <script>
-
+  import { requestPost } from "@/js/dai/request";
 export default {
     
    name: "see",
@@ -63,6 +61,19 @@ export default {
     return {
         labelPosition: 'right',
         tableData: [],
+        SearchForm:{
+          content:"",
+          Stutas:"",
+        },
+        optionsStatus: [
+          { value: '0', label: '打卡' },
+          { value: '1', label: '未打卡' },
+        ],
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+     
+        
     };
   },
   props:{
@@ -71,14 +82,73 @@ export default {
       default: () => {}
     }
   },
-  methods: {},
   created() {
     console.log(this.list,"list");
-    this.tableData=this.list
+    this.tableData=this.list;
+    this.getTableData()
   },
+  methods:{
+    //查询列表
+     getTableData() {
+        console.log("row");
+        
+        const url = "/governance/project/project-list";
+        let params={
+          pageSize:this.pageSize,
+          pageNo:this.pageNo,
+       
+        }
+        const { data, code, msg } =  requestPost(url,params);
+        if (code === 0) {
+          console.log("列表请求成功！！！！！！！！！！！！！！");
+          this.total = data.total || 0;
+          this.tableData = data.list
+            ? data.list.map((item) => {
+                return item;
+              })
+            : [];
+  
+          this.tableData.forEach((item) => {
+            if (item.origin === "issue") {
+              item.originName = "议题 ";
+            } else if (item.origin === "agency") {
+              item.originName = "项目立项";
+            } else if (item.origin === "resi_event") {
+              item.originName = "旧版事件上报";
+            } else if (item.origin === "work_event") {
+              item.originName = "巡查上报";
+            } else if (item.origin === "ic_event") {
+              item.originName = "事件";
+            } else {
+              item.sourceTypeName = "--";
+            }
+          });
+        } else {
+        }
+      },
+    //换页
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNo = val;
+      this.getTableData();
+    },
+    handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.pageSize = val;
+        window.localStorage.setItem("pageSize", val);
+        this.getTableData();
+      },
+    //查询
+    handleSearch(val) {
+      console.log(this.SearchForm);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+  },
+
 }
 
 </script>
 <style lang="scss" scoped>
-  @import "@/assets/scss/modules/management/list-main.scss";
+  @import "@/assets/scss/modules/management/volunteet.scss";
 </style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/VolManage/index.vue b/src/views/modules/volunteer/VolManage/index.vue
index 654223fbb..17ffda781 100644
--- a/src/views/modules/volunteer/VolManage/index.vue
+++ b/src/views/modules/volunteer/VolManage/index.vue
@@ -22,8 +22,16 @@
       </el-form>
     </div>
     <div class="m-table">
-      <el-button style="" class="diy-button--add" size="small" @click="handleAdd">下载模板</el-button>
-      <el-button style="" class="diy-button--add" size="small" @click="handleAdd">导入</el-button>
+      <el-button style="" class="diy-button--add" size="small"  @click="handleExportModule()">下载模板</el-button>
+      <el-button class="diy-button--white" size="small">
+                        <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn"
+                                action="uploadUlr" :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true"
+                                :show-file-list="false" :auto-upload="true" :on-progress="handleProgress"
+                                :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
+                                :http-request="uploadHttpRequest">
+                               导入
+                            </el-upload>
+                    </el-button>
       <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
         <el-table-column label="序号" header-align="center" align="center" type="index" ></el-table-column>
         <el-table-column prop="Community" header-align="center" align="center" label="所属社区" >
@@ -70,22 +78,22 @@
       </div>
       <el-dialog :visible.sync="Record" :close-on-click-modal="false" :close-on-press-escape="false" title="活动记录"
       width="750px" top="10vh" class="dialog-h" @closed="diaClose">
-        <Record :list="fmData"/>
+        <Record v-if="Record" :list="fmData"/>
     </el-dialog>
     <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
       width="750px" top="10vh" class="dialog-h" @closed="diaClose">
         <see :list="fmData"/>
     </el-dialog>
     <el-dialog :visible.sync="integral" :close-on-click-modal="false" :close-on-press-escape="false" title="积分调整"
-      width="750px" top="10vh" class="dialog-h" @closed="diaClose">
-        <integral :list="fmData"/>
+      width="750px" top="10vh" class="dialog-h"  @closed="summDetailClose">
+        <integral :list="fmData" @summDetailClose="summDetailClose"/>
     </el-dialog>
     </div>
   </div>
 </template>
   
   <script>
-  import { requestPost } from "@/js/dai/request";
+  import { requestPost,requestGet } from "@/js/dai/request";
   import nextTick from "dai-js/tools/nextTick";
   import { mapGetters } from "vuex";
   import see from "./see.vue"
@@ -180,35 +188,7 @@
 ],
         Record:false,
         fmData:[],
-      //   optionsStatus: [
-      //     {
-      //       value: "pending",
-      //       label: "未结案",
-      //     },
-      //     {
-      //       value: "closed",
-      //       label: "已结案",
-      //     },
-      //   ],
-  
-      //   fmData: {
-      //     title: "",
-      //     status: "",
-      //     startDate: "",
-      //     endDate: "",
-      //   },
-  
-      //   importBtnTitle: "导入",
-      //   importLoading: false,
-      //   startPickerOptions: {
-      //     disabledDate: startDisabledDate,
-      //   },
-  
-      //   currentProject: {
-      //     projectId: "",
-      //     userId: "",
-      //     categoryCodes: [],
-      //   },
+    
       };
     },
     computed: {
@@ -232,6 +212,87 @@
       // this.getTableData();
     },
     methods: {
+      summDetailClose(){
+        this.integral=false
+      },
+      async uploadHttpRequest(file) {
+            this.importLoading = true;
+            this.importBtnTitle = '正在上传中...';
+            this.$message({
+                showClose: true,
+                dangerouslyUseHTMLString: true,
+                message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+                duration: 3000
+            });
+            let than = this;
+            document.getElementById('clickA').addEventListener('click', function () {
+                than.$router.replace('/main/importRecord-index');
+            });
+            const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+            formData.append('file', file.file); //添加文件对象
+            formData.append('code', ''); //添加文件对象
+            let url = '/governance/icEvent/importEvent'
+            if (this.importType == 2) {
+              url = '/governance/icEvent/importAwo'
+            }
+            console.log(url)
+            await this.$http
+                .post(url, formData)
+                .then(res => {
+                    if (res.data.code == 0 && res.data.msg == 'success') {
+                        const data = res.data.data;
+                        this.dataList = [
+                            ...Object.keys(data.option.exist).map(k => {
+                                return {
+                                    index: k,
+                                    srcField: data.option.exist[k],
+                                    exist: true,
+                                    field: data.option.exist[k]
+                                };
+                            }),
+                            ...Object.keys(data.option.notExist).map(k => {
+                                return {
+                                    index: k,
+                                    srcField: data.option.notExist[k],
+                                    exist: false,
+                                    field: ''
+                                };
+                            })
+                        ];
+                        this.importOption = data.option;
+                        this.importCode = data.code;
+                        this.fileData = file;
+                    } else this.$message.error(res.data.msg);
+                })
+                .catch(err => {
+                    console.log('失败', err);
+                    file.onError(); //上传失败的文件会从文件列表中删除
+                });
+            this.importLoading = false;
+            this.importBtnTitle = '导入';
+            this.$refs.upload.clearFiles();
+            this.getTableData();
+        },
+
+      handleExcelSuccess(res, file) {
+            if (!res.code === 0 && !res.msg === 'success') {
+                this.$message.error(res.msg);
+            }
+      },
+      beforeExcelUpload(file) {
+            const isType = file.type === 'application/vnd.ms-excel';
+            const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+            const fileType = isType || isTypeComputer;
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            if (!fileType) {
+                this.$message.error('上传文件只能是xls/xlsx格式！');
+            }
+
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+            }
+            return fileType && isLt1M;
+        },
       handleintegral(row){
         this.integral=true
         console.log(row,"row");
@@ -250,7 +311,6 @@
       },
       async handleExportModule() {
         let url = "/heart/iccommunityselforganization/import-template-download";
-  
         let params = {};
         await this.$http({
           method: "POST",
@@ -259,7 +319,6 @@
           data: params,
         })
           .then((res) => {
-            // this.download(res.data, title + '.xls')
             if (res.headers["content-disposition"]) {
               let fileName = window.decodeURI(
                 res.headers["content-disposition"].split(";")[1].split("=")[1]
@@ -462,6 +521,9 @@
         //   projectId: item.projectId,
         // };
         // this.pageType = "edit";
+        console.log(row,"row");
+        
+        this.fmData=row
         this.Record=true
       },
       handleClose() {
@@ -533,42 +595,43 @@
   
   <style lang="scss" scoped>
   @import "@/assets/scss/modules/management/list-main.scss";
-    .g-main {
-      width: 100%;
-    }
-    .m-search {
-      background: #ffffff;
-      border-radius: 4px;
-      padding: 30px 20px 5px;
-      box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-    }
-    .item_width_1 {
-      width: 260px;
-    }
-    .item_width_2 {
-      width: 495px;
-    }
-    .m-table {
-      background: #ffffff;
-      box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-      border-radius: 4px;
-      margin-top: 15px;
-      padding: 23px 30px 10px;
-      .table {
-        margin-top: 20px;
-      }
-    }
-    .div_btn {
-      display: flex;
-      justify-content: space-between;
-    }
-    .el-row {
-      /* margin-bottom: 20px; */
-      display: flex;
-      flex-wrap: wrap;
-      margin-top: 10px;
-      margin-right: 50px;
-    }
+  .g-main {
+          width: 100%;
+        }
+        .m-search {
+          background: #ffffff;
+          border-radius: 4px;
+          padding: 30px 20px 5px;
+          box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+        }
+        .item_width_1 {
+          width: 260px;
+        }
+        .item_width_2 {
+          width: 495px;
+        }
+        .m-table {
+          background: #ffffff;
+          box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+          border-radius: 4px;
+          margin-top: 15px;
+          padding: 23px 30px 10px;
+          .table {
+            margin-top: 20px;
+          }
+        }
+        .div_btn {
+          display: flex;
+          justify-content: space-between;
+        }
+        .el-row {
+          /* margin-bottom: 20px; */
+          display: flex;
+          flex-wrap: wrap;
+          margin-top: 10px;
+          margin-right: 50px;
+        }
+      
   
   </style>
   
\ No newline at end of file
diff --git a/src/views/modules/volunteer/VolManage/integral.vue b/src/views/modules/volunteer/VolManage/integral.vue
index 9cf856283..ab5cb0935 100644
--- a/src/views/modules/volunteer/VolManage/integral.vue
+++ b/src/views/modules/volunteer/VolManage/integral.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="g-main"  style="padding: 30px;">
-    <el-form :label-position="labelPosition" :model="tableData" :rules="rules" >
+    <el-form ref="ref_form" :label-position="labelPosition" :model="tableData" style="margin-left: 80px; margin-bottom: 30px;" >
       <el-form-item label="姓名" prop="name">
         {{ tableData.name }}
       </el-form-item>
@@ -29,9 +29,9 @@
           label="描述文字"></el-input-number>
       </el-form-item>
     </el-form>
-    <div style="display: flex ; align-items: center;justify-items: center;">
-      <el-button type="info" @click="handleremove" round>取消</el-button>
-      <el-button type="danger" round>确定</el-button>
+    <div class="flex flex-center1 flex-center2">
+      <el-button type="info" @click="handleremove" >取消</el-button>
+      <el-button   type="danger" @click="handleSubmit" >确定</el-button>
     </div>
     <div>
     </div>
@@ -44,22 +44,6 @@ export default {
    name: "see",
     data() {
     return {
-      rules:{
-        behaviorName: [
-            { required: true, message: '请选择积分行为', trigger: 'change' }
-          ],
-          textarea: [
-            { required: true, message: '请填写调整原因', trigger: 'change' }
-          ],
-          radio: [
-            { required: true, message: '请选择操作类型', trigger: 'change' }
-          ],
-          integralnum: [
-            { required: true, message: '请对积分进行调整', trigger: 'change' }
-          ],
-          
-          
-    },
         labelPosition: 'right',
         tableData: [],
         integralnum: 1,
@@ -95,8 +79,68 @@ export default {
     this.tableData=this.list
   },
   methods: {
+    async addActivity() {
+            if (this.formType === 'edit' || this.formType === 'summary') {
+                let url = '/actual/base/communityActivity/update'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            } else {
+                let url = '/actual/base/communityActivity/save'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            }
+
+
+        },
+    async handleComfirm() {
+            this.btnDisable = true
+            setTimeout(() => {
+                this.btnDisable = false
+            }, 10000)
+            // console.log("data/actual/base/communityActivity/save",this.formData)
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                // this.formData.sendMessage = this.formData.sendMessage ? 1 : 0;
+                // console.log(this.formData, "2234323424")
+                // const dateObj = this.formData.startTime;
+                // console.log(dateObj);
+                // const formattedDate = dateObj; // 获取日期部分，即 '2424-10-22'
+                // if (this.formData.cutOffTime != '' && formattedDate <= this.formData.cutOffTime) {
+                //     this.$message.error('报名截止时间要小于活动开始时间')
+                // } else if (!valid) {
+                //     app.util.validateRule(messageObj)
+                //     this.btnDisable = false
+                // } else {
+                    this.addActivity()
+                
+            })
+        },
+    handleSubmit(){
+      this.$emit('summDetailClose')
+    },
     handleremove(){
-      this.$emit('')
+      this.$emit('summDetailClose')
     },
     handleadjustment(value) {
       console.log(value,"num");
@@ -107,5 +151,5 @@ export default {
 
 </script>
 <style lang="scss" scoped>
-  @import "@/assets/scss/modules/management/list-main.scss";
+  @import "@/assets/scss/modules/management/volunteet.scss";
 </style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/VolManage/see.vue b/src/views/modules/volunteer/VolManage/see.vue
index df36badd0..01bef1c05 100644
--- a/src/views/modules/volunteer/VolManage/see.vue
+++ b/src/views/modules/volunteer/VolManage/see.vue
@@ -1,37 +1,37 @@
 <template>
-    <div style="display: flex; justify-content: center;white-space: nowrap;" >
-        <el-form  :label-position="labelPosition" :model="tableData">
-            <el-form-item label="姓名">
+    <div style="display: flex; white-space: nowrap; padding: 10px 0 0 100px;" >
+        <el-form  label-position="left" :model="tableData">
+            <el-form-item label="姓名" label-width="80px" style="margin-bottom:10px;" >
                 {{ tableData.name }}
             </el-form-item> 
-            <el-form-item label="昵称">
+            <el-form-item label="昵称" label-width="80px">
                 {{ tableData.nickname }}
             </el-form-item>
-            <el-form-item label="身份信息">
+            <el-form-item label="身份信息" label-width="80px" >
                {{ tableData.Nickname}}
             </el-form-item>
-            <el-form-item label="手机号">
+            <el-form-item label="手机号" label-width="80px">
                {{ tableData.Nickname}}
             </el-form-item>
-            <el-form-item label="身份证号">
+            <el-form-item label="身份证号"label-width="80px" >
                {{ tableData.Nickname}}
             </el-form-item>
-            <el-form-item label="所属社区">
+            <el-form-item label="所属社区" label-width="80px">
                {{ tableData.Nickname}}
             </el-form-item>
-            <el-form-item label="注册时间">
+            <el-form-item label="注册时间" label-width="80px">
                {{ tableData.Nickname}}
             </el-form-item>
-            <el-form-item label="加入的志愿者组织">
+            <el-form-item label="加入的志愿者组织" label-width="150px">
                {{ tableData.Nickname}}
             </el-form-item>
-            <el-form-item label="积分">
+            <el-form-item label="积分" label-width="80px" >
                {{ tableData.Nickname}}
             </el-form-item>
-            <el-form-item label="活动次数">
+            <el-form-item label="活动次数" label-width="80px">
                {{ tableData.Nickname}}
             </el-form-item>
-            <el-form-item label="星级">
+            <el-form-item label="星级" label-width="80px">
                {{ tableData.Nickname}}
             </el-form-item>
         </el-form>
@@ -61,4 +61,6 @@ export default {
 
 </script>
 <style lang="scss" scoped>
+  @import "@/assets/scss/modules/management/volunteet.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 be1d374eb..b890da7a9 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -566,7 +566,7 @@
     </script>
     
     <style lang="scss" scoped>
-   @import "@/assets/scss/modules/management/detail-main.scss";
+  @import "@/assets/scss/modules/management/list-main.scss";
       .g-main {
         width: 100%;
       }
diff --git a/src/views/modules/volunteer/pointsRedemption/Select.vue b/src/views/modules/volunteer/pointsRedemption/Select.vue
new file mode 100644
index 000000000..a93a897c1
--- /dev/null
+++ b/src/views/modules/volunteer/pointsRedemption/Select.vue
@@ -0,0 +1,77 @@
+<template>
+    <div style="display: flex;white-space: nowrap;  padding: 30px;" >
+        <el-form  style="padding-left: 50px;" :label-position="labelPosition" :model="tableData">
+            <el-form-item label="分类" aria-required="">
+                {{ tableData.className }}
+            </el-form-item> 
+            <el-form-item label="标题">
+                {{ tableData.awardName }}
+            </el-form-item>
+            <el-form-item label="金额">
+               {{ tableData.worthAmount}}
+            </el-form-item>
+            <el-form-item label="兑换积分">
+               {{ tableData.points}}
+            </el-form-item>
+            <el-form-item label="有效期至">
+               {{ tableData.Nickname}}
+            </el-form-item>
+            <el-form-item label="兑换地点">
+               {{ tableData.Nicknae}}
+            </el-form-item>
+            <el-form-item label="规则说明">
+               {{ tableData.Nickname}}
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+import { requestPost,requestGet } from "@/js/dai/request";
+export default {
+   name: "see",
+    data() {
+    return {
+        labelPosition: 'right',
+        tableData: [],
+        awardId:""
+    };
+  },
+  props:{
+    list:{
+      type: Object,
+      default: () => {}
+    }
+  },
+  created() {
+    console.log(this.list,"list");
+    // this.tableData=this.list
+    this.awardId=this.list.id
+    this.getTableData()
+  },
+  methods: {
+     getTableData() {
+        console.log(this.formData);
+        const url = "/voluntary/pointsAward/admin/detail";
+        let params = {
+          id:this.awardId
+      }
+        const { data, code, msg } =  requestGet(url, params)
+        if (code === 0) {
+          console.log("列表请求成功！！！！！！！！！！！！！！");
+          this.total = data.total || 0;
+          this.tableData = data
+          console.log(this.tableData,"this.tableData");
+          
+    
+        } else {
+        }
+      },
+
+  },
+
+
+}
+
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/pointsRedemption/add.vue b/src/views/modules/volunteer/pointsRedemption/add.vue
index 36f7a7a36..010f02e92 100644
--- a/src/views/modules/volunteer/pointsRedemption/add.vue
+++ b/src/views/modules/volunteer/pointsRedemption/add.vue
@@ -1,69 +1,82 @@
 <template>
-   <div style="display: flex; justify-content: center;white-space: nowrap;">
-      <el-form :label-position="labelPosition" :model="tableData">
-         <el-form-item label="TypeName" required>
-            <el-select v-model="TypeName" placeholder="请选择">
-               <el-option v-for="item in TypeList" :key="item.value" :label="item.label" :value="item.value">
+   <div class="g-main">
+      <el-form :inline="true" :label-position="labelPosition" :model="tableData"
+         style="height: 500px; overflow: scroll;">
+         <el-form-item label="分类" required label-width="150px">
+            <el-select class="item_width_1" v-model="formData.classKey" placeholder="请选择">
+               <el-option v-for="item in TypeList" :key="item.classKey" :label="item.className" :value="item.classKey">
                </el-option>
             </el-select>
          </el-form-item>
-         <el-form-item label="标题">
-            <el-input v-model="title" placeholder="请输入内容"></el-input>
+         <el-form-item label="标题" label-width="150px" required>
+            <el-input class="item_width_1" v-model="formData.awardName" placeholder="请输入内容"></el-input>
          </el-form-item>
-         <el-form-item v-if="TypeName=='1'" label="金额">
-            <div  style="display: flex;">
+         <el-form-item v-if="formData.classKey=='mjq' ||formData.classKey=='cxdjq'" required label="金额"
+            label-width="150px">
+            <div class="item_width_2" style="display: flex;">
                <div>￥</div>
-               <el-input v-model="title" placeholder="请输入内容"></el-input>
+               <el-input v-model="formData.worthAmount" placeholder="请输入金额"></el-input>
             </div>
          </el-form-item>
-         <el-form-item v-if="TypeName=='2'" label="折扣">
-            <div  style="display: flex;">
-               <el-input v-model="title" placeholder="请输入内容"></el-input>
-               <div>折</div>
+         <el-form-item :inline="true" required v-if="formData.classKey=='zkq'" label="折扣" label-width="150px">
+            <div class="item_width_2" style="display: flex;">
+               <el-input v-model="formData.worthAmount" placeholder="请输入折扣"></el-input>
+               <div> 折</div>
             </div>
          </el-form-item>
-         <el-form-item v-if="TypeName=='4'" label="原价">
-            <div  style="display: flex;">
+         <el-form-item required v-if="formData.classKey=='hwjh'" label="原价" label-width="150px">
+            <div style="display: flex;">
                <div>￥</div>
-               <el-input v-model="title" placeholder="请输入内容"></el-input>>
+               <el-input v-model="formData.worthAmount" placeholder="请输入内容"></el-input>
             </div>
          </el-form-item>
-         <el-form-item label="兑换积分">
-            <el-input v-model="title" placeholder="请输入"></el-input>
+         <el-form-item required label="兑换积分" label-width="150px">
+            <el-input class="item_width_2" v-model="formData.points" placeholder="请输入"></el-input>
          </el-form-item>
-         <el-form-item label="有效期至">
-            <el-date-picker v-model="Validuntil" type="date" placeholder="请选择日期">
+         <el-form-item label="有效期至" label-width="150px">
+            <el-date-picker style="width: 250px;" v-model="formData.lifespan" type="datetime" placeholder="请选择日期"  format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
          </el-form-item>
-         <el-form-item label="规则说明">
-            <Tinymce class="tinymce_view " v-model.trim="condition" :height="250" placeholder="请输入活动内容" />
+         <el-form-item label="规则说明" label-width="150px">
+            <Tinymce style="width: 560px;" class="tinymce_view" v-model.trim="formData.description" :height="250"
+               placeholder="请输入活动内容" />
          </el-form-item>
-         <el-form-item label="库存">
+         <el-form-item label="库存" label-width="150px">
             <el-radio v-model="radio" label="1">不限数目</el-radio>
-            <div style="display: flex;">
+            <div class="flex flex-x">
                <el-radio v-model="radio" label="2">自定义</el-radio>
-               <el-input v-if="radio=='2'" v-model="NumberKucun" placeholder="请输入数量"></el-input>
+               <el-input v-if="radio=='2'" v-model="formData.stockQty" placeholder="请输入数量"></el-input>
             </div>
 
          </el-form-item>
-         <el-form-item label="发布范围">
-            <el-input v-model.trim="scope" size="small" class="item_width_1" clearable placeholder="请输入">
-            </el-input>
+         <el-form-item label="发布范围" label-width="150px">
+            <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small"
+               v-model.trim="formData.redeemerOrgId" :options="orgOptions" :props="orgOptionProps"
+               @change="handleChangeAgency"></el-cascader>
          </el-form-item>
-         <el-form-item label="上架">
-            <el-switch v-model="shelves" active-color="#13ce66" inactive-color="#ff4949">
-            </el-switch>
+
+         <el-form-item label="赞助单位" label-width="150px">
+            <el-input v-model="formData.sponsorName" placeholder="请输入"></el-input>
          </el-form-item>
-         <el-form-item label="赞助单位">
-            <el-input  v-model="sponsor" placeholder="请输入"></el-input>
+         <el-form-item label="联系电话" label-width="150px">
+            <el-input style="width: 210px;" v-model="formData.phone" placeholder="请输入"></el-input>
          </el-form-item>
-         <el-form-item label="联系电话">
-            <el-input  v-model="phone" placeholder="请输入"></el-input>
+         <el-form-item label="上架" label-width="150px" inline="false">
+            <el-switch style="width: 500px;" v-model="formData.shelveStatus" active-color="#13ce66"
+               inactive-color="#ff4949" active-value="1" inactive-value="0">
+            </el-switch>
          </el-form-item>
       </el-form>
+      <div class="flex  flex-center1 flex-center2">
+         <el-button v-if="list" type="primary" @click="updateForm()">提交</el-button>
+         <el-button v-if="!list" type="primary" @click="submitForm()">提交</el-button>
+         <el-button @click="handlecancel">取消</el-button>
+      </div>
    </div>
 </template>
 <script>
+import { requestPost,requestGet } from "@/js/dai/request";
 import Tinymce from '@c/tinymce2/index.vue'
 export default {
    components: {
@@ -73,36 +86,33 @@ export default {
    
     data() {
     return {
-      scope:"",
-      Validuntil:"",
-      phone:"",
-      sponsor:"",
-      shelves: true,
-      NumberKucun:"",
-      radio:"",
-      condition:"",
-         TypeName:"",
-         TypeList:[
-            {
-               value: '1',
-               label: '满减卷'
-            },
-            {
-               value: '2',
-               label: '折扣卷'
-            },
-            {
-               value: '3',
-               label: '出行代金卷'
-            },
-            {
-               value: '4',
-               label: '好物集合'
-            }
+      formData:{
+          classKey: "",
+          awardName: "",
+          worthAmount: "",
+          points: "",
+          redeemerOrgId: "",
+          expireTime: "",
+          description: "",
+          stockQty: '',
+          sponsorName: "",
+          sponsorMobile: "",
+          shelveStatus: ''
+      },
+      orgOptionProps: {
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        emitPath: false,
+        multiple: false,
+        checkStrictly: true
+    },
+      labelPosition: 'right',
+      TypeList:[
+            
          ],
-         title:"",
-        labelPosition: 'right',
-        tableData: [],
+      radio:'1',
+      orgOptions:[]
     };
   },
   props:{
@@ -111,14 +121,122 @@ export default {
       default: () => {}
     }
   },
-
-  methods: {},
   created() {
-    console.log(this.list,"list");
-    this.tableData=this.list
+   if (this.list) {
+      this.formData=this.list 
+   }
+
+    this.getclasses()
+    this.getOrgTreeList()
+  },
+  methods: {
+   //更改
+   async updateForm(){
+      console.log(this.formData,"formData");
+      const url = "/voluntary/pointsAward/admin/update";
+        let params = {
+         ...this.formData
+      }
+      console.log(params,"formData");
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+          console.log("列表请求成功！！！！！！！！！！！！！！");
+          this.TypeList=data
+          this.total = data.total || 0;
+          this.tableData = data.list
+          console.log(this.tableData,"this.tableData");
+          this.$emit('closeDialog')
+        } else {
+          this.$message.error(msg || "列表请求失败");
+        }
+
+   },
+   //获取当前组织
+   getOrgTreeList() {
+      this.$http
+        .post("/gov/org/customeragency/agencygridtree", {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.orgOptions = [];
+            this.orgOptions.push(res.data);
+            console.log(this.orgOptions,"this.orgOptions");
+            
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    handleChangeAgency(val){
+      console.log(val);
+      this.redeemerOrgId=val
+      
+    },
+   //获取物品分类信息
+   async getclasses() {
+        // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+        const url = "/voluntary/pointsAward/classes/list";
+        let params = {
+      }
+        const { data, code, msg } = await requestGet(url, params)
+        if (code === 0) {
+          console.log("列表请求成功！！！！！！！！！！！！！！");
+          this.TypeList=data
+          this.total = data.total || 0;
+          this.tableData = data.list
+          console.log(this.tableData,"this.tableData");
+          
+    
+        } else {
+          this.$message.error(msg || "列表请求失败");
+        }
+      },
+   handlecancel(){
+      this.$emit('closeDialog')
+   },
+   //提交
+  async submitForm(){
+      console.log(this.formData,"formData");
+      const url = "/voluntary/pointsAward/admin/add";
+        let params = {
+         ...this.formData
+      }
+      console.log(params,"formData");
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+          console.log("列表请求成功！！！！！！！！！！！！！！");
+          this.TypeList=data
+          this.total = data.total || 0;
+          this.tableData = data.list
+          console.log(this.tableData,"this.tableData");
+          this.$emit('closeDialog')
+        } else {
+          this.$message.error(msg || "列表请求失败");
+        }
+
+   }
+
   },
+
 }
 
 </script>
 <style lang="scss" scoped>
+  @import "@/assets/scss/modules/management/volunteet.scss";
+  .item_width_1 {
+    width: 560px;
+
+    /deep/.tox .tox-dialog {
+        z-index: 20000;
+    }
+}
+.item_width_2 {
+    width: 150px;
+
+    /deep/.tox .tox-dialog {
+        z-index: 20000;
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/pointsRedemption/index.vue b/src/views/modules/volunteer/pointsRedemption/index.vue
index 6827fb774..079d3e8e9 100644
--- a/src/views/modules/volunteer/pointsRedemption/index.vue
+++ b/src/views/modules/volunteer/pointsRedemption/index.vue
@@ -4,8 +4,9 @@
         <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
           <div>
             <el-form-item label="发布区域">
-              <el-input v-model.trim="formData.name" size="small" class="item_width_1" clearable placeholder="请输入">
-              </el-input>
+              <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small"
+               v-model.trim="formData.redeemerOrgId" :options="orgOptions" :props="orgOptionProps"
+               @change="handleChangeAgency"></el-cascader>
             </el-form-item>
             <el-form-item label="分类">
               <el-select v-model="formData.StatusName" placeholder="请选择">
@@ -35,24 +36,25 @@
         <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
         <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
           <el-table-column label="序号" header-align="center" align="center" type="index"></el-table-column>
-          <el-table-column prop="Community" header-align="center" align="center" label="发布区域">
+          <el-table-column prop="redeemerOrgName" header-align="center" align="center" label="发布区域">
           </el-table-column>
-          <el-table-column prop="Nickname" header-align="center" align="center" label="分类">
+          <el-table-column prop="className" header-align="center" align="center" label="分类">
             <!-- <template slot-scope="scope">
           <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
         </template> -->
           </el-table-column>
-          <el-table-column prop="Name" header-align="center" align="center" label="标题">
+          <el-table-column prop="awardName" header-align="center" align="center" label="标题">
             <template slot-scope="scope">
-              <el-button style="width: 100%" type="text" @click="showAwoList(scope.row)">{{scope.row.exportNum}}</el-button>
+                    <el-button style="width: 100%" type="text" @click="handleSelect(scope.row)">{{scope.row.awardName}}</el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="Identity" header-align="center" align="center" label="状态">
+          <el-table-column prop="shelveStatus" header-align="center" align="center" label="状态">
             <template slot-scope="scope">
-              <span>{{ scope.row.status === 0 ? '已下线' : '已发布' }}</span>
+              <span>{{ scope.row.shelveStatus === 0 ? '下架' : '上架' }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="PhoneNumber" header-align="center" align="center" label="上架时间">
+          <el-table-column prop="shelveOnTime" header-align="center" align="center" label="上架时间"  format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss">
           </el-table-column>
           <!-- <el-table-column prop="IDNumber" header-align="center" align="center" label="发布时间">
           </el-table-column>
@@ -64,7 +66,7 @@
           </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>
+              <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">修改</el-button>
               <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleEdit(scope.row)">下架</el-button>
               <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleEdit(scope.row)">上架</el-button>
               <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleEdit(scope.row)">兑换记录</el-button>
@@ -77,16 +79,16 @@
           </el-pagination>
         </div>
         <el-dialog :visible.sync="add" :close-on-click-modal="false" :close-on-press-escape="false" title="新增"
-          width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
-          <add :list="fmData" />
+          width="1000px" top="10vh" class="dialog-h" @closed="closeDialog">
+          <add v-if="add" :list="fmData" @closeDialog="closeDialog"/>
         </el-dialog>
         <el-dialog :visible.sync="recordshow" :close-on-click-modal="false" :close-on-press-escape="false" title="兑换记录"
           width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
-          <record :list="fmData" />
+          <record v-if="recordshow" :list="fmData" />
         </el-dialog>
-        <el-dialog :visible.sync="ActivityCountshow" :close-on-click-modal="false" :close-on-press-escape="false" title="报名管理"
+        <el-dialog :visible.sync="showSelect" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
           width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
-          <ActivityCountshow :list="fmData" />
+          <Select v-if="showSelect" :list="fmData" />
         </el-dialog>
       </div>
   
@@ -95,19 +97,31 @@
   
       <script>
       import record from "./record"
-      import { requestPost } from "@/js/dai/request";
+      import { requestPost,requestGet } from "@/js/dai/request";
       import nextTick from "dai-js/tools/nextTick";
       import { mapGetters } from "vuex";
       import add from "./add";
+      import Select from "./Select.vue"
       export default {
-        components: {add,record},
+        components: {add,record,Select},
       
         data() {
           return {
+            orgOptionProps: {
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        emitPath: false,
+        multiple: false,
+        checkStrictly: true
+    },
+            orgOptions:[],
+            showSelect:false,
             recordshow:false,
             HandlePointsshow:false,
             ActivityCountshow:false,
             add:false,
+            orgTypeFilter:[],
             formData:{
               name:"",
               StatusName:"",
@@ -128,74 +142,7 @@
             pageSize: window.localStorage.getItem("pageSize") || 20,
             total: 1,
             tableData: [
-      {
-        Community: "Stellar Community",
-        Nickname: "Dawn",
-        Name: "Li Xiaoming",
-        Identity: "Regular Member",
-        PhoneNumber: "13800138000",
-        IDNumber: "420123198901011234",
-        RegistrationTime: "2024-01-15T08:30:00Z",
-        Points: 1250,
-        ActivityCount: 15
-      },
-      {
-        Community: "Stellar Community",
-        Nickname: "Dawn",
-        Name: "Li Xiaoming",
-        Identity: "Regular Member",
-        PhoneNumber: "13800138000",
-        IDNumber: "420123198901011234",
-        RegistrationTime: "2024-01-15T08:30:00Z",
-        Points: 1250,
-        ActivityCount: 15
-      },
-      {
-        Community: "Stellar Community",
-        Nickname: "Dawn",
-        Name: "Li Xiaoming",
-        Identity: "Regular Member",
-        PhoneNumber: "13800138000",
-        IDNumber: "420123198901011234",
-        RegistrationTime: "2024-01-15T08:30:00Z",
-        Points: 1250,
-        ActivityCount: 15
-      },
-      {
-        Community: "Stellar Community",
-        Nickname: "Dawn",
-        Name: "Li Xiaoming",
-        Identity: "Regular Member",
-        PhoneNumber: "13800138000",
-        IDNumber: "420123198901011234",
-        RegistrationTime: "2024-01-15T08:30:00Z",
-        Points: 1250,
-        ActivityCount: 15
-      },
-      {
-        Community: "Stellar Community",
-        Nickname: "Dawn",
-        Name: "Li Xiaoming",
-        Identity: "Regular Member",
-        PhoneNumber: "13800138000",
-        IDNumber: "420123198901011234",
-        RegistrationTime: "2024-01-15T08:30:00Z",
-        Points: 1250,
-        ActivityCount: 15
-      },
-      {
-        Community: "Stellar Community",
-        Nickname: "Dawn",
-        Name: "Li Xiaoming",
-        Identity: "Regular Member",
-        PhoneNumber: "13800138000",
-        IDNumber: "420123198901011234",
-        RegistrationTime: "2024-01-15T08:30:00Z",
-        Points: 1250,
-        ActivityCount: 15
-      },
-    ],
-  
+            ],
             Record:false,
             fmData:[],
          
@@ -219,9 +166,42 @@
           },
         },
         mounted() {
-          // this.getTableData();
+          this.getTableData();
+          this.getOrgTreeList()
         },
         methods: {
+             //获取当前组织
+   getOrgTreeList() {
+      this.$http
+        .post("/gov/org/customeragency/agencygridtree", {orgTypeFilter:this.orgTypeFilter})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.orgOptions = [];
+            this.orgOptions.push(res.data);
+            console.log(this.orgOptions,"this.orgOptions");
+            
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+          handleChangeAgency(val) {
+            console.log(val);
+            this.redeemerOrgId = val
+
+          },
+          closeDialog(){
+              this.add=false,
+              this.getTableData()
+          },
+          handleSelect(row){
+            this.showSelect=true
+            this.fmData=row
+            console.log("row",row);
+          },
           handelRegister(command, row) {
         if (command == "signup") {
           this.HandleRegistration(row);
@@ -264,7 +244,7 @@
           },
           handleDetail(row){
             console.log(row,"row");
-            this.formShow=true
+            this.add=true
             this.fmData=row
     
           },
@@ -479,7 +459,7 @@
             this.pageType = "info";
           },
           async handleEdit(row) {
-            
+            this.fmData=row
             this.recordshow=true
           },
           handleClose() {
@@ -510,47 +490,33 @@
             }
           },
           async getTableData() {
-            // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
-            const url = "/governance/project/project-list";
-            const { pageSize, pageNo, fmData } = this;
-            const { data, code, msg } = await requestPost(url, {
-              pageSize,
-              pageNo,
-              ...fmData,
-            });
-            if (code === 0) {
-              console.log("列表请求成功！！！！！！！！！！！！！！");
-              this.total = data.total || 0;
-              this.tableData = data.list
-                ? data.list.map((item) => {
-                    return item;
-                  })
-                : [];
-      
-              this.tableData.forEach((item) => {
-                if (item.origin === "issue") {
-                  item.originName = "议题 ";
-                } else if (item.origin === "agency") {
-                  item.originName = "项目立项";
-                } else if (item.origin === "resi_event") {
-                  item.originName = "旧版事件上报";
-                } else if (item.origin === "work_event") {
-                  item.originName = "巡查上报";
-                } else if (item.origin === "ic_event") {
-                  item.originName = "事件";
-                } else {
-                  item.sourceTypeName = "--";
-                }
-              });
-            } else {
-            }
-          },
+        // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+        const url = "/voluntary/pointsAward/admin/list";
+        let params = {
+          pageNo: this.pageNo,
+          shelveOnTimeFrom:"",
+          redeemOrgId:"",
+          pageTo:this.pageSize,
+          classKey:""
+
+      }
+        const { data, code, msg } = await requestGet(url, params)
+        if (code === 0) {
+          console.log("列表请求成功！！！！！！！！！！！！！！");
+          this.total = data.total || 0;
+          this.tableData = data.list
+          console.log(this.tableData,"this.tableData");
+          
+    
+        } else {
+        }
+      },
         },
       };
       </script>
       
       <style lang="scss" scoped>
-     @import "@/assets/scss/modules/management/detail-main.scss";
+  @import "@/assets/scss/modules/management/list-main.scss";
         .g-main {
           width: 100%;
         }
diff --git a/src/views/modules/volunteer/pointsRedemption/record.vue b/src/views/modules/volunteer/pointsRedemption/record.vue
index 8eae60b31..56772ef63 100644
--- a/src/views/modules/volunteer/pointsRedemption/record.vue
+++ b/src/views/modules/volunteer/pointsRedemption/record.vue
@@ -1,17 +1,17 @@
 <template>
     <div class="g-main" style="padding: 30px;">
-        <div class="f-flex">
-            <div class="f-flex" style="align-items: center;">
-                <div>姓名</div>
-                <el-input placeholder="请输入内容" v-model="input" style="width: 200px" clearable>
+        <div class="flex flex-wrap flex-end">
+            <div class="flex flex-center1 flex-center2 m-bottom10  " style="">
+                <div>姓名：</div>
+                <el-input placeholder="请输入内容" v-model="searchData.SearchName" style="width: 200px" clearable>
                 </el-input>
             </div>
-            <div class="f-flex" style="align-items: center;">
-                <div>手机号</div>
-                <el-input placeholder="请输入内容" v-model="input" style="width: 200px" clearable>
+            <div class="flex flex-center1 flex-center2 m-bottom10" style="">
+                <div>手机号：</div>
+                <el-input placeholder="请输入内容" v-model="searchData.phone" style="width: 200px" clearable>
                 </el-input>
             </div>
-            <div class="f-flex" style="align-items: center;">
+            <div class="flex flex-center1 flex-center2 m-bottom10" style="">
                 <div>状态：</div>
                 <el-select v-model="StatusName" placeholder="请选择">
                     <el-option v-for="item in Status" :key="item.value" :label="item.label" :value="item.value">
@@ -19,28 +19,28 @@
                 </el-select>
 
             </div>
-            <div class="f-flex" style="align-items: center;">
+            <div class="flex flex-center1 flex-center2 m-bottom10" style="">
                 <div>兑换时间选择：</div>
                 <el-date-picker v-model="ExchangeTime" type="date" placeholder="选择日期">
                 </el-date-picker>
             </div>
             <div>
-                <el-button type="primary">查询</el-button>
+                <el-button type="primary" class="m-bottom10">查询</el-button>
             </div>
         </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="Community" header-align="center" align="center" label="姓名">
+                <el-table-column prop="redeemerName" header-align="center" align="center" label="姓名">
                 </el-table-column>
-                <el-table-column prop="ActivityCount" header-align="center" align="center" label="兑换时间">
+                <el-table-column prop="redeemTime" 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="redeemerIdCard" 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="ActivityCount" header-align="center" align="center" label="手机号">
+                <el-table-column prop="redeemerMobile" header-align="center" align="center" label="手机号">
                 </el-table-column>
                 <el-table-column prop="ActivityCount" header-align="center" align="center" label="核销时间">
                 </el-table-column>
@@ -74,7 +74,7 @@
     </div>
 </template>
 <script>
-
+   import { requestPost,requestGet } from "@/js/dai/request";
 export default {
     data() {
     return {
@@ -91,6 +91,9 @@ export default {
         ExchangeTime:"",
         labelPosition: 'right',
         tableData: [],
+        searchData:{
+        },
+        awardId:"",
     };
   },
   props:{
@@ -99,14 +102,45 @@ export default {
       default: () => {}
     }
   },
-  methods: {},
+  methods: {
+    async getTableData() {
+        // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+        const url = "/voluntary/points/admin/listRedeemRecords";
+        let params = {
+            awardId:this.awardId
+
+      }
+      console.log(params,"params");
+      console.log(this.awardId,"awardId"
+          
+      )
+      
+        const { data, code, msg } = await requestGet(url, params)
+        if (code === 0) {
+          console.log("列表请求成功！！！！！！！！！！！！！！");
+          this.total = data.total || 0;
+          this.tableData = data.list
+          console.log(this.tableData,"this.tableData");
+          
+    
+        } else {
+        }
+      },
+    
+  },
   created() {
     console.log(this.list,"list");
     this.tableData=this.list
+    this.awardId=this.list.id
+    console.log(this.awardId,"awardId");
+    this.getTableData(
+        
+    )
+    
   },
 }
 
 </script>
 <style lang="scss" scoped>
-  @import "@/assets/scss/modules/management/list-main.scss";
+  @import "@/assets/scss/modules/management/volunteet.scss";
 </style>
\ No newline at end of file