From e38a011041b27da59ca5ead25736605d8e6deec0 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 15:52:14 +0800
Subject: [PATCH] bug

---
 .../volunteer/VolManage/activeRecord.vue      |   31 +-
 .../modules/volunteer/VolManage/index.vue     |    4 +-
 .../volunteer/activityArchive/Points.vue      |   28 +-
 .../modules/volunteer/activityArchive/add.vue |  257 ++--
 .../volunteer/activityArchive/index.vue       |   19 +-
 .../volunteer/activityArchive/select.vue      | 1049 +++++++++--------
 .../volunteer/pointsRedemption/Select.vue     |    3 +-
 .../volunteer/pointsRedemption/add.vue        |  104 +-
 .../volunteer/pointsRedemption/record.vue     |   44 +-
 .../volunteer/pointsRedemption/update.vue     |  180 +--
 10 files changed, 1006 insertions(+), 713 deletions(-)

diff --git a/src/views/modules/volunteer/VolManage/activeRecord.vue b/src/views/modules/volunteer/VolManage/activeRecord.vue
index 455de2716..8951a0a70 100644
--- a/src/views/modules/volunteer/VolManage/activeRecord.vue
+++ b/src/views/modules/volunteer/VolManage/activeRecord.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="g-main ">
-    <div class="flex flex-mean m-bottom10" >
-      <div class="flex flex-center1 flex-center2 ">
+    <div class="">
+      <!-- <div class="flex flex-center1 flex-center2 ">
         <div>活动查询：</div>
         <el-input placeholder="请输入内容" v-model="SearchForm.content" style="width: 200px" clearable>
         </el-input>
@@ -12,20 +12,33 @@
           <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> -->
+      <el-form :inline="true" :model="SearchForm" class="demo-form-inline" style="">
+        <el-form-item label="活动查询">
+          <el-input placeholder="请输入内容" v-model="SearchForm.content" style="width: 150px" clearable>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="状态" label-width="80px">
+          <el-select v-model="SearchForm.Stutas" placeholder="请选择" clearable>
+            <el-option v-for="item in optionsStatus" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+     
+        <el-button type="primary" @click="handleSearch"  style="margin-left: 50px;">查询</el-button>
+ 
+      </el-form>
+
     </div>
     <div class="m-bot50">
       <el-table class="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="agencyName" header-align="center" align="center" label="主办方">
 
         </el-table-column>
         <el-table-column prop="address" header-align="center" align="center" label="活动地点">
-  
+
         </el-table-column>
         <el-table-column prop="title" header-align="center" align="center" label="活动标题">
         </el-table-column>
@@ -98,7 +111,7 @@ export default {
           pageSize:this.pageSize,
           pageNo:this.pageNo,
           userId:this.fmData.userId,
-          content:this.SearchForm.content,
+          searchContent:this.SearchForm.content,
           signFlag:this.SearchForm.Stutas
           
         }
diff --git a/src/views/modules/volunteer/VolManage/index.vue b/src/views/modules/volunteer/VolManage/index.vue
index 1d09533a4..e44d06b11 100644
--- a/src/views/modules/volunteer/VolManage/index.vue
+++ b/src/views/modules/volunteer/VolManage/index.vue
@@ -6,8 +6,8 @@
           <el-form-item label="姓名">
             <el-input v-model.trim="formData.name" size="small" class="item_width_1" clearable placeholder="请输入">
             </el-input>
-          </el-form-item>
-          <el-form-item label="手机号">
+          </el-form-item>手机号
+          <el-form-item label="">
             <el-input v-model.trim="formData.mobile" size="small" class="item_width_1" clearable
               placeholder="请输入"></el-input>
           </el-form-item>
diff --git a/src/views/modules/volunteer/activityArchive/Points.vue b/src/views/modules/volunteer/activityArchive/Points.vue
index 5fa2b1bde..912e985c9 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="justify-content: space-around; margin-bottom: 20px;">
-            <div class="f-flex" style="align-items: center;">
+            <!-- <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">
@@ -21,7 +21,27 @@
             </div>
             <div>
                 <el-button type="primary"  @click="handleSearch">查询</el-button>
-            </div>
+            </div> -->
+            <el-form :inline="true" :model="searchData" class="demo-form-inline" style="" >
+                <el-form-item label="姓名">
+                    <el-input placeholder="请输入内容" v-model="searchData.redeemerName" style="width: 150px" clearable>
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="手机号"  label-width="80px">
+                    <el-input placeholder="请输入内容" v-model="searchData.redeemerMobile" style="width: 150px" clearable>
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="兑换时间选择"  label-width="120px">
+                    <el-date-picker v-model="searchData.redeemTimeFrom" type="datetime" placeholder="开始时间"
+                        format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  style="width: 150px">
+                    </el-date-picker>至 <el-date-picker v-model="searchData.redeemTimeTo" type="datetime"
+                        placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  style="width: 150px">
+                    </el-date-picker>
+                </el-form-item>
+                <div style="display: flex; justify-content: flex-end; margin:10px 0 20px 0;">
+                    <el-button  type="primary" @click="handleSeach" style="margin: 20rpx;">查询</el-button>
+                </div>
+            </el-form>
         </div>
         <div>
             <el-table :data="tableData" border>
