From 198a1cb02ac77ce35b579a35e44d8a01a993bb32 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: Fri, 20 Sep 2024 17:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E8=BF=94=E5=9B=9E=E7=A7=AF=E5=88=86=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/LifeCircleManagement/add.vue    |   71 +-
 .../volunteer/LifeCircleManagement/index.vue  |   19 +-
 .../modules/volunteer/Venuemanagement/add.vue | 1017 +++++++++++++++++
 .../volunteer/Venuemanagement/index.vue       |  491 ++++++++
 .../modules/volunteer/activityArchive/add.vue |   32 +-
 .../volunteer/activityArchive/index.vue       |    4 +-
 6 files changed, 1575 insertions(+), 59 deletions(-)
 create mode 100644 src/views/modules/volunteer/Venuemanagement/add.vue
 create mode 100644 src/views/modules/volunteer/Venuemanagement/index.vue

diff --git a/src/views/modules/volunteer/LifeCircleManagement/add.vue b/src/views/modules/volunteer/LifeCircleManagement/add.vue
index b265ec3d5..588e872ca 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/add.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/add.vue
@@ -13,12 +13,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="组织类型" prop="typeName" label-width="100px">
-              <el-cascader v-model="typeName" :options="options" @change="handleChange"></el-cascader>
+              <el-cascader v-model="formData.typeName" :options="options" @change="handleChange" :disabled="showdisabled"></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="名称" label-width="100px" prop="Name">
-              <el-input v-model.trim="formData.Name" size="small" clearable placeholder="请输入活动名称"
+              <el-input v-model.trim="formData.Name" size="small" clearable placeholder="请输入活动名称" :disabled="showdisabled"
                 class="u-item-width-normal"></el-input>
             </el-form-item>
           </el-col>
@@ -35,8 +35,8 @@
           <el-col :span="24">
             <el-form-item label="位置" prop="address" label-width="100px" style="display: block">
               <div style="width: 634px">
-                <el-select v-model.trim="searchValue" filterable style="width: 634px" remote :reserve-keyword="true"
-                  placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
+                <el-select v-model.trim="searchValue" filterable style="width: 634px" remote :reserve-keyword="true" :disabled="showdisabled"
+                  placeholder="请输入关键词" :remote-method="remoteMethod" >
                   <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
                     :key="item.value || index" :label="item.label" :value="item.value">
                   </el-option>
@@ -47,13 +47,13 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系人" prop="operator" label-width="100px">
-              <el-input v-model.trim="formData.operator" size="small" clearable placeholder="请输入管理员姓名"
+              <el-input v-model.trim="formData.operator" size="small" clearable placeholder="请输入管理员姓名" :disabled="showdisabled"
                 class="u-item-width-normal"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="mobile" label-width="100px">
-              <el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号"
+              <el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号" :disabled="showdisabled"
                 class="u-item-width-normal"></el-input>
             </el-form-item>
           </el-col> 
@@ -62,9 +62,9 @@
               <div  >
                 <div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index style="display: flex;">
                   <el-form-item label="标签" prop="sponsors" label-width="100px" >
-                    <el-input v-model="item.name" placeholder="请输入(最多添加四个)"  lass="u-item-width-normal"></el-input>
+                    <el-input :disabled="showdisabled" v-model="item.name" placeholder="请输入(最多添加四个)"  lass="u-item-width-normal"></el-input>
                   </el-form-item>
-                  <div v-if="index > 0"  @click="removeDomain(item)" style="color: blue; font-size: 12px;  margin-top: 15px">删除
+                  <div  v-if="index > 0"  @click="removeDomain(item)" style="color: blue; font-size: 12px;  margin-top: 15px">删除
                   </div>
                 </div>
               </div>
@@ -73,29 +73,26 @@
               <!-- <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i> -->
             </div>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="身份证号" prop="idCard" label-width="100px">
-              <el-input v-model.trim="formData.idCard" size="small" clearable placeholder="请输入身份证号"
-                class="u-item-width-normal"></el-input>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="12">
             <el-form-item label="展示图片" label-width="100px" prop="coverImg">
               <template>
-                <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
+                <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList" v-if="!showdisabled"
                   @file-removed="removedImg"></upload-image>
+                  <div v-else>
+                  <img :src="formData.coverImg" alt="" style="width: 100px; height: 100px;">
+                </div>
               </template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="营业时间" label-width="100px" prop="datatime">
-              <el-input v-model.trim="formData.datatime" size="small" clearable placeholder="请输入营业时间"
+              <el-input v-model.trim="formData.datatime" size="small" clearable placeholder="请输入营业时间" :disabled="showdisabled"
                 class="u-item-width-normal"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="备注" label-width="100px" prop="beizhu">
-              <el-input v-model.trim="formData.beizhu" size="small" clearable placeholder="请输入备注"
+              <el-input v-model.trim="formData.beizhu" size="small" clearable placeholder="请输入备注" :disabled="showdisabled"
                 class="u-item-width-normal"></el-input>
             </el-form-item>
           </el-col>
@@ -133,7 +130,7 @@
  
  <script>
  import { mapGetters } from 'vuex'
- import { Loading } from 'element-ui' // 引入Loading服务
+//  import { Loading } from 'element-ui' // 引入Loading服务
  import { requestPost } from '@/js/dai/request'
  import Tinymce from '@c/tinymce2/index.vue'
  import daiMap from "@/utils/dai-map";
@@ -147,10 +144,12 @@
  var infoWindowList
  var geocoder // 新建一个正逆地址解析类
  
