From c0eac8a7af20d212c8385692dbb6ef62933706bc 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: Thu, 5 Sep 2024 14:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/volunteer/VolManage/enclosure.vue | 168 ++++++++++++++----
 .../modules/volunteer/VolManage/integral.vue  |  46 ++++-
 .../modules/volunteer/activityArchive/add.vue |   3 +-
 .../volunteer/activityArchive/index.vue       |  16 +-
 .../volunteer/activityArchive/process.vue     |  65 +++++--
 5 files changed, 235 insertions(+), 63 deletions(-)

diff --git a/src/views/modules/volunteer/VolManage/enclosure.vue b/src/views/modules/volunteer/VolManage/enclosure.vue
index e87c34c91..58c7f878a 100644
--- a/src/views/modules/volunteer/VolManage/enclosure.vue
+++ b/src/views/modules/volunteer/VolManage/enclosure.vue
@@ -1,20 +1,37 @@
 <template>
   <div>
-  <div style="display: flex;white-space: nowrap;  padding: 30px 0 0 0 ;" >
-    <el-col :span="12">
-       <el-form-item label="调整类型" prop="type" required>
-              <el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 280px">
+  <div style="display: flex;white-space: nowrap;  padding: 30px ;" >
+    <el-form :rules="rules"  :model="formData" >   
+      <el-row><el-col :span="12">
+       <el-form-item label="调整类型" prop="type" >
+              <el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 200px">
                 <el-option v-for="item in  typeList" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="活动积分" prop="points">
+              <el-input-number v-model="formData.points" label="描述文字" :step="0.1" :precision="1" ></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="调整原因" prop="description">
+              <el-input type="textarea" placeholder="请输入活动标题，不超过50子" :height="150" v-model="formData.description"
+                maxlength="200" show-word-limit style="width: 555px;">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        </el-form>
+
+       
      </div>
      <div class="div_btn">
  
         <el-button size="small" @click="handleCancle">取 消</el-button>
         <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
-           @click="handleComfirm">确 定</el-button>
+           @click="getTableData">确 定</el-button>
 
   </div>
 </div>
