From e55bdc7114e0908408f9299a73d3d28e2eee9a21 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 17:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E5=8A=A8=E4=BB=96?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/initiateActivity.vue             |   2 +
 .../activityArchive/Administration.vue        |  21 +-
 .../volunteer/activityArchive/Points.vue      |  36 +-
 .../modules/volunteer/activityArchive/add.vue |  17 +-
 .../volunteer/activityArchive/index.vue       |  27 +-
 .../volunteer/activityArchive/realselect.vue  | 635 ++++++++++++++++++
 .../volunteer/activityArchive/select.vue      | 108 +--
 7 files changed, 773 insertions(+), 73 deletions(-)
 create mode 100644 src/views/modules/volunteer/activityArchive/realselect.vue

diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue
index 5df0dff83..1c6edca38 100644
--- a/src/views/modules/communityParty/activity/initiateActivity.vue
+++ b/src/views/modules/communityParty/activity/initiateActivity.vue
@@ -457,6 +457,8 @@ export default {
                 }
                 this.formData = activityId
                 this.timeRange = [this.formData.startTime, this.formData.endTime]
+                console.log(activityId,"activityId");
+                
                 if (activityId.coverPic) {
                     let ob = {
                         fileType: '0',
diff --git a/src/views/modules/volunteer/activityArchive/Administration.vue b/src/views/modules/volunteer/activityArchive/Administration.vue
index 36403a894..0f0a2d4af 100644
--- a/src/views/modules/volunteer/activityArchive/Administration.vue
+++ b/src/views/modules/volunteer/activityArchive/Administration.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="g-main"  style="padding: 30px;">
-        <div class="flex flex-mean m-bottom10"  >
-                    <div class="flex flex-center1 flex-center2" style="align-items: center;">
+        <div class="flex"  >
+                    <!-- <div class="flex flex-center1 flex-center2" style="align-items: center;">
                     <div>姓名</div>
                     <el-input  placeholder="请输入内容" v-model="name"  style="width: 200px"  clearable>
                     </el-input>
@@ -13,7 +13,22 @@
                    </div>
                    <div>
                     <el-button type="primary" @click="handleSearch">查询</el-button>
-                   </div>
+                   </div> -->
+                   <el-form :inline="true" :model="formData" class="demo-form-inline" style="" >
+                <el-form-item label="姓名">
+                  <el-input  placeholder="请输入内容" v-model="name"  style="width: 200px"  clearable>
+                  </el-input>
+                </el-form-item>
+           
+                <el-form-item label="手机号"  label-width="120px">
+                 <el-input placeholder="请输入内容" v-model="mobile" style="width: 150px" clearable>
+                    </el-input>
+                </el-form-item>
+        
+            </el-form>
+            <div style="display: flex; justify-content: flex-end; margin:0 0 10px 30px;">
+                    <el-button   type="primary" @click="handleSearch" style="margin: 20rpx;">查询</el-button>
+                </div>
         </div>
         <div >
       <el-table :data="tableData" border>
diff --git a/src/views/modules/volunteer/activityArchive/Points.vue b/src/views/modules/volunteer/activityArchive/Points.vue
index 912e985c9..1690f13ec 100644
--- a/src/views/modules/volunteer/activityArchive/Points.vue
+++ b/src/views/modules/volunteer/activityArchive/Points.vue
@@ -1,6 +1,6 @@
 <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="">
             <!-- <div class="f-flex" style="align-items: center;">
                 <div>是否发放积分</div>
                 <el-select v-model="formData.whether" placeholder="请选择" clearable >
@@ -22,24 +22,23 @@
             <div>
                 <el-button type="primary"  @click="handleSearch">查询</el-button>
             </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 :inline="true" :model="formData" class="demo-form-inline" style="" >
+                <el-form-item label="是否发放积分">
+                  <el-select v-model="formData.whether" placeholder="请选择" clearable >
+                    <el-option v-for="item in formData.options" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
                 </el-form-item>
-                <el-form-item label="手机号"  label-width="80px">
-                    <el-input placeholder="请输入内容" v-model="searchData.redeemerMobile" style="width: 150px" clearable>
+                <el-form-item label="姓名"  label-width="80px">
+                    <el-input placeholder="请输入内容" v-model="formData.name" style="width: 150px" clearable>
                     </el-input>
                 </el-form-item>
-                <el-form-item label="兑换时间选择"  label-width="120px">
-                    <el-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 label="手机号"  label-width="120px">
+                 <el-input placeholder="请输入内容" v-model="formData.mobile" style="width: 150px" clearable>
+                    </el-input>
                 </el-form-item>
-                <div style="display: flex; justify-content: flex-end; margin:10px 0 20px 0;">
-                    <el-button  type="primary" @click="handleSeach" style="margin: 20rpx;">查询</el-button>
+                <div style="display: flex; justify-content: flex-end; margin:0 0 10px 0;">
+                    <el-button  type="primary" @click="handleSearch" style="margin: 20rpx;">查询</el-button>
                 </div>
             </el-form>
         </div>
@@ -61,12 +60,12 @@
                 </el-table-column>
                 <el-table-column prop="points" header-align="center" align="center" label="积分">
                 </el-table-column>
-                <el-table-column label="操作" fixed="right" header-align="center" align="center" class="operate">
+                <!-- <el-table-column label="操作" fixed="right" header-align="center" align="center" class="operate">
                     <template slot-scope="scope">
                         <el-button type="text" style="color:#1C6AFD;" size="small"
                             @click="handleDetail(scope.row)">查看</el-button>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
             </el-table>
             <div>
                 <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
@@ -85,6 +84,7 @@ export default {
    name: "see",
     data() {
     return {
+      searchData:[],
         labelPosition: 'right',
         tableData: [],
         pageSize: 10,
@@ -96,7 +96,7 @@ export default {
             mobile:"",
             options:[
                 {value:1,label:"已发放"},
-                {value:'',label:"未发放"},
+                {value:0,label:"未发放"},
             ]
         }
        
diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
index 20d903322..b2fc8b71a 100644
--- a/src/views/modules/volunteer/activityArchive/add.vue
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -97,12 +97,21 @@
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
           </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>
+          <div style="display: flex;">
+            <div style="">
+            <div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
+              <el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" label-width="110px">
+                <el-input v-model="item.name" placeholder="请输入" style="width: 300px;"></el-input>
+                <i class="el-icon-remove-outline" @click.prevent="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i> 
               </el-form-item>
-              <el-form-item label="联系电话" prop="sponsor" >
-                <el-input v-model="tableDate.phone" placeholder="请输入" style="width: 300px;"></el-input>
+             
+              <el-form-item label="联系电话" prop="sponsors">
+                <el-input v-model="item.phone" placeholder="请输入" style="width: 300px;"></el-input>
               </el-form-item>
+            </div>
+          </div>
+     
+            <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;" ></i>   </div>
 <!-- <i class="el-icon-circle-plus"  @click="addDomain" style="font-size: 20px;"></i> -->
      
           <el-form-item label="活动地点" prop="searchValue"   >
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index e65fd7977..74d91ad84 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -65,6 +65,7 @@
         <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
             <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">修改</el-button>
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button>
             <el-button  v-if="scope.row.online === 1" type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button>
             <el-button v-if="scope.row.online === 0" type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">上线</el-button>
             <!-- <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleintegral(scope.row)">更多</el-button> -->
@@ -92,8 +93,12 @@
         <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">
-        <selecthande  v-if="showselect" :list="fmData" />
+        width="1000px" top="10vh" class="dialog-h" @closed="updateClose">
+        <selecthande  v-if="showselect" :list="fmData" @updateClose="updateClose" />
+      </el-dialog>
+      <el-dialog :visible.sync="showdeltail" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
+        width="1000px" top="10vh" class="dialog-h" @closed="selectClose">
+        <realselect  v-if="showdeltail" :list="fmData" @selectClose="selectClose" />
       </el-dialog>
       <el-dialog :visible.sync="HandlePointsshow" :close-on-click-modal="false" :close-on-press-escape="false"
         title="打卡积分" width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
@@ -119,12 +124,14 @@
     import ActivityCountshow from "./Administration.vue"
     import Points from "./Points.vue"
     import selecthande from "./select.vue"
+      import realselect from "./realselect.vue"
 
     export default {
       components: {add,ActivityCountshow,Points,selecthande },
     
       data() {
         return {
+          showdeltail:false,
           HandlePointsshow: false,
           ActivityCountshow: false,
           add: false,
@@ -309,6 +316,16 @@
           this.add=false
           this.getTableData()
         },
+        updateClose(){
+          console.log("sdkjksd");
+          this.showselect=false
+          this.getTableData()
+        },
+        selectClose(){
+          console.log("sdkjksd");
+          this.showdeltail=false
+          this.getTableData()
+        },
         resetSearch(){
           this.formData=[]
         },
@@ -318,6 +335,12 @@
           this.fmData=row
   
         },
+        handleselect(row){
+          console.log(row,"row");
+          this.showdeltail=true
+          this.fmData=row
+  
+        },
    
     
    
diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue
new file mode 100644
index 000000000..be429c203
--- /dev/null
+++ b/src/views/modules/volunteer/activityArchive/realselect.vue
@@ -0,0 +1,635 @@
+<template>
+    <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="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="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="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 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>
+            </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="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>
+                          <div v-if="true"  id="app_activity" class="div_map"></div>
+                      </el-form-item>
+          </el-form>
+        </div>
+      </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:[
+      ]
+  
+        },
+  
+        activityImgs:[],//图片
+        typeList:[
+            {
+              id:"1",
+              name:"线上活动"
+            },
+            {
+              id:"2",
+              name:"线下活动"
+            }
+          ],
+        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: {
+      'formData.notQuota'(newValue) {
+        console.log(newValue,'newvalue');
+        // 当 notQuota 变为 '0' 时，清空 quota
+        if (newValue === '0') {
+          this.formData.quota = '';
+        }
+        console.log( this.formData.quota);
+        
+      }
+    },
+    components: { fileList,Tinymce,UploadImage},
+    async mounted () {
+      this.getTableData()
+      // this.startLoading()
+      // await this.loadInfo()
+      // this.endLoading()
+      console.log(this.list,"dsfslfjl");
+      this.getOrgTreeList()
+  
+    },
+  
+    methods: {
+      //获取活动详情
+          async getTableData() {
+          // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+          const url = `/voluntary/activityInfo/detail/${this.list.id}`;
+          let params = {
+  
+        }
+        requestGet(url, params).then((res) => {
+          if (res.code == 0) {
+              this.formData=res.data;
+              this.tableDate=res.data.sponsors[0],
+              this.searchValue=res.data.address
+              this.formData.activityImgs=res.data.imgs
+  
+          } else {
+            this.$message.error(res.msg);
+          }
+        });
+          // const { data, code, msg } = await requestGet(url, params)
+          // if (code === 0) {
+          //   console.log("列表请求成功！！！！！！！！！！！！！！");
+          //   this.total = data.total || 0;
+          //   this.tableData = data.list
+          //   console.log(this.tableData,"this.tableData");
+            
+      
+          // } else {
+          // }
+        },
+          //控制活动时间
+          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/updateInfo";
+        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('updateClose')
+            // 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(" ")
+              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.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
+         },
+   
+      //图片
+      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)
+                  }
+              })
+      },
+      handleCancle () {
+        console.log(    "kdsljk");
+    
+        this.$emit('updateClose')
+  
+      },
+           // 开启加载动画
+           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: 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/activityArchive/select.vue b/src/views/modules/volunteer/activityArchive/select.vue
index 4547ac7c8..3153cb16d 100644
--- a/src/views/modules/volunteer/activityArchive/select.vue
+++ b/src/views/modules/volunteer/activityArchive/select.vue
@@ -3,43 +3,44 @@
     <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 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 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;">