@@ -118,8 +138,8 @@ export default {
           name:this.formData.name,
           pageSize:this.pageSize,
           mobile:this.formData.mobile,
-        //   activityId:this.list.id,
-            activityId:"1826111922849996802",
+          activityId:this.list.id,
+            // activityId:"1826111922849996802",
       }
       requestGet(url, params).then((res) => {
         if (res.code == 0) {
diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
index a0e63b6c0..20d903322 100644
--- a/src/views/modules/volunteer/activityArchive/add.vue
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -2,63 +2,63 @@
   <div>
     <div class="dialog-h-content scroll-h"
       style="display: flex; flex-direction: row; justify-content:space-between; padding: 20px;">
-      <div style="width: 49%; ">
-        <el-form ref="ref_form" :inline="true" :model="formData" class="form">
-          <el-form-item label="主办方" prop="agencyId">
-            <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small"
+      <div style="width: 48%; ">
+        <el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="90px" :rules="rules"  >
+          <el-form-item label="主办方" prop="agencyId" required>
+            <el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 300px;"
               v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
               @change="handleChangeAgency"></el-cascader>
           </el-form-item>
-          <el-form-item label="活动标题" prop="title">
-            <el-input type="textarea" placeholder="请输入活动标题，不超过50子" v-model="formData.title" maxlength="50"
+          <el-form-item label="活动标题" prop="title" required>
+            <el-input type="textarea" style="width: 300px;" placeholder="请输入活动标题，不超过50子" v-model="formData.title" maxlength="50"
               show-word-limit>
             </el-input>
           </el-form-item>
-          <el-form-item label="活动详情" prop="content" style="display: block">
-            <div class="item_width_1">
-              <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="250" placeholder="请输入活动内容" />
+          <el-form-item label="活动详情" prop="content" style="display: block" required>
+            <div  style="width: 300px;">
+              <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="150" placeholder="请输入活动内容" />
             </div>
           </el-form-item>
-          <el-form-item label="照片" prop="activityImgs">
-            <div>
-              <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+          <el-form-item label="照片" prop="activityImgs" required>
+            <div >
+              <el-upload  :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
                 :show-file-list="true" :data="{ customerId: customerId }" :file-list="formData.activityImgs"
                 :on-preview="handleImgPreview" :on-success="handleImgSuccess" :on-remove="handleImgRemove"
                 :on-exceed="handleImgExceed" :before-upload="beforeImgUpload" list-type="picture-card" :limit="1">
-                <i class="el-icon-plus avatar-uploader-icon"></i>  </el-upload>
+                <i class="el-icon-plus avatar-uploader-icon" style="width: 50px;height: 50px;"></i>  </el-upload>
             </div>
           </el-form-item>
 
-          <el-form-item label="活动时间" prop="activeTime">
+          <el-form-item label="活动时间" prop="strTime" required >
             <el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss">
+              value-format="yyyy-MM-dd HH:mm:ss" style="width: 150px;">
             </el-date-picker>至 <el-date-picker v-model="formData.endTime" type="datetime" placeholder="结束时间"
-              format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+              format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"style="width: 150px;"@change="actcontrolTime">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="活动名额" prop="points">
+          <el-form-item label="活动名额" prop="points" required>
             <div style="display: flex; flex-direction: column;">
-              <el-input-number :disabled="formData.notQuota === '0'" v-model.trim="formData.quota" :max="10"
-                label="描述文字"></el-input-number>
+              <el-input-number :disabled="formData.notQuota === '0'" v-model.trim="formData.quota" 
+                label="描述文字" type="number"></el-input-number>
               <el-radio style="margin-top: 20px;" v-model="formData.notQuota" label="0">不限名额</el-radio>
             </div>
           </el-form-item>
           <el-form-item label="活动类型" prop="type" required>
-            <el-select v-model.trim="formData.type" placeholder="请选择" clearable>
+            <el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 300px;">
               <el-option v-for="item in  typeList" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label=" 联系人" prop="contacts">
-            <el-input v-model="formData.linkman" placeholder="请输入"></el-input>
+          <el-form-item label=" 联系人" prop="linkman" required >
+            <el-input v-model="formData.linkman" placeholder="请输入" style="width: 300px;"></el-input>
           </el-form-item>
-          <el-form-item label=" 联系电话" prop="phone">
-            <el-input v-model="formData.linkMobile" placeholder="请输入"></el-input>
+          <el-form-item label=" 联系电话" prop="linkMobile"  required>
+            <el-input v-model="formData.linkMobile" placeholder="请输入"style="width: 300px;"></el-input>
           </el-form-item>
         </el-form>
       </div>
-      <div style="width: 49%;">
-        <el-form ref="ref_form" :inline="true" :model="formData"  class="form">
+      <div style="width: 48%;">
+        <el-form ref="ref_form" :inline="true" :model="formData"  class="form"  label-width="115px">
           <div>
             <el-form-item label="活动积分" prop="integral">
               <el-input-number v-model="formData.points"  :min="1" :max="10"
@@ -73,21 +73,20 @@
                             </el-select>
                         </el-form-item> -->
             <el-form-item label="报名条件" prop="conditions" style="display: block">
-              <div class="item_width_1">
                 <el-input type="textarea" placeholder="请输入活动标题，不超过50子" v-model="formData.conditions" maxlength="200"
-                show-word-limit>
+                show-word-limit style="width: 300px;">
               </el-input>
-              </div>
+       
             </el-form-item>
-            <el-form-item label="签到时间" prop="Checktime">
+            <el-form-item label="签到时间" prop="signInTime" required>
               <el-date-picker v-model.trim="formData.signInTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd HH:mm:ss" placeholder="请选择签到时间" style="width:280px">
+                format="yyyy-MM-dd HH:mm:ss" placeholder="开始时间" style="width:150px">
               </el-date-picker>至
               <el-date-picker v-model.trim="formData.signOutTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd HH:mm:ss" placeholder="请选择签到时间" style="width:280px">
+                format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间" style="width:150px" @change="controlTime ">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="报名截止时间" prop="deadline">
+            <el-form-item label="报名截止时间" prop="deadline" required>
               <el-date-picker v-model="formData.deadline" type="datetime" placeholder="选择日期时间"
                 value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
@@ -98,26 +97,24 @@
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
           </div>
-          <!-- <el-form-item label="赞助单位" prop="sponsor">
-            <div style="display: flex;  align-items: center">
-  
-              <el-input v-model="input" placeholder="请输入"></el-input>
-              <i class="el-icon-circle-plus" style="width: 50px;"></i>
-            </div>
-          </el-form-item>
-          <el-form-item label=" 联系电话" prop="number">
-            <el-input v-model="input" placeholder="请输入"></el-input>
-          </el-form-item> -->
-          <el-form-item label="活动地点" prop="address"  style="display: block">
-                        <div style="width: 500px">
-                            <el-select v-model.trim="searchValue" filterable style="width: 400px" remote
+              <el-form-item label="赞助单位" prop="sponsor" style="margin-bottom:20px"  label-width="110px">
+                <el-input v-model="tableDate.name" placeholder="请输入" style="width: 300px;"></el-input>
+              </el-form-item>
+              <el-form-item label="联系电话" prop="sponsor" >
+                <el-input v-model="tableDate.phone" placeholder="请输入" style="width: 300px;"></el-input>
+              </el-form-item>
+<!-- <i class="el-icon-circle-plus"  @click="addDomain" style="font-size: 20px;"></i> -->
+     
+          <el-form-item label="活动地点" prop="searchValue"   >
+                        <div style="width: 300px">
+                            <el-select v-model.trim="searchValue" filterable style="width: 300px" remote
                                 :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
                                 :loading="loading">
                                 <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)" style="width: 400px;"
                                     :key="item.value || index" :label="item.label" :value="item.value">
                                 </el-option>
                             </el-select>
-                            <div id="app_activity" class="div_map"></div>
+                            <div  id="app_activity" class="div_map"></div>
                         </div>
                     </el-form-item>
         </el-form>
@@ -187,14 +184,6 @@ export default {
     type:"",
     online:0,
     sponsors:[
-        {
-            "name":"赞助1",
-            "phone":"13111111111"
-        },
-        {
-            "name":"赞助2",
-            "phone":"13122222222"
-        }
     ]
 
       },
@@ -212,7 +201,32 @@ export default {
         ],
       fileList: [],
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
-
+        tableDate:{},
+        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' },
+        ],
+      }
     }
   },
   watch: {
@@ -227,7 +241,7 @@ export default {
     }
   },
   components: { fileList,Tinymce,UploadImage},