@@ -25,61 +42,144 @@ export default {
  name: "see",
   data() {
   return {
+    formData:{
+      type:"",
+      points:'',
+      description:"",//调整原因
+    },
+    typeList:[
+      {
+        id:"0",
+        name:"增积分"
+      },
+      {
+        id:"1",
+        name:"减积分"
+      }
+    ],
+    Positive:'',
       radio:'1',
       stockQty:"",
       labelPosition: 'right',
       tableData: [],
-      awardId:""
+      awardId:"",
+      rules: {
+        //   linkMobile: [
+        //   { required: true, message: '联系电话不能为空', trigger: 'blur' },
+        //   { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+        // ],
+        // title: [
+        //   { required: true, message: '活动标题不能为空', trigger: 'blur' },
+        // ],
+        // content: [
+        //   { required: true, message: '活动详情不能为空', trigger: 'blur' },
+        // ],
+        
+        type: [
+          { required: true, message: '调整类型不能为空', trigger: 'blur' },
+        ],
+        points: [
+          { required: true, message: '积分修改不能为空', trigger: 'blur' },
+        ],
+        // signInTime: [
+        //   { required: true, message: '签到时间不能为空', trigger: 'blur' },
+        // ],
+        // deadline: [
+        //   { required: true, message: '活动报名时间不能为空', trigger: 'blur' },
+        // ],
+        // serviceTime: [
+        //   { required: true, message: '服务时长不能为空', trigger: 'blur' },
+        // ],
+        
+      }
   };
+  
 },
 props:{
   VolunteerList:{
     type: Object,
     default: () => {}
-  }
+  },
+  listL:{
+    type: Object,
+    default: () => {}
+  },
+},
+comments: {
+
 },
 created() {
+  console.log(this.listL,"list");
   console.log(this.VolunteerList,"list");
   this.tableData=this.VolunteerList
   // this.awardId=this.list.id
   // this.getTableData()
 },
 methods: {
+  // 调整积分
+        async getTableData() {
+        const url = "/voluntary/points/adjustVolunteerPoints/commit";
+        // this.Positive = this.formData.type === 0 ? 1 : -1; // 使用数字表示正
+        // console.log(this.Positive,"this.Positive");
+        // console.log(this.formData.points,this.formData.type,"this.formData.points");
+        // let pointsDelta = this.Positive * parseFloat(this.formData.points);
+        let params={
+          id:this.VolunteerList.id,
+          description:this.formData.description,
+          pointsDelta:this.formData.points,
+          primaryPoints:this.listL.points
+          // volunteerId:this.list.id,
+          // mobile:this.formData.phone,
+          // name:this.formData.name
+        }
+        console.log(params,"params");
+        
+        const { data, code, msg } = await requestPost(url,params);
+        if (code === 0) {
+          console.log("列表请求成功！！！！！！！！！！！！！！");
+          this.$message({
+            message: "调整成功",
+            type: "success",
+          });
+          this.$emit('summDetailClose')
+        } else {
+        }
+      },
   //取消审查
   handleCancle(){
-    this.$emit('handleprocesslClose')
+    this.$emit('handleAdjustClose')
   },
   //确认审查
   handleComfirm(){
-    this.$emit('handleprocesslClose')
+    this.$emit('handleAdjustClose')
   },
-   getTableData() {
-      console.log(this.formData);
-      const url = "/voluntary/pointsAward/admin/detail";
-      let params = {
-        id:this.awardId
-    }
-    requestGet(url, params).then((res) =>{
-      console.log(res,"res");
-      if(res.code===0){
-        console.log("列表请求成功！！！！！！！！！！！！！！");
-        console.log(res.data, "data");
-        this.tableData = res.data
-        console.log(this.tableData, "this.tableData");
-      }
-    })
-      // const { data, code, msg } =  requestGet(url, params)
-      // console.log(data,"data");
-      // if (code === 0) {
-      //   console.log("列表请求成功！！！！！！！！！！！！！！");
-      //   console.log(data,"data");
-      //   this.tableData = data
-      //   console.log(this.tableData,"this.tableData");
+  //  getTableData() {
+  //     console.log(this.formData);
+  //     const url = "/voluntary/pointsAward/admin/detail";
+  //     let params = {
+  //       id:this.awardId
+  //   }
+  //   requestGet(url, params).then((res) =>{
+  //     console.log(res,"res");
+  //     if(res.code===0){
+  //       console.log("列表请求成功！！！！！！！！！！！！！！");
+  //       console.log(res.data, "data");
+  //       this.tableData = res.data
+  //       console.log(this.tableData, "this.tableData");
+  //     }
+  //   })
+  //     // const { data, code, msg } =  requestGet(url, params)
+  //     // console.log(data,"data");
+  //     // if (code === 0) {
+  //     //   console.log("列表请求成功！！！！！！！！！！！！！！");
+  //     //   console.log(data,"data");
+  //     //   this.tableData = data
+  //     //   console.log(this.tableData,"this.tableData");
         
   
-      // } else {
-      // }
-    },
+  //     // } else {
+  //     // }
+  //   },
 
 },
 
diff --git a/src/views/modules/volunteer/VolManage/integral.vue b/src/views/modules/volunteer/VolManage/integral.vue
index c3ea4c7ff..8dff26477 100644
--- a/src/views/modules/volunteer/VolManage/integral.vue
+++ b/src/views/modules/volunteer/VolManage/integral.vue
@@ -61,7 +61,9 @@
         </el-table-column>
         <!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="姓名">
                 </el-table-column> -->
-        . <el-table-column prop="operationName" header-align="center" align="center" label="名称">
+        <el-table-column prop="operationName" header-align="center" align="center" label="积分行为">
+        </el-table-column>
+        <el-table-column prop="activityTitle" header-align="center" align="center" label="关联活动">
         </el-table-column>
         <el-table-column prop="pointsDelta" header-align="center" align="center" label="类型">
           <template slot-scope="scope">
@@ -69,7 +71,8 @@
             <span v-else>减积分</span>
           </template>
         </el-table-column>