+            <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"
+            <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>
+                <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-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">
+              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-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>
@@ -49,20 +50,19 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label=" 联系人" prop="linkman" required >
+          <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 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 style="width: 50%;">
+        <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-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
             </el-form-item>
 
             <!-- <el-form-item label="所属项目" prop="typeId" required>
@@ -73,10 +73,10 @@
                             </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"
+              <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="signInTime" required>
               <el-date-picker v-model.trim="formData.signInTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
@@ -97,26 +97,35 @@
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
           </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>
+          <div style="display: flex;">
+            <div style="">
+            <div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
+              <el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" label-width="110px">
+                <el-input v-model="item.name" placeholder="请输入" style="width: 300px;"></el-input>
+                <i class="el-icon-remove-outline" @click.prevent="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i> 
               </el-form-item>
-              <el-form-item label="联系电话" prop="sponsor" >
-                <el-input v-model="tableDate.phone" placeholder="请输入" style="width: 300px;"></el-input>
+             
+              <el-form-item label="联系电话" prop="sponsors">
+                <el-input v-model="item.phone" placeholder="请输入" style="width: 300px;"></el-input>
               </el-form-item>
-<!-- <i class="el-icon-circle-plus"  @click="addDomain" style="font-size: 20px;"></i> -->
+        
+
+            </div>
+      
+          </div>
      