- let loading // 加载动画
+
  export default {
     data() {
         return {
+          showdisabled:false,
+          searchOptions:[],
             options: [{
           value: 'zhinan',
           label: '指南',
@@ -358,9 +357,7 @@
             tableDate:{},
             formData:    
                 {
-                  sponsors: [{ name: ""}],//标签
-         
-             
+                sponsors: [{ name: ""}],//标签
                 typeName:"",//类型名称
                 status:"pass",//审核状态
                 numberNum:"",//组织成员数量
@@ -411,7 +408,9 @@
       //父组件传的
       async initForm(type, unitId) {
         console.log(type, unitId,"i就理解哦i");
-        
+        if(type=="info"){
+          this.showdisabled=true
+        }
       // await this.getDemandOptions()
       // console.log(this.demandOptions);
       // let { latitude, longitude } = this.$store.state.user;
@@ -536,7 +535,6 @@
                 // agencyId: this.agencyId
                 pageSize: 20,
                 pageNo: 1,
-                typeName: "",
                 enabled: 1
             }
             const { data, code, msg } = await requestPost(url, params)
@@ -884,9 +882,8 @@
         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) {
@@ -924,31 +921,11 @@
         },
  
 
-        // 开启加载动画
-        startLoading() {
-            loading = Loading.service({
-                lock: true, // 是否锁定
-                text: '正在加载……', // 加载中需要显示的文字
-                background: 'rgba(0,0,0,.7)' // 背景颜色
-            })
-        },
-        // 结束加载动画
-        endLoading() {
-            // clearTimeout(timer);
-            if (loading) {
-                loading.close()
-            }
-        }
+
     },
     computed: {
         dataRule() {
             return {
-              // typeName: [
-              //       { required: true, message: '', trigger: 'blur' }
-              //   ],
-                // serviceTypeList: [
-                //     { required: true, message: '请选择服务类型', trigger: 'blur' }
-                // ],
                 typeName: [
                     { required: true, message: '请选择组织类型', trigger: 'blur' }
                 ],
diff --git a/src/views/modules/volunteer/LifeCircleManagement/index.vue b/src/views/modules/volunteer/LifeCircleManagement/index.vue
index efbaa1dce..ccbea5aa9 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/index.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/index.vue
@@ -229,6 +229,18 @@ export default {
         //关闭查看
         showInfoClose(){
             this.showEdit=false
+        },
+        //打开查看
+        handleDetail(row){
+          // console.log(row,"row");
+          // this.showInfo=true
+            this.showAdd=true
+            this.formTitle="查看"
+            this.$nextTick(() => {
+        this.$refs.ref_form.initForm("info", row);
+      });
+         
+  
         },
         //查询列表
         async getTableData() {
@@ -376,12 +388,7 @@ export default {
           this.formData=[]
           this.getTableData()
         },
-        handleDetail(row){
-          console.log(row,"row");
-          this.showInfo=true
-          this.fmData=row
-  
-        },
+
         summDetailClose(){
             this.showAdd=false
           this.getTableData()
diff --git a/src/views/modules/volunteer/Venuemanagement/add.vue b/src/views/modules/volunteer/Venuemanagement/add.vue
new file mode 100644
index 000000000..a5ef6dd65
--- /dev/null
+++ b/src/views/modules/volunteer/Venuemanagement/add.vue
@@ -0,0 +1,1017 @@
+<template>
+    <div>
+  
+      <div class="dialog-h-content scroll-h">
+  
+        <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
+          <el-row>
+
+            <el-col :span="12">
+              <el-form-item label="挂靠阵地" prop="typeName" label-width="100px">
+                <el-cascader v-model="formData.typeName" :options="options" @change="handleChange" :disabled="showdisabled"></el-cascader>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="名称" label-width="100px" prop="Name">
+                <el-input v-model.trim="formData.Name" size="small" clearable placeholder="请输入活动名称" :disabled="showdisabled"
+                  class="u-item-width-normal"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话" prop="mobile" label-width="100px">
+                <el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号" :disabled="showdisabled"
+                  class="u-item-width-normal"></el-input>
+              </el-form-item>
+            </el-col> 
+            <!-- <el-col :span="12">
+                          <el-form-item label="组织类型" label-width="100px" prop="orgType">
+                              <el-select class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择"
+                                  clearable>
+                                  <el-option v-for="item in OrganizationaltypeList" :key="item.value" :label="item.label"
+                                      :value="item.value">
+                                  </el-option>
+                              </el-select>
+                          </el-form-item>
+                      </el-col> -->
+            <el-col :span="24">
+              <el-form-item label="位置" prop="address" label-width="100px" style="display: block">
+                <div style="width: 634px">
+                  <el-select v-model.trim="searchValue" filterable style="width: 634px" remote :reserve-keyword="true" :disabled="showdisabled"
+                    placeholder="请输入关键词" :remote-method="remoteMethod" >
+                    <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                      :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-col>
+            <el-col :span="12">
+              <el-form-item label="联系人" prop="operator" label-width="100px">
+                <el-input v-model.trim="formData.operator" size="small" clearable placeholder="请输入管理员姓名" :disabled="showdisabled"
+                  class="u-item-width-normal"></el-input>
+              </el-form-item>
+            </el-col>
+ 
+            <el-col :span="12">
+              <div v-if="formData.sponsors" style="display: flex; ">
+                <div  >
+                  <div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index style="display: flex;">
+                    <el-form-item label="标签" prop="sponsors" label-width="100px" >
+                      <el-input :disabled="showdisabled" v-model="item.name" placeholder="请输入(最多添加四个)"  lass="u-item-width-normal"></el-input>
+                    </el-form-item>
+                    <div  v-if="index > 0"  @click="removeDomain(item)" style="color: blue; font-size: 12px;  margin-top: 15px">删除
+                    </div>
+                  </div>
+                </div>
+                <div  @click="addDomain" style="color: blue; font-size: 12px;  margin-top: 15px">添加
+                  </div>
+                <!-- <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i> -->
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="展示图片" label-width="100px" prop="coverImg">
+                <template>
+                  <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList" v-if="!showdisabled"
+                    @file-removed="removedImg"></upload-image>
+                    <div v-else>
+                    <img :src="formData.coverImg" alt="" style="width: 100px; height: 100px;">
+                  </div>
+                </template>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="营业时间" label-width="100px" prop="datatime">
+                <el-input v-model.trim="formData.datatime" size="small" clearable placeholder="请输入营业时间" :disabled="showdisabled"
+                  class="u-item-width-normal"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注" label-width="100px" prop="beizhu">
+                <el-input v-model.trim="formData.beizhu" size="small" clearable placeholder="请输入备注" :disabled="showdisabled"
+                  class="u-item-width-normal"></el-input>
+              </el-form-item>
+            </el-col>
+            <!-- <el-form-item label="组织介绍" prop="introduction" label-width="100px" style="display: block">
+                          <div class="item_width_1">
+                              <el-input type="textarea" autosize placeholder="请填写组织介绍"
+                                  v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}">
+                              </el-input>
+                          </div>
+                      </el-form-item> -->
+            <!-- 
+                      <el-form-item label="志愿品牌" prop="brand" label-width="100px" style="display: block">
+                          <div class="item_width_1">
+                              <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand"
+                                  :autosize="{ minRows:4., maxRows: 10}">
+                              </el-input>
+                          </div>
+                      </el-form-item>
+                      <el-form-item label="品牌展示图" label-width="100px" prop="brandImg">
+                          <template>
+                              <upload-image :defaultFileList="formData.brandImg" :limit="1" @change="onChangeFileList1"
+                                  @file-removed="removedImg"></upload-image>
+                          </template>
+                      </el-form-item> -->
+          </el-row></el-form>
+      </div>
+      <div class="div_btn">
+        <el-button size="small" @click="handleCancle">取 消</el-button>
+        <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable" @click="handleComfirm">确
+          定</el-button>
+  
+      </div>
+    </div>
+  </template>
+   
+   <script>
+   import { mapGetters } from 'vuex'
+  //  import { Loading } from 'element-ui' // 引入Loading服务
+   import { requestPost } from '@/js/dai/request'
+   import Tinymce from '@c/tinymce2/index.vue'
+   import daiMap from "@/utils/dai-map";
+   import util from '@js/util.js';
+   // import UploadImage from './upload-image.vue'
+   import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+   
+   var map
+   var search
+   var markers
+   var infoWindowList
+   var geocoder // 新建一个正逆地址解析类
+   
+  
+   export default {
+      data() {
+          return {
+            showdisabled:false,
+            searchOptions:[],
+              options: [{
+            value: 'zhinan',
+            label: '指南',
+            children: [{
+              value: 'shejiyuanze',
+              label: '设计原则',
+              children: [{
+                value: 'yizhi',
+                label: '一致'
+              }, {
+                value: 'fankui',
+                label: '反馈'
+              }, {
+                value: 'xiaolv',
+                label: '效率'
+              }, {
+                value: 'kekong',
+                label: '可控'
+              }]
+            }, {
+              value: 'daohang',
+              label: '导航',
+              children: [{
+                value: 'cexiangdaohang',
+                label: '侧向导航'
+              }, {
+                value: 'dingbudaohang',
+                label: '顶部导航'
+              }]
+            }]
+          }, {
+            value: 'zujian',
+            label: '组件',
+            children: [{
+              value: 'basic',
+              label: 'Basic',
+              children: [{
+                value: 'layout',
+                label: 'Layout 布局'
+              }, {
+                value: 'color',
+                label: 'Color 色彩'
+              }, {
+                value: 'typography',
+                label: 'Typography 字体'
+              }, {
+                value: 'icon',
+                label: 'Icon 图标'
+              }, {
+                value: 'button',
+                label: 'Button 按钮'
+              }]
+            }, {
+              value: 'form',
+              label: 'Form',
+              children: [{
+                value: 'radio',
+                label: 'Radio 单选框'
+              }, {
+                value: 'checkbox',
+                label: 'Checkbox 多选框'
+              }, {
+                value: 'input',
+                label: 'Input 输入框'
+              }, {
+                value: 'input-number',
+                label: 'InputNumber 计数器'
+              }, {
+                value: 'select',
+                label: 'Select 选择器'
+              }, {
+                value: 'cascader',
+                label: 'Cascader 级联选择器'
+              }, {
+                value: 'switch',
+                label: 'Switch 开关'
+              }, {
+                value: 'slider',
+                label: 'Slider 滑块'
+              }, {
+                value: 'time-picker',
+                label: 'TimePicker 时间选择器'
+              }, {
+                value: 'date-picker',
+                label: 'DatePicker 日期选择器'
+              }, {
+                value: 'datetime-picker',
+                label: 'DateTimePicker 日期时间选择器'
+              }, {
+                value: 'upload',
+                label: 'Upload 上传'
+              }, {
+                value: 'rate',
+                label: 'Rate 评分'
+              }, {
+                value: 'form',
+                label: 'Form 表单'
+              }]
+            }, {
+              value: 'data',
+              label: 'Data',
+              children: [{
+                value: 'table',
+                label: 'Table 表格'
+              }, {
+                value: 'tag',
+                label: 'Tag 标签'
+              }, {
+                value: 'progress',
+                label: 'Progress 进度条'
+              }, {
+                value: 'tree',
+                label: 'Tree 树形控件'
+              }, {
+                value: 'pagination',
+                label: 'Pagination 分页'
+              }, {
+                value: 'badge',
+                label: 'Badge 标记'
+              }]
+            }, {
+              value: 'notice',
+              label: 'Notice',
+              children: [{
+                value: 'alert',
+                label: 'Alert 警告'
+              }, {
+                value: 'loading',
+                label: 'Loading 加载'
+              }, {
+                value: 'message',
+                label: 'Message 消息提示'
+              }, {
+                value: 'message-box',
+                label: 'MessageBox 弹框'
+              }, {
+                value: 'notification',
+                label: 'Notification 通知'
+              }]
+            }, {
+              value: 'navigation',
+              label: 'Navigation',
+              children: [{
+                value: 'menu',
+                label: 'NavMenu 导航菜单'
+              }, {
+                value: 'tabs',
+                label: 'Tabs 标签页'
+              }, {
+                value: 'breadcrumb',
+                label: 'Breadcrumb 面包屑'
+              }, {
+                value: 'dropdown',
+                label: 'Dropdown 下拉菜单'
+              }, {
+                value: 'steps',
+                label: 'Steps 步骤条'
+              }]
+            }, {
+              value: 'others',
+              label: 'Others',
+              children: [{
+                value: 'dialog',
+                label: 'Dialog 对话框'
+              }, {
+                value: 'tooltip',
+                label: 'Tooltip 文字提示'
+              }, {
+                value: 'popover',
+                label: 'Popover 弹出框'
+              }, {
+                value: 'card',
+                label: 'Card 卡片'
+              }, {
+                value: 'carousel',
+                label: 'Carousel 走马灯'
+              }, {
+                value: 'collapse',
+                label: 'Collapse 折叠面板'
+              }]
+            }]
+          }, {
+            value: 'ziyuan',
+            label: '资源',
+            children: [{
+              value: 'axure',
+              label: 'Axure Components'
+            }, {
+              value: 'sketch',
+              label: 'Sketch Templates'
+            }, {
+              value: 'jiaohu',
+              label: '组件交互文档'
+            }]
+          }],
+              fileList:[],
+              searchValue:"",
+              OrganizationaltypeList:[],
+              ServicetypeListName:[],
+              Organizationaltype:[
+                  { label: "社区", value: 1 },
+                  { label: "企业", value: 2 },
+                  { label: "学校", value: 3 },
+              ],
+              tableDate:{},
+              formData:    
+                  {
+                  sponsors: [{ name: ""}],//标签
+                  typeName:"",//类型名称
+                  status:"pass",//审核状态
+                  numberNum:"",//组织成员数量
+                  userId:"",//志愿者id
+                  agencyId:"",//组织id
+                  orgType:"",
+                  brandImg:"",//品牌图片
+                  brand:"",//志愿品牌
+                  introduction:"",//组织介绍
+                  qualification: "",//封面图片
+                  idCard:"",//身份证信息
+                  mobile:"",//管理员电话
+                  operator:"",//管理员姓名
+                  Organizationaltype:"",//组织类型
+               //    serviceTypeList:"",//服务类型
+                  orgName:"",//组织名称
+                  agencyName:"",//所属组织
+                  serviceTypeList:[],//服务类型
+                  address: "",//地址
+                  longitude: this.$store.state.user.longitude, //经度
+                  latitude: this.$store.state.user.latitude,//纬度
+                  },
+              corganizerList: [],
+              uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+              customerId: localStorage.getItem('customerId'),
+   
+          }
+          
+      },
+   
+      components: { Tinymce, UploadImage },
+      mounted() {
+       this.formData.agencyId=this.$store.state.user.agencyId
+         this.formData.agencyName=this.$store.state.user.agencyName
+         let { latitude, longitude } = this.$store.state.user;
+          if (!latitude || latitude == "" || latitude == "0") {
+              latitude = 39.9088810666821;
+              longitude = 116.39743841556731;
+          }
+          this.formData.latitude = latitude;
+          this.formData.longitude = longitude;
+          this.activityType()
+          this.listServerOrg()
+   
+      },
+   
+      methods: {
+        //父组件传的
+        async initForm(type, unitId) {
+          console.log(type, unitId,"i就理解哦i");
+          if(type=="info"){
+            this.showdisabled=true
+          }
+        // await this.getDemandOptions()
+        // console.log(this.demandOptions);
+        // let { latitude, longitude } = this.$store.state.user;
+  
+        // this.formType = type;
+        // if (unitId) {
+        //   this.unitId = unitId;
+        //   this.formData.id = unitId;
+        //   await this.loadFormData();
+        // } else {
+        //   this.formData.latitude = latitude;
+        //   this.formData.longitude = longitude;
+        // }
+  
+        // // if (!map) {
+        // this.initMap(this.formData.latitude, this.formData.longitude);
+        // // }
+  
+        // this.endLoading();
+      },
+        //添加标签
+        addDomain() {
+          if (this.formData.sponsors.length < 4) {
+            console.log("jshdfdsjdfkl");
+        console.log(this.formData.sponsors,this.tableDate,);
+          this.formData.sponsors.push(this.tableDate);
+          console.log(this.formData.sponsors,this.tableDate,);
+          }else{
+            this.$message.error("最多添加4个标签");
+          }
+     
+        },
+        //删除动态
+        removeDomain(item) {
+          console.log(item);
+          var index = this.formData.sponsors.indexOf(item)
+          if (index !== -1) {
+            this.formData.sponsors.splice(index, 1)
+            this.tableDate = {}
+          }
+        },
+          validateContent() {
+        // 使用正则表达式去除HTML标签后检查内容
+        const textContent = this.stripHtml(this.formData.sumUp);
+        if (textContent.trim() === '') {
+          this.formData.sumUp = null;
+        }
+      },
+      stripHtml(html) {
+        const div = document.createElement('div');
+        div.innerHTML = html;
+        return div.textContent || div.innerText || '';
+      },
+   
+       //    // 上传成功
+       //    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.formData.activityImgs.push({
+       //            //     format,
+       //            //     name: file.name,
+       //            //     size: file.size,
+       //            //     type,
+       //            //     url: res.data.url
+       //            // });
+       //            // console.log('this.formData.activityImgs',res.data.url)
+       //            this.formData.activityImgs.push(res.data.url);
+   
+       //        } else {
+       //            this.$message.error(res.msg);
+       //        }
+       //    },
+       //    // 删除图片
+       //    handleImgRemove(file) {
+       //        console.log('handleImgRemove', file);
+       //        if (file.response) {
+       //            let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
+       //            this.formData.activityImgs.splice(index, 1);
+       //        } else if (file.url) {
+       //            let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
+       //            this.formData.activityImgs.splice(index, 1);
+       //        }
+       //    },
+          // 图片预览
+       //    handleImgPreview(file) {
+       //        console.log(file);
+       //        window.open(file.url || file.response.data.url);
+       //    },
+       //    // 文件数量超过限制
+       //    handleImgExceed() {
+       //        this.$message({
+       //            type: 'warning',
+       //            message: '文件数量最多不超过三个'
+       //        });
+       //    },
+          // 上传前的验证
+       //    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;
+       //    },
+   
+          async activityType() {
+              const url = "/actual/base/activityType/page"
+              let params = {
+                  // agencyId: this.agencyId
+                  pageSize: 20,
+                  pageNo: 1,
+                  enabled: 1
+              }
+              const { data, code, msg } = await requestPost(url, params)
+              if (code === 0) {
+                  this.typeList = data.list
+              } else {
+                  this.$message.error(msg)
+              }
+              this.$nextTick(() => {
+                  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)
+                  }
+              })
+          },
+   
+          handleOnlineRegistration(value) {
+              // 
+              if (value) {
+                  this.online = true;
+                  this.formData.online = 1;
+              } else {
+                  this.online = false;
+                  this.formData.cutOffTime = ''
+                  this.formData.online = 0;
+              }
+          },
+          onChangeFileList(e) {
+              console.log(e, 'sssssb');
+              this.fileList = e.length > 0 ? e.map(item => ({
+                  fileType: '0',
+                  fileUrl: item.response.data.url
+              })) : []; // 当e为空时清空fileList
+              if (e.length > 0) {
+                  this.formData.coverPic = e[0].response.data.url;
+              } else {
+                  this.formData.coverPic = '';
+              }
+          },
+   
+          removedImg() {
+              this.formData.coverPic = ''
+          },
+          // onChangeFileList(e) {
+          //     console.log(e, 'sssssb');
+          //     this.fileList = e.length > 0 ? e.map(item => ({
+          //         fileType: '0',
+          //         fileUrl: item.response.data.url
+          //     })) : []; // 当e为空时清空fileList
+          //     if (e.length > 0) {
+          //         this.formData.qualification = e[0].response.data.url;
+          //     } else {
+          //         this.formData.qualification = '';
+          //     }
+          // },
+          onChangeFileList1(e) {
+              console.log(e, 'sssssb');
+              this.fileList1 = e.length > 0 ? e.map(item => ({
+                  fileType: '0',
+                  fileUrl: item.response.data.url
+              })) : []; // 当e为空时清空fileList
+              if (e.length > 0) {
+                  this.formData.brandImg = e[0].response.data.url;
+              } else {
+                  this.formData.brandImg = '';
+              }
+          },
+   
+          onChangeImgs(e, rowIndex = 0) {
+              console.log('onChangeFileList', e)
+              if (e.length > 0) {
+                  this.activityImgs = []
+                  e.forEach(item => {
+                      let ob = {
+                          fileType: '0',
+                          fileUrl: item.response.data.url
+                      }
+                      this.activityImgs.push(ob)
+                  })
+              }
+          },
+   
+          // onChangeImgs(e) {
+          //     this.activityImgs = [];
+          //     if (e.length > 0) {
+          //         e.forEach(item => {
+          //             let ob = {
+          //                 fileType: '0',
+          //                 fileUrl: item.response.data.url
+          //             };
+          //             this.activityImgs.push(ob);
+          //         });
+          //         console.log('this.activityImgs',this.activityImgs)
+          //     }
+          // },
+   
+          handleChange(value) {},
+          handleTimeChange(time) {
+              if (time) {
+                  const startTimeArray = util.dateFormatter(time[0], 'time').split('-')
+                  console.log(startTimeArray);
+                  const endTimeArray = util.dateFormatter(time[1], 'time').split('-')
+                  console.log(endTimeArray);
+                  this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] 
+                  this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] 
+                  // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+                  // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+              } else {
+                  this.formData.startTime = ''
+                  this.formData.endTime = ''
+              }
+   
+          },
+       //    async initForm(type, activityId) {
+       //        this.startLoading()
+       //        this.formType = type
+       //        if (type === 'edit') {
+       //            if (activityId.activityImgs || activityId.sumUp) {
+       //                this.records = true
+       //            } else {
+       //                this.records = false
+       //            }
+       //            this.formData = activityId
+       //            this.timeRange = [this.formData.startTime, this.formData.endTime]
+       //            console.log(activityId,"activityId");
+                  
+       //            if (activityId.coverPic) {
+       //                let ob = {
+       //                    fileType: '0',
+       //                    fileUrl: activityId.coverPic
+       //                };
+       //                this.fileList = [ob];
+       //                this.formData.coverPic = ob.fileUrl;
+       //                if (this.formData.online == 1) {
+       //                    this.online = true
+       //                }
+       //            }
+       //        } else if (type === 'records') {
+       //            this.records = true
+       //        } else if (type === 'summary') {
+       //            this.formData = activityId
+       //            this.formData.activityImgs = []
+       //            console.log("this.formData", this.formData)
+       //            this.records = true
+       //            this.summary = false
+       //        } else {
+       //            this.records = false
+       //        }
+       //        this.endLoading()
+   
+       //    },
+   
+          async getDemandOptions() {
+              this.$http
+                  .post("/actual/base/serviceitem/listAllCategory")
+                  .then(({ data: res }) => {
+                      if (res.code !== 0) {
+                          return this.$message.error(res.msg);
+                      } else {
+                          console.log(res.data);
+                          this.demandOptions = this.getFlagData(
+                              this.getTreeData(res.data),
+                              "usableFlag"
+                          );
+                      }
+                  })
+                  .catch(() => {
+                      return this.$message.error("网络错误");
+                  });
+          },
+          getFlagData(data, flag) {
+              if (!Array.isArray(data)) return [];
+              let arr1 = data.filter((item) => item[flag]);
+              let arr2 = arr1.map((item) => {
+                  if (item.childCateList)
+                      return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
+                  else return item;
+              });
+              return arr2;
+          },
+          getTreeData(data) {
+              if (!Array.isArray(data)) return [];
+              let arr = data.map((item) => {
+                  let _item = {};
+                  if (item.childCateList) {
+                      if (item.childCateList.length === 0)
+                          _item = { ...item, childCateList: undefined };
+                      else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+                  } else {
+                      _item = { ...item };
+                  }
+                  return _item;
+              });
+              return arr;
+          },
+          async loadGrid() {
+              const url = "/gov/org/customergrid/gridoption"
+   
+              let params = {
+                  agencyId: this.agencyId
+              }
+   
+              const { data, code, msg } = await requestPost(url, params)
+   
+              if (code === 0) {
+                  this.gridList = data
+   
+              } else {
+                  this.$message.error(msg)
+              }
+   
+          },
+          async handleComfirm() {
+           console.log(this.formData,"     this.formData");
+           
+             if (!this.formData.agencyName) {
+                this.$message.error('请选择所属组织');
+                return;
+             }
+      
+   
+    
+             if (!this.formData.introduction) {
+                this.$message.error('请输入组织介绍');
+                return;
+             }
+   
+             if (this.fileList.length === 0) {
+                this.$message.error('请上传封面图片');
+                return;
+             }
+   
+             if (!this.formData.idCard) {
+                this.$message.error('请输入身份证信息');
+                return;
+             }
+   
+             if (!this.formData.mobile) {
+                this.$message.error('请输入管理员电话');
+                return;
+             }
+   
+             if (!this.formData.operator) {
+                this.$message.error('请输入管理员姓名');
+                return;
+             }
+   
+             if (!this.formData.orgType) {
+                this.$message.error('请输入组织类型');
+                return;
+             }
+   
+             if (!this.formData.serviceTypeList) {
+                this.$message.error('请输入服务类型');
+                return;
+             }
+   
+             if (!this.formData.orgName) {
+                this.$message.error('请输入组织名称');
+                return;
+             }
+             console.log(this.formData,"this.formData");
+             this.addActivity()
+          },
+          //增加
+          async addActivity() {
+                  let url = '/voluntary/volunteerOrg/saveOrUpdate'
+                  const { data, code, msg } = await requestPost(url, this.formData)
+                  if (code === 0) {
+                      this.$message({
+                          type: 'success',
+                          message: '操作成功'
+                      })
+                   //    this.resetData()
+                      this.$emit('showAddClose')
+                      this.btnDisable = false
+                  } else {
+                      this.btnDisable = false
+                      this.$message.error(msg)
+                  }
+              
+              
+   
+   
+          },
+   
+          handleCancle() {
+               console.log("sdlkfjklsdf ");
+              this.$emit('showAddClose')
+   
+          },
+   
+          // 地图初始化函数，本例取名为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 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
+                  console.log(this.formData.address," this.formData.address ");
+                  
+                  this.searchValue = data.address
+                  this.searchOptions = []
+                  // console.log('data,this.searchValue ', this.searchValue)
+   
+              }
+          },
+   
+          async remoteMethod(query) {
+              console.log(query, "sfsvsdv");
+              if (query !== '') {
+  
+                  const { msg, data } = await map.searchNearby(query);
+                  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 = [];
+              }
+          },
+   
+          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.searchValue = selPosition.address + selPosition.name
+          },
+   
+  
+  
+      },
+      computed: {
+          dataRule() {
+              return {
+                  typeName: [
+                      { required: true, message: '请选择组织类型', trigger: 'blur' }
+                  ],
+                  Name: [
+                      { required: true, message: '请填写名称', trigger: 'blur' }
+                  ],
+                  searchValue: [
+                      { required: true, message: '请选择地址', trigger: 'blur' },
+                     
+                  ],
+                  mobile: [
+                      { required: true, message: '管理员电话不能为空不能为空', trigger: 'blur' },
+                      { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+                  ],
+                  operator: [
+                      { required: true, message: '请填写联系人', trigger: 'blur' }
+                  ],
+                  sponsors: [
+                      { required: true, message: '请填写标签信息', trigger: 'blur' },
+                  ],
+                  fileList: [
+                      { required: true, message: '请选择封面图片', trigger: 'blur' }
+                  ],
+                  sumUp: [
+                      { required: true, message: '请输入活动总结', trigger: 'blur' }
+                  ],
+                  activityImgs: [
+                      { required: true, message: '请选择活动照片', trigger: 'blur' }
+                  ]
+              }
+          },
+   
+      },
+      props: {
+   
+   
+   
+      },
+      destroyed () {
+       map = null
+     }
+   }
+   </script>
+   
+   
+   <style lang="scss" scoped>
+   @import "@/assets/scss/modules/visual/communityManageForm.scss";
+   </style>
+   <style lang="scss" scoped>
+   .item_width_1 {
+      width: 634px;
+   
+      /deep/.tox .tox-dialog {
+          z-index: 20000;
+      }
+   }
+   .u-item-width-normal{
+      width: 222px;
+   }
+   
+   .tinymce_view {
+      ::v-deep .tox .tox-dialog {
+          z-index: 2000000000;
+      }
+   }
+   
+   .div_map {
+      position: relative;
+   }
+   
+   .div_searchmap {
+      z-index: 5000;
+      position: absolute;
+      top: 5px;
+      left: 5px;
+   }
+   
+   .tinymce_view {
+      height: 400px;
+      overflow: auto;
+   }
+   
+   .text_p {
+      margin: 0;
+      padding: 0 10px;
+      border: 1px solid #d9d9d9;
+      border-radius: 5px;
+   
+      >p {
+          margin: 0;
+      }
+   }
+   </style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/Venuemanagement/index.vue b/src/views/modules/volunteer/Venuemanagement/index.vue
new file mode 100644
index 000000000..fb7709095
--- /dev/null
+++ b/src/views/modules/volunteer/Venuemanagement/index.vue
@@ -0,0 +1,491 @@
+<template>
+    <div class="g-main">
+        <div class="m-search">
+            <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
+                <div>
+                    <el-form-item label="挂靠阵地">
+                        <el-select v-model="formData.serviceType" placeholder="请选择" clearable>
+                            <el-option v-for="item in formData.optionstype" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="名称">
+                        <el-input v-model.trim="formData.orgName" size="small" class="item_width_1" clearable
+                            placeholder="请输入">
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div class="block">
+                    <div style="display: flex; justify-content: flex-end;">
+                        <el-button style="margin-left:10px" class="diy-button--blue" size="small"
+                            @click="handleSearch">查询</el-button>
+                        <el-button style="margin-left:10px" class="diy-button--white" size="small"
+                            @click="resetSearch">重置</el-button>
+                    </div>
+                </div>
+            </el-form>
+        </div>
+        <div class="m-table">
+            <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
+            <el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</el-button>
+            <el-button class="diy-button--white" size="small">
+                <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
+                    :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
+                    :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
+                    :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
+                    导入
+                </el-upload>
+            </el-button>
+            <el-table class="table" :data="tableData" border  style="width: 100%">
+                <el-table-column label="序号" header-align="center" align="center" type="index"
+                    width="80"></el-table-column>
+                <el-table-column prop="agencyName" header-align="center" align="center" label="挂靠阵地"
+                    :show-overflow-tooltip="true">
+                </el-table-column>
+                <el-table-column prop="orgName" header-align="center" align="center" label="名称"
+                    :show-overflow-tooltip="true">
+                    <!-- <template slot-scope="scope">
+        <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
+      </template> -->
+                </el-table-column>
+                <el-table-column prop="serviceTypeName" header-align="center" align="center" label="咨询电话"
+                    :show-overflow-tooltip="true">
+                </el-table-column>
+                <el-table-column prop="numberNum" header-align="center" align="center" label="地址"
+                    :show-overflow-tooltip="true">
+                </el-table-column>
+                <el-table-column prop="operator" header-align="center" align="center" label="预约时间"
+                    :show-overflow-tooltip="true">
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center"
+                    class="operate">
+                    <template slot-scope="scope">
+                        <el-button type="text" style="color:#1C6AFD;" size="small"
+                            @click="handleDetail(scope.row)">查看</el-button>
+                        <el-button type="text" style="color:#1C6AFD;" size="small"
+                            @click="handleEdit(scope.row)">修改</el-button>
+                        <el-button type="text" style="color:#1C6AFD;" size="small"
+                            @click="handleDel(scope.row)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div>
+                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize"
+                    layout="sizes, prev, pager, next, total" :total="total">
+                </el-pagination>
+            </div>
+            <el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
+                width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
+                <add   ref="ref_form" v-if="showAdd" @showAddClose="showAddClose" />
+            </el-dialog>
+            <el-dialog :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
+                width="850px" top="10vh" class="dialog-h" @closed="showInfoClose">
+                <info v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
+            </el-dialog>
+            <el-dialog :visible.sync="showEdit" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
+                width="850px" top="10vh" class="dialog-h" @closed="showEditClose">
+                <edit v-if="showEdit" :VolunteerList="EditList" @showEditClose="showEditClose" />
+            </el-dialog>
+     
+        </div>
+    </div>
+</template>
+
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import add from "./add.vue"
+// import info from "./info.vue"
+// import edit from "./edit.vue"
+// import MemberManagement from "./MemberManagement.vue"
+// import process from "./process.vue"
+// import Record from "./activeRecord"
+// import integral from "./integral"
+// //   import projectInfo from "./cpts/project-info";
+import axios from "axios";
+
+export default {
+    components: { add},
+
+    data() {
+        return {
+            formTitle:"",
+            formData: {
+                orgName: "",
+                serviceType: "",
+                optionstype: [
+                    { value: 1, label: "志愿者服务组织" },
+                    { value: 2, label: "志愿者服务团队" },
+                ]
+            },
+            showprocess:false,
+            EditList:{},
+
+            showAdd: false,
+            showMember: false,
+            showEdit: false,
+            //   pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info
+            pageNo: 1,
+            pageSize: 20,
+            total: 0,
+            tableData: [
+               
+          ],
+          importLoading:false,
+          showInfo:false,
+
+        };
+      },
+      computed: {
+        maxTableHeight() {
+          return this.$store.state.inIframe
+            ? this.clientHeight - 400 + this.iframeHeigh
+            : this.clientHeight - 400;
+        },
+        ...mapGetters(["clientHeight", "iframeHeight"]),
+      },
+      watch: {
+    
+      },
+      mounted() {
+        this.getTableData();
+      },
+      methods: {
+        //审查
+        handleprocessl(row){
+            this.showprocess=true
+            this.EditList=row
+            console.log(row,this.fmData,"row");
+        },
+        //关闭审查
+        
+        handleprocesslClose(){
+            this.showprocess=false
+            this.getTableData()
+        },
+        //成员管理
+        handleshowMember(row){
+          console.log    (row,this.fmData,"row");
+            this.showMember=true
+            this.fmData=row
+   
+        },
+        //关闭成员管理
+        MemberManagementClose(){
+            this.showMember=false  
+            this.getTableData()
+        },
+        //修改
+        handleEdit(row){
+             this.showAdd=true
+            this.formTitle="新增"
+             console.log(row,"row");
+             this.$nextTick(() => {
+             this.$refs.ref_form.initForm("edit", row);
+      });
+             
+        },
+        //关闭修改
+        showEditClose(){
+            this.showEdit=false
+            this.getTableData()
+        },
+        //新增
+        handleAdd(){
+            this.showAdd=true
+            this.formTitle="新增"
+            this.$nextTick(() => {
+        this.$refs.ref_form.initForm("add", null);
+      });
+            // this.$refs.ref_form.initForm("add", null);
+        },
+        //关闭新增
+        showAddClose(){
+            console.log("sdlkfjklsdf1");
+            this.showAdd=false
+            this.getTableData()
+        },
+        //关闭查看
+        showInfoClose(){
+            this.showEdit=false
+        },
+        //打开查看
+        handleDetail(row){
+          // console.log(row,"row");
+          // this.showInfo=true
+            this.showAdd=true
+            this.formTitle="查看"
+            this.$nextTick(() => {
+        this.$refs.ref_form.initForm("info", row);
+      });
+         
+  
+        },
+        //查询列表
+        async getTableData() {
+          // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+          const url = "/voluntary/volunteerOrg/page";
+  
+          let params={
+              orgName: this.formData.orgName,
+              serviceType: this.formData.serviceType,
+              pageNo:this.pageNo,
+              pageSize: this.pageSize
+          }
+          const { data, code, msg } = await requestPost(url,params);
+          if (code === 0) {
+            console.log("列表请求成功！！！！！！！！！！！！！！");
+            this.total = data.total || 0;
+            this.tableData = data.list
+          } else {
+          }
+        },
+        //模板
+        async uploadHttpRequest(file) {
+          debugger
+      
+              // this.importLoading = true;
+            console.log(this.importLoading,"this.importLoading");
+            debugger
+              // this.importBtnTitle = '正在上传中...';
+              this.$message({
+                  showClose: true,
+                  dangerouslyUseHTMLString: true,
+                  message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+                  duration: 3000
+              });debugger
+              let than = this;
+              console.log(than,"than");
+              debugger
+              // document.getElementById('clickA').addEventListener('click', function () {
+              //     than.$router.replace('/main/importRecord-index');
+              // });
+              const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+              formData.append('file', file.file); //添加文件对象
+              formData.append('code', ''); //添加文件对象
+              debugger
+              console.log(formData,"formData");
+              
+              let url = '/voluntary/volunteerOrg/import'
+              // if (this.importType == 2) {
+              //   url = '/governance/icEvent/importAwo'
+              // }
+              console.log(url)
+              await this.$http
+                  .post(url, formData)
+                  .then(res => {
+                    log("res", res);
+                      if (res.data.code == 0 && res.data.msg == 'success') {
+                          const data = res.data.data;
+                          this.dataList = [
+                              ...Object.keys(data.option.exist).map(k => {
+                                  return {
+                                      index: k,
+                                      srcField: data.option.exist[k],
+                                      exist: true,
+                                      field: data.option.exist[k]
+                                  };
+                              }),
+                              ...Object.keys(data.option.notExist).map(k => {
+                                  return {
+                                      index: k,
+                                      srcField: data.option.notExist[k],
+                                      exist: false,
+                                      field: ''
+                                  };
+                              })
+                          ];
+                          this.importOption = data.option;
+                          this.importCode = data.code;
+                          this.fileData = file;
+                      } else this.$message.error(res.data.msg);
+                  })
+                  .catch(err => {
+                      console.log('失败', err);
+                      file.onError(); //上传失败的文件会从文件列表中删除
+                  });
+              this.importLoading = false;
+              this.importBtnTitle = '导入';
+              this.$refs.upload.clearFiles();
+              this.getTableData();
+          },
+  
+        handleExcelSuccess(res, file) {
+              if (!res.code === 0 && !res.msg === 'success') {
+                  this.$message.error(res.msg);
+              }
+        },
+        beforeExcelUpload(file) {
+              console.log(file,"file1");
+              debugger
+              const isType = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+              debugger
+              const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+              const fileType = isType || isTypeComputer;
+              debugger
+              const isLt1M = file.size / 1024 / 1024 < 10;
+              debugger
+              if (!fileType) {
+                  this.$message.error('上传文件只能是xls/xlsx格式！');
+              }
+              debugger
+              if (!isLt1M) {
+                  this.$message.error('上传文件大小不能超过 10MB!');
+              }
+              console.log(isLt1M,"isLt1M");
+              debugger
+              return fileType && isLt1M;
+          },
+          handleDel(row){
+        console.log(row,"row");
+        let url="/voluntary/volunteerOrg/delete";
+        let params={
+          id:row.id
+        }
+        requestPost(
+        url,params
+        ).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: '删除成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+            this.getTableData()
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+         
+        },
+        diaClose(){
+          this.formShow=false
+        },
+        resetSearch(){
+          this.formData=[]
+          this.getTableData()
+        },
+
+        summDetailClose(){
+            this.showAdd=false
+          this.getTableData()
+        },
+        async handleExportModule() {
+          let url = "/voluntary/volunteerOrg/downloadImportTemplate";
+          let params = {};
+          await this.$http({
+            method: "GET",
+            url,
+            responseType: "blob",
+            data: params,
+          })
+            .then((res) => {
+              console.log(res,"resskfk");
+              
+              if (res.headers["content-disposition"]) {
+                let fileName = window.decodeURI(
+                  res.headers["content-disposition"].split(";")[1].split("=")[1]
+                );
+                console.log("filename", fileName);
+                let blob = new Blob([res.data], {
+                  type: "application/vnd.ms-excel",
+                });
+                var url = window.URL.createObjectURL(blob);
+                var aLink = document.createElement("a");
+                aLink.style.display = "none";
+                aLink.href = url;
+                aLink.setAttribute("download", fileName);
+                document.body.appendChild(aLink);
+                aLink.click();
+                document.body.removeChild(aLink); //下载完成移除元素
+                window.URL.revokeObjectURL(url); //释放掉blob对象
+              } else this.$message.error("下载失败");
+            })
+            .catch((err) => {
+              console.log("err", err);
+              return this.$message.error("网络错误");
+            });
+        },
+     
+        handleProgress(event, file, fileList) {
+          console.log("percentage", file.percentage);
+        },
+        handleSizeChange(val) {
+          console.log(`每页 ${val} 条`);
+          this.pageSize = val;
+          window.localStorage.setItem("pageSize", val);
+          this.getTableData();
+        },
+        handleCurrentChange(val) {
+          console.log(`当前页: ${val}`);
+          this.pageNo = val;
+          this.getTableData();
+        },
+        //查询
+        handleSearch(val) {
+          console.log(this.fmData);
+          this.pageNo = 1;
+          this.getTableData();
+        },
+        handleClose() {
+          this.pageType = "list";
+          this.currentProject = {
+            projectId: "",
+          };
+        },
+        handleEditSuccess() {
+          this.handleClose();
+          this.getTableData();
+        },
+  
+      },
+    };
+    </script>
+    
+    <style lang="scss" scoped>
+    @import "@/assets/scss/modules/management/list-main.scss";
+    .g-main {
+            width: 100%;
+          }
+          .m-search {
+            background: #ffffff;
+            border-radius: 4px;
+            padding: 30px 20px 5px;
+            box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+          }
+          .item_width_1 {
+            width: 260px;
+          }
+          .item_width_2 {
+            width: 495px;
+          }
+          .m-table {
+            background: #ffffff;
+            box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+            border-radius: 4px;
+            margin-top: 15px;
+            padding: 23px 30px 10px;
+            .table {
+              margin-top: 20px;
+            }
+          }
+          .div_btn {
+            display: flex;
+            justify-content: space-between;
+          }
+          .el-row {
+            /* margin-bottom: 20px; */
+            display: flex;
+            flex-wrap: wrap;
+            margin-top: 10px;
+            margin-right: 50px;
+          }
+        
+    
+    </style>
+    
\ No newline at end of file
diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
index 5ce7218a2..93e6c95a3 100644
--- a/src/views/modules/volunteer/activityArchive/add.vue
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -36,7 +36,7 @@
           </el-col>
           <el-col :span="12"> <el-form-item label="活动级别" prop="serviceLevel" >
               <el-select v-model.trim="formData.serviceLevel" placeholder="请选择" clearable style="width: 280px">
-                <el-option v-for="item in  serviceLevelList" :key="item.id" :label="item.name" :value="item.id">
+                <el-option v-for="item in  serviceLevelList" :key="item.id" :label="item.name" :value="item.id" @click.native="handeleserviceLevel()">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -60,13 +60,13 @@
             <el-form-item label="服务时长" prop="serviceTime" required>
               <div style="display: flex; justify-items:center; align-items: center;" >
                 <el-input-number  v-model.trim="formData.serviceTime" :min="1"
-                  label="描述文字" type="number"></el-input-number>
+                  label="描述文字" type="number" @change="handeleserviceTime()"></el-input-number>
               </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="活动积分" prop="integral">
-              <el-input-number v-model="formData.points" :min="0" label="描述文字" :step="0.1" :precision="1" ></el-input-number>
+              <el-input-number :disabled="true" v-model="formData.points" :min="0" label="描述文字" :step="0.1" :precision="1" ></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -402,7 +402,31 @@ export default {
     this.getTableData()
   },
 
-  methods: {       
+  methods: {     
+          //活动级别调取积分
+          handeleserviceLevel(){
+              console.log(this.formData.serviceLevel,"this.formData.serviceLevel");
+              this.getintegralComputation()
+          },
+          //服务时长调取积分
+          handeleserviceTime(){
+              console.log(this.formData.serviceTime,"this.formData.serviceLevel");
+              this.getintegralComputation()
+          },
+         //计算积分
+         async getintegralComputation() {
+          const url = "/voluntary/activityInfo/integralComputation";
+          let params={
+            level:this.formData.serviceLevel,
+            serviceTime:this.formData.serviceTime,
+          }
+          requestGet(url,params).then(res=>{
+            console.log(res,"res");
+            this.formData.points=res.data
+          })
+          
+
+        },
      //查询所属项目
         async getTableData() {
           const url = "/voluntary/project/admin/list";
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index 7f47b26ae..071198406 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -85,9 +85,9 @@
               @click="handleDetail(scope.row)">修改</el-button>
             <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button>
             <el-button type="text"v-if="scope.row.auditStatus === 0" style="color:#1C6AFD;" size="small" @click="handleprocessl(scope.row)">审核</el-button>
-            <el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'" 
+            <el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'&&scope.row.client !== 1" 
               type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button>
-            <el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'"  type="text" style="color:#1C6AFD;"
+            <el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'&&scope.row.client !== 1"  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> -->
             <el-dropdown trigger="click" style="margin-left: 10px"   v-if="scope.row.client !== 1||scope.row.auditStatus==1"