From 6b93ed35fa82cdc83c24fdf0404e2bb53398d43d Mon Sep 17 00:00:00 2001
From: juwei001 <974220104@qq.com>
Date: Mon, 18 Mar 2024 10:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9=E3=80=81?=
 =?UTF-8?q?=E5=85=9A=E5=BB=BA=E6=B4=BB=E5=8A=A8=EF=BC=9A=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=BB=8B=E7=BB=8D=E6=94=B9=E4=B8=BA=E5=AF=8C=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activivityList/activivityList.vue         | 814 +++++++++---------
 .../activivityList/addActivity.vue            |  25 +-
 .../activivityList/scheduleForm.vue           | 333 ++++---
 .../partyBuilding/activitys.vue               |   6 +-
 .../modules/communityParty/wish/activitys.vue |   4 +-
 5 files changed, 604 insertions(+), 578 deletions(-)

diff --git a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
index fb2782f..b1b7ec1 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
@@ -1,300 +1,365 @@
 <template>
   <div class="div_main">
-    <div v-if="showType==='list'">
+    <div v-if="showType === 'list'">
       <div class="div_search">
-        <el-form :inline="true"
-                 :model="formData"
-                 ref="ref_searchform"
-                 :label-width="'80px'">
+        <el-form
+          :inline="true"
+          :model="formData"
+          ref="ref_searchform"
+          :label-width="'80px'"
+        >
           <div>
-
-            <el-form-item label="所属组织"
-                          prop="publishPartyOrgId">
-              <el-cascader class="customer_cascader"
-                           ref="myCascader"
-                           size="small"
-                           v-model="agencyIdArray"
-                           :options="orgOptions"
-                           :props="orgOptionProps"
-                           :show-all-levels="false"
-                           @change="handleChangeAgency"></el-cascader>
+            <el-form-item label="所属组织" prop="publishPartyOrgId">
+              <el-cascader
+                class="customer_cascader"
+                ref="myCascader"
+                size="small"
+                v-model="agencyIdArray"
+                :options="orgOptions"
+                :props="orgOptionProps"
+                :show-all-levels="false"
+                @change="handleChangeAgency"
+              ></el-cascader>
             </el-form-item>
-            <el-form-item label="活动类型"
-                          prop="actType">
-              <el-select v-model="formData.actType"
-                         placeholder="请选择"
-                         size="small"
-                         clearable
-                         class="item_width_2">
-                <el-option v-for="item in categrayArray"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
+            <el-form-item label="活动类型" prop="actType">
+              <el-select
+                v-model="formData.actType"
+                placeholder="请选择"
+                size="small"
+                clearable
+                class="item_width_2"
+              >
+                <el-option
+                  v-for="item in categrayArray"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="举办时间"
-                          prop="startDate">
-              <el-date-picker v-model="formData.startDate"
-                              class="item_width_2"
-                              size="small"
-                              type="date"
-                              value-format="yyyyMMdd"
-                              format="yyyy-MM-dd"
-                              placeholder="开始时间">
+            <el-form-item label="举办时间" prop="startDate">
+              <el-date-picker
+                v-model="formData.startDate"
+                class="item_width_2"
+                size="small"
+                type="date"
+                value-format="yyyyMMdd"
+                format="yyyy-MM-dd"
+                placeholder="开始时间"
+              >
               </el-date-picker>
               <span class="data-tag">至</span>
-              <el-date-picker v-model="formData.endDate"
-                              :picker-options="endPickerOptions"
-                              class="item_width_2 data-tag"
-                              size="small"
-                              type="date"
-                              value-format="yyyyMMdd"
-                              format="yyyy-MM-dd"
-                              placeholder="结束时间">
+              <el-date-picker
+                v-model="formData.endDate"
+                :picker-options="endPickerOptions"
+                class="item_width_2 data-tag"
+                size="small"
+                type="date"
+                value-format="yyyyMMdd"
+                format="yyyy-MM-dd"
+                placeholder="结束时间"
+              >
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="活动地点"
-                          prop="address">
-              <el-input v-model="formData.address"
-                        class="item_width_2"
-                        size="small"
-                        clearable
-                        placeholder="请输入">
+            <el-form-item label="活动地点" prop="address">
+              <el-input
+                v-model="formData.address"
+                class="item_width_2"
+                size="small"
+                clearable
+                placeholder="请输入"
+              >
               </el-input>
             </el-form-item>
 