-
+        <el-table-column prop="description" header-align="center" align="center" label="备注">
+        </el-table-column>
         <el-table-column prop="pointsDelta" header-align="center" align="center" label="积分">
           <template slot-scope="scope">
             <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleAdjust(scope.row)">{{ scope.row.pointsDelta}}</el-button>
@@ -92,7 +95,7 @@
       </div>
       <el-dialog   :modal="false" :visible.sync="adjustment" :close-on-click-modal="false" :close-on-press-escape="false" title="积分调整"
             width="750px" top="15vh" class="dialog-h"   >
-            <enclosure v-if="adjustment" :list="fmData"  />
+            <enclosure v-if="adjustment" :listL="listL" :VolunteerList="VolunteerList"    @handleAdjustClose="handleAdjustClose" />
           </el-dialog>
     </div>
 
@@ -146,6 +149,8 @@ export default {
         pageSize: 10,
         pageNo: 1,
         total: 0,
+        VolunteerList:{},
+        listL:{}
     };
   },
   props:{
@@ -159,25 +164,54 @@ export default {
   },
   created() {
     console.log(this.list,"list");
+    this.listL=this.list
     this.getlist()
     this.getpoint1s()
 
   },
   computed:{
-  
+    rules: {
+        //   linkMobile: [
+        //   { required: true, message: '联系电话不能为空', trigger: 'blur' },
+        //   { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+        // ],
+        // title: [
+        //   { required: true, message: '活动标题不能为空', trigger: 'blur' },
+        // ],
+        // content: [
+        //   { required: true, message: '活动详情不能为空', trigger: 'blur' },
+        // ],
+        
+        type: [
+          { required: true, message: '调整类型不能为空', trigger: 'blur' },
+        ],
+        linkman: [
+          { required: true, message: '联系人不能为空', trigger: 'blur' },
+        ],
+        signInTime: [
+          { required: true, message: '签到时间不能为空', trigger: 'blur' },
+        ],
+        deadline: [
+          { required: true, message: '活动报名时间不能为空', trigger: 'blur' },
+        ],
+        serviceTime: [
+          { required: true, message: '服务时长不能为空', trigger: 'blur' },
+        ],
+        
+      }
   },
   methods: {
     //调整积分
     handleAdjust(row){
-   
       this.adjustment=true
+      this.VolunteerList=row
       console.log(row, this.adjustment,"row");
     },
     //关闭调整积分
         //调整积分
         handleAdjustClose(row){
       console.log(row,"row");
-      this.adjustmen=false
+      this.adjustment=false
       
     },
           //控制活动时间
diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
index 0aeb88408..4e10a8f06 100644
--- a/src/views/modules/volunteer/activityArchive/add.vue
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -267,7 +267,8 @@ export default {
         multiple: false,
         checkStrictly: true
     },
-    orgTypeFilter:[],
+    orgTypeFilter:[
+],
     customerId: localStorage.getItem('customerId'),
     uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
       orgOptions:[],
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index cc7ecd90e..a2cec85cd 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -65,10 +65,16 @@
           </template> -->
         </el-table-column>
         <el-table-column prop="Points" header-align="center" align="center" label="来源" :show-overflow-tooltip="true">
-          管理端
+               <template slot-scope="scope">
+            <span>{{ scope.row.client === 0 ? '管理端' : '移动端' }}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="Points" header-align="center" align="center" label="审核状态" :show-overflow-tooltip="true">
-          管理端
+          <template slot-scope="scope">
+            <span v-if="scope.row.auditStatus === 0">待审核</span>
+            <span v-if="scope.row.auditStatus === 1">已通过</span>
+            <span v-if="scope.row.auditStatus === 2">未通过</span>
+          </template>
         </el-table-column>
         <!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="所属项目">
         </el-table-column> -->
@@ -78,7 +84,7 @@
             <el-button type="text" v-if="scope.row.statusType=='未发布'" style="color:#1C6AFD;" size="small"
               @click="handleDetail(scope.row)">修改</el-button>
             <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button>
-            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleprocessl(scope.row)">审核</el-button>
+            <el-button type="text"v-if="scope.row.auditStatus === 0" style="color:#1C6AFD;" size="small" @click="handleprocessl(scope.row)">审核</el-button>
             <el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'&&scope.row.statusType!='进行中'"
               type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button>
             <el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'" type="text" style="color:#1C6AFD;"
@@ -124,7 +130,7 @@
         <ActivityCountshow v-if="ActivityCountshow" :list="fmData" />
       </el-dialog>
       <el-dialog :visible.sync="showprocess" :close-on-click-modal="false" :close-on-press-escape="false" title="审核"
-                width="500px" top="10vh" class="dialog-h" @closed="handleprocesslClose">
+                width="750px" top="10vh" class="dialog-h" @closed="handleprocesslClose">
                 <process v-if="showprocess" @handleprocesslClose="handleprocesslClose"  :VolunteerList="EditList"/>
             </el-dialog>
     </div>
@@ -211,7 +217,9 @@
                 //关闭审核
         
                 handleprocesslClose(){
+              
             this.showprocess=false
+            this.getTableData()
         },
         //新增关闭
       //   AddClose(){
diff --git a/src/views/modules/volunteer/activityArchive/process.vue b/src/views/modules/volunteer/activityArchive/process.vue
index 69f6e322f..eda83a28b 100644
--- a/src/views/modules/volunteer/activityArchive/process.vue
+++ b/src/views/modules/volunteer/activityArchive/process.vue
@@ -1,22 +1,23 @@
 <template>
   <div>
   <div style="display: flex;white-space: nowrap;  padding: 30px 0 0 0 ;" >
-      <el-form  style="padding-left: 50px;" :label-position="labelPosition" :model="tableData">
-      
+      <el-form  style="padding-left: 50px;" :label-position="labelPosition" :model="tableData" label-width="120px">
           <el-form-item label="审核">
-  
-          <div style="display: flex; justify-items:center; align-items: center;">
-              <el-radio v-model="radio" label="1" style="margin-right:20px">通过</el-radio>
-             <div class="flex flex-x  flex-center2">
-                <el-radio v-model="radio" label="2" style="margin-right: 10px;">不通过</el-radio>
-                <el-input v-if="radio == '2'" type="number" v-model="stockQty" style="width: 200px;"
-                   placeholder="请说明原因"></el-input>
-     
-            </div>
-      </div>
-          </el-form-item>
-      </el-form>
-     
+                            <el-select class="item_width_1" v-model.trim="formData.auditStatus" placeholder="请选择" clearable style="width: 280px">
+                                <el-option v-for="item in auditStatusList" :key="item.id" :label="item.typeName"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                   </el-form-item>
+      
+      <el-col :span="24">
+            <el-form-item label="报名条件" prop="auditReason">
+              <el-input type="textarea" placeholder="请输入活动标题，不超过50子" :height="150" v-model="formData.auditReason"
+                maxlength="200" show-word-limit style="width: 500px;">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
      </div>
      <div class="div_btn">
  
@@ -33,9 +34,24 @@ export default {
  name: "see",
   data() {
   return {
-      radio:'1',
-      stockQty:"",
-      labelPosition: 'right',
+    auditStatusList:[
+      {
+        id: 0,
+        typeName: "待审核",
+      },
+      {
+        id: 1,
+        typeName: "通过",
+      },
+      {
+        id: 2,
+        typeName: "不通过",
+      },
+    ],
+    formData:{
+      auditStatus :'',
+      auditReason:"",
+    },
       tableData: [],
       awardId:""
   };
@@ -59,6 +75,19 @@ methods: {
   },
   //确认审查
   handleComfirm(){
+    let url="/voluntary/activityInfo/audit"
+    let params={
+      id:this.tableData.id,
+      auditStatus:this.formData.auditStatus ,
+      auditReason:this.formData.auditReason
+    }
+    requestPost(url,params).then((res)=>{
+      console.log(res,"res");
+      if(res.code===0){
+        this.$message.success("审核成功")
+        this.$emit('handleprocesslClose')
+      }
+    })
     this.$emit('handleprocesslClose')
   },
    getTableData() {