-  async mounted () {
+   mounted () {
     // this.startLoading()
     // await this.loadInfo()
     // this.endLoading()
@@ -235,7 +249,106 @@ export default {
   },
 
   methods: {
-    
+        //控制活动时间
+        actcontrolTime(){
+      console.log("dislfj");
+        if(this.formData.strTime>this.formData.endTime){
+          this.$message.error('活动结束时间不能在活动开始时间之前');
+          this.formData.endTime=''
+          return
+        }
+    },
+    //控制签到时间
+    controlTime(){
+      console.log("dislfj");
+        if(this.formData.signInTime>this.formData.signOutTime){
+          this.$message.error('签到开始时间不能在签到结束时间之后');
+          this.formData.signOutTime=''
+          return
+        }
+    },
+       //提交
+      async  handleComfirm() {
+        console.log(this.tableDate);
+      this.formData.sponsors.push(this.tableDate);
+      console.log(this.formData,"this,formD");
+      if (this.formData.address == '') {
+        this.$message.error('请输入活动地点');
+        return;
+      }
+      if (this.formData.agencyId == '') {
+        this.$message.error('请选择主办方');
+        return;
+      }
+      if (this.formData.title == '') {
+        this.$message.error('请输入活动标题');
+        return;
+      }
+      if (this.formData.content == '') {
+        this.$message.error('请输入活动详情');
+        return;
+      }
+      // if (this.formData.imgs == '') {
+      //   this.$message.error('请上传图片');
+      //   return;
+      // }
+      if (this.formData.strTime  == '') {
+        this.$message.error('请填写活动开始时间');
+        return;
+      }
+      if (this.formData.endTime  == '') {
+        this.$message.error('请填写活动结束时间');
+        return;
+      }
+      if (this.formData.type=='') {
+        this.$message.error('请填写活动和类型');
+        return;
+      }
+      if (this.formData.linkman=='') {
+        this.$message.error('请填写联系人');
+        return;
+      }
+      if (this.formData.linkMobile=='') {
+        this.$message.error('请填写联系电话');
+        return;
+      }
+      if (this.formData.signInTime=='') {
+        this.$message.error('请填写签到开始时间');
+        return;
+      }
+      if (this.formData.signOutTime=='') {
+        this.$message.error('请填写签到结束时间');
+        return;
+      }
+      if (this.formData.deadline=='') {
+        this.$message.error('请填写报名截止时间');
+        return;
+      }
+      let url="/voluntary/activityInfo/saveInfo";
+      let parms={
+        ...this.formData
+      }
+      console.log(parms,"parms");
+      
+      await requestPost(url,parms).then((res)=>{
+        console.log(res,"res");
+        if (res.code==0) {
+          this.$message.success('添加成功');
+          this.$emit('AddClose')
+          // this.$router.push({path:'/volunteer/activityArchive'})
+        }else{
+          this.$message.error(res.msg);
+        }
+        
+      })
+    },
+    addDomain() {
+      console.log(this.formData.sponsors,this.tableDate,);
+        this.formData.sponsors.push(this.tableDate);
+        console.log(this.formData.sponsors,this.tableDate,);
+   
+        
+      },
     handleClickKey(index) {
             let selPosition = this.resultList[index]
             let lonlat = selPosition.lonlat.split(" ")
@@ -396,20 +509,7 @@ export default {
             console.log(val);
             this.formData.agencyId = val
        },
-    //提交
-    handleComfirm() {
-      console.log(this.formData,"this,formD");
-      let url="/voluntary/activityInfo/ ";
-      let parms={
-        ...this.formData
-      }
-      console.log(parms,"parms");
-      
-      requestPost(url,parms).then((res)=>{
-        console.log(res,"res");
-        
-      })
-    },
+ 
     //图片
     removedImg() {
             this.formData.imgs = ''
@@ -456,8 +556,9 @@ export default {
             })
     },
     handleCancle () {
-
-      this.$emit('diaDetailClose')
+      console.log(    "kdsljk");
+  
+      this.$emit('AddClose')
 
     },
          // 开启加载动画
@@ -488,17 +589,15 @@ export default {
       type: String,
       required: ''
     },
-    list:{
-      type: Object,
-      default: () => {}
-    }
+
 
   }
 }
 </script>
 <style lang="scss" scoped>
 .div_map{
-  width: 400px;
+  width: 300px;
+  margin-top: 10px;
 }
 .div_btn1{
   display: flex;
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index 3a7614aed..e65fd7977 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -4,7 +4,7 @@
       <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
         <div>
           <el-form-item label="活动标题">
-            <el-input v-model.trim="formData.content" size="small" class="item_width_1" clearable placeholder="请输入">
+            <el-input v-model.trim="formData.content"  class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
           <el-form-item label="活动时间">
@@ -88,8 +88,8 @@
         </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  v-if="add" :list="fmData" />
+        width="1000px" top="10vh" class="dialog-h" @closed="AddClose">
+        <add  v-if="add" :list="fmData" @AddClose="AddClose" />
       </el-dialog>
       <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">
@@ -173,7 +173,12 @@
         this.getTableData();
       },
       methods: {
-        
+        //新增关闭
+      //   AddClose(){
+      //   this.Record=false
+      //   this.integral=false
+      //   this.getTableData()
+      // },
         //活动上下线
         handleupOnline(row){
           console.log(row,"row");
@@ -298,6 +303,12 @@
         diaClose(){
           this.formShow=false
         },
+        AddClose(){
+          console.log("sdkjksd");
+          
+          this.add=false
+          this.getTableData()
+        },
         resetSearch(){
           this.formData=[]
         },
diff --git a/src/views/modules/volunteer/activityArchive/select.vue b/src/views/modules/volunteer/activityArchive/select.vue
index ab63eb490..4547ac7c8 100644
--- a/src/views/modules/volunteer/activityArchive/select.vue
+++ b/src/views/modules/volunteer/activityArchive/select.vue
@@ -1,251 +1,257 @@
 <template>
-    <div>
-      <div class="dialog-h-content scroll-h"
-        style="display: flex; flex-direction: row; justify-content:space-between; padding: 20px;">
-        <div style="width: 49%; ">
-          <el-form ref="ref_form" :inline="true" :model="formData" class="form">
-            <el-form-item label="主办方" prop="agencyId">
-              <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small"
-                v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
-                @change="handleChangeAgency"></el-cascader>
+  <div>
+    <div class="dialog-h-content scroll-h"
+      style="display: flex; flex-direction: row; justify-content:space-between; padding: 20px;">
+      <div style="width: 48%; ">
+        <el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="90px" :rules="rules"  >
+          <el-form-item label="主办方" prop="agencyId" required>
+            <el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 300px;"
+              v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
+              @change="handleChangeAgency"></el-cascader>
+          </el-form-item>
+          <el-form-item label="活动标题" prop="title" required>
+            <el-input type="textarea" style="width: 300px;" placeholder="请输入活动标题，不超过50子" v-model="formData.title" maxlength="50"
+              show-word-limit>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="活动详情" prop="content" style="display: block" required>
+            <div  style="width: 300px;">
+              <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="150" placeholder="请输入活动内容" />
+            </div>
+          </el-form-item>
+          <el-form-item label="照片" prop="activityImgs" required>
+            <div >
+              <el-upload  :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+                :show-file-list="true" :data="{ customerId: customerId }" :file-list="formData.activityImgs"
+                :on-preview="handleImgPreview" :on-success="handleImgSuccess" :on-remove="handleImgRemove"
+                :on-exceed="handleImgExceed" :before-upload="beforeImgUpload" list-type="picture-card" :limit="1">
+                <i class="el-icon-plus avatar-uploader-icon" style="width: 50px;height: 50px;"></i>  </el-upload>
+            </div>
+          </el-form-item>
+
+          <el-form-item label="活动时间" prop="strTime" required >
+            <el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss" style="width: 150px;">
+            </el-date-picker>至 <el-date-picker v-model="formData.endTime" type="datetime" placeholder="结束时间"
+              format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"style="width: 150px;"@change="actcontrolTime">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="活动名额" prop="points" required>
+            <div style="display: flex; flex-direction: column;">
+              <el-input-number :disabled="formData.notQuota === '0'" v-model.trim="formData.quota" 
+                label="描述文字" type="number"></el-input-number>
+              <el-radio style="margin-top: 20px;" v-model="formData.notQuota" label="0">不限名额</el-radio>
+            </div>
+          </el-form-item>
+          <el-form-item label="活动类型" prop="type" required>
+            <el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 300px;">
+              <el-option v-for="item in  typeList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label=" 联系人" prop="linkman" required >
+            <el-input v-model="formData.linkman" placeholder="请输入" style="width: 300px;"></el-input>
+          </el-form-item>
+          <el-form-item label=" 联系电话" prop="linkMobile"  required>
+            <el-input v-model="formData.linkMobile" placeholder="请输入"style="width: 300px;"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div style="width: 48%;">
+        <el-form ref="ref_form" :inline="true" :model="formData"  class="form"  label-width="115px">
+          <div>
+            <el-form-item label="活动积分" prop="integral">
+              <el-input-number v-model="formData.points"  :min="1" :max="10"
+                label="描述文字"></el-input-number>
             </el-form-item>
-            <el-form-item label="活动标题" prop="title">
-              <el-input type="textarea" placeholder="请输入活动标题，不超过50子" v-model="formData.title" maxlength="50"
-                show-word-limit>
+
+            <!-- <el-form-item label="所属项目" prop="typeId" required>
+                            <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
+                                <el-option v-for="item in typeList" :key="item.nametypeName" :label="item.typeName"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item> -->
+            <el-form-item label="报名条件" prop="conditions" style="display: block">
+                <el-input type="textarea" placeholder="请输入活动标题，不超过50子" v-model="formData.conditions" maxlength="200"
+                show-word-limit style="width: 300px;">
               </el-input>
+       
             </el-form-item>
-            <el-form-item label="活动详情" prop="content" style="display: block">
-              <div class="item_width_1">
-                <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="250" placeholder="请输入活动内容" />
-              </div>
-            </el-form-item>
-            <el-form-item label="照片" prop="activityImgs">
-              <div>
-                <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
-                  :show-file-list="true" :data="{ customerId: customerId }" :file-list="formData.activityImgs"
-                  :on-preview="handleImgPreview" :on-success="handleImgSuccess" :on-remove="handleImgRemove"
-                  :on-exceed="handleImgExceed" :before-upload="beforeImgUpload" list-type="picture-card" :limit="1">
-                  <i class="el-icon-plus avatar-uploader-icon"></i>  </el-upload>
-              </div>
-            </el-form-item>
-  
-            <el-form-item label="活动时间" prop="activeTime">
-              <el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
-                value-format="yyyy-MM-dd HH:mm:ss">
-              </el-date-picker>至 <el-date-picker v-model="formData.endTime" type="datetime" placeholder="结束时间"
-                format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+            <el-form-item label="签到时间" prop="signInTime" required>
+              <el-date-picker v-model.trim="formData.signInTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd HH:mm:ss" placeholder="开始时间" style="width:150px">
+              </el-date-picker>至
+              <el-date-picker v-model.trim="formData.signOutTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间" style="width:150px" @change="controlTime ">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="活动名额" prop="points">
-              <div style="display: flex; flex-direction: column;">
-                <el-input-number :disabled="formData.notQuota === '0'" v-model.trim="formData.quota" :max="10"
-                  label="描述文字"></el-input-number>
-                <el-radio style="margin-top: 20px;" v-model="formData.notQuota" label="0">不限名额</el-radio>
-              </div>
-            </el-form-item>
-            <el-form-item label="活动类型" prop="type" required>
-              <el-select v-model.trim="formData.type" placeholder="请选择" clearable>
-                <el-option v-for="item in  typeList" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label=" 联系人" prop="contacts">
-              <el-input v-model="formData.linkman" placeholder="请输入"></el-input>
+            <el-form-item label="报名截止时间" prop="deadline" required>
+              <el-date-picker v-model="formData.deadline" type="datetime" placeholder="选择日期时间"
+                value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss">
+              </el-date-picker>
             </el-form-item>
-            <el-form-item label=" 联系电话" prop="phone">
-              <el-input v-model="formData.linkMobile" placeholder="请输入"></el-input>
+
+            <el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="peopleCount">
+              <el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
+                @change="handleSwitchChange"></el-switch>
             </el-form-item>
-          </el-form>
-        </div>
-        <div style="width: 49%;">
-          <el-form ref="ref_form" :inline="true" :model="formData"  class="form">
-            <div>
-              <el-form-item label="活动积分" prop="integral">
-                <el-input-number v-model="formData.points"  :min="1" :max="10"
-                  label="描述文字"></el-input-number>
+          </div>
+              <el-form-item label="赞助单位" prop="sponsor" style="margin-bottom:20px"  label-width="110px">
+                <el-input v-model="tableDate.name" placeholder="请输入" style="width: 300px;"></el-input>
               </el-form-item>
-  
-              <!-- <el-form-item label="所属项目" prop="typeId" required>
-                              <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
-                                  <el-option v-for="item in typeList" :key="item.nametypeName" :label="item.typeName"
-                                      :value="item.id">
-                                  </el-option>
-                              </el-select>
-                          </el-form-item> -->
-              <el-form-item label="报名条件" prop="conditions" style="display: block">
-                <div class="item_width_1">
-                  <el-input type="textarea" placeholder="请输入活动标题，不超过50子" v-model="formData.conditions" maxlength="200"
-                show-word-limit>
-              </el-input>
-                </div>
-              </el-form-item>
-              <el-form-item label="签到时间" prop="Checktime">
-                <el-date-picker v-model.trim="formData.signInTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                  format="yyyy-MM-dd HH:mm:ss" placeholder="请选择签到时间" style="width:280px">
-                </el-date-picker>至
-                <el-date-picker v-model.trim="formData.signOutTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                  format="yyyy-MM-dd HH:mm:ss" placeholder="请选择签到时间" style="width:280px">
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item label="报名截止时间" prop="deadline">
-                <el-date-picker v-model="formData.deadline" type="datetime" placeholder="选择日期时间"
-                  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss">
-                </el-date-picker>
-              </el-form-item>
-  
-              <el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="peopleCount">
-                <el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
-                  @change="handleSwitchChange"></el-switch>
+              <el-form-item label="联系电话" prop="sponsor" >
+                <el-input v-model="tableDate.phone" placeholder="请输入" style="width: 300px;"></el-input>
               </el-form-item>
-            </div>
-            <el-form-item label="赞助单位" prop="sponsor">
-              <div class="flex flex-center1 flex-center2">
-                <el-input v-model="input" placeholder="请输入"></el-input>
-                <i class="el-icon-circle-plus"></i>
-              </div>
-            </el-form-item>
-            <el-form-item label=" 联系电话" prop="number">
-              <el-input v-model="input" placeholder="请输入"></el-input>
-            </el-form-item>
-            <el-form-item label="活动地点" prop="address"  style="display: block">
-                          <div style="width: 500px">
-                              <el-select v-model.trim="formData.address" filterable style="width: 400px" remote
-                                  :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
-                                  :loading="loading">
-                                  <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)" style="width: 400px;"
-                                      :key="item.value || index" :label="item.label" :value="item.value">
-                                  </el-option>
-                              </el-select>
-                              <div id="app_activity" class="div_map"></div>
-                          </div>
-                      </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <div class="div_btn1">
-        <el-button size="small" @click="handleCancle">取 消</el-button>
-        <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
-          @click="handleComfirm">确定</el-button>
-  
-  
+<!-- <i class="el-icon-circle-plus"  @click="addDomain" style="font-size: 20px;"></i> -->
+     
+          <el-form-item label="活动地点" prop="searchValue"   >
+                        <div style="width: 300px">
+                            <el-select v-model.trim="searchValue" filterable style="width: 300px" remote
+                                :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                                :loading="loading">
+                                <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)" style="width: 400px;"
+                                    :key="item.value || index" :label="item.label" :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </div>
+                        <div v-if="true"  id="app_activity" class="div_map"></div>
+                    </el-form-item>
+        </el-form>
       </div>
     </div>
-  </template>
-  <script>
-  
-  import { Loading } from 'element-ui' // 引入Loading服务
-  import { mapGetters } from 'vuex'
-  import { requestPost, requestGet } from '@/js/dai/request'
-  import fileList from '@/views/components/fileList'
-  import Tinymce from '@c/tinymce2/index.vue'
-  import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
-  import daiMap from "@/utils/dai-map";
-  var map
-  var search
-  var markers
-  var infoWindowList
-  var geocoder // 新建一个正逆地址解析类
-  export default {
-    data () {
-      return {
-        loading: false,
-        searchOptions: [],
-        orgOptionProps: {
-          value: 'agencyId',
-          label: 'agencyName',
-          children: 'subAgencyList',
-          emitPath: false,
-          multiple: false,
-          checkStrictly: true
+    <div class="div_btn1">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
+        @click="handleComfirm">确定</el-button>
+
+
+    </div>
+  </div>
+</template>
+<script>
+import { Loading } from 'element-ui' // 引入Loading服务
+import { mapGetters } from 'vuex'
+import { requestPost, requestGet } from '@/js/dai/request'
+import fileList from '@/views/components/fileList'
+import Tinymce from '@c/tinymce2/index.vue'
+import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+import daiMap from "@/utils/dai-map";
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+export default {
+  data () {
+    return {
+      loading: false,
+      searchOptions: [],
+      orgOptionProps: {
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        emitPath: false,
+        multiple: false,
+        checkStrictly: true
+    },
+    customerId: localStorage.getItem('customerId'),
+    uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+      orgOptions:[],
+      resultList: [],
+      btnDisable: false,    
+      searchValue:"",
+      formData: {
+        title:"",
+    agencyId:"",
+    projectId:"",
+    content:"",
+    points:10,
+    imgs:"",
+    deadline:"",
+    strTime:"",
+    endTime:"",
+    signInTime:"",
+    signOutTime:"",
+    quota:'',
+    conditions:"",
+    notQuota:'',
+    linkman:"",
+    linkMobile:"",
+    address:"",
+    longitude: this.$store.state.user.longitude, //经度
+    latitude: this.$store.state.user.latitude,//纬度
+    type:"",
+    online:0,
+    sponsors:[
+    ]
+
       },
-      customerId: localStorage.getItem('customerId'),
-      uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-        orgOptions:[],
-        resultList: [],
-        btnDisable: false,    
-        searchValue:"",
-        formData: {
-          title:"",
-      agencyId:"",
-      projectId:"",
-      content:"",
-      points:10,
-      imgs:"",
-      deadline:"",
-      strTime:"",
-      endTime:"",
-      signInTime:"",
-      signOutTime:"",
-      quota:'',
-      conditions:"",
-      notQuota:'',
-      linkman:"",
-      linkMobile:"",
-      address:"",
-      longitude: this.$store.state.user.longitude, //经度
-      latitude: this.$store.state.user.latitude,//纬度
-      type:"",
-      online:0,
-      sponsors:[
+
+      activityImgs:[],//图片
+      typeList:[
           {
-              "name":"赞助1",
-              "phone":"13111111111"
+            id:"1",
+            name:"线上活动"
           },
           {
-              "name":"赞助2",
-              "phone":"13122222222"
+            id:"2",
+            name:"线下活动"
           }
-      ]
-  
-        },
-  
-        activityImgs:[],//图片
-        typeList:[
-            {
-              id:"1",
-              name:"线上活动"
-            },
-            {
-              id:"2",
-              name:"线下活动"
-            }
-          ],
-        fileList: [],
-        uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
-  
+        ],
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+        tableDate:{},
+        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' },
+        ],
       }
-    },
-    props:{
-    list:{
-      type: Object,
-      default: () => {}
     }
   },
-    watch: {
-      'formData.notQuota'(newValue) {
-        console.log(newValue,'newvalue');
-        // 当 notQuota 变为 '0' 时，清空 quota
-        if (newValue === '0') {
-          this.formData.quota = '';
-        }
-        console.log( this.formData.quota);
-        
+  watch: {
+    'formData.notQuota'(newValue) {
+      console.log(newValue,'newvalue');
+      // 当 notQuota 变为 '0' 时，清空 quota
+      if (newValue === '0') {
+        this.formData.quota = '';
       }
-    },
-    components: { fileList,Tinymce,UploadImage},
-    async mounted () {
+      console.log( this.formData.quota);
+      
+    }
+  },
+  components: { fileList,Tinymce,UploadImage},
+  async mounted () {
+    // this.startLoading()
+    // await this.loadInfo()
+    // this.endLoading()
+    console.log(this.list,"dsfslfjl");
+    this.getOrgTreeList()
+    this.getTableData()
+  },
 
-      console.log(this.list,"list");
-      // this.formData=this.list
-      // this.startLoading()
-      // await this.loadInfo()
-      // this.endLoading()
-      this.getOrgTreeList()
-      this.getTableData()
-    },
-  
-    methods: {
-              //活动详情
+  methods: {
+    //获取活动详情
         async getTableData() {
         // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
         const url = `/voluntary/activityInfo/detail/${this.list.id}`;
@@ -254,9 +260,9 @@
       }
       requestGet(url, params).then((res) => {
         if (res.code == 0) {
-          // this.total = res.data.total || 0;
-          this.formData = res.data;
-          console.log(res, "this.tableData");
+            this.formData=res.data;
+            this.tableDate=res.data.sponsors,
+            this.searchValue=res.data.address
         } else {
           this.$message.error(res.msg);
         }
@@ -272,253 +278,362 @@
         // } else {
         // }
       },
-      handleClickKey(index) {
-              let selPosition = this.resultList[index]
-              let lonlat = selPosition.lonlat.split(" ")
-              map.setCenter(lonlat[1], lonlat[0]);
-              map.setMarker(lonlat[1], lonlat[0]);
-              this.formData.latitude = lonlat[1];
-              this.formData.longitude = lonlat[0];
-              this.formData.address = selPosition.address + selPosition.name
-          },
-  
-      async handleMoveCenter(e) {
-              //修改地图中心点
-              // const { lat, lng } = map.getCenter();
-              const { lat, lng } = e.latLng;
-              this.formData.latitude = lat;
-              this.formData.longitude = lng;
-              map.setMarker(lat, lng);
-  
-              let { msg, data } = await map.getAddress(lat, lng);
-              if (msg == "success") {
-                  this.formData.address = data.address
-                  this.formData.address = data.address
-                  this.searchOptions = []
- 
-  
-              }
-          },
-          // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-          initMap(latitude, longitude) {
-              console.log(latitude, longitude,"564564568");
-              map = new daiMap(
-                  document.getElementById("app_activity"),
-                  { latitude, longitude },
-                  {
-                      zoom: 16.2, // 设置地图缩放级别
-                      pitch: 43.5, // 设置俯仰角
-                      rotation: 45, // 设置地图旋转角度
-                  }
-              );           
-  
-              // 监听地图平移结束
-              /*  map.on("dragend", (e) => {
-                  this.handleMoveCenter(e);
-                });*/
-              map.on("click", (e) => {
-                  this.handleMoveCenter(e);
-              });
-  
-              map.setCenter(latitude, longitude);
-              map.setMarker(latitude, longitude);
-  
-          },
-      async remoteMethod(query) {
-              console.log(query, "sfsvsdv");
-              if (query !== '') {
-                  this.loading = true;
-                  const { msg, data } = await map.searchNearby(query);
-                  this.loading = false;
-                  this.resultList = []
-                  if (msg == "success" && data.resultList && data.resultList.length > 0) {
-  
-                      if (data.resultList && data.resultList.length > 0) {
-                          this.resultList = data.resultList
-                          console.log(this.resultList, "this.resultList");
-                          this.searchOptions = this.resultList.map(item => {
-                              return { value: `${item.id}`, label: `${item.address + item.title}` };
-  
-                          });
-                          console.log(this.searchOptions, "this.searchOptions");
-                      }
-                  } else {
-                      this.searchOptions = [
-                          {
-                              value: '0',
-                              label: '未检索到结果'
-                          }
-                      ]
-                  }
-              } else {
-                  this.searchOptions = [];
-              }
-          },
-             // 上传前的验证
-             beforeImgUpload(file) {
-              const isLt1M = file.size / 1024 / 1024 < 10;
-              const srcType = file.type;
-              const format = file.name.split('.').pop();
-              if (!isLt1M) {
-                  this.$message.error('上传文件大小不能超过 10MB!');
-                  return false;
-              }
-              if (srcType.indexOf('image') == -1) {
-                  this.$message.error('仅限图片格式');
-                  return false;
-              }
-              return true;
-          },
-              // 文件数量超过限制
-              handleImgExceed() {
-              this.$message({
-                  type: 'warning',
-                  message: '文件数量最多不超过一个'
-              });
-          },
-              // 删除图片
-              handleImgRemove(file) {
-              console.log('handleImgRemove', file);
-              if (file.response) {
-                  let index = this.activityImgs.findIndex(item => item.url == file.response.data.url);
-                  this.activityImgs.splice(index, 1);
-              } else if (file.url) {
-                  let index = this.activityImgs.findIndex(item => item.url == file.url);
-                  this.activityImgs.splice(index, 1);
-              }
-          },
-            // 上传成功
-            handleImgSuccess(res, file, fileList) {
-              if (res.code === 0 && res.msg === 'success') {
-                  let format = file.name.split('.').pop();
-                  let srcType = file.raw.type;
-                  let type = 'file';
-                  if (srcType.indexOf('image') != -1) {
-                      type = 'image';
-                  } else if (srcType.indexOf('video') != -1) {
-                      type = 'video';
-                  }
-                  this.activityImgs.push(res.data.url);
-                  this.formData.imgs=this.activityImgs[0]
-                console.log( this.formData.imgs," this.formData.imgs");
-                
-                  
-  
-              } else {
-                  this.$message.error(res.msg);
-              }
-          },
-         // 图片预览
-          handleImgPreview(file) {
-              console.log(file);
-              window.open(file.url || file.response.data.url);
-          },
-      handleSwitchChange(value) {
-        // 将 value 转换为整数
-        this.formData.online = Number(value);
-      },
-    
-      handleOnlineRegistration(value) {
-              if (value) {
-                  this.online = true;
-                  this.formData.online = 1;
-              } else {
-                  this.online = false;
-                  this.formData.cutOffTime = ''
-                  this.formData.online = 0;
-              }
-          },
-      handleChangeAgency(val) {
-              console.log(val);
-              this.formData.agencyId = val
-         },
-      //提交
-      handleComfirm() {
-        console.log(this.formData,"this,formD");
-        let url="/voluntary/activityInfo/saveInfo";
-        let parms={
-          ...this.formData
+        //控制活动时间
+        actcontrolTime(){
+      console.log("dislfj");
+        if(this.formData.strTime>this.formData.endTime){
+          this.$message.error('活动结束时间不能在活动开始时间之前');
+          this.formData.endTime=''
+          return
+        }
+    },
+    //控制签到时间
+    controlTime(){
+      console.log("dislfj");
+        if(this.formData.signInTime>this.formData.signOutTime){
+          this.$message.error('签到开始时间不能在签到结束时间之后');
+          this.formData.signOutTime=''
+          return
+        }
+    },
+       //提交
+      async  handleComfirm() {
+        console.log(this.tableDate);
+      this.formData.sponsors.push(this.tableDate);
+      console.log(this.formData,"this,formD");
+      if (this.formData.address == '') {
+        this.$message.error('请输入活动地点');
+        return;
+      }
+      if (this.formData.agencyId == '') {
+        this.$message.error('请选择主办方');
+        return;
+      }
+      if (this.formData.title == '') {
+        this.$message.error('请输入活动标题');
+        return;
+      }
+      if (this.formData.content == '') {
+        this.$message.error('请输入活动详情');
+        return;
+      }
+      // if (this.formData.imgs == '') {
+      //   this.$message.error('请上传图片');
+      //   return;
+      // }
+      if (this.formData.strTime  == '') {
+        this.$message.error('请填写活动开始时间');
+        return;
+      }
+      if (this.formData.endTime  == '') {
+        this.$message.error('请填写活动结束时间');
+        return;
+      }
+      if (this.formData.type=='') {
+        this.$message.error('请填写活动和类型');
+        return;
+      }
+      if (this.formData.linkman=='') {
+        this.$message.error('请填写联系人');
+        return;
+      }
+      if (this.formData.linkMobile=='') {
+        this.$message.error('请填写联系电话');
+        return;
+      }
+      if (this.formData.signInTime=='') {
+        this.$message.error('请填写签到开始时间');
+        return;
+      }
+      if (this.formData.signOutTime=='') {
+        this.$message.error('请填写签到结束时间');
+        return;
+      }
+      if (this.formData.deadline=='') {
+        this.$message.error('请填写报名截止时间');
+        return;
+      }
+      let url="/voluntary/activityInfo/saveInfo";
+      let parms={
+        ...this.formData
+      }
+      console.log(parms,"parms");
+      
+      await requestPost(url,parms).then((res)=>{
+        console.log(res,"res");
+        if (res.code==0) {
+          this.$message.success('添加成功');
+          this.$emit('AddClose')
+          // this.$router.push({path:'/volunteer/activityArchive'})
+        }else{
+          this.$message.error(res.msg);
         }
-        console.log(parms,"parms");
         
-        requestPost(url,parms).then((res)=>{
-          console.log(res,"res");
-          
-        })
+      })
+    },
+    addDomain() {
+      console.log(this.formData.sponsors,this.tableDate,);
+        this.formData.sponsors.push(this.tableDate);
+        console.log(this.formData.sponsors,this.tableDate,);
+   
+        
       },
-      //图片
-      removedImg() {
-              this.formData.imgs = ''
-       },
-      onChangeFileList(e) {
-              console.log(e, 'sssssb');
-              // this.formData.$slotsimgs = e.length > 0 ? e.map(item => ({
-              //     fileType: '0',
-              //     fileUrl: item.response.data.url
-              // })) : []; // 当e为空时清空fileList
-              if (e.length > 0) {
-                  this.formData.imgs = e[0].response.data.url;
-              } else {
-                  this.formData.imgs = '';
-              }
-          },
-      //获取当前组织
-     getOrgTreeList() {
-        this.$http
-          .post("/gov/org/customeragency/agencygridtree", {orgTypeFilter:this.orgTypeFilter})
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg);
+    handleClickKey(index) {
+            let selPosition = this.resultList[index]
+            let lonlat = selPosition.lonlat.split(" ")
+            map.setCenter(lonlat[1], lonlat[0]);
+            map.setMarker(lonlat[1], lonlat[0]);
+            this.formData.latitude = lonlat[1];
+            this.formData.longitude = lonlat[0];
+            this.formData.address = selPosition.address + selPosition.name
+        },
+
+    async handleMoveCenter(e) {
+            //修改地图中心点
+            // const { lat, lng } = map.getCenter();
+            const { lat, lng } = e.latLng;
+            this.formData.latitude = lat;
+            this.formData.longitude = lng;
+            map.setMarker(lat, lng);
+
+            let { msg, data } = await map.getAddress(lat, lng);
+            if (msg == "success") {
+                this.formData.address = data.address
+                this.searchValue = data.address
+                this.searchOptions = []
+                console.log('data,this.searchValue ', this.searchValue)
+
+            }
+        },
+        // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+        initMap(latitude, longitude) {
+            console.log(latitude, longitude,"564564568");
+            map = new daiMap(
+                document.getElementById("app_activity"),
+                { latitude, longitude },
+                {
+                    zoom: 16.2, // 设置地图缩放级别
+                    pitch: 43.5, // 设置俯仰角
+                    rotation: 45, // 设置地图旋转角度
+                }
+            );           
+
+            // 监听地图平移结束
+            /*  map.on("dragend", (e) => {
+                this.handleMoveCenter(e);
+              });*/
+            map.on("click", (e) => {
+                this.handleMoveCenter(e);
+            });
+
+            map.setCenter(latitude, longitude);
+            map.setMarker(latitude, longitude);
+
+        },
+    async remoteMethod(query) {
+            console.log(query, "sfsvsdv");
+            if (query !== '') {
+                this.loading = true;
+                const { msg, data } = await map.searchNearby(query);
+                this.loading = false;
+                this.resultList = []
+                if (msg == "success" && data.resultList && data.resultList.length > 0) {
+
+                    if (data.resultList && data.resultList.length > 0) {
+                        this.resultList = data.resultList
+                        console.log(this.resultList, "this.resultList");
+                        this.searchOptions = this.resultList.map(item => {
+                            return { value: `${item.id}`, label: `${item.address + item.title}` };
+
+                        });
+                        console.log(this.searchOptions, "this.searchOptions");
+                    }
+                } else {
+                    this.searchOptions = [
+                        {
+                            value: '0',
+                            label: '未检索到结果'
+                        }
+                    ]
+                }
             } else {
-              this.orgOptions = [];
-              this.orgOptions.push(res.data);
-              console.log(this.orgOptions,this.list,"this.orgOptions");
+                this.searchOptions = [];
+            }
+        },
+           // 上传前的验证
+           beforeImgUpload(file) {
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            const srcType = file.type;
+            const format = file.name.split('.').pop();
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+                return false;
+            }
+            if (srcType.indexOf('image') == -1) {
+                this.$message.error('仅限图片格式');
+                return false;
+            }
+            return true;
+        },
+            // 文件数量超过限制
+            handleImgExceed() {
+            this.$message({
+                type: 'warning',
+                message: '文件数量最多不超过一个'
+            });
+        },
+            // 删除图片
+            handleImgRemove(file) {
+            console.log('handleImgRemove', file);
+            if (file.response) {
+                let index = this.activityImgs.findIndex(item => item.url == file.response.data.url);
+                this.activityImgs.splice(index, 1);
+            } else if (file.url) {
+                let index = this.activityImgs.findIndex(item => item.url == file.url);
+                this.activityImgs.splice(index, 1);
+            }
+        },
+          // 上传成功
+          handleImgSuccess(res, file, fileList) {
+            if (res.code === 0 && res.msg === 'success') {
+                let format = file.name.split('.').pop();
+                let srcType = file.raw.type;
+                let type = 'file';
+                if (srcType.indexOf('image') != -1) {
+                    type = 'image';
+                } else if (srcType.indexOf('video') != -1) {
+                    type = 'video';
+                }
+                this.activityImgs.push(res.data.url);
+                this.formData.imgs=this.activityImgs[0]
+              console.log( this.formData.imgs," this.formData.imgs");
               
+                
+
+            } else {
+                this.$message.error(res.msg);
             }
-          })
-          .catch(() => {
-            return this.$message.error("网络错误");
-          });
-          this.$nextTick(() => {
-            console.log(map,"mao");
-                  if (!map) {
-                      this.initMap(this.formData.latitude, this.formData.longitude);
-                      console.log("map", map,this.formData.latitude, this.formData.longitude)
-                  } else {
-                      map.setCenter(this.formData.latitude, this.formData.longitude);
-                      map.setMarker(this.formData.latitude, this.formData.longitude);
-                      console.log("mapmapmap", map)
-                  }
-              })
-      },
-      handleCancle () {
-  
-        this.$emit('diaDetailClose')
+        },
+       // 图片预览
+        handleImgPreview(file) {
+            console.log(file);
+            window.open(file.url || file.response.data.url);
+        },
+    handleSwitchChange(value) {
+      // 将 value 转换为整数
+      this.formData.online = Number(value);
+    },
   
-      },
-           // 开启加载动画
-           startLoading() {
-              loading = Loading.service({
-                  lock: true, // 是否锁定
-                  text: '正在加载……', // 加载中需要显示的文字
-                  background: 'rgba(0,0,0,.7)' // 背景颜色
-              })
-          },
-          // 结束加载动画
-          endLoading() {
-              // clearTimeout(timer);
-              if (loading) {
-                  loading.close()
-              }
+    handleOnlineRegistration(value) {
+            if (value) {
+                this.online = true;
+                this.formData.online = 1;
+            } else {
+                this.online = false;
+                this.formData.cutOffTime = ''
+                this.formData.online = 0;
+            }
+        },
+    handleChangeAgency(val) {
+            console.log(val);
+            this.formData.agencyId = val
+       },
+ 
+    //图片
+    removedImg() {
+            this.formData.imgs = ''
+     },
+    onChangeFileList(e) {
+            console.log(e, 'sssssb');
+            // this.formData.$slotsimgs = e.length > 0 ? e.map(item => ({
+            //     fileType: '0',
+            //     fileUrl: item.response.data.url
+            // })) : []; // 当e为空时清空fileList
+            if (e.length > 0) {
+                this.formData.imgs = e[0].response.data.url;
+            } else {
+                this.formData.imgs = '';
+            }
+        },
+    //获取当前组织
+   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("网络错误");
+        });
+        this.$nextTick(() => {
+          console.log(map,"mao");
+                if (!map) {
+                    this.initMap(this.formData.latitude, this.formData.longitude);
+                    console.log("map", map,this.formData.latitude, this.formData.longitude)
+                } else {
+                    map.setCenter(this.formData.latitude, this.formData.longitude);
+                    map.setMarker(this.formData.latitude, this.formData.longitude);
+                    console.log("mapmapmap", map)
+                }
+            })
     },
-    computed: {
+    handleCancle () {
+      console.log(    "kdsljk");
+  
+      this.$emit('AddClose')
+
     },
+         // 开启加载动画
+         startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
+  },
+  computed: {
+  },
+  props: {
+
+    formType: { //表单操作类型 add新增，edit编辑，detail详情
+      type: String,
+      required: ''
+    },
+    icPartyActId: {
+      type: String,
+      required: ''
+    },
+    list:{
+      type: Object,
+      default: () => {}
+    }
+
 
   }
-  </script>
-  <style lang="scss" scoped>
-  .div_map{
-    width: 400px;
-  }
-  </style>
\ No newline at end of file
+}
+</script>
+<style lang="scss" scoped>
+.div_map{
+  width: 300px;
+  margin-top: 10px;
+}
+.div_btn1{
+  display: flex;
+    justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/pointsRedemption/Select.vue b/src/views/modules/volunteer/pointsRedemption/Select.vue
index 90aeddbf8..aeed5c8f2 100644
--- a/src/views/modules/volunteer/pointsRedemption/Select.vue
+++ b/src/views/modules/volunteer/pointsRedemption/Select.vue
@@ -14,7 +14,8 @@
                {{ tableData.points}}
             </el-form-item>
             <el-form-item label="有效期至">
-               {{ tableData.expireTime}}
+               {{ tableData.expireTime }}
+              
             </el-form-item>
             <el-form-item label="兑换地点">
                {{ tableData.redeemerOrgName}}
diff --git a/src/views/modules/volunteer/pointsRedemption/add.vue b/src/views/modules/volunteer/pointsRedemption/add.vue
index 95939f7c5..2c09d10ec 100644
--- a/src/views/modules/volunteer/pointsRedemption/add.vue
+++ b/src/views/modules/volunteer/pointsRedemption/add.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="g-main">
-      <el-form :inline="true" :label-position="labelPosition" :model="tableData"
+      <el-form :inline="true" :label-position="labelPosition" :model="formData" :rules="rules"
          style="height: 500px; overflow: scroll;">
          <el-form-item label="分类" required label-width="150px">
             <el-select class="item_width_1" v-model="formData.classKey" placeholder="请选择">
@@ -34,42 +34,45 @@
             <el-input class="item_width_2" v-model="formData.points" placeholder="请输入"></el-input>
          </el-form-item>
          <el-form-item label="有效期至" label-width="150px">
-            <el-date-picker style="width: 250px;" v-model="formData.expireTime" type="datetime" placeholder="请选择日期"  format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss">
+            <el-date-picker style="width: 250px;" v-model="formData.expireTime" 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="规则说明" label-width="150px">
             <Tinymce style="width: 560px;" class="tinymce_view" v-model="formData.description" :height="250"
                placeholder="请输入活动内容" />
          </el-form-item>
-         <el-form-item label="库存" label-width="150px">
-            <el-radio v-model="radio" label="1">不限数目</el-radio>
-            <div class="flex flex-x">
-               <el-radio v-model="radio" label="2">自定义</el-radio>
-               <el-input v-if="radio=='2'" v-model="formData.stockQty" placeholder="请输入数量"></el-input>
+         <el-form-item label="库存" label-width="150px" >
+            <div style="width:195px;;">
+               <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="formData.stockQty" placeholder="请输入数量"></el-input>
+               </div>
             </div>
 
+
          </el-form-item>
-         <el-form-item label="发布范围" label-width="150px">
-            <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small"
+         <el-form-item label="发布范围" label-width="150px" required>
+            <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small" style="width:210px ;"
                v-model.trim="formData.redeemerOrgId" :options="orgOptions" :props="orgOptionProps"
                @change="handleChangeAgency"></el-cascader>
          </el-form-item>
 
-         <el-form-item label="赞助单位" label-width="150px">
+         <el-form-item label="赞助单位" label-width="150px" >
             <el-input v-model="formData.sponsorName" placeholder="请输入"></el-input>
          </el-form-item>
-         <el-form-item label="联系电话" label-width="150px">
+         <el-form-item label="联系电话" label-width="150px"prop="sponsorMobile" >
             <el-input style="width: 210px;" v-model="formData.sponsorMobile" placeholder="请输入"></el-input>
          </el-form-item>
          <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 style="width: 500px;" v-model="formData.shelveStatus" active-color="#13ce66" inactive-color=""
+               active-value="1" inactive-value="0">
             </el-switch>
          </el-form-item>
       </el-form>
       <div class="flex  flex-center1 flex-center2">
-         <el-button  type="primary" @click="submitForm()">提交</el-button>
+         <el-button type="primary" @click="submitForm()">提交</el-button>
          <el-button @click="handlecancel">取消</el-button>
       </div>
    </div>
@@ -111,42 +114,23 @@ export default {
             
          ],
       radio:'1',
-      orgOptions:[]
+      orgOptions:[],
+          rules: {
+        sponsorMobile: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' },
+          { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+        ]
+      }
     };
+
   },
-  props:{
-    list:{
-      type: Object,
-      default: () => {}
-    }
-  },
+
+
   created() {
     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.formData={}
-          this.$emit('closeDialog')
-        } else {
-          this.$message.error(msg || "列表请求失败");
-        }
-
-   },
    //获取当前组织
    getOrgTreeList() {
       this.$http
@@ -180,11 +164,6 @@ export default {
         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 || "列表请求失败");
         }