-          <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>
+            <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;" ></i>   </div>
+          <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>
@@ -199,7 +208,6 @@ export default {
             name:"线下活动"
           }
         ],
-      fileList: [],
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
         tableDate:{},
         rules: {
@@ -242,15 +250,23 @@ export default {
   },
   components: { fileList,Tinymce,UploadImage},
   async mounted () {
+    this.getTableData()
     // this.startLoading()
     // await this.loadInfo()
     // this.endLoading()
     console.log(this.list,"dsfslfjl");
     this.getOrgTreeList()
-    this.getTableData()
+
   },
 
   methods: {
+    //删除动态
+    removeDomain(item) {
+        var index = this.formData.sponsors.indexOf(item)
+        if (index !== -1) {
+          this.formData.sponsors.splice(index, 1)
+        }
+      },
     //获取活动详情
         async getTableData() {
         // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
@@ -261,8 +277,10 @@ export default {
       requestGet(url, params).then((res) => {
         if (res.code == 0) {
             this.formData=res.data;
-            this.tableDate=res.data.sponsors,
+            this.formData.sponsors=res.data.sponsors,
             this.searchValue=res.data.address
+            this.formData.activityImgs=res.data.imgs
+
         } else {
           this.$message.error(res.msg);
         }
@@ -298,9 +316,7 @@ export default {
     },
        //提交
       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;
@@ -353,7 +369,7 @@ export default {
         this.$message.error('请填写报名截止时间');
         return;
       }
-      let url="/voluntary/activityInfo/saveInfo";
+      let url="/voluntary/activityInfo/updateInfo";
       let parms={
         ...this.formData
       }
@@ -363,7 +379,7 @@ export default {
         console.log(res,"res");
         if (res.code==0) {
           this.$message.success('添加成功');
-          this.$emit('AddClose')
+          this.$emit('updateClose')
           // this.$router.push({path:'/volunteer/activityArchive'})
         }else{
           this.$message.error(res.msg);
@@ -587,7 +603,7 @@ export default {
     handleCancle () {
       console.log(    "kdsljk");
   
-      this.$emit('AddClose')
+      this.$emit('updateClose')
 
     },
          // 开启加载动画