-            <el-form-item label="活动主题"
-                          prop="topic">
-              <el-input v-model="formData.topic"
-                        class="item_width_2"
-                        size="small"
-                        clearable
-                        placeholder="请输入">
+            <el-form-item label="活动主题" prop="topic">
+              <el-input
+                v-model="formData.topic"
+                class="item_width_2"
+                size="small"
+                clearable
+                placeholder="请输入"
+              >
               </el-input>
             </el-form-item>
 
-            <el-form-item label="发布状态"
-                          prop="isPublish">
-              <el-select class="item_width_2"
-                         v-model="formData.isPublish"
-                         placeholder="全部"
-                         size="small"
-                         clearable>
-                <el-option v-for="item in statusArray"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
+            <el-form-item label="发布状态" prop="isPublish">
+              <el-select
+                class="item_width_2"
+                v-model="formData.isPublish"
+                placeholder="全部"
+                size="small"
+                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-button style="margin-left:30px"
-                       size="small"
-                       class="diy-button--search"
-                       @click="handleSearch">查询</el-button>
-            <el-button style="margin-left:10px"
-                       size="small"
-                       class="diy-button--reset"
-                       @click="resetSearch">重置</el-button>
+            <el-button
+              style="margin-left: 30px"
+              size="small"
+              class="diy-button--search"
+              @click="handleSearch"
+              >查询</el-button
+            >
+            <el-button
+              style="margin-left: 10px"
+              size="small"
+              class="diy-button--reset"
+              @click="resetSearch"
+              >重置</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>
+          <el-button class="diy-button--add" size="small" @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 style="float:left;margin-left:10px"
-                     class="diy-button--delete"
-                     size="small"
-                     @click="deleteBatch">批量删除</el-button>
-          <el-button @click="handleExport"
-                     class="diy-button--reset"
-                     size="small">导出</el-button>
+          <el-button
+            style="float: left; margin-left: 10px"
+            class="diy-button--delete"
+            size="small"
+            @click="deleteBatch"
+            >批量删除</el-button
+          >
+          <el-button
+            @click="handleExport"
+            class="diy-button--reset"
+            size="small"
+            >导出</el-button
+          >
         </div>
 
-        <el-table :data="tableData"
-                  border
-                  v-loading="tableLoading"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                  class="table"
-                  style="width: 100%"
-                  @select-all="selectAll"
-                  @selection-change="selectionChange"
-                  :height="maxTableHeight">
-          <el-table-column type="selection"
-                           width="55">
-          </el-table-column>
-          <el-table-column label="序号"
-                           fixed="left"
-                           type="index"
-                           align="center"
-                           width="50" />
-
-          <el-table-column prop="topic"
-                           align="center"
-                           min-width="150"
-                           label="活动主题"
-                           :show-overflow-tooltip="true">
+        <el-table
+          :data="tableData"
+          border
+          v-loading="tableLoading"
+          :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+          class="table"
+          style="width: 100%"
+          @select-all="selectAll"
+          @selection-change="selectionChange"
+          :height="maxTableHeight"
+        >
+          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column
+            label="序号"
+            fixed="left"
+            type="index"
+            align="center"
+            width="50"
+          />
+
+          <el-table-column
+            prop="topic"
+            align="center"
+            min-width="150"
+            label="活动主题"
+            :show-overflow-tooltip="true"
+          >
           </el-table-column>
 
-          <el-table-column prop="publishPartyOrgName"
-                           label="所属组织"
-                           align="center"
-                           :show-overflow-tooltip="true">
+          <el-table-column
+            prop="publishPartyOrgName"
+            label="所属组织"
+            align="center"
+            :show-overflow-tooltip="true"
+          >
           </el-table-column>
 
-          <el-table-column prop="actTypeName"
-                           align="center"
-                           width="150"
-                           label="会议类型"
-                           :show-overflow-tooltip="true">
-
+          <el-table-column
+            prop="actTypeName"
+            align="center"
+            width="150"
+            label="会议类型"
+            :show-overflow-tooltip="true"
+          >
           </el-table-column>
 
-          <el-table-column prop="holdTime"
-                           align="center"
-                           width="150"
-                           label="开始时间"
-                           :show-overflow-tooltip="true">
+          <el-table-column
+            prop="holdTime"
+            align="center"
+            width="150"
+            label="开始时间"
+            :show-overflow-tooltip="true"
+          >
           </el-table-column>
-          <el-table-column prop="address"
-                           align="center"
-                           width="110"
-                           label="活动地点"
-                           :show-overflow-tooltip="true">
+          <el-table-column
+            prop="address"
+            align="center"
+            width="110"
+            label="活动地点"
+            :show-overflow-tooltip="true"
+          >
           </el-table-column>
