diff --git a/src/App.vue b/src/App.vue
index 848664f80..7acbfab9d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -133,11 +133,11 @@ export default {
 .dialog-h {
   .el-dialog__body {
     position: relative;
-    max-height: 82vh;
+    max-height: 83vh;
     box-sizing: border-box;
     padding: 0 0 20px !important;
     .dialog-h-content {
-      max-height: calc(82vh - 80px);
+      max-height: calc(83vh - 80px);
       box-sizing: border-box;
       padding: 0 10px;
       overflow: auto;
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
index c27097d52..8291b79e5 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
@@ -1,6 +1,6 @@
-    <template>
+<template>
   <div class="div_main">
-    <div>
+    <div v-if="showType==='list'">
       <div class="div_search">
         <el-form :inline="true"
                  :model="formData"
@@ -108,7 +108,13 @@
         <div class="div_btn">
           <el-button class="diy-button--add"
                      size="small"
-                     @click="handleAdd">发起服务</el-button>
+                     @click="handleAdd">新增活动计划</el-button>
+          <el-button class="diy-button--add"
+                     size="small"
+                     @click="handleAddYearPlan">生成年度活动计划</el-button>
+          <el-button class="diy-button--add"
+                     size="small"
+                     @click="handleAddSchedule">添加日程提醒</el-button>
 
           <!-- <el-button @click="handleExport"
                      class="diy-button--reset"
@@ -130,49 +136,41 @@
 
           <el-table-column prop="serviceCategoryName"
                            align="center"
-                           width="100"
-                           label="服务类别"
+                           min-width="150"
+                           label="活动主题"
                            :show-overflow-tooltip="true">
           </el-table-column>
 
           <el-table-column prop="serviceProjectName"
-                           label="服务项目"
+                           label="所属组织"
                            align="center"
                            :show-overflow-tooltip="true">
           </el-table-column>
 
           <el-table-column prop="serviceOrgName"
                            align="center"
-                           min-width="150"
-                           label="服务组织名称"
+                           width="100"
+                           label="会议类型"
                            :show-overflow-tooltip="true">
 
           </el-table-column>
 
-          <el-table-column prop="serviceTimeStart"
+          <el-table-column prop="servicePeopleNumber"
                            align="center"
-                           width="250"
-                           :show-overflow-tooltip="true"
-                           label="服务时间">
-            <template slot-scope="scope">
-              <span>{{scope.row.serviceTimeStart}}-{{scope.row.serviceTimeEnd}}</span>
-            </template>
+                           width="110"
+                           label="开始时间"
+                           :show-overflow-tooltip="true">
           </el-table-column>
-
-          <el-table-column prop="serviceStatus"
+          <el-table-column prop="servicePeopleNumber"
                            align="center"
-                           width="100"
-                           label="服务状态"
+                           width="110"
+                           label="活动地点"
                            :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              <span>{{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}}</span>
-            </template>
           </el-table-column>
-
           <el-table-column prop="servicePeopleNumber"
                            align="center"
-                           width="110"
-                           label="服务人数"
+                           width="80"
+                           label="发布状态"
                            :show-overflow-tooltip="true">
           </el-table-column>
 
@@ -181,25 +179,19 @@
                            align="center"
                            width="180">
             <template slot-scope="scope">
-              <el-button @click="handleDetail(scope.row)"
+              <el-button @click="handlePublish(scope.row)"
                          type="text"
                          size="small"
-                         class=".div-table-button--detail">详情</el-button>
-              <el-button v-if="scope.row.serviceStatus==='in_service'"
-                         @click="handleEdit(scope.row)"
+                         class=".div-table-button--detail">发布</el-button>
+              <el-button @click="handleEdit(scope.row)"
                          type="text"
                          size="small"
-                         class="div-table-button--edit">编辑</el-button>
-              <el-button v-if="scope.row.serviceStatus==='in_service'"
-                         @click="handleFeedback(scope.row)"
-                         type="text"
-                         size="small"
-                         class="div-table-button--edit">反馈</el-button>
-              <el-button v-if="scope.row.serviceStatus==='in_service'"
-                         @click="handleDel(scope.row)"
+                         class="div-table-button--edit">修改</el-button>
+
+              <el-button @click="handleDel(scope.row)"
                          type="text"
                          size="small"
-                         class="div-table-button--delete">取消</el-button>
+                         class="div-table-button--delete">删除</el-button>
 
             </template>
           </el-table-column>
@@ -228,35 +220,32 @@
                top="5vh"
                class="dialog-h"
                @closed="showAdd = false">
-      <add-form ref="ref_add_form"
-                :formType="formType"
-                :categrayArray="categrayArray"
-                :statusArray="statusArray"
-                :satisfyArray="satisfyArray"
-                :serviceRecordId="serviceRecordId"
-                :serviceProjectName="serviceProjectName"
-                @handleOk="handleOk"
-                @handleClose="handleClose"></add-form>
+      <add-activity ref="ref_add_form"
+                    :formType="formType"
+                    @handleOk="handleOk"
+                    @handleClose="handleClose"></add-activity>
     </el-dialog>
-    <el-dialog v-if="showDetail"
-               :visible.sync="showDetail"
+    <el-dialog v-if="showSchedule"
+               :visible.sync="showSchedule"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="detailDiaTitle"
+               :title="'添加日程提醒'"
                width="850px"
                top="5vh"
                class="dialog-h"
-               @closed="showDetail = false">
-      <detail-form ref="ref_detail_form"
-                   :serviceRecordId="serviceRecordId"
-                   :satisfyArray="satisfyArray"
-                   :categrayArray="categrayArray"
-                   @handleOk="handleOk"
-                   @handleClose="handleClose"
-                   :formType="formType">
-      </detail-form>
+               @closed="showSchedule = false">
+      <schedule-form ref="ref_schedule_form"
+                     :formType="formType"
+                     @handleOk="handleOk"
+                     @handleClose="handleClose">
+      </schedule-form>
     </el-dialog>
 
+    <div v-if="showType==='yearplan'">
+      <yearplan-list @handleOk="handleAddPlanOk"
+                     @handleClose="handleAddPlanClose"></yearplan-list>
+    </div>
+
   </div>
 </template>
 
@@ -266,12 +255,13 @@ import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 // import eventInfo from "./cpts/event-info";
 import axios from "axios";
-import addForm from "./addForm";
-import detailForm from "./detailForm";
-import feedBackForm from "./addForm";
+import addActivity from "./addActivity";
+import scheduleForm from "./scheduleForm";
+import yearplanList from "./yearplanList";
+
 
 export default {
-  components: { addForm, detailForm, feedBackForm },
+  components: { addActivity, scheduleForm, yearplanList },
 
   data () {
     let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
@@ -356,11 +346,11 @@ export default {
       agencyIdArray: [],
 
       showAdd: false,
-      showDetail: false,
-      showFeedback: false,
       formType: 'add',
-      addDiaTitle: '发起服务',
-      detailDiaTitle: '服务详情',
+      addDiaTitle: '添加活动计划',
+      showSchedule: false,
+      showType: 'list',
+
 
     };
   },
@@ -415,12 +405,26 @@ export default {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
       if (obj) {
 
-
       } else {
 
       }
 
+    },
+    handleAddYearPlan () {
+      this.showType = 'yearplan'
+    },
 
+    handleAddPlanOk () {
+      this.showType = 'list'
+    },
+    handleAddPlanClose () {
+      this.showType = 'list'
+    },
+
+    handleAddSchedule () {
+
+      this.formType = 'schedule'
+      this.showSchedule = true;
     },
 
     handleSearch (val) {
@@ -447,45 +451,63 @@ export default {
 
 
     async handleAdd () {
-      this.addDiaTitle = '发起服务'
+      this.addDiaTitle = '新增活动计划'
       this.formType = 'add'
       this.showAdd = true;
     },
 
-    async handleDetail (row) {
-      this.serviceRecordId = row.serviceRecordId
+    async handlePublish (row) {
+      this.$confirm("确认发布活动?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.publishActivity()
+        })
+        .catch(err => {
+          if (err == "cancel") {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消发布"
+            // });
+          }
 
-      this.formType = 'detail'
-      this.showDetail = true
+        });
 
     },
-    async handleEdit (row) {
-      this.serviceRecordId = row.serviceRecordId
-      this.formType = 'edit'
-      this.showDetail = true
 
+    async publishActivity () {
+
+      const url = `/heart/icServiceProject/service/cancel/${this.serviceRecordId}`;
+
+
+      const { data, code, msg } = await requestPost(url, {});
+
+      if (code === 0) {
+        this.$message.success("发布成功！");
+        this.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
     },
 
-    //加载组织数据
-    async handleFeedback (row) {
 
-      this.serviceRecordId = row.serviceRecordId
-      this.serviceProjectName = row.serviceProjectName
-      this.addDiaTitle = '服务反馈'
-      this.formType = 'feedback'
-      this.showAdd = true;
+    async handleEdit (row) {
+      this.addDiaTitle = '修改活动计划'
+      this.formType = 'edit'
+      this.showAdd = true
+
     },
 
 
     handleClose () {
-      this.serviceRecordId = ""
       this.formType = ''
 
       this.showAdd = false
-      this.showDetail = false
-
-
+      this.showSchedule = false
     },
+
     handleOk () {
       this.handleClose()
       this.pageNo = 1
@@ -504,7 +526,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          this.cancelFuwu()
+          this.cancelActivity()
         })
         .catch(err => {
           if (err == "cancel") {
@@ -516,11 +538,9 @@ export default {
 
         });
 
-
-
     },
 
-    async cancelFuwu () {
+    async cancelActivity () {
 
       const url = `/heart/icServiceProject/service/cancel/${this.serviceRecordId}`;
 
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
new file mode 100644
index 000000000..9764df454
--- /dev/null
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -0,0 +1,567 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               class="div_form">
+
+        <el-form-item label="活动类型"
+                      label-width="150px"
+                      prop="serviceCategoryKey">
+          <el-select v-model="formData.serviceCategoryKey"
+                     placeholder="请选择"
+                     clearable
+                     class="item_width_1">
+            <el-option v-for="(item,index) in categrayArray"
+                       @click.native="hancleClickCategray(index)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="举办活动时间"
+                      style="display: block"
+                      prop="activityTime"
+                      label-width="150px">
+          <el-date-picker v-model="formData.activityTime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          type="datetime"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="活动主题"
+                      prop="principalName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入活动主题"
+                    v-model="formData.principalName">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="活动地点"
+                      prop="principalName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入活动地点"
+                    v-model="formData.principalName">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="自动发布时间"
+                      prop="serviceProjectId"
+                      label-width="150px"
+                      style="display: block">
+          <el-select class="item_width_1"
+                     v-model="formData.serviceProjectId"
+                     placeholder="请选择"
+                     filterable
+                     clearable>
+            <el-option v-for="item in autoTimeArray"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="参加活动党组织"
+                      prop="serviceScope"
+                      label-width="150px"
+                      style="display: block">
+          <el-cascader class="item_width_1"
+                       ref="myCascader"
+                       v-model="scopeIdArray"
+                       :key="iscascaderShow"
+                       :options="orgOptions"
+                       :props="optionProps"
+                       :show-all-levels="false"
+                       @change="handleChangeScope"></el-cascader>
+        </el-form-item>
+
+        <el-form-item label="参加人员"
+                      prop="serviceOrgId"
+                      label-width="150px"
+                      style="display: block">
+          <el-select class="item_width_1"
+                     v-model="formData.serviceOrgId"
+                     placeholder="请选择"
+                     filterable
+                     clearable>
+            <el-option v-for="item in joinArray"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="自动通知参加人员"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox :label="'是'"
+                       v-model="autoNotice"></el-checkbox>
+        </el-form-item>
+
+        <el-form-item label="活动介绍"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :rows="3"
+                    placeholder="请输入活动介绍，不超过1000字"
+                    v-model="formData.remark"></el-input>
+        </el-form-item>
+
+        <el-form-item class="block"
+                      label="附件"
+                      label-width="150px"
+                      prop="attach">
+          <el-upload class="upload-demo"
+                     :action="uploadUlr"
+                     accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+                     :on-success="handleFileSuccess"
+                     :on-remove="handleFileRemove"
+                     :limit="3"
+                     :before-upload="beforeUpload"
+                     :file-list="fileList">
+            <el-button size="small"
+                       :disabled="fileList.length===3"
+                       type="primary">点击上传</el-button>
+            <div slot="tip"
+                 class="el-upload__tip">支持图片、word、pdf</div>
+          </el-upload>
+        </el-form-item>
+
+      </el-form>
+
+    </div>
+
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      btnDisable: false,
+      orgOptions: [],
+      scopeIdArray: [],
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: true,
+        value: 'id',
+        label: 'partyOrgName',
+        children: 'children',
+        checkStrictly: true
+      },
+
+      categrayArray: [],
+
+      formData: {
+        serviceCategoryKey: '',//服务分类id	
+        serviceProjectId: '',//服务项目id	
+        serviceOrgId: '',//服务组织id	
+        serviceScope: [],//
+        principalName: '',//经办人(责任人)姓名	
+        principalContact: '',//经办人联系方式	
+        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
+        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
+        remark: '',//
+
+
+      },
+      autoNotice: true,
+
+      autoTimeArray: [
+        {
+          valule: '3',
+          label: '活动开始前3天'
+        },
+        {
+          valule: '5',
+          label: '活动开始前5天'
+        },
+        {
+          valule: '7',
+          label: '活动开始前7天'
+        },
+        {
+          valule: '1',
+          label: '活动开始前1天'
+        },
+      ],
+
+      joinArray: [//参加人员
+        {
+          valule: 'all',
+          label: '全体党员'
+        },
+        {
+          valule: 'branch',
+          label: '支部委员'
+        },
+      ],
+
+
+
+
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+
+    }
+  },
+
+  watch: {
+    "formData.serviceTimeEnd": function (val) {
+      if (val && val != '') {
+        let arrayTemp = val.split(' ')
+        this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
+      }
+
+    },
+  },
+  components: {},
+  async mounted () {
+    this.startLoading()
+    await this.getCategrayList()
+    await this.getOrgTreeList()
+
+    if (this.formType === 'add') {
+      this.$refs.ref_form.resetFields();
+
+    } else {
+
+    }
+
+    this.endLoading()
+
+  },
+
+
+  methods: {
+
+
+    hancleClickCategray () {
+      this.formData.serviceProjectId = ''
+      this.formData.serviceOrgId = ''
+
+      //获取服务组织
+      // this.loadOrgList()
+    },
+
+    // 字典
+    async getCategrayList () {
+      const url = "/sys/dict/data/dictlist"
+
+      let params = {
+        dictType: 'ic_service_type'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.categrayArray = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async getOrgTreeList () {
+
+      const url = '/resi/partymember/icPartyOrg/getSearchTreelist'
+      let params = {
+        customerId: localStorage.getItem('customerId'),
+        agencyId: localStorage.getItem('agencyId')
+      };
+
+      const { data, code, msg } = await requestGet(url, params);
+      console.log('data-orgparty----o', data)
+      if (code === 0) {
+
+        this.orgOptions = data
+
+      } else {
+      }
+
+
+    },
+
+
+    handleChangeScope (value) {
+      this.formData.serviceScope = []
+      let selArray = this.$refs["myCascader"].getCheckedNodes()
+      selArray.forEach(element => {
+
+        let obj = {
+          objectType: element.data.objectType === 'grid' ? 'grid' : element.data.objectType === 'neighborhood' ? 'neighborhood' : 'agency',
+          objectId: element.data.objectId,
+          objectName: element.data.objectName,
+        }
+        this.formData.serviceScope.push(obj)
+      });
+
+    },
+
+
+    //加载组织
+    async loadOrgList () {
+      const url = '/heart/icServiceOrg/selectlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceOrg/selectlist'
+      let params = {
+        serviceType: this.formData.serviceCategoryKey,
+
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.orgList = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm () {
+
+      if (this.formType === 'add') {
+        this.handleAdd()
+      } else if (this.formType === 'feedback') {
+
+      }
+    },
+
+    async handleAdd () {
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+
+
+          this.addActivity()
+
+
+        }
+
+      })
+
+    },
+
+    async addActivity () {
+
+
+
+      console.log(this.formData)
+      // return false
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
+
+
+      const url = '/heart/icServiceProject/service/initiate'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
+      let params = {
+
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message.success('发起成功')
+        this.resetData()
+        this.$emit('handleOk')
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+
+
+    beforeUpload (file) {
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+
+      const formatarray = ['jpg', 'png', 'jpeg', 'bmp', 'mp4', 'wma', 'm4a', 'mp3', 'doc', 'docx', 'xls', 'xlsx', 'pdf']
+
+      if (formatarray.indexOf(extension) === -1) {
+        this.$message.error('只支持图片、word、pdf')
+        return false
+      }
+
+    },
+
+    handleFileRemove (file) {
+
+      if (file && file.status === "success") {
+        this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
+      }
+    },
+
+    handleFileSuccess (res, file) {
+
+      if (res.code === 0 && res.msg === 'success') {
+        const array = file.name.split('.')
+        const fileType = array[array.length - 1]
+
+        const picArray = ['jpg', 'png', 'jpeg', 'bmp']
+        const videoarray = ['mp4', 'wma', 'm4a']
+        const docArray = ['doc', 'docx', 'xls', 'xlsx', 'pdf']
+        const mp3Array = ['mp3']
+
+        if (picArray.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'image'
+        } else if (videoarray.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'video'
+        } else if (docArray.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'doc'
+        } else if (mp3Array.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'voice'
+        }
+
+        file.url = res.data.url
+        file.type = fileType
+
+        file.attachmentName = file.name
+        file.attachmentType = file.type
+        file.attachmentUrl = file.url
+
+        this.fileList.push(file)
+        console.log(this.fileList)
+      } else this.$message.error(res.msg)
+    },
+
+    //下载
+    handleFileDownload (file) {
+
+      var a = document.createElement('a');
+      var event = new MouseEvent('click');
+      a.download = file.name;
+      console.log(a)
+      a.href = file.url;
+      a.dispatchEvent(event);
+
+
+    },
+    handleCancle () {
+      this.resetData()
+      this.$emit('handleClose')
+
+    },
+
+
+
+    resetData () {
+      this.formData = {
+        serviceCategoryKey: '',//服务分类id	
+        serviceProjectId: '',//服务项目id	
+        serviceOrgId: '',//服务组织id	
+        serviceScope: [],//
+        principalName: '',//经办人(责任人)姓名	
+        principalContact: '',//经办人联系方式	
+        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
+        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
+        remark: '',//
+
+
+      }
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+
+        serviceCategoryKey: [
+          { required: true, message: '服务类别不能为空', trigger: 'blur' },
+        ],
+        serviceProjectId: [
+          { required: true, message: '服务项目不能为空', trigger: 'blur' }
+        ],
+
+        serviceOrgId: [
+          { required: true, message: '服务组织不能为空', trigger: 'blur' }
+        ],
+        serviceTimeStart: [
+          { required: true, message: '服务时间不能为空', trigger: 'blur' }
+        ],
+        serviceScope: [
+          { required: true, message: '服务范围不能为空', trigger: 'blur' }
+        ],
+
+      }
+    },
+
+
+  },
+  props: {
+
+
+    formType: { //表单操作类型 add新增，edit编辑，detail详情
+      type: String,
+      required: ''
+    },
+
+
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/form-main.scss";
+</style>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/addForm.vue
deleted file mode 100644
index 8cb7c9c7e..000000000
--- a/src/views/modules/communityParty/orgActivity/activivityList/addForm.vue
+++ /dev/null
@@ -1,960 +0,0 @@
-<template>
-  <div>
-    <div class="dialog-h-content scroll-h">
-
-      <el-form v-if="formType==='add'"
-               ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               class="div_form">
-
-        <el-form-item label="服务分类"
-                      label-width="150px"
-                      prop="serviceCategoryKey">
-          <el-select v-model="formData.serviceCategoryKey"
-                     placeholder="请选择"
-                     clearable
-                     class="item_width_1">
-            <el-option v-for="(item,index) in categrayArray"
-                       @click.native="hancleClickCategray(index)"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="服务项目"
-                      prop="serviceProjectId"
-                      label-width="150px"
-                      style="display: block">
-          <el-select class="item_width_1"
-                     v-model="formData.serviceProjectId"
-                     placeholder="请选择"
-                     filterable
-                     clearable>
-            <el-option v-for="(item,index) in projectList"
-                       @click.native="hancleClickProject(index)"
-                       :key="item.serviceProjectId"
-                       :label="item.serviceName"
-                       :value="item.serviceProjectId">
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-        <el-form-item label="服务组织"
-                      prop="serviceOrgId"
-                      label-width="150px"
-                      style="display: block">
-          <el-select class="item_width_1"
-                     v-model="formData.serviceOrgId"
-                     placeholder="请选择"
-                     filterable
-                     clearable>
-            <el-option v-for="item in orgList"
-                       :key="item.icServiceOrgId"
-                       :label="item.orgName"
-                       :value="item.icServiceOrgId">
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-
-        <el-form-item label="服务范围"
-                      prop="serviceScope"
-                      label-width="150px"
-                      style="display: block">
-          <el-cascader class="item_width_1"
-                       ref="myCascader"
-                       v-model="scopeIdArray"
-                       :key="iscascaderShow"
-                       :options="casOptions"
-                       :props="optionProps"
-                       :show-all-levels="false"
-                       @change="handleChangeScope"></el-cascader>
-        </el-form-item>
-
-        <el-form-item label="经办人"
-                      prop="principalName"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人姓名"
-                    v-model="formData.principalName">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="联系方式"
-                      prop="principalContact"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人电话"
-                    v-model="formData.principalContact">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="服务时间"
-                      label-width="150px"
-                      prop="serviceTimeStart">
-          <el-date-picker v-model="formData.serviceTimeStart"
-                          :picker-options="startPickerOptions"
-                          class="item_width_2"
-                          type="date"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          value="yyyy-MM-dd"
-                          placeholder="开始时间">
-          </el-date-picker>
-          <span class="data-tag">至</span>
-          <el-date-picker v-model="formData.serviceTimeEnd"
-                          :picker-options="endPickerOptions"
-                          class="item_width_2 data-tag"
-                          type="date"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          value="yyyy-MM-dd"
-                          placeholder="结束时间">
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item label="备注"
-                      prop="remark"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    maxlength="1000"
-                    show-word-limit
-                    :rows="3"
-                    placeholder="请输入备注，不超过1000字"
-                    v-model="formData.remark"></el-input>
-        </el-form-item>
-        <el-form-item label="直接反馈"
-                      prop="remark"
-                      label-width="150px"
-                      style="display: block">
-          <el-checkbox :label="'是'"
-                       v-model="showFeedback"
-                       @change="handleChangeFeedback"></el-checkbox>
-        </el-form-item>
-
-      </el-form>
-      <div v-show="formType==='feedback'||showFeedback">
-        <!-- <h3 class="d-h3">反馈内容</h3> -->
-
-        <el-form ref="ref_form_feedback"
-                 :inline="true"
-                 :model="feedbackFormData"
-                 :rules="feedbackDataRule"
-                 class="div_form">
-
-          <el-form-item label="服务项目"
-                        prop="serviceProjectName"
-                        label-width="150px"
-                        style="display: block">
-            <span v-if="feedbackFormData.serviceProjectName">{{feedbackFormData.serviceProjectName}}</span>
-            <span v-else>--</span>
-
-          </el-form-item>
-
-          <el-form-item label="服务目标"
-                        prop="serviceGoal"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      type="textarea"
-                      maxlength="1000"
-                      show-word-limit
-                      :rows="3"
-                      placeholder="请输入服务目标，不超过1000字"
-                      v-model="feedbackFormData.serviceGoal"></el-input>
-          </el-form-item>
-
-          <el-form-item label="服务效果"
-                        prop="serviceEffect"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      type="textarea"
-                      maxlength="1000"
-                      show-word-limit
-                      :rows="3"
-                      placeholder="请输入服务效果，不超过1000字"
-                      v-model="feedbackFormData.serviceEffect"></el-input>
-          </el-form-item>
-
-          <el-form-item label="服务人数"
-                        style="display: block"
-                        prop="servicePeopleNumber"
-                        label-width="150px">
-            <el-input-number class="item_width_1"
-                             v-model="feedbackFormData.servicePeopleNumber"
-                             :min="0"
-                             :max="9999"
-                             label="服务人数"></el-input-number>
-          </el-form-item>
-
-          <el-form-item label="服务状态"
-                        label-width="150px"
-                        prop="serviceStatus">
-            <span>已完成</span>
-            <!-- <el-select class="item_width_1"
-                       v-model="feedbackFormData.serviceStatus"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in statusArray"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select> -->
-
-          </el-form-item>
-          <el-form-item label="满意度"
-                        label-width="150px"
-                        prop="satisfaction">
-            <el-select class="item_width_1"
-                       v-model="feedbackFormData.satisfaction"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in satisfyArray"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-          <el-form-item label="地址"
-                        prop="address"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      v-model="feedbackFormData.address"></el-input>
-          </el-form-item>
-          <el-form-item label="地图位置"
-                        label-width="150px"
-                        style="display: block">
-            <div style="width:500px">
-
-              <div class="div_map">
-                <div id="map_app">
-
-                </div>
-                <div class="div_searchmap">
-                  <el-input maxlength="50"
-                            size="mini"
-                            placeholder="请输入关键字"
-                            v-model="keyWords">
-                  </el-input>
-                  <el-button style="margin-left: 10px"
-                             type="primary"
-                             size="mini"
-                             @click="handleSearchMap">查询</el-button>
-                </div>
-              </div>
-
-            </div>
-          </el-form-item>
-
-          <el-form-item class="block"
-                        label="附件"
-                        label-width="150px"
-                        prop="attach">
-            <el-upload class="upload-demo"
-                       :action="uploadUlr"
-                       accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
-                       :on-success="handleFileSuccess"
-                       :on-remove="handleFileRemove"
-                       :limit="3"
-                       :before-upload="beforeUpload"
-                       :file-list="fileList">
-              <el-button size="small"
-                         :disabled="fileList.length===3"
-                         type="primary">点击上传</el-button>
-              <div slot="tip"
-                   class="el-upload__tip">支持图片、word、pdf</div>
-            </el-upload>
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-
-    <div class="div_btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 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'
-
-
-
-var map
-var search
-var markers
-var infoWindowList
-var geocoder // 新建一个正逆地址解析类
-
-let loading // 加载动画
-export default {
-  data () {
-    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      if (this.formData.serviceTimeStart) {
-        let serviceTimeStart = new Date(this.formData.serviceTimeStart)
-        return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart
-      } else {
-        return time.getTime() > nowData
-      }
-
-    }
-    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      return time.getTime() > nowData
-    }
-
-    return {
-      btnDisable: false,
-      casOptions: [],
-      scopeIdArray: [],
-      iscascaderShow: 0,
-
-      optionProps: {
-        multiple: true,
-        value: 'objectId',
-        label: 'objectName',
-        children: 'children',
-        checkStrictly: true
-      },
-
-      keyWords: '',
-      formData: {
-        serviceCategoryKey: '',//服务分类id	
-        serviceProjectId: '',//服务项目id	
-        serviceOrgId: '',//服务组织id	
-        serviceScope: [],//
-        principalName: '',//经办人(责任人)姓名	
-        principalContact: '',//经办人联系方式	
-        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
-        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
-        remark: '',//
-        feedback: {},//反馈。允许发起服务的时候直接填写反馈，完成服务。	
-
-      },
-      feedbackFormData: {
-        serviceProjectId: '',//	服务项目id	
-        serviceProjectName: '',
-        serviceGoal: '',//	服务目标	
-        serviceEffect: '',//	服务效果	
-        servicePeopleNumber: null,//	服务人数	
-        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
-        satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
-        longitude: '',//	经度	
-        latitude: '',//	维度	
-        address: '',
-        attachmentList: [],//	附件列表
-      },
-
-      projectList: [],//服务项目list
-      orgList: [],//服务组织list
-
-      endPickerOptions: {
-        disabledDate: endDisabledDate
-      },
-      startPickerOptions: {
-        disabledDate: startDisabledDate
-      },
-
-      showFeedback: true,
-
-
-      fileList: [],
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
-
-    }
-  },
-
-  watch: {
-    "formData.serviceTimeEnd": function (val) {
-      if (val && val != '') {
-        let arrayTemp = val.split(' ')
-        this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
-      }
-
-    },
-  },
-  components: {},
-  async mounted () {
-    this.startLoading()
-    this.initMap()
-    this.$refs.ref_form_feedback.resetFields();
-    if (this.formType === 'add') {
-      this.$refs.ref_form.resetFields();
-      await this.loadScopeTree()
-    } else {
-      this.$set(this.feedbackFormData, 'serviceProjectName', this.serviceProjectName)
-
-    }
-
-    this.endLoading()
-
-  },
-
-
-  methods: {
-    handleChangeFeedback (val) {
-      this.showFeedback = val
-
-    },
-
-    hancleClickCategray () {
-      this.formData.serviceProjectId = ''
-      this.formData.serviceOrgId = ''
-      //获取服务项目
-      this.loadProjectList()
-      //获取服务组织
-      this.loadOrgList()
-    },
-
-    hancleClickProject (index) {
-      this.feedbackFormData.serviceProjectId = this.projectList[index].serviceProjectId
-      this.feedbackFormData.serviceProjectName = this.projectList[index].serviceName
-    },
-
-    // 获取服务范围树
-    loadScopeTree () {
-      const url = '/gov/org/icServiceProject/service/serviceScopeTree'
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {}
-      window.app.ajax.post(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          //组织级联数据
-          ++this.iscascaderShow
-          this.casOptions = []
-          this.scopeIdArray = []
-          this.casOptions.push(data)
-
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg)
-        }
-      )
-
-    },
-
-
-    handleChangeScope (value) {
-      this.formData.serviceScope = []
-      let selArray = this.$refs["myCascader"].getCheckedNodes()
-      selArray.forEach(element => {
-
-        let obj = {
-          objectType: element.data.objectType === 'grid' ? 'grid' : element.data.objectType === 'neighborhood' ? 'neighborhood' : 'agency',
-          objectId: element.data.objectId,
-          objectName: element.data.objectName,
-        }
-        this.formData.serviceScope.push(obj)
-      });
-
-    },
-
-    //加载组织
-    async loadProjectList () {
-      const url = '/heart/icServiceProject/serviceProjectList'
-      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/serviceProjectList'
-      let params = {
-        isPage: false,
-        serviceCategoryKey: this.formData.serviceCategoryKey,
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.projectList = [...data.list]
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    //加载组织
-    async loadOrgList () {
-      const url = '/heart/icServiceOrg/selectlist'
-      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceOrg/selectlist'
-      let params = {
-        serviceType: this.formData.serviceCategoryKey,
-
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.orgList = data
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    async handleComfirm () {
-
-      if (this.formType === 'add') {
-        this.handleAdd()
-      } else if (this.formType === 'feedback') {
-        this.handleFeedback()
-      }
-    },
-
-    async handleAdd () {
-
-      this.btnDisable = true
-      setTimeout(() => {
-        this.btnDisable = false
-      }, 10000)
-      this.$refs['ref_form'].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj)
-          this.btnDisable = false
-        } else {
-
-          if (this.showFeedback) {
-            this.$refs['ref_form_feedback'].validate((valid, messageObj) => {
-              if (!valid) {
-                app.util.validateRule(messageObj)
-                this.btnDisable = false
-              } else {
-                this.formData.feedback = { ...this.feedbackFormData }
-                this.addFuwu()
-
-
-              }
-
-            })
-          } else {
-            this.addFuwu()
-          }
-
-        }
-
-      })
-
-    },
-
-    async addFuwu () {
-      if (this.showFeedback) {
-        this.feedbackFormData.attachmentList = []
-        this.feedbackFormData.attachmentList = [...this.fileList]
-        this.formData.feedback = { ... this.feedbackFormData }
-      } else {
-        this.formData.feedback = null
-      }
-
-
-      console.log(this.formData)
-      // return false
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的手机号码'
-        })
-        return false;
-      }
-
-
-      const url = '/heart/icServiceProject/service/initiate'
-      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
-      let params = {
-
-        ...this.formData
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message.success('发起成功')
-        this.resetData()
-        this.$emit('handleOk')
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    async handleFeedback () {
-
-      this.btnDisable = true
-      setTimeout(() => {
-        this.btnDisable = false
-      }, 10000)
-
-      this.$refs['ref_form_feedback'].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj)
-          this.btnDisable = false
-        } else {
-
-          this.addFeecback()
-
-        }
-
-      })
-
-    },
-
-    async addFeecback () {
-
-      this.feedbackFormData.attachmentList = []
-      this.feedbackFormData.attachmentList = [...this.fileList]
-      this.feedbackFormData.serviceRecordId = this.serviceRecordId
-
-      console.log(this.feedbackFormData)
-      // return false
-
-      const url = '/heart/icServiceProject/service/feedback'
-      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
-      let params = {
-
-        ...this.feedbackFormData
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message.success('发起成功')
-        this.resetData()
-        this.$emit('handleOk')
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    beforeUpload (file) {
-      const array = file.name.split('.')
-      const extension = array[array.length - 1]
-
-      const formatarray = ['jpg', 'png', 'jpeg', 'bmp', 'mp4', 'wma', 'm4a', 'mp3', 'doc', 'docx', 'xls', 'xlsx', 'pdf']
-
-      if (formatarray.indexOf(extension) === -1) {
-        this.$message.error('只支持图片、word、pdf')
-        return false
-      }
-
-    },
-
-    handleFileRemove (file) {
-
-      if (file && file.status === "success") {
-        this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
-      }
-    },
-
-    handleFileSuccess (res, file) {
-
-      if (res.code === 0 && res.msg === 'success') {
-        const array = file.name.split('.')
-        const fileType = array[array.length - 1]
-
-        const picArray = ['jpg', 'png', 'jpeg', 'bmp']
-        const videoarray = ['mp4', 'wma', 'm4a']
-        const docArray = ['doc', 'docx', 'xls', 'xlsx', 'pdf']
-        const mp3Array = ['mp3']
-
-        if (picArray.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'image'
-        } else if (videoarray.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'video'
-        } else if (docArray.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'doc'
-        } else if (mp3Array.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'voice'
-        }
-
-        file.url = res.data.url
-        file.type = fileType
-
-        file.attachmentName = file.name
-        file.attachmentType = file.type
-        file.attachmentUrl = file.url
-
-        this.fileList.push(file)
-        console.log(this.fileList)
-      } else this.$message.error(res.msg)
-    },
-
-    //下载
-    handleFileDownload (file) {
-
-      var a = document.createElement('a');
-      var event = new MouseEvent('click');
-      a.download = file.name;
-      console.log(a)
-      a.href = file.url;
-      a.dispatchEvent(event);
-
-
-    },
-    handleCancle () {
-      this.resetData()
-      this.$emit('handleClose')
-
-    },
-
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('map_app'), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45 // 设置地图旋转角度
-      })
-
-      search = new window.TMap.service.Search({ pageSize: 10 })
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: []
-      })
-      infoWindowList = Array(10)
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
-
-      // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      this.convert()
-    },
-
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
-        {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
-        }
-      ])
-    },
-
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close()
-      })
-      infoWindowList.length = 0
-      markers.setGeometries([])
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchRectangle({
-          keyword: this.keyWords,
-          bounds: map.getBounds()
-        })
-        .then((result) => {
-          let { data } = result
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng }
-            } = data[0]
-
-
-            map.setCenter(new TMap.LatLng(lat, lng))
-            this.setMarker(lat, lng)
-            this.feedbackFormData.latitude = lat
-            this.feedbackFormData.longitude = lng
-            this.convert()
-          } else {
-            this.$message.error('未检索到相关位置坐标')
-          }
-        })
-    },
-
-    handleMoveCenter () {
-      //修改地图中心点
-      const center = map.getCenter()
-      const lat = center.getLat()
-      const lng = center.getLng()
-      this.feedbackFormData.latitude = lat
-      this.feedbackFormData.longitude = lng
-      this.setMarker(lat, lng)
-      this.convert(lat, lng)
-    },
-
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
-      } else {
-        location = new TMap.LatLng(this.feedbackFormData.latitude, this.feedbackFormData.longitude);
-      }
-
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: 'main', // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-
-          this.feedbackFormData.address = result.result.address
-          // 显示搜索到的地址
-        });
-    },
-
-
-    resetData () {
-      this.formData = {
-        serviceCategoryKey: '',//服务分类id	
-        serviceProjectId: '',//服务项目id	
-        serviceOrgId: '',//服务组织id	
-        serviceScope: [],//
-        principalName: '',//经办人(责任人)姓名	
-        principalContact: '',//经办人联系方式	
-        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
-        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
-        remark: '',//
-        feedback: {},//反馈。允许发起服务的时候直接填写反馈，完成服务。	
-
-      }
-      this.feedbackFormData = {
-        serviceProjectId: '',//	服务项目id	
-        serviceProjectName: '',
-        serviceGoal: '',//	服务目标	
-        serviceEffect: '',//	服务效果	
-        servicePeopleNumber: null,//	服务人数	
-        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
-        satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
-        longitude: '',//	经度	
-        latitude: '',//	维度	
-        address: '',
-        attachmentList: [],//	附件列表
-      }
-    },
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-
-        serviceCategoryKey: [
-          { required: true, message: '服务类别不能为空', trigger: 'blur' },
-        ],
-        serviceProjectId: [
-          { required: true, message: '服务项目不能为空', trigger: 'blur' }
-        ],
-
-        serviceOrgId: [
-          { required: true, message: '服务组织不能为空', trigger: 'blur' }
-        ],
-        serviceTimeStart: [
-          { required: true, message: '服务时间不能为空', trigger: 'blur' }
-        ],
-        serviceScope: [
-          { required: true, message: '服务范围不能为空', trigger: 'blur' }
-        ],
-
-      }
-    },
-    feedbackDataRule () {
-      return {
-
-        serviceProjectName: [
-          { required: true, message: '服务项目不能为空', trigger: 'blur' },
-        ],
-        serviceGoal: [
-          { required: true, message: '服务目标不能为空', trigger: 'blur' }
-        ],
-
-        serviceEffect: [
-          { required: true, message: '服务效果不能为空', trigger: 'blur' }
-        ],
-        servicePeopleNumber: [
-          { required: true, message: '服务人数不能为空', trigger: 'blur' }
-        ],
-        serviceStatus: [
-          { required: true, message: '服务状态不能为空', trigger: 'blur' }
-        ],
-        satisfaction: [
-          { required: true, message: '满意度不能为空', trigger: 'blur' }
-        ],
-        address: [
-          { required: true, message: '地址不能为空', trigger: 'blur' }
-        ]
-      }
-    },
-
-  },
-  props: {
-
-    serviceRecordId: {
-      type: String,
-      required: ''
-    },
-    serviceProjectName: {//服务项目名称
-      type: String,
-      required: false,
-      default: ''
-    },
-    formType: { //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
-      type: String,
-      required: ''
-    },
-    categrayArray: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
-    statusArray: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
-    satisfyArray: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
-  }
-}
-</script>
-
-
-<style lang="scss" scoped >
-@import "@/assets/scss/modules/management/form-main.scss";
-</style>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
new file mode 100644
index 000000000..3f127f111
--- /dev/null
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
@@ -0,0 +1,543 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <div style="margin-left:20px">
+        <div class="div_search">
+          <span>选择活动类型</span>
+
+          <el-select style="margin-left:30px"
+                     class="item_width_1"
+                     v-model="actType"
+                     placeholder="全部"
+                     size="small"
+                     clearable>
+            <el-option v-for="(item,index) in actTypeArray"
+                       @click.native="handleClickActType(index)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+          <el-button size="small"
+                     class="diy-button--add"
+                     style="margin-left:50px"
+                     @click="handleAdd">新增</el-button>
+
+        </div>
+        <div class="div_search">
+          <span>活动举办频次</span>
+          <span style="margin-left:30px">每季度一次</span>
+        </div>
+      </div>
+
+      <div class="div_table">
+
+        <el-table class="table"
+                  :data="tableData"
+                  border
+                  :height="tableHeight"
+                  v-loading="tableLoading"
+                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  style="width: 100%">
+          <el-table-column label="序号"
+                           header-align="center"
+                           align="center"
+                           type="index"
+                           width="50">
+          </el-table-column>
+
+          <el-table-column prop="reviewTime"
+                           header-align="center"
+                           align="center"
+                           label="举办活动时间"
+                           width="200">
+            <template slot-scope="scope">
+
+              <el-date-picker v-model="scope.row.reviewTime"
+                              style="width: 175px"
+                              size="small"
+                              format="yyyy-MM-dd hh:mm"
+                              value-format="yyyy-MM-dd hh:mm"
+                              type="datetime"
+                              placeholder="选择日期">
+              </el-date-picker>
+
+            </template>
+
+          </el-table-column>
+
+          <el-table-column prop="address"
+                           header-align="center"
+                           align="center"
+                           label="活动地点"
+                           width="220">
+            <template slot-scope="scope">
+
+              <el-input v-model="scope.row.address"
+                        style="width: 195px"
+                        size="small"
+                        placeholder="输入地点">
+              </el-input>
+
+            </template>
+
+          </el-table-column>
+          <el-table-column prop="theme"
+                           header-align="center"
+                           align="center"
+                           label="活动主题"
+                           width="220">
+            <template slot-scope="scope">
+
+              <el-input v-model="scope.row.theme"
+                        style="width: 195px"
+                        size="small"
+                        placeholder="输入主题">
+              </el-input>
+
+            </template>
+
+          </el-table-column>
+
+          <el-table-column prop="scopeId"
+                           header-align="center"
+                           align="center"
+                           label="参加活动党组织"
+                           width="220">
+
+            <template slot-scope="scope">
+
+              <el-cascader style="width: 195px"
+                           ref="myCascader"
+                           v-model="scope.row.scopeIdArray"
+                           size="small"
+                           :key="iscascaderShow"
+                           :options="orgOptions"
+                           :props="optionProps"
+                           :show-all-levels="false"
+                           @change="handleChangeScope"></el-cascader>
+
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="joinPerson"
+                           header-align="center"
+                           align="center"
+                           label="参加人员"
+                           width="140">
+
+            <template slot-scope="scope">
+
+              <el-select style="width: 115px"
+                         size="small"
+                         v-model="scope.row.joinPerson"
+                         placeholder="请选择"
+                         clearable>
+                <el-option v-for="item in joinArray"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+
+            </template>
+          </el-table-column>
+          <el-table-column prop="autoTime"
+                           header-align="center"
+                           align="center"
+                           label="自动发布时间"
+                           width="160">
+
+            <template slot-scope="scope">
+
+              <el-select style="width: 135px"
+                         v-model="scope.row.autoTime"
+                         size="small"
+                         placeholder="请选择"
+                         filterable
+                         clearable>
+                <el-option v-for="item in autoTimeArray"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="autoNotice"
+                           header-align="center"
+                           align="center"
+                           label="自动通知"
+                           width="80">
+
+            <template slot-scope="scope">
+
+              <el-checkbox :label="'是'"
+                           size="small"
+                           v-model="scope.row.autoNotice"></el-checkbox>
+
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作"
+                           fixed="right"
+                           min-width="60"
+                           header-align="center"
+                           align="center"
+                           class="operate">
+            <template slot-scope="scope">
+
+              <el-button type="text"
+                         style="color:#D51010;text-decoration: underline;"
+                         size="small"
+                         @click="handleDelete(scope.row,scope.$index)">删除</el-button>
+
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </div>
+      <div class="div_btn">
+        <el-button @click="handleCancle">取 消</el-button>
+        <el-button @click="handleCancle">确定</el-button>
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      tableLoading: false,
+
+      tableData: [],
+      actTypeArray: [
+        {
+          value: '1',
+          label: '支部党员大会',
+          fre: 4
+
+        },
+        {
+          value: '2',
+          label: '支部委员会',
+          fre: 12
+
+        }
+      ],
+      actType: "",
+      joinArray: [//参加人员
+        {
+          valule: 'all',
+          label: '全体党员'
+        },
+        {
+          valule: 'branch',
+          label: '支部委员'
+        },
+      ],
+
+      autoTimeArray: [
+        {
+          valule: '3',
+          label: '活动开始前3天'
+        },
+        {
+          valule: '5',
+          label: '活动开始前5天'
+        },
+        {
+          valule: '7',
+          label: '活动开始前7天'
+        },
+        {
+          valule: '1',
+          label: '活动开始前1天'
+        },
+      ],
+
+      orgOptions: [],
+
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: true,
+        value: 'id',
+        label: 'partyOrgName',
+        children: 'children',
+        checkStrictly: true
+      },
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    handleClickActType (index) {
+
+    },
+
+    async initTable () {
+
+      await this.getOrgTreeList()
+
+      // await this.loadTable()
+
+    },
+
+    handleAdd () {
+      let obj = {
+        isNew: true,//是否新增
+        reviewTime: '',
+        address: '',
+        theme: '',
+        scopeIdArray: [],
+        joinPerson: '',
+        autoTime: '',
+        autoNotice: true,
+
+      }
+      this.tableData.push(obj)
+    },
+
+    async getOrgTreeList () {
+
+      const url = '/resi/partymember/icPartyOrg/getSearchTreelist'
+      let params = {
+        customerId: localStorage.getItem('customerId'),
+        agencyId: localStorage.getItem('agencyId')
+      };
+
+      const { data, code, msg } = await requestGet(url, params);
+      console.log('data-orgparty----o', data)
+      if (code === 0) {
+
+        this.orgOptions = data
+
+      } else {
+      }
+
+    },
+
+
+    //加载form
+    async loadTable () {
+      this.tableLoading = true
+      const url = '/gov/org/placepatrolreviewrecord/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist'
+      let params = {
+        placePatrolRecordId: this.placePatrolRecordId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+      this.tableLoading = false
+      if (code === 0) {
+
+        if (data.list && data.list.length > 0) {
+          data.list.forEach(item => {
+            item.isEdit = false
+            item.isNew = false
+            let arrayInspectors = item.inspectors.split(',')
+            item.inspectorArray = [...arrayInspectors]
+
+            let arrayReviewTime = item.reviewTime.split(' ')
+            item.reviewTime = arrayReviewTime[0]
+          });
+
+          this.tableData = [...data.list]
+        } else {
+          this.tableData = []
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm (row, tableIndex) {
+      let valiMsg = this.validata(row)
+      if (valiMsg) {
+        this.$message({
+          type: 'warning',
+          message: valiMsg
+        })
+        return false
+      }
+
+      this.addReview(row, tableIndex)
+
+    },
+    async addReview (row, tableIndex) {
+
+      let url = "/gov/org/placepatrolreviewrecord/add"
+      if (row.placePatrolReviewRecordId) {
+        url = "/gov/org/placepatrolreviewrecord/edit"
+      }
+
+      let params = JSON.parse(JSON.stringify(row))
+      params.inspectors = params.inspectorArray.join(',')
+      params.reviewTime = params.reviewTime + ' 00:00:00'
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        let array = data.reviewTime.split(' ')
+        data.reviewTime = array[0]
+        data.isEdit = false
+        data.isNew = false
+
+        this.$set(this.tableData, tableIndex, data)
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    validata (row) {
+      let message = ''
+      if (row.reviewTime === '') {
+        message = message + '复查时间不能为空；'
+      }
+      if (row.placePatrolTeamId === '') {
+        message = message + '分队名称不能为空；'
+      }
+      if (row.inspectorArray.length === 0) {
+        message = message + '检查人员不能为空；'
+      }
+      if (row.reviewResult === '') {
+        message = message + '复查结论不能为空；'
+      }
+      return message
+    },
+
+    async handleDelete (row, tableIndex) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+
+          this.tableData.splice(tableIndex, 1);
+
+
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteRecord (row, tableIndex) {
+
+      const url = "/gov/org/placepatrolreviewrecord/del"
+
+      let params = {
+        placePatrolReviewRecordId: row.placePatrolReviewRecordId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        // this.$message({
+        //   type: "success",
+        //   message: "删除成功"
+        // });
+
+        this.tableData.splice(tableIndex, 1);
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      this.$emit('dialogCancle')
+
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 375)
+
+    },
+
+    ...mapGetters(['clientHeight'])
+
+  },
+  props: {
+
+
+    resultList: {
+      type: Array,
+      default: []
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+
+.item_width_1 {
+  width: 160px;
+}
+.item_width_2 {
+  width: 200px;
+}
+.div_search {
+  margin-top: 10px;
+}
+.div_table {
+  margin-top: 20px;
+  // background: #ffffff;
+  // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  // border-radius: 4px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+.div_btn {
+  margin-top: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/detailForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/detailForm.vue
deleted file mode 100644
index 6125199cc..000000000
--- a/src/views/modules/communityParty/orgActivity/activivityList/detailForm.vue
+++ /dev/null
@@ -1,693 +0,0 @@
-<template>
-  <div>
-    <div class="dialog-h-content scroll-h">
-
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :disabled="formType==='detail'"
-               :rules="dataRule"
-               class="div_form">
-
-        <el-form-item label="服务分类"
-                      label-width="150px"
-                      prop="serviceCategoryKey">
-          <span>{{formData.serviceCategoryName}}</span>
-
-          <!-- <el-select v-model="formData.serviceCategoryKey"
-                     placeholder="请选择"
-                     clearable
-                     class="item_width_1">
-            <el-option v-for="(item,index) in categrayArray"
-                       @click.native="hancleClickCategray(index)"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select> -->
-        </el-form-item>
-
-        <el-form-item label="服务项目"
-                      prop="serviceProjectId"
-                      label-width="150px"
-                      style="display: block">
-          <span>{{formData.serviceProjectName}}</span>
-          <!-- <el-select class="item_width_1"
-                     v-model="formData.serviceProjectId"
-                     placeholder="请选择"
-                     filterable
-                     clearable>
-            <el-option v-for="(item,index) in projectList"
-                       @click.native="hancleClickProject(index)"
-                       :key="item.serviceProjectId"
-                       :label="item.serviceName"
-                       :value="item.serviceProjectId">
-            </el-option>
-          </el-select> -->
-
-        </el-form-item>
-        <el-form-item label="服务组织"
-                      prop="serviceOrgId"
-                      label-width="150px"
-                      style="display: block">
-          <span>{{formData.serviceOrgName}}</span>
-          <!-- <el-select class="item_width_1"
-                     v-model="formData.serviceOrgId"
-                     placeholder="请选择"
-                     filterable
-                     clearable>
-            <el-option v-for="item in orgList"
-                       :key="item.icServiceOrgId"
-                       :label="item.orgName"
-                       :value="item.icServiceOrgId">
-            </el-option>
-          </el-select> -->
-
-        </el-form-item>
-
-        <el-form-item label="服务范围"
-                      prop="serviceScope"
-                      label-width="150px"
-                      style="display: block">
-          <div v-for="item in formData.serviceScope"
-               :key="item.objectId">
-            <div>{{item.objectName}}</div>
-          </div>
-          <!-- <el-cascader class="item_width_1"
-                       ref="myCascader"
-                       v-model="scopeIdArray"
-                       :key="iscascaderShow"
-                       :options="casOptions"
-                       :props="optionProps"
-                       :show-all-levels="false"
-                       @change="handleChangeScope"></el-cascader> -->
-        </el-form-item>
-
-        <el-form-item label="经办人"
-                      prop="principalName"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人姓名"
-                    v-model="formData.principalName">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="联系方式"
-                      prop="principalContact"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人电话"
-                    v-model="formData.principalContact">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="服务时间"
-                      label-width="150px"
-                      prop="serviceTimeStart">
-          <el-date-picker v-model="formData.serviceTimeStart"
-                          :picker-options="startPickerOptions"
-                          class="item_width_2"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          value="yyyy-MM-dd"
-                          placeholder="开始时间">
-          </el-date-picker>
-          <span class="data-tag">至</span>
-          <el-date-picker v-model="formData.serviceTimeEnd"
-                          :picker-options="endPickerOptions"
-                          class="item_width_2 data-tag"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          value="yyyy-MM-dd"
-                          placeholder="结束时间">
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item label="备注"
-                      prop="remark"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    maxlength="500"
-                    show-word-limit
-                    :rows="3"
-                    placeholder="请输入备注，不超过500字"
-                    v-model="formData.remark"></el-input>
-        </el-form-item>
-
-      </el-form>
-
-      <div v-show="formData.serviceStatus==='completed'">
-        <h3 class="d-h3">反馈内容</h3>
-
-        <el-form ref="ref_form_feedback"
-                 :inline="true"
-                 :disabled="true"
-                 :model="feedbackFormData"
-                 class="div_form">
-
-          <el-form-item label="服务目标"
-                        prop="serviceGoal"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      type="textarea"
-                      maxlength="1000"
-                      show-word-limit
-                      :rows="3"
-                      placeholder="请输入服务目标，不超过1000字"
-                      v-model="feedbackFormData.serviceGoal"></el-input>
-          </el-form-item>
-
-          <el-form-item label="服务效果"
-                        prop="serviceEffect"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      type="textarea"
-                      maxlength="1000"
-                      show-word-limit
-                      :rows="3"
-                      placeholder="请输入服务效果，不超过1000字"
-                      v-model="feedbackFormData.serviceEffect"></el-input>
-          </el-form-item>
-
-          <el-form-item label="服务人数"
-                        style="display: block"
-                        prop="servicePeopleNumber"
-                        label-width="150px">
-            <el-input-number class="item_width_1"
-                             v-model="feedbackFormData.servicePeopleNumber"
-                             :min="0"
-                             :max="9999"
-                             label="服务人数"></el-input-number>
-          </el-form-item>
-
-          <el-form-item label="服务状态"
-                        label-width="150px"
-                        prop="serviceStatus">
-            <span>已完成</span>
-            <!-- <el-select class="item_width_1"
-                       v-model="feedbackFormData.serviceStatus"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in statusArray"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select> -->
-
-          </el-form-item>
-          <el-form-item label="满意度"
-                        label-width="150px"
-                        prop="satisfaction">
-            <el-select class="item_width_1"
-                       v-model="feedbackFormData.satisfaction"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in satisfyArray"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-          <el-form-item label="地址"
-                        prop="address"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      v-model="feedbackFormData.address"></el-input>
-          </el-form-item>
-          <!-- <el-form-item label="地图位置"
-                        label-width="150px"
-                        style="display: block">
-            <div style="width:500px">
-
-              <div class="div_map">
-                <div id="map_app">
-
-                </div>
-                <div class="div_searchmap">
-                  <el-input maxlength="50"
-                            size="mini"
-                            placeholder="请输入关键字"
-                            v-model="keyWords">
-                  </el-input>
-                  <el-button style="margin-left: 10px"
-                             type="primary"
-                             size="mini"
-                             @click="handleSearchMap">查询</el-button>
-                </div>
-              </div>
-
-            </div>
-          </el-form-item> -->
-
-          <el-form-item class="block"
-                        label="附件"
-                        label-width="150px"
-                        prop="attach">
-            <!-- <el-upload v-if="feedbackFormData.attachmentList&&feedbackFormData.attachmentList.length>0"
-                       class="upload-demo"
-                       :on-preview="handleFileDownload"
-                       accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
-                       :limit="3"
-                       :file-list="fileList">
-
-            </el-upload> -->
-            <div v-if="feedbackFormData.attachmentList&&feedbackFormData.attachmentList.length>0"
-                 class="attachement-list">
-              <a :href="att.attachmentUrl"
-                 target="_blank"
-                 :key="att.attachmentUrl"
-                 v-for="att in feedbackFormData.attachmentList">
-                <i class="el-icon-folder-opened"></i>
-                {{ att.attachmentName }}
-              </a>
-            </div>
-            <span v-else>无附件</span>
-          </el-form-item>
-        </el-form>
-      </div>
-
-    </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'
-
-
-
-var map
-var search
-var markers
-var infoWindowList
-var geocoder // 新建一个正逆地址解析类
-
-let loading // 加载动画
-export default {
-  data () {
-    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      if (this.formData.serviceTimeStart) {
-        let serviceTimeStart = new Date(this.formData.serviceTimeStart)
-        return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart
-      } else {
-        return time.getTime() > nowData
-      }
-
-    }
-    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      return time.getTime() > nowData
-    }
-
-    return {
-
-
-      btnDisable: false,
-
-      keyWords: '',
-      formData: {
-        unitName: '',
-        serviceMatterList: [],
-        type: '',
-        contact: '',
-        contactMobile: '',
-        memberCount: 0,
-        remark: '', //备注【最大500字】
-        address: '', //详细地址
-        longitude: 36.0722275, //经度
-        latitude: 120.38945519 //纬度
-      },
-
-      feedbackFormData: {
-        serviceProjectId: '',//	服务项目id	
-        serviceProjectName: '',
-        serviceGoal: '',//	服务目标	
-        serviceEffect: '',//	服务效果	
-        servicePeopleNumber: null,//	服务人数	
-        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
-        satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
-        longitude: '',//	经度	
-        latitude: '',//	维度	
-        address: '',
-        attachmentList: [],//	附件列表
-      },
-      serviceList: [],//服务list
-
-      endPickerOptions: {
-        disabledDate: endDisabledDate
-      },
-      startPickerOptions: {
-        disabledDate: startDisabledDate
-      },
-
-      projectList: [],
-      fileList: [],
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
-    }
-  },
-  components: {},
-  mounted () {
-    if (this.serviceRecordId) {//详情
-      this.loadInfo()
-
-    }
-    // this.initMap()
-
-  },
-
-
-  methods: {
-
-
-    //加载组织
-    async loadInfo () {
-      const url = `/heart/icServiceProject/service/detail/${this.serviceRecordId}`
-      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail' + this.serviceRecordId
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.formData = { ...data }
-        this.formData.serviceRecordId = this.serviceRecordId
-        this.feedbackFormData = { ...data.feedBack }
-        this.feedbackFormData.servicePeopleNumber = this.formData.servicePeopleNumber
-        this.fileList = []
-        if (data.feedBack.attachmentList && data.feedBack.attachmentList.length > 0) {
-          data.feedBack.attachmentList.forEach(element => {
-            let obj = {
-              name: element.attachmentName,
-              format: element.attachmentFormat,
-              url: element.attachmentUrl,
-            }
-            this.fileList.push(obj)
-          });
-        }
-
-
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    async handleComfirm () {
-
-      this.btnDisable = true
-      setTimeout(() => {
-        this.btnDisable = false
-      }, 10000)
-      this.$refs['ref_form'].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj)
-          this.btnDisable = false
-        } else {
-          this.editFuwu()
-        }
-
-      })
-
-
-    },
-    async editFuwu () {
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      if (regPhone.test(this.formData.principalContact) === false) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的手机号码'
-        })
-        return false;
-      }
-
-      let url = '/heart/icServiceProject/service/update'
-      // let url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/update"
-
-
-      const { data, code, msg } = await requestPost(url, this.formData)
-
-      if (code === 0) {
-        this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.resetData()
-
-        this.$emit('handleOk')
-      } else {
-        this.btnDisable = false
-        this.$message.error(msg)
-      }
-
-    },
-
-    handleCancle () {
-      this.resetData()
-      this.$emit('handleClose')
-
-    },
-
-    //下载
-    handleFileDownload (file) {
-
-      var a = document.createElement('a');
-      var event = new MouseEvent('click');
-      a.download = file.name;
-      console.log(a)
-      a.href = file.url;
-      a.dispatchEvent(event);
-
-
-    },
-
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('app'), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45 // 设置地图旋转角度
-      })
-
-      search = new window.TMap.service.Search({ pageSize: 10 })
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: []
-      })
-      infoWindowList = Array(10)
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
-
-      // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      this.convert()
-    },
-
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
-        {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
-        }
-      ])
-    },
-
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close()
-      })
-      infoWindowList.length = 0
-      markers.setGeometries([])
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchRectangle({
-          keyword: this.keyWords,
-          bounds: map.getBounds()
-        })
-        .then((result) => {
-          let { data } = result
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng }
-            } = data[0]
-
-
-            map.setCenter(new TMap.LatLng(lat, lng))
-            this.setMarker(lat, lng)
-            this.formData.latitude = lat
-            this.formData.longitude = lng
-            this.convert()
-          } else {
-            this.$message.error('未检索到相关位置坐标')
-          }
-        })
-    },
-
-    handleMoveCenter () {
-      //修改地图中心点
-      const center = map.getCenter()
-      const lat = center.getLat()
-      const lng = center.getLng()
-      this.formData.latitude = lat
-      this.formData.longitude = lng
-      this.setMarker(lat, lng)
-      this.convert(lat, lng)
-    },
-
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
-      } else {
-        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
-      }
-
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: 'main', // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          this.formData.address = result.result.address
-          // 显示搜索到的地址
-        });
-    },
-
-
-    resetData () {
-      this.formData = {
-        serviceCategoryKey: '',//服务分类id	
-        serviceProjectId: '',//服务项目id	
-        serviceOrgId: '',//服务组织id	
-        serviceScope: [],//
-        principalName: '',//经办人(责任人)姓名	
-        principalContact: '',//经办人联系方式	
-        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
-        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
-        remark: '',//
-
-      }
-    },
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-
-        serviceCategoryKey: [
-          { required: true, message: '服务类别不能为空', trigger: 'blur' },
-        ],
-        serviceProjectId: [
-          { required: true, message: '服务项目不能为空', trigger: 'blur' }
-        ],
-
-        serviceOrgId: [
-          { required: true, message: '服务组织不能为空', trigger: 'blur' }
-        ],
-        serviceTimeStart: [
-          { required: true, message: '服务时间不能为空', trigger: 'blur' }
-        ],
-        serviceScope: [
-          { required: true, message: '服务范围不能为空', trigger: 'blur' }
-        ],
-
-      }
-    },
-  },
-  props: {
-
-    serviceRecordId: {
-      type: String,
-      required: true
-    },
-    formType: {//表单操作类型 add新增，edit编辑，detail详情,feedback反馈
-      type: String,
-      required: true
-    },
-    categrayArray: {
-      type: Array,
-      required: true,
-      default () {
-        return []
-      }
-    },
-    satisfyArray: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
-  }
-}
-</script>
-
-
-<style lang="scss" scoped >
-@import "@/assets/scss/modules/management/form-main.scss";
-
-.attachement-list {
-  // padding-left: 20px;
-  a {
-    display: block;
-    cursor: pointer;
-    // color: #4df0ff;
-    font-size: 14px;
-
-    i {
-      color: #333;
-    }
-  }
-}
-</style>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
new file mode 100644
index 000000000..de2ae9a3d
--- /dev/null
+++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
@@ -0,0 +1,291 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               class="div_form">
+
+        <el-form-item label="活动标题"
+                      prop="principalName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入活动标题"
+                    v-model="formData.principalName">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="提醒时间"
+                      style="display: block"
+                      prop="activityTime"
+                      label-width="150px">
+          <el-date-picker v-model="formData.activityTime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          type="datetime"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="是否公开"
+                      label-width="150px"
+                      prop="serviceCategoryKey">
+          <el-select v-model="formData.serviceCategoryKey"
+                     placeholder="请选择"
+                     clearable
+                     class="item_width_1">
+            <el-option v-for="item in gongkaiArray"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="活动介绍"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :rows="3"
+                    placeholder="请输入活动介绍，不超过1000字"
+                    v-model="formData.remark"></el-input>
+        </el-form-item>
+
+      </el-form>
+
+    </div>
+
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      btnDisable: false,
+
+
+      formData: {
+        serviceCategoryKey: '',//服务分类id	
+        serviceProjectId: '',//服务项目id	
+        serviceOrgId: '',//服务组织id	
+        serviceScope: [],//
+        principalName: '',//经办人(责任人)姓名	
+        principalContact: '',//经办人联系方式	
+        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
+        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
+        remark: '',//
+
+
+      },
+
+
+      gongkaiArray: [
+        {
+          valule: '1',
+          label: '仅自己可见'
+        },
+        {
+          valule: '2',
+          label: '组织内其他人可见'
+        },
+
+      ],
+
+    }
+  },
+
+  watch: {
+
+  },
+  components: {},
+  async mounted () {
+
+
+  },
+
+
+  methods: {
+
+    async handleComfirm () {
+
+      this.handleAdd()
+    },
+
+    async handleAdd () {
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+
+          this.addSchedule()
+
+        }
+
+      })
+
+    },
+
+    async addSchedule () {
+
+      console.log(this.formData)
+
+
+
+
+      const url = '/heart/icServiceProject/service/initiate'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
+      let params = {
+
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message.success('添加成功')
+        this.resetData()
+        this.$emit('handleOk')
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('handleClose')
+
+    },
+
+
+
+    resetData () {
+      this.formData = {
+        serviceCategoryKey: '',//服务分类id	
+        serviceProjectId: '',//服务项目id	
+        serviceOrgId: '',//服务组织id	
+        serviceScope: [],//
+        principalName: '',//经办人(责任人)姓名	
+        principalContact: '',//经办人联系方式	
+        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
+        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
+        remark: '',//
+
+
+      }
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+
+        serviceCategoryKey: [
+          { required: true, message: '服务类别不能为空', trigger: 'blur' },
+        ],
+        serviceProjectId: [
+          { required: true, message: '服务项目不能为空', trigger: 'blur' }
+        ],
+
+        serviceOrgId: [
+          { required: true, message: '服务组织不能为空', trigger: 'blur' }
+        ],
+        serviceTimeStart: [
+          { required: true, message: '服务时间不能为空', trigger: 'blur' }
+        ],
+        serviceScope: [
+          { required: true, message: '服务范围不能为空', trigger: 'blur' }
+        ],
+
+      }
+    },
+    feedbackDataRule () {
+      return {
+
+        serviceProjectName: [
+          { required: true, message: '服务项目不能为空', trigger: 'blur' },
+        ],
+        serviceGoal: [
+          { required: true, message: '服务目标不能为空', trigger: 'blur' }
+        ],
+
+        serviceEffect: [
+          { required: true, message: '服务效果不能为空', trigger: 'blur' }
+        ],
+        servicePeopleNumber: [
+          { required: true, message: '服务人数不能为空', trigger: 'blur' }
+        ],
+        serviceStatus: [
+          { required: true, message: '服务状态不能为空', trigger: 'blur' }
+        ],
+        satisfaction: [
+          { required: true, message: '满意度不能为空', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '地址不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+  },
+  props: {
+
+
+    formType: { //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+      type: String,
+      required: ''
+    },
+
+
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/form-main.scss";
+</style>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
new file mode 100644
index 000000000..0235765f6
--- /dev/null
+++ b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
@@ -0,0 +1,415 @@
+<template>
+  <div class="div_main">
+    <div>
+      <div class="div_search">
+        <el-form :inline="true"
+                 :model="formData"
+                 ref="ref_searchform"
+                 :label-width="'80px'">
+          <div>
+
+            <el-form-item label="活动类型"
+                          prop="serviceCategoryKey">
+              <el-select v-model="formData.year"
+                         placeholder="请选择"
+                         size="small"
+                         clearable
+                         class="item_width_2">
+                <el-option v-for="item in yearArray"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-button style="margin-left:30px"
+                       size="small"
+                       class="diy-button--search"
+                       @click="handleSearch">查询</el-button>
+
+          </div>
+        </el-form>
+      </div>
+
+      <div class="div_table">
+
+        <div class="div_btn">
+          <el-button class="diy-button--add"
+                     size="small"
+                     @click="handleAdd">添加规则</el-button>
+
+        </div>
+
+        <el-table :data="tableData"
+                  border
+                  v-loading="tableLoading"
+                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  class="table"
+                  style="width: 100%"
+                  :height="maxTableHeight">
+          <el-table-column label="序号"
+                           fixed="left"
+                           type="index"
+                           align="center"
+                           width="50" />
+
+          <el-table-column prop="serviceCategoryName"
+                           align="center"
+                           width="100"
+                           label="活动类别"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="serviceProjectName"
+                           label="举办频次"
+                           align="center"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="serviceOrgName"
+                           align="center"
+                           width="100"
+                           label="活动时间"
+                           :show-overflow-tooltip="true">
+
+          </el-table-column>
+
+          <el-table-column prop="servicePeopleNumber"
+                           align="center"
+                           width="110"
+                           label="活动地点"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="servicePeopleNumber"
+                           align="center"
+                           width="110"
+                           label="活动主题"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="servicePeopleNumber"
+                           align="center"
+                           width="80"
+                           label="参加活动党支部"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="servicePeopleNumber"
+                           align="center"
+                           width="80"
+                           label="参加人员"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="servicePeopleNumber"
+                           align="center"
+                           width="80"
+                           label="自动发布时间"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="servicePeopleNumber"
+                           align="center"
+                           width="80"
+                           label="自动通知"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column fixed="right"
+                           label="操作"
+                           align="center"
+                           width="180">
+            <template slot-scope="scope">
+
+              <el-button @click="handleEdit(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--edit">修改</el-button>
+
+              <el-button @click="handleDel(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--delete">删除</el-button>
+
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="div-btn">
+          <el-button size="small"
+                     @click="handleCancle">取 消</el-button>
+          <el-button size="small"
+                     type="primary"
+                     @click="handleComfirm">确 定</el-button>
+        </div>
+      </div>
+
+    </div>
+    <el-dialog v-if="showAdd"
+               :visible.sync="showAdd"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="addDiaTitle"
+               width="1400px"
+               top="5vh"
+               class="dialog-h"
+               @closed="showAdd = false">
+      <add-rule ref="ref_add_form"
+                @handleOk="handleOk"
+                @handleClose="handleClose"></add-rule>
+    </el-dialog>
+    <el-dialog v-if="showEdit"
+               :visible.sync="showEdit"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="editDiaTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="showEdit = false">
+      <add-activity ref="ref_edit_form"
+                    :formType="formType"
+                    @handleOk="handleOk"
+                    @handleClose="handleClose"></add-activity>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+import { mapGetters } from "vuex";
+import axios from "axios";
+import addRule from "./addRule";
+import addActivity from "./addActivity";
+
+export default {
+  components: { addRule, addActivity },
+
+  data () {
+
+    return {
+      tableLoading: false,
+      user: {},
+      agencyId: '',
+
+      tableData: [],
+      categrayArray: [],
+      yearArray: [],
+      formData: {
+        year: '',
+      },
+      serviceRecordId: '',
+      serviceProjectName: '',
+
+
+      showAdd: false,
+      showEdit: false,
+
+      formType: 'add',
+      addDiaTitle: '添加规则',
+      editDiaTitle: '修改规则',
+
+    };
+  },
+  computed: {
+    maxTableHeight () {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 410 + this.iframeHeigh
+        : this.clientHeight - 410;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {
+
+  },
+  mounted () {
+    console.log(this.$store.state)
+    this.user = this.$store.state.user
+    this.agencyId = this.user.agencyId
+
+    this.yearArray = []
+    let now = new Date()
+    let year = now.getFullYear()
+    this.formData.year = year
+    for (let i = 0; i < 5; i++) {
+      let obj = {
+        value: (year - i) + '',
+        label: (year - i) + '年'
+
+      }
+
+      this.yearArray.push(obj)
+    }
+
+    this.getTableData();
+  },
+  methods: {
+    handleCancle () {
+      this.$emit('handleClose')
+    },
+    handleComfirm () {
+      this.$emit('handleOk')
+    },
+
+    handleSearch (val) {
+
+      this.getTableData();
+    },
+
+
+
+    async handleAdd () {
+
+      this.formType = 'add'
+      this.showAdd = true;
+    },
+
+
+
+
+    async handleEdit (row) {
+
+      this.formType = 'edit'
+      this.showEdit = true
+
+    },
+
+
+    handleClose () {
+      this.serviceRecordId = ""
+      this.formType = ''
+
+      this.showAdd = false
+      this.showEdit = false
+
+
+    },
+    handleOk () {
+      this.handleClose()
+      this.pageNo = 1
+      this.getTableData()
+
+    },
+
+
+    async handleDel (row) {
+
+      this.serviceRecordId = row.serviceRecordId
+
+      this.$confirm("确认取消活动?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.cancelActivity()
+        })
+        .catch(err => {
+          if (err == "cancel") {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消删除"
+            // });
+          }
+
+        });
+
+    },
+
+    async cancelActivity () {
+
+      const url = `/heart/icServiceProject/service/cancel/${this.serviceRecordId}`;
+
+
+      const { data, code, msg } = await requestPost(url, {});
+
+      if (code === 0) {
+        this.$message.success("取消成功！");
+        this.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+
+    async getTableData () {
+      this.tableLoading = true
+      const url = "/heart/icServiceProject/service/recordList";
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
+
+      const { data, code, msg } = await requestPost(url, this.formData);
+
+      this.tableLoading = false
+      if (code === 0) {
+
+        this.total = data.total || 0;
+        this.tableData = data.list
+          ? data.list.map((item) => {
+            return item;
+          })
+          : [];
+
+        this.tableData.forEach(item => {
+          if (item.operationType === '2') {
+            item.operationTypeShow = '已转需求'
+          }
+          if (item.operationType === '1') {
+            item.operationTypeShow = '已立项'
+          }
+          if (item.operationType === '0') {
+            item.operationTypeShow = '已回复'
+          }
+
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async handleExport () {
+      const url = "/gov/project/icEvent/export";
+      const { pageSize, pageNo, formData } = this;
+      axios({
+        url: window.SITE_CONFIG["apiURL"] + url,
+        method: "post",
+        data: {
+          pageSize,
+          pageNo,
+          ...formData,
+        },
+        responseType: "blob",
+      })
+        .then((res) => {
+          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对象
+        })
+        .catch((err) => {
+          console.log("获取导出情失败", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+
+.div-btn {
+  display: flex;
+  justify-content: center;
+  padding-bottom: 20px;
+}
+</style>