@@ -197,24 +176,33 @@ export default {
    },
    //提交
   async submitForm(){
-      console.log(this.formData,"formData");
+      if (this.formData.classKey == '') {
+        this.$message.error('请选择分类');
+        return;
+      }
+      if (this.formData.awardName == '') {
+        this.$message.error('请输入标题');
+        return;
+      }
+      if (this.formData.points == '') {
+        this.$message.error('请输入积分');
+        return;
+      }
+      if (this.formData.redeemerOrgId == '') {
+        this.$message.error('请选择发布乏味');
+        return;
+      }
       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.formData={}
+        
           this.$emit('closeDialog')
           
         } else {
-          this.$message.error(msg || "列表请求失败");
+          this.$message.error(msg || "提交失败");
         }
 
    }
diff --git a/src/views/modules/volunteer/pointsRedemption/record.vue b/src/views/modules/volunteer/pointsRedemption/record.vue
index 1d261e464..4ef4e29c1 100644
--- a/src/views/modules/volunteer/pointsRedemption/record.vue
+++ b/src/views/modules/volunteer/pointsRedemption/record.vue
@@ -1,7 +1,30 @@
 <template>
     <div class="g-main" style="padding: 30px;">
-        <div class="flex flex-wrap flex-end">
-            <div class="flex flex-center1 flex-center2 m-bottom10  " style="">
+        <div class="">
+            <el-form :inline="true" :model="searchData" class="demo-form-inline" style="" >
+                <el-form-item label="姓名">
+                    <el-input placeholder="请输入内容" v-model="searchData.redeemerName" style="width: 150px" clearable>
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="手机号"  label-width="80px">
+                    <el-input placeholder="请输入内容" v-model="searchData.redeemerMobile" style="width: 150px" clearable>
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="兑换时间选择"  label-width="120px">
+                    <el-date-picker v-model="searchData.redeemTimeFrom" type="datetime" placeholder="开始时间"
+                        format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  style="width: 150px">
+                    </el-date-picker>至 <el-date-picker v-model="searchData.redeemTimeTo" type="datetime"
+                        placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  style="width: 150px">
+                    </el-date-picker>
+                </el-form-item>
+                <div style="display: flex; justify-content: flex-end; margin:10px 0 20px 0;">
+                    <el-button  type="primary" @click="handleSeach" style="margin: 20rpx;">查询</el-button>
+                </div>
+            </el-form>
+            
+
+  
+            <!-- <div class="flex flex-center1 flex-center2 m-bottom10  " style="">
                 <div>姓名：</div>
                 <el-input placeholder="请输入内容" v-model="searchData.redeemerName" style="width: 200px" clearable>
                 </el-input>