-          <el-table-column prop="isPublish"
-                           align="center"
-                           width="80"
-                           label="发布状态"
-                           :show-overflow-tooltip="true">
+          <el-table-column
+            prop="isPublish"
+            align="center"
+            width="80"
+            label="发布状态"
+            :show-overflow-tooltip="true"
+          >
             <template slot-scope="scope">
               <span v-if="scope.row.isPublish == '1'">已发布</span>
               <span v-if="scope.row.isPublish == '0'">未发布</span>
-
             </template>
           </el-table-column>
 
-          <el-table-column fixed="right"
-                           label="操作"
-                           align="center"
-                           width="180">
+          <el-table-column
+            fixed="right"
+            label="操作"
+            align="center"
+            width="180"
+          >
             <template slot-scope="scope">
-              <el-button @click="handleDetail(scope.row)"
-                         type="text"
-                         size="small"
-                         class=".div-table-button--detail">查看</el-button>
-              <el-button v-if="scope.row.isPublish == '0' && user.id===scope.row.publishStaffId"
-                         @click="handlePublish(scope.row)"
-                         type="text"
-                         size="small"
-                         class=".div-table-button--detail">发布</el-button>
+              <el-button
+                @click="handleDetail(scope.row)"
+                type="text"
+                size="small"
+                class=".div-table-button--detail"
+                >查看</el-button
+              >
+              <el-button
+                v-if="
+                  scope.row.isPublish == '0' &&
+                  user.id === scope.row.publishStaffId
+                "
+                @click="handlePublish(scope.row)"
+                type="text"
+                size="small"
+                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="user.id===scope.row.publishStaffId"
-                         @click="handleEdit(scope.row)"
-                         type="text"
-                         size="small"
-                         class="div-table-button--edit">修改</el-button>
+              <el-button
+                v-if="user.id === scope.row.publishStaffId"
+                @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> -->
-              <el-button v-if="user.id===scope.row.publishStaffId"
-                         @click="handleDel(scope.row)"
-                         type="text"
-                         size="small"
-                         class="div-table-button--delete">删除</el-button>
-
+              <el-button
+                v-if="user.id === scope.row.publishStaffId"
+                @click="handleDel(scope.row)"
+                type="text"
+                size="small"
+                class="div-table-button--delete"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
 
         <div>
-          <el-pagination @size-change="handleSizeChange"
-                         @current-change="handleCurrentChange"
-                         :current-page.sync="pageNo"
-                         :page-sizes="[20, 50, 100, 200]"
-                         :page-size="parseInt(pageSize)"
-                         layout="sizes, prev, pager, next, total"
-                         :total="total">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page.sync="pageNo"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="parseInt(pageSize)"
+            layout="sizes, prev, pager, next, total"
+            :total="total"
+          >
           </el-pagination>
         </div>
-
       </div>
-
     </div>
-    <el-dialog v-if="showAdd"
-               :visible.sync="showAdd"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="addDiaTitle"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="showAdd = false">
-      <add-activity ref="ref_add_form"
-                    :formType="formType"
-                    :icPartyActId="icPartyActId"
-                    @handleOk="handleOk"
-                    @handleClose="handleClose"></add-activity>
+    <el-dialog
+      v-if="showAdd"
+      :visible.sync="showAdd"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="addDiaTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showAdd = false"
+    >
+      <add-activity
+        ref="ref_add_form"
+        :formType="formType"
+        :icPartyActId="icPartyActId"
+        @handleOk="handleOk"
+        @handleClose="handleClose"
+      ></add-activity>
     </el-dialog>
 
-    <el-dialog v-if="detailShow"
-               :visible.sync="detailShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'活动详情'"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="detailShow = false">
-      <detail-activity ref="ref_add_form"
-                       :formType="formType"
-                       :icPartyActId="icPartyActId"
-                       @diaDetailClose="detailShow = false"></detail-activity>
+    <el-dialog
+      v-if="detailShow"
+      :visible.sync="detailShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'活动详情'"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="detailShow = false"
+    >
+      <detail-activity
+        ref="ref_add_form"
+        :formType="formType"
+        :icPartyActId="icPartyActId"
+        @diaDetailClose="detailShow = false"
+      ></detail-activity>
     </el-dialog>
-    <el-dialog v-if="showSchedule"
-               :visible.sync="showSchedule"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'添加日程提醒'"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="showSchedule = false">
-      <schedule-form ref="ref_schedule_form"
-                     :formType="formType"
-                     @handleOk="handleOk"
-                     @handleClose="handleClose">
+    <el-dialog
+      v-if="showSchedule"
+      :visible.sync="showSchedule"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'添加日程提醒'"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @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 v-if="showType === 'yearplan'">
+      <yearplan-list
+        @handleOk="handleAddPlanOk"
+        @handleClose="handleAddPlanClose"
+      ></yearplan-list>
     </div>