@@ -10,27 +33,27 @@
                 <div>手机号：</div>
                 <el-input placeholder="请输入内容" v-model="searchData.redeemerMobile" style="width: 200px" clearable>
                 </el-input>
-            </div>
-            <div class="flex flex-center1 flex-center2 m-bottom10" style="">
+            </div> -->
+            <!-- <div class="flex flex-center1 flex-center2 m-bottom10" style="">
                 <div>状态：</div>
                 <el-select v-model="searchData.StatusName" placeholder="请选择">
                     <el-option v-for="item in Status" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </el-select>
 
-            </div>
-            <div class="flex flex-center1 flex-center2 m-bottom10" style="">
+            </div> -->
+            <!-- <div class="flex flex-center1 flex-center2 m-bottom10" style="">
                 <div>兑换时间选择：</div>
                 <el-date-picker v-model="searchData.redeemTimeFrom" type="datetime" placeholder="开始时间"
                     format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
                 </el-date-picker>至 <el-date-picker v-model="searchData.redeemTimeTo" type="datetime" placeholder="结束时间"
                     format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
                 </el-date-picker>
-            </div>
-
+            </div> -->
+<!-- 
             <div>
                 <el-button type="primary" class="m-bottom10" @click="handleSeach">查询</el-button>
-            </div>
+            </div> -->
         </div>
         <div>
             <el-table :data="tableData" border>
@@ -134,13 +157,10 @@ export default {
             redeemTimeTo:this.searchData.redeemTimeTo,
             pageSize:this.pageSize,
             pageNo:this.pageNo
-            
       }
       console.log(params,"params");
       console.log(this.awardId,"awardId"
-          
       )
-      
         const { data, code, msg } = await requestGet(url, params)
         if (code === 0) {
           console.log("列表请求成功！！！！！！！！！！！！！！");
diff --git a/src/views/modules/volunteer/pointsRedemption/update.vue b/src/views/modules/volunteer/pointsRedemption/update.vue
index f3eb8bd5e..00d797014 100644
--- a/src/views/modules/volunteer/pointsRedemption/update.vue
+++ b/src/views/modules/volunteer/pointsRedemption/update.vue
@@ -1,79 +1,82 @@
 <template>
-    <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="标题" 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="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="formData.worthAmount" placeholder="请输入金额"></el-input>
-             </div>
-          </el-form-item>
-          <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 required v-if="formData.classKey=='hwjh'" label="原价" label-width="150px">
-             <div style="display: flex;">
-                <div>￥</div>
-                <el-input v-model="formData.worthAmount" placeholder="请输入内容"></el-input>
-             </div>
-          </el-form-item>
-          <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="有效期至" label-width="150px">
-             <el-date-picker style="width: 250px;" v-model="formData.expireTime" 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="规则说明" label-width="150px">
-             <Tinymce style="width: 560px;" class="tinymce_view" v-model="formData.description" :height="250"
-                placeholder="请输入活动内容" />
-          </el-form-item>
-          <el-form-item label="库存" label-width="150px">
-             <el-radio v-model="radio" label="1">不限数目</el-radio>
-             <div class="flex flex-x">
-                <el-radio v-model="radio" label="2">自定义</el-radio>
-                <el-input v-if="radio=='2'" v-model="formData.stockQty" placeholder="请输入数量"></el-input>
-             </div>
- 
-          </el-form-item>
-          <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="赞助单位" label-width="150px">
-             <el-input v-model="formData.sponsorName" placeholder="请输入"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话" label-width="150px">
-             <el-input style="width: 210px;" v-model="formData.sponsorMobile" placeholder="请输入"></el-input>
-          </el-form-item>
-          <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 type="primary" @click="updateForm()">提交</el-button>
-          <el-button @click="handlecancel">取消</el-button>
-       </div>
-    </div>
- </template>
+   <div class="g-main">
+      <el-form :inline="true" :label-position="labelPosition" :model="formData" :rules="rules"
+         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="标题" 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="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="formData.worthAmount" placeholder="请输入金额"></el-input>
+            </div>
+         </el-form-item>
+         <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 required v-if="formData.classKey=='hwjh'" label="原价" label-width="150px">
+            <div style="display: flex;">
+               <div>￥</div>
+               <el-input v-model="formData.worthAmount" placeholder="请输入内容"></el-input>
+            </div>
+         </el-form-item>
+         <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="有效期至" label-width="150px">
+            <el-date-picker style="width: 250px;" v-model="formData.expireTime" 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="规则说明" label-width="150px">
+            <Tinymce style="width: 560px;" class="tinymce_view" v-model="formData.description" :height="250"
+               placeholder="请输入活动内容" />
+         </el-form-item>
+         <el-form-item label="库存" label-width="150px">
+            <div style="width:195px;;">
+               <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="formData.stockQty" placeholder="请输入数量"></el-input>
+               </div>
+            </div>
+
+
+         </el-form-item>
+         <el-form-item label="发布范围" label-width="150px" required>
+            <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small" style="width:210px ;"
+               v-model.trim="formData.redeemerOrgId" :options="orgOptions" :props="orgOptionProps"
+               @change="handleChangeAgency"></el-cascader>
+         </el-form-item>
+
+         <el-form-item label="赞助单位" label-width="150px" >
+            <el-input v-model="formData.sponsorName" placeholder="请输入"></el-input>
+         </el-form-item>
+         <el-form-item label="联系电话" label-width="150px"prop="sponsorMobile" >
+            <el-input style="width: 210px;" v-model="formData.sponsorMobile" placeholder="请输入"></el-input>
+         </el-form-item>
+         <el-form-item label="上架" label-width="150px" inline="false">
+            <el-switch style="width: 500px;" v-model="formData.shelveStatus" active-color="#13ce66" inactive-color=""
+               active-value="1" inactive-value="0">
+            </el-switch>
+         </el-form-item>
+      </el-form>
+      <div class="flex  flex-center1 flex-center2">
+         <el-button 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'
@@ -111,7 +114,13 @@
              
           ],
        radio:'1',
-       orgOptions:[]
+       orgOptions:[],
+       rules: {
+        sponsorMobile: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' },
+          { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+        ]
+      }
      };
    },
    props:{
@@ -230,9 +239,26 @@
     },
     //提交
    async submitForm(){
+      if (this.formData.classKey == '') {
+        this.$message.error('请选择分类');
+        return;
+      }
+      if (this.formData.awardName == '') {
+        this.$message.error('请输入标题');
+        return;
+      }
+      if (this.formData.points == '') {
+        this.$message.error('请输入积分');
+        return;
+      }
+      if (this.formData.redeemerOrgId == '') {
+        this.$message.error('请选择发布乏味');
+        return;
+      }
        console.log(this.formData,"formData");
-       const url = "/voluntary/pointsAward/admin/add";
+       const url = "/voluntary/pointsAward/admin/update";
          let params = {
+            id:this.list.id,
           ...this.formData
        }
        console.log(params,"formData");