-
   </div>
 </template>
 
 <script>
 import { requestPost, requestGet } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
+import Tinymce from "@c/tinymce2/index.vue";
 import { mapGetters } from "vuex";
 // import eventInfo from "./cpts/event-info";
 import axios from "axios";
@@ -303,29 +368,29 @@ import detailActivity from "./detailActivity";
 import scheduleForm from "./scheduleForm";
 import yearplanList from "./yearplanList";
 
-
 export default {
-  components: { addActivity, detailActivity, scheduleForm, yearplanList },
+  components: { addActivity, detailActivity, scheduleForm, yearplanList, Tinymce },
 
-  data () {
-    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
+  data() {
+    let endDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now();
 
       if (this.formData.startDate) {
-        let startDate = new Date(this.formData.startDate)
-        return time.getTime() < startDate || time.getTime() === startDate
+        let startDate = new Date(this.formData.startDate);
+        return time.getTime() < startDate || time.getTime() === startDate;
       }
-
-    }
-    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      return time.getTime() > nowData
-    }
+    };
+    let startDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now();
+      return time.getTime() > nowData;
+    };
 
     return {
       tableLoading: false,
       user: {},
-      agencyId: '',
+      agencyId: "",
 
       tableData: [],
       categrayArray: [],
@@ -341,173 +406,155 @@ export default {
       ],
 
       formData: {
-        publishPartyOrgId: '',//发布活动党组织；所属党组织
-        actType: '',//活动类型
-        startDate: '',//活动开始时间20220817
-        endDate: '',//活动结束时间20220817
-        isPublish: '',//活动状态。0未完成；1:已完成
-        address: '',
-        topic: '',
-
+        publishPartyOrgId: "", //发布活动党组织；所属党组织
+        actType: "", //活动类型
+        startDate: "", //活动开始时间20220817
+        endDate: "", //活动结束时间20220817
+        isPublish: "", //活动状态。0未完成；1:已完成
+        address: "",
+        topic: "",
       },
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
       total: 1,
       endPickerOptions: {
-        disabledDate: endDisabledDate
+        disabledDate: endDisabledDate,
       },
       // startPickerOptions: {
       //   disabledDate: startDisabledDate
       // },
 
-
       orgOptions: [],
       orgOptionProps: {
         multiple: false,
-        value: 'id',
-        label: 'partyOrgName',
-        children: 'children',
-        checkStrictly: true
+        value: "id",
+        label: "partyOrgName",
+        children: "children",
+        checkStrictly: true,
       },
       agencyIdArray: [],
 
       showAdd: false,
-      formType: 'add',
-      addDiaTitle: '添加活动计划',
+      formType: "add",
+      addDiaTitle: "添加活动计划",
       showSchedule: false,
-      showType: 'list',
+      showType: "list",
       detailShow: false,
 
-      icPartyActId: '',
-      selection: []
+      icPartyActId: "",
+      selection: [],
     };
   },
   computed: {
-    maxTableHeight () {
+    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.getOrgTreeList()
-    this.getCategrayList()
+  watch: {},
+  mounted() {
+    console.log(this.$store.state);
+    this.user = this.$store.state.user;
+    this.agencyId = this.user.agencyId;
+    this.getOrgTreeList();
+    this.getCategrayList();
     this.getTableData();
   },
   methods: {
-
-    async getOrgTreeList () {
-
-      const url = '/resi/partymember/icPartyOrg/getSearchTreelist'
+    async getOrgTreeList() {
+      const url = "/resi/partymember/icPartyOrg/getSearchTreelist";
       let params = {
-        customerId: localStorage.getItem('customerId'),
-        agencyId: localStorage.getItem('agencyId')
+        customerId: localStorage.getItem("customerId"),
+        agencyId: localStorage.getItem("agencyId"),
       };
 
       const { data, code, msg } = await requestGet(url, params);
-      console.log('data-orgparty----o', data)
+      console.log("data-orgparty----o", data);
       if (code === 0) {
-
-        this.orgOptions = data
-
+        this.orgOptions = data;
       } else {
       }
-
-
     },
 
-    handleChangeAgency (val) {
-
-      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+    handleChangeAgency(val) {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
       if (obj) {
-        this.formData.publishPartyOrgId = obj.id
+        this.formData.publishPartyOrgId = obj.id;
       } else {
-        this.formData.publishPartyOrgId = ''
+        this.formData.publishPartyOrgId = "";
       }
-
     },
-    handleAddYearPlan () {
-      this.showType = 'yearplan'
+    handleAddYearPlan() {
+      this.showType = "yearplan";
     },
 
-    handleAddPlanOk () {
-      this.showType = 'list'
+    handleAddPlanOk() {
+      this.showType = "list";
     },
-    handleAddPlanClose () {
-      this.showType = 'list'
+    handleAddPlanClose() {
+      this.showType = "list";
     },
 
-    handleAddSchedule () {
-
-      this.formType = 'schedule'
+    handleAddSchedule() {
+      this.formType = "schedule";
       this.showSchedule = true;
     },
 
-    handleSearch (val) {
+    handleSearch(val) {
       console.log(this.formData);
       this.pageNo = 1;
       this.getTableData();
     },
     // 字典
-    async getCategrayList () {
-      const url = "/resi/partymember/icPartyAct/acttypelist"
+    async getCategrayList() {
+      const url = "/resi/partymember/icPartyAct/acttypelist";
       // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist"
 
-      let params = {}
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.categrayArray = data
+        this.categrayArray = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
-
-    async handleAdd () {
-      this.icPartyActId = ''
-      this.addDiaTitle = '新增活动计划'
-      this.formType = 'add'
+    async handleAdd() {
+      this.icPartyActId = "";
+      this.addDiaTitle = "新增活动计划";
+      this.formType = "add";
       this.showAdd = true;
     },
 
-    async handlePublish (row) {
-      this.icPartyActId = row.icPartyActId
+    async handlePublish(row) {
+      this.icPartyActId = row.icPartyActId;
 
       this.$confirm("确认发布活动?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          this.publishActivity()
+          this.publishActivity();
         })
-        .catch(err => {
+        .catch((err) => {
           if (err == "cancel") {
             // this.$message({
             //   type: "info",
             //   message: "已取消发布"
             // });
           }
-
         });
-
     },
 
-    async publishActivity () {
-
+    async publishActivity() {
       const url = `/resi/partymember/icPartyAct/publish/${this.icPartyActId}`;
       // const url = `http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/publish/${this.icPartyActId}`;
 
-
       const { data, code, msg } = await requestPost(url, {});
 
       if (code === 0) {
@@ -518,76 +565,64 @@ export default {
       }
     },
 
-
-    async handleDetail (row) {
-      this.icPartyActId = row.icPartyActId
+    async handleDetail(row) {
+      this.icPartyActId = row.icPartyActId;
       // this.addDiaTitle = '查看活动计划'
       // this.formType = 'detail'
       // this.showAdd = true
 
-      this.detailShow = true
+      this.detailShow = true;
 
       // this.$nextTick(() => {
       //   this.$refs.ref_form_detail.initForm(this.tableData[rowIndex])
       // })
-
-
     },
-    async handleEdit (row) {
-      this.icPartyActId = row.icPartyActId
-      this.addDiaTitle = '修改活动计划'
-      this.formType = 'edit'
-      this.showAdd = true
-
+    async handleEdit(row) {
+      this.icPartyActId = row.icPartyActId;
+      this.addDiaTitle = "修改活动计划";
+      this.formType = "edit";
+      this.showAdd = true;
     },
 
+    handleClose() {
+      this.formType = "";
 
-    handleClose () {
-      this.formType = ''
-
-      this.showAdd = false
-      this.showSchedule = false
+      this.showAdd = false;
+      this.showSchedule = false;
     },
 
-    handleOk () {
-      this.handleClose()
-      this.pageNo = 1
-      this.getTableData()
-
+    handleOk() {
+      this.handleClose();
+      this.pageNo = 1;
+      this.getTableData();
     },
 
-
-    async handleDel (row) {
-
-      this.icPartyActId = row.icPartyActId
+    async handleDel(row) {
+      this.icPartyActId = row.icPartyActId;
 
       this.$confirm("活动删除后不可恢复，您确定要删除吗？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          this.cancelActivity()
+          this.cancelActivity();
         })
-        .catch(err => {
+        .catch((err) => {
           if (err == "cancel") {
             // this.$message({
             //   type: "info",
             //   message: "已取消删除"
             // });
           }
-
         });
-
     },
 
-    async cancelActivity () {
-
+    async cancelActivity() {
       const url = "/resi/partymember/icPartyAct/del";
       // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del";
-      let params = []
-      params.push(this.icPartyActId)
-
+      let params = [];
+      params.push(this.icPartyActId);
 
       const { data, code, msg } = await requestPost(url, params);
 
@@ -599,61 +634,57 @@ export default {
       }
     },
 
-    selectAll (selection) {
-      this.selection = selection
-
+    selectAll(selection) {
+      this.selection = selection;
     },
-    selectionChange (selection) {
-      this.selection = selection
-
+    selectionChange(selection) {
+      this.selection = selection;
     },
 
-    deleteBatch () {
+    deleteBatch() {
       if (this.selection.length > 0) {
         this.$confirm("确认删除选择的活动?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
           .then(() => {
-            this.deleteActBatch()
+            this.deleteActBatch();
           })
-          .catch(err => {
+          .catch((err) => {
             if (err == "cancel") {
               // this.$message({
               //   type: "info",
               //   message: "已取消删除"
               // });
             }
-
           });
       } else {
-        this.$message.warning('请先选择要删除的活动')
+        this.$message.warning("请先选择要删除的活动");
       }
     },
 
-    async deleteActBatch () {
-      let params = []
-      this.selection.forEach(element => {
-
-        params.push(element.icPartyActId)
+    async deleteActBatch() {
+      let params = [];
+      this.selection.forEach((element) => {
+        params.push(element.icPartyActId);
       });
 
       const url = "/resi/partymember/icPartyAct/del";
       // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del";
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.$message.success("删除成功！");
         this.getTableData();
       } else {
-        this.$message.error('操作失败！')
+        this.$message.error("操作失败！");
       }
     },
 
-    async getTableData () {
-      this.tableLoading = true
+    async getTableData() {
+      this.tableLoading = true;
       const url = "/resi/partymember/icPartyAct/page-list";
       // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/page-list";
       const { pageSize, pageNo, formData } = this;
@@ -663,34 +694,32 @@ export default {
         ...formData,
       });
 
-      this.tableLoading = false
+      this.tableLoading = false;
       if (code === 0) {
-
         this.total = data.total || 0;
         this.tableData = data.list
           ? data.list.map((item) => {
-            return item;
-          })
+              return item;
+            })
           : [];
 
-        this.tableData.forEach(item => {
-          if (item.operationType === '2') {
-            item.operationTypeShow = '已转需求'
+        this.tableData.forEach((item) => {
+          if (item.operationType === "2") {
+            item.operationTypeShow = "已转需求";
           }
-          if (item.operationType === '1') {
-            item.operationTypeShow = '已立项'
+          if (item.operationType === "1") {
+            item.operationTypeShow = "已立项";
           }
-          if (item.operationType === '0') {
-            item.operationTypeShow = '已回复'
+          if (item.operationType === "0") {
+            item.operationTypeShow = "已回复";
           }
-
         });
       } else {
         this.$message.error(msg);
       }
     },
 
-    async handleExport () {
+    async handleExport() {
       const url = "/resi/partymember/icPartyAct/export-act";
       // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/export-act";
       const { pageSize, pageNo, formData } = this;
@@ -726,33 +755,30 @@ export default {
         });
     },
 
-    handleSizeChange (val) {
-
+    handleSizeChange(val) {
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getTableData();
     },
-    handleCurrentChange (val) {
-
+    handleCurrentChange(val) {
       this.pageNo = val;
       this.getTableData();
     },
 
-    resetSearch () {
-      this.agencyIdArray = []
+    resetSearch() {
+      this.agencyIdArray = [];
       this.formData = {
-        publishPartyOrgId: '',//发布活动党组织；所属党组织
-        actType: '',//活动类型
-        startDate: '',//活动开始时间20220817
-        endDate: '',//活动结束时间20220817
-        isPublish: '',//活动状态。
-        address: '',
-        topic: '',
-      }
-
+        publishPartyOrgId: "", //发布活动党组织；所属党组织
+        actType: "", //活动类型
+        startDate: "", //活动开始时间20220817
+        endDate: "", //活动结束时间20220817
+        isPublish: "", //活动状态。
+        address: "",
+        topic: "",
+      };
 
-      this.pageNo = 1
-      this.getTableData()
+      this.pageNo = 1;
+      this.getTableData();
     },
   },
 };
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
index 4db6d4b..ee25816 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -167,7 +167,7 @@
           <el-checkbox :label="'是'" v-model="isAutoInform"></el-checkbox>
         </el-form-item>
 
-        <el-form-item
+        <!-- <el-form-item
           label="活动介绍"
           prop="introduce"
           label-width="150px"
@@ -182,8 +182,23 @@
             placeholder="请输入活动介绍，不超过1000字"
             v-model="formData.introduce"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
 
+        <el-form-item
+          label="活动介绍"
+          prop="introduce"
+          label-width="150px"
+          style="display: block"
+        >
+          <div class="item_width_1">
+            <Tinymce
+              class="tinymce_view"
+              v-model="formData.introduce"
+              :height="300"
+              placeholder="请输入活动介绍"
+            />
+          </div>
+        </el-form-item>
         <el-form-item
           class="block"
           label="封面"
@@ -206,8 +221,9 @@
               size="small"
               :disabled="fileList.length === 3"
               type="primary"
-              >点击上传</el-button
             >
+              点击上传
+            </el-button>
             <div slot="tip" class="el-upload__tip">支持图片、word、pdf</div>
           </el-upload>
         </el-form-item>
@@ -231,6 +247,7 @@
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost, requestGet } from "@/js/dai/request";
+import Tinymce from "@c/tinymce2/index.vue";
 
 let loading; // 加载动画
 export default {
@@ -313,7 +330,7 @@ export default {
       this.formData.holdMonthId = array[0] + array[1];
     },
   },
-  components: {},
+  components: {Tinymce},
   async mounted() {
     this.startLoading();
 
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
index ed023e7..1963707 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
@@ -1,286 +1,269 @@
 <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="title"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入活动标题"
-                    v-model="formData.title">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="formData"
+        :rules="dataRule"
+        class="div_form"
+      >
+        <el-form-item
+          label="日程标题"
+          prop="title"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入活动标题"
+            v-model="formData.title"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="日程时间"
-                      style="display: block"
-                      prop="happenedTime"
-                      label-width="150px">
-          <el-date-picker v-model="formData.happenedTime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          format="yyyy-MM-dd"
-                          type="date"
-                          placeholder="选择时间">
+        <el-form-item
+          label="日程时间"
+          style="display: block"
+          prop="happenedTime"
+          label-width="150px"
+        >
+          <el-date-picker
+            v-model="formData.happenedTime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd"
+            type="date"
+            placeholder="选择时间"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="提醒时间"
-                      style="display: block"
-                      prop="remindTime"
-                      label-width="150px">
-          <el-date-picker v-model="formData.remindTime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          format="yyyy-MM-dd"
-                          placeholder="选择时间">
+        <el-form-item
+          label="提醒时间"
+          style="display: block"
+          prop="remindTime"
+          label-width="150px"
+        >
+          <el-date-picker
+            v-model="formData.remindTime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd"
+            placeholder="选择时间"
+          >
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="是否公开"
-                      label-width="150px"
-                      prop="isPublic">
-          <el-select v-model="formData.isPublic"
-                     placeholder="请选择"
-                     clearable
-                     class="item_width_1">
-            <el-option v-for="item in gongkaiArray"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+        <el-form-item label="是否公开" label-width="150px" prop="isPublic">
+          <el-select
+            v-model="formData.isPublic"
+            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="500"
-                    show-word-limit
-                    :rows="3"
-                    placeholder="请输入日程介绍，不超过500字"
-                    v-model="formData.remark"></el-input>
+        <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>
 
     <div class="div_btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
+      <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'
-
-
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost, requestGet } from "@/js/dai/request";
 
-
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
+  data() {
     return {
       btnDisable: false,
 
-
       formData: {
-        title: '',//
-        remindTime: '',//
-        isPublic: '',//
-        remark: '',//
-        scheduleId: '',
-        happenedTime: ''
+        title: "", //
+        remindTime: "", //
+        isPublic: "", //
+        remark: "", //
+        scheduleId: "",
+        happenedTime: "",
       },
 
-
       gongkaiArray: [
         {
-          value: '0',
-          label: '仅自己可见'
+          value: "0",
+          label: "仅自己可见",
         },
         {
-          value: '1',
-          label: '组织内其他人可见'
+          value: "1",
+          label: "组织内其他人可见",
         },
-
       ],
-
-    }
+    };
   },
 
-  watch: {
-
-  },
+  watch: {},
   components: {},
-  async mounted () {
-
+  async mounted() {
     if (this.scheduleId) {
-      this.formData.scheduleId = this.scheduleId
-      await this.loadInfo()
-
+      this.formData.scheduleId = this.scheduleId;
+      await this.loadInfo();
     } else {
       this.$refs.ref_form.resetFields();
     }
-
   },
 
-
   methods: {
-
-    async handleComfirm () {
-
-      this.handleAdd()
+    async handleComfirm() {
+      this.handleAdd();
     },
 
-    async loadInfo () {
+    async loadInfo() {
       const url = `/resi/partymember/icSchedule/${this.scheduleId}`;
       // const url = `http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/act-detail/${this.icPartyActId}`;
 
-      let params = {}
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.formData = { ...data }
-        this.formData.scheduleId = this.scheduleId
-
+        this.formData = { ...data };
+        this.formData.scheduleId = this.scheduleId;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
-    async handleAdd () {
-
-      this.btnDisable = true
+    async handleAdd() {
+      this.btnDisable = true;
       setTimeout(() => {
-        this.btnDisable = false
-      }, 10000)
-      this.$refs['ref_form'].validate((valid, messageObj) => {
+        this.btnDisable = false;
+      }, 10000);
+      this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
-
-          this.btnDisable = false
+          this.btnDisable = false;
         } else {
-
-          this.addSchedule()
-
+          this.addSchedule();
         }
-
-      })
-
+      });
     },
 
-    async addSchedule () {
+    async addSchedule() {
+      console.log(this.formData);
 
-      console.log(this.formData)
-
-
-      const url = '/resi/partymember/icSchedule/addOrEdit'
+      const url = "/resi/partymember/icSchedule/addOrEdit";
       // const url = 'http://yapi.elinkservice.cn/mock/245/icSchedule/addOrEdit'
       let params = {
-
-        ...this.formData
-      }
+        ...this.formData,
+      };
       //params.happenedTime = this.formData+" 08:00:00"
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success('操作成功')
-        this.resetData()
-        this.$emit('handleOk')
+        this.$message.success("操作成功");
+        this.resetData();
+        this.$emit("handleOk");
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
-
-
-    handleCancle () {
-      this.resetData()
-      this.$emit('handleClose')
-
+    handleCancle() {
+      this.resetData();
+      this.$emit("handleClose");
     },
 
-    resetData () {
-      this.scheduleId = ''
+    resetData() {
+      this.scheduleId = "";
       this.formData = {
-        title: '',//
-        remindTime: '',//
-        isPublic: '',//
-        remark: '',//
-        scheduleId: '',
-      }
-
+        title: "", //
+        remindTime: "", //
+        isPublic: "", //
+        remark: "", //
+        scheduleId: "",
+      };
     },
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
+        loading.close();
       }
-    }
+    },
   },
   computed: {
-    dataRule () {
+    dataRule() {
       return {
-
         title: [
-          { required: true, message: '日程标题不能为空', trigger: 'change' },
+          { required: true, message: "日程标题不能为空", trigger: "change" },
         ],
         remindTime: [
-          { required: true, message: '提醒时间不能为空', trigger: 'change' }
+          { required: true, message: "提醒时间不能为空", trigger: "change" },
         ],
         happenedTime: [
-          { required: true, message: '日程时间不能为空', trigger: 'change' }
+          { required: true, message: "日程时间不能为空", trigger: "change" },
         ],
         isPublic: [
-          { required: true, message: '是否公开不能为空', trigger: 'change' }
+          { required: true, message: "是否公开不能为空", trigger: "change" },
         ],
-
-      }
+      };
     },
-
   },
   props: {
-
-
-    formType: { //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+    formType: {
+      //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
       type: String,
-      required: ''
+      required: "",
     },
-    scheduleId: { //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+    scheduleId: {
+      //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
       type: String,
-      required: ''
+      required: "",
     },
-
-
-  }
-}
+  },
+};
 </script>
 
-
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 </style>
diff --git a/src/views/modules/communityParty/partyBuilding/activitys.vue b/src/views/modules/communityParty/partyBuilding/activitys.vue
index a0f3f31..35e4eef 100644
--- a/src/views/modules/communityParty/partyBuilding/activitys.vue
+++ b/src/views/modules/communityParty/partyBuilding/activitys.vue
@@ -242,9 +242,9 @@ export default {
     async loadTable() {
       this.tableLoading = true;
       const url = "/resi/partymember/icpartyplace/page";
-      let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
+      let params = { 
+        limit: this.pageSize,
+        page: this.pageNo,
         ...this.formData,
       };
 
diff --git a/src/views/modules/communityParty/wish/activitys.vue b/src/views/modules/communityParty/wish/activitys.vue
index 220e5c1..06f975d 100644
--- a/src/views/modules/communityParty/wish/activitys.vue
+++ b/src/views/modules/communityParty/wish/activitys.vue
@@ -223,8 +223,8 @@ export default {
       this.tableLoading = true;
       const url = "/resi/partymember/icpartywish/page";
       let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
+        limit: this.pageSize,
+        page: this.pageNo,
         ...this.formData,
       };