diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
index 603bc3f..4b8e251 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -1,257 +1,196 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <el-form
-        ref="ref_form"
-        :inline="true"
-        :model="formData"
-        :rules="dataRule"
-        :disabled="formType === 'detail'"
-        class="div_form"
-      >
-        <el-form-item label="活动类型" label-width="150px" prop="actType">
-          <el-select
-            v-model="formData.actType"
-            placeholder="请选择"
-            clearable
-            class="item_width_1"
-          >
-            <el-option
-              v-for="item in categrayArray"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType==='detail'"
+               class="div_form">
+
+        <el-form-item label="活动类型"
+                      label-width="150px"
+                      prop="actType">
+          <el-select v-model="formData.actType"
+                     placeholder="请选择"
+                     clearable
+                     class="item_width_1">
+            <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="举办活动时间"
-          style="display: block"
-          prop="holdTime"
-          label-width="150px"
-        >
-          <el-date-picker
-            v-model="formData.holdTime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
-            placeholder="选择时间"
-          >
+        <el-form-item label="举办活动时间"
+                      style="display: block"
+                      prop="holdTime"
+                      label-width="150px">
+          <el-date-picker v-model="formData.holdTime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          format="yyyy-MM-dd HH:mm:ss"
+                          type="datetime"
+                          placeholder="选择时间">
           </el-date-picker>
-        </el-form-item> -->
-
-        <el-form-item
-          label="活动主题"
-          prop="topic"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入活动主题"
-            v-model="formData.topic"
-          >
+        </el-form-item>
+
+        <el-form-item label="活动主题"
+                      prop="topic"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入活动主题"
+                    v-model="formData.topic">
           </el-input>
         </el-form-item>
-        <!-- <el-form-item
-          label="活动地点"
-          prop="address"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入活动地点"
-            v-model="formData.address"
-          >
+        <el-form-item label="活动地点"
+                      prop="address"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入活动地点"
+                    v-model="formData.address">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="自动发布时间"
-          prop="autoPublicType"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            class="item_width_1"
-            v-model="formData.autoPublicType"
-            placeholder="请选择"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="item in autoTimeArray"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+        <el-form-item label="自动发布时间"
+                      prop="autoPublicType"
+                      label-width="150px"
+                      style="display: block">
+          <el-select class="item_width_1"
+                     v-model="formData.autoPublicType"
+                     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="publichIdArray"
-          label-width="150px"
-          style="display: block"
-        >
-          <div v-if="formType === 'detail'" class="item_width_1">
-            {{ formData.publishPartyOrgName }}
-          </div>
-          <el-cascader
-            v-else
-            class="item_width_1"
-            ref="myCascader"
-            v-model="formData.publichIdArray"
-            :key="iscascaderShow"
-            :options="publishOptions"
-            :props="publichOptionProps"
-            :show-all-levels="false"
-            @change="handleChangeScope"
-          ></el-cascader>
+        <el-form-item label="发布活动党组织"
+                      prop="publichIdArray"
+                      label-width="150px"
+                      style="display: block">
+          <div v-if="formType==='detail'"
+               class="item_width_1">{{formData.publishPartyOrgName}}</div>
+          <el-cascader v-else
+                       class="item_width_1"
+                       ref="myCascader"
+                       v-model="formData.publichIdArray"
+                       :key="iscascaderShow"
+                       :options="publishOptions"
+                       :props="publichOptionProps"
+                       :show-all-levels="false"
+                       @change="handleChangeScope"></el-cascader>
         </el-form-item>
-        <el-form-item
-          label="参加活动党组织"
-          prop="joinIdArray"
-          label-width="150px"
-          style="display: block"
-        >
-          <div v-if="formType === 'detail'" class="item_width_1">
-            {{ formData.joinNames }}
-          </div>
-          <el-cascader
-            v-else
-            class="item_width_1"
-            ref="myCascader_join"
-            v-model="formData.joinIdArray"
-            :key="joinIscascaderShow"
-            :options="joinOptions"
-            :props="joinOptionProps"
-            :show-all-levels="false"
-            @change="handleChangeJoinOrg"
-          ></el-cascader>
+        <el-form-item label="参加活动党组织"
+                      prop="joinIdArray"
+                      label-width="150px"
+                      style="display: block">
+          <div v-if="formType==='detail'"
+               class="item_width_1">{{formData.joinNames}}</div>
+          <el-cascader v-else
+                       class="item_width_1"
+                       ref="myCascader_join"
+                       v-model="formData.joinIdArray"
+                       :key="joinIscascaderShow"
+                       :options="joinOptions"
+                       :props="joinOptionProps"
+                       :show-all-levels="false"
+                       @change="handleChangeJoinOrg"></el-cascader>
         </el-form-item>
 
-        <el-form-item
-          label="参加人员"
-          prop="joinUserType"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            class="item_width_1"
-            v-model="formData.joinUserType"
-            placeholder="请选择"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="item in joinArray"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+        <el-form-item label="参加人员"
+                      prop="joinUserType"
+                      label-width="150px"
+                      style="display: block">
+          <el-select class="item_width_1"
+                     v-model="formData.joinUserType"
+                     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="isAutoInform"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox :label="'是'"
+                       v-model="isAutoInform"></el-checkbox>
         </el-form-item>
 
-        <el-form-item
-          label="自动通知参加人员"
-          prop="isAutoInform"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-checkbox :label="'是'" v-model="isAutoInform"></el-checkbox>
-        </el-form-item> -->
-
-        <!-- <el-form-item
-          label="活动介绍"
-          prop="introduce"
-          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.introduce"
-          ></el-input>
-        </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 label="活动介绍"
+                      prop="introduce"
+                      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.introduce"></el-input>
         </el-form-item>
-        <el-form-item
-          class="block"
-          label="封面"
-          label-width="150px"
-          prop="attach"
-        >
-          <el-upload
-            :headers="$getElUploadHeaders()"
-            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"
-            :on-preview="(item) => handlePreview(item.url)"
-            :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-form-item class="block"
+                      label="附件"
+                      label-width="150px"
+                      prop="attach">
+          <el-upload :headers="$getElUploadHeaders()"
+                     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"
+                     :on-preview="item => handlePreview(item.url)"
+                     :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
-      >
+      <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 Tinymce from "@c/tinymce2/index.vue";
+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,
       publishOptions: [],
@@ -259,10 +198,10 @@ export default {
       iscascaderShow: 0,
       publichOptionProps: {
         multiple: false,
-        value: "id",
-        label: "partyOrgName",
-        children: "children",
-        checkStrictly: true,
+        value: 'id',
+        label: 'partyOrgName',
+        children: 'children',
+        checkStrictly: true
       },
 
       joinOptions: [],
@@ -270,92 +209,98 @@ export default {
       joinIscascaderShow: 0,
       joinOptionProps: {
         multiple: true,
-        value: "id",
-        label: "partyOrgName",
-        children: "children",
-        checkStrictly: false,
+        value: 'id',
+        label: 'partyOrgName',
+        children: 'children',
+        checkStrictly: false
       },
 
       categrayArray: [],
 
       formData: {
-        icPartyActId: "", //编辑活动时必传
-        actType: "", //	活动类型，来源于活动类型接口value
-        holdYearId: "", //活动开始时间所属年份：yyyy
-        holdMonthId: "", //活动开始时间所属月份：yyyyMM
-        holdTime: "", //活动开始时间：yyyy-MM-dd HH:mm:ss
-        topic: "", //	活动主题
-        address: "", //	活动地址
-        latitude: "", //活动地点纬度
-        longitude: "", //	活动地点经度
-        autoPublicType: "", //自动发布时间key; 来源于字典表接口
-        publishPartyOrgId: "", //	发布活动党组织id
-        publishPartyOrgName: "", //	发布活动党组织名称
-        publishOrgPid: "", //	参加活动党组织ID的上级节点
-        publishOrgType: "", //党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
-        publishOrgPathShow: "", //PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
-        joinUserType: "", //参加人员类型，0：全体党员；1：支部委员
-        isAutoInform: "", //	是否自动通知参加人员，0否；1是
-        introduce: "", //	活动介绍
+        icPartyActId: '',//编辑活动时必传	
+        actType: '',//	活动类型，来源于活动类型接口value	
+        holdYearId: '',//活动开始时间所属年份：yyyy	
+        holdMonthId: '',//活动开始时间所属月份：yyyyMM	
+        holdTime: '',//活动开始时间：yyyy-MM-dd HH:mm:ss
+        topic: '',//	活动主题	
+        address: '',//	活动地址	
+        latitude: '',//活动地点纬度	
+        longitude: '',//	活动地点经度	
+        autoPublicType: '',//自动发布时间key; 来源于字典表接口	
+        publishPartyOrgId: '',//	发布活动党组织id	
+        publishPartyOrgName: '',//	发布活动党组织名称	
+        publishOrgPid: '',//	参加活动党组织ID的上级节点	
+        publishOrgType: '',//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组	
+        publishOrgPathShow: '',//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显	
+        joinUserType: '',//参加人员类型，0：全体党员；1：支部委员	
+        isAutoInform: '',//	是否自动通知参加人员，0否；1是	
+        introduce: '',//	活动介绍
         joinOrgList: [],
         attachmentList: [],
         joinIdArray: [],
         publichIdArray: [],
+
       },
       isAutoInform: false,
 
       autoTimeArray: [],
 
-      joinArray: [
-        //参加人员
+      joinArray: [//参加人员
         {
-          value: "0",
-          label: "全体党员",
+          value: '0',
+          label: '全体党员'
         },
         {
-          value: "1",
-          label: "支部委员",
+          value: '1',
+          label: '支部委员'
         },
       ],
 
       fileList: [],
-      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
-    };
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+
+    }
   },
 
   watch: {
     "formData.holdTime": function (val) {
-      let array = val.split("-");
-      this.formData.holdYearId = array[0];
-      this.formData.holdMonthId = array[0] + array[1];
-    },
+      let array = val.split('-')
+      this.formData.holdYearId = array[0]
+      this.formData.holdMonthId = array[0] + array[1]
+    }
   },
-  components: {Tinymce},
-  async mounted() {
-    this.startLoading();
+  components: {},
+  async mounted () {
+    this.startLoading()
+
 
-    await this.getCategrayList();
-    await this.getAutoTimeArray();
-    await this.getOrgTreeList();
-    await this.getJoinOrgTreeList();
+    await this.getCategrayList()
+    await this.getAutoTimeArray()
+    await this.getOrgTreeList()
+    await this.getJoinOrgTreeList()
 
     if (this.icPartyActId) {
-      await this.loadInfo();
+      await this.loadInfo()
+
     } else {
       this.$refs.ref_form.resetFields();
     }
     if (this.defaultTime) {
-      let year = this.defaultTime.substring(0, 4);
-      let month = this.defaultTime.substring(4, 6);
-      let day = this.defaultTime.substring(6, 8);
+      console.log('this.defaultTime', this.defaultTime)
+      let year = this.defaultTime.substring(0, 4)
+      let month = this.defaultTime.substring(4, 6)
+      let day = this.defaultTime.substring(6, 8)
+
+      this.formData.holdTime = year + '-' + month + '-' + day + ' 09:00:00'
 
-      this.formData.holdTime = year + "-" + month + "-" + day + " 09:00:00";
     }
-    this.endLoading();
+    this.endLoading()
+
   },
 
   methods: {
-    getFormatDate() {
+    getFormatDate () {
       var date = new Date();
       var month = date.getMonth() + 1;
       var strDate = date.getDate();
@@ -365,460 +310,466 @@ export default {
       if (strDate >= 0 && strDate <= 9) {
         strDate = "0" + strDate;
       }
-      var currentDate =
-        date.getFullYear() + "-" + month + "-" + strDate + " " + "09:00:00";
+      var currentDate = date.getFullYear() + "-" + month + "-" + strDate
+        + " " + '09:00:00';
       return currentDate;
     },
-    handleChangeScope(value) {
-      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
+    handleChangeScope (value) {
+
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
 
       if (obj) {
-        this.formData.publishPartyOrgId = obj.id; //发布活动党组织id
-        this.formData.publishPartyOrgName = obj.partyOrgName; //发布活动党组织名称
-        this.formData.publishOrgPid = obj.pid; //发布活动党组织ID的上级节点
-        this.formData.publishOrgType = obj.partyOrgType; //党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
-        this.formData.publishOrgPathShow = value.join(":"); //PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
+        this.formData.publishPartyOrgId = obj.id//发布活动党组织id	
+        this.formData.publishPartyOrgName = obj.partyOrgName//发布活动党组织名称	
+        this.formData.publishOrgPid = obj.pid//发布活动党组织ID的上级节点	
+        this.formData.publishOrgType = obj.partyOrgType//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组	
+        this.formData.publishOrgPathShow = value.join(':')//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显	
       } else {
-        this.formData.publishPartyOrgId = "";
-        this.formData.publishPartyOrgName = "";
-        this.formData.publishOrgPid = "";
-        this.formData.publishOrgType = "";
-        this.formData.publishOrgPathShow = "";
+        this.formData.publishPartyOrgId = ''
+        this.formData.publishPartyOrgName = ''
+        this.formData.publishOrgPid = ''
+        this.formData.publishOrgType = ''
+        this.formData.publishOrgPathShow = ''
       }
     },
 
-    handleChangeJoinOrg(value) {
-      console.log("value", value);
-      console.log("joinIdArray", this.formData.joinIdArray);
-      this.formData.joinIdArray = [];
-      this.formData.joinIdArray = value;
-      this.formData.joinOrgList = [];
-      let selArray = this.$refs["myCascader_join"].getCheckedNodes();
+    handleChangeJoinOrg (value) {
+      console.log('value', value)
+      console.log('joinIdArray', this.formData.joinIdArray)
+      this.formData.joinIdArray = []
+      this.formData.joinIdArray = value
+      this.formData.joinOrgList = []
+      let selArray = this.$refs["myCascader_join"].getCheckedNodes()
 
-      console.log("selArray", selArray);
+      console.log('selArray', selArray)
 
       selArray.forEach((element, index) => {
+
         let obj = {
           joinOrgId: element.data.id,
           orgType: element.data.partyOrgType,
           pid: element.data.pid,
-          joinOrgPathShow: element.path.join(":"),
+          joinOrgPathShow: element.path.join(':'),
           joinOrgName: element.data.partyOrgName,
-        };
-        this.formData.joinOrgList.push(obj);
+        }
+        this.formData.joinOrgList.push(obj)
       });
+
     },
 
-    async handleComfirm() {
-      this.btnDisable = true;
+    async handleComfirm () {
+
+      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) {
           // app.util.validateRule(messageObj)
-          this.btnDisable = false;
+          this.btnDisable = false
         } else {
-          this.addActivity();
+          this.addActivity()
+
         }
-      });
+
+      })
+
     },
 
-    async addActivity() {
+    async addActivity () {
       // debugger
 
       if (this.isAutoInform) {
-        this.formData.isAutoInform = "1";
+        this.formData.isAutoInform = '1'
       } else {
-        this.formData.isAutoInform = "0";
+        this.formData.isAutoInform = '0'
       }
-      this.formData.attachmentList = [...this.fileList];
+      this.formData.attachmentList = [...this.fileList]
       /*let array = this.formData.holdTime.split('-')
       this.formData.holdYearId = array[0]
       this.formData.holdMonthId = array[0] + array[1]*/
 
-      if (this.formType === "add") {
-        this.formData.icPartyActId = "";
+      if (this.formType === 'add') {
+        this.formData.icPartyActId = ''
       }
-      console.log(this.formData);
-      const url = "/resi/partymember/icPartyAct/addOrUpdate";
+      console.log(this.formData)
+      const url = '/resi/partymember/icPartyAct/addOrUpdate'
       // const url = 'http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/addOrUpdate'
       let params = {
-        ...this.formData,
-      };
 
-      const { data, code, msg } = await requestPost(url, params);
+        ...this.formData
+      }
+
+      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)
       }
     },
 
-    async loadInfo() {
+    async loadInfo () {
       const url = `/resi/partymember/icPartyAct/act-detail/${this.icPartyActId}`;
       // 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.publichIdArray = [];
+        this.formData = { ...data }
+        this.formData.publichIdArray = []
         if (data.publishOrgPathShow) {
-          this.formData.publichIdArray = data.publishOrgPathShow.split(":");
+          this.formData.publichIdArray = data.publishOrgPathShow.split(':')
         } else {
-          let array = data.publishOrgPath.split(":");
-          array.forEach((element) => {
+          let array = data.publishOrgPath.split(':')
+          array.forEach(element => {
             if (this.isInTree(element)) {
-              this.formData.publichIdArray.push(element);
+              this.formData.publichIdArray.push(element)
             }
+
           });
         }
 
-        this.formData.joinIdArray = [];
-        this.formData.joinNames = "";
-        data.joinOrgList.forEach((element) => {
+        this.formData.joinIdArray = []
+        this.formData.joinNames = ''
+        data.joinOrgList.forEach(element => {
           if (element.joinOrgPathShow) {
-            this.formData.joinIdArray.push(element.joinOrgPathShow.split(":"));
+            this.formData.joinIdArray.push(element.joinOrgPathShow.split(':'))
           } else {
-            let array = element.joinOrgPath.split(":");
-            let joinIdTemp = [];
-            array.forEach((element) => {
+            let array = element.joinOrgPath.split(':')
+            let joinIdTemp = []
+            array.forEach(element => {
               if (this.isInTree(element)) {
-                joinIdTemp.push(element);
+                joinIdTemp.push(element)
               }
+
             });
 
-            this.formData.joinIdArray.push(joinIdTemp);
+            this.formData.joinIdArray.push(joinIdTemp)
           }
 
-          this.formData.joinNames =
-            this.formData.joinNames + element.joinOrgName + ",";
+          this.formData.joinNames = this.formData.joinNames + element.joinOrgName + ','
+
         });
 
-        console.log("info-joinIdArray", this.formData.joinIdArray);
+        console.log('info-joinIdArray', this.formData.joinIdArray)
 
         if (this.formData.joinNames) {
-          this.formData.joinNames = this.formData.joinNames.substring(
-            0,
-            this.formData.joinNames.length - 1
-          );
+          this.formData.joinNames = this.formData.joinNames.substring(0, this.formData.joinNames.length - 1)
         }
-        this.isAutoInform = this.formData.isAutoInform == "1";
+        this.isAutoInform = this.formData.isAutoInform == '1'
+
+        this.fileList = [... this.formData.attachmentList]
 
-        this.fileList = [...this.formData.attachmentList];
       } else {
-        this.$message.error(msg);
+        this.$message.error(msg)
       }
     },
 
     //剔除树上没有的id
-    isInTree(id) {
-      let inTree = false;
+    isInTree (id) {
+      let inTree = false
       const fn = (obj) => {
         if (Array.isArray(obj)) {
+
+
           obj.forEach((item) => {
-            //
+            //  
             if (item.id === id) {
-              inTree = true;
+              inTree = true
             } else {
+
             }
 
             fn(item.children);
           });
+
         }
+
+
       };
       fn(this.publishOptions);
-      return inTree;
+      return inTree
+
     },
 
     // 活动类型
-    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 getAutoTimeArray() {
-      const url = "/sys/dict/data/dictlist";
+    async getAutoTimeArray () {
+      const url = "/sys/dict/data/dictlist"
 
       let params = {
-        dictType: "icpartyact_auto_publish_time",
-      };
+        dictType: 'icpartyact_auto_publish_time'
+      }
 
-      const { data, code, msg } = await requestPost(url, params);
+      const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.autoTimeArray = data;
+        this.autoTimeArray = data
 
-        this.autoTimeArray.forEach((element) => {
-          element.value = parseInt(element.value);
+        this.autoTimeArray.forEach(element => {
+          element.value = parseInt(element.value)
         });
       } else {
-        this.$message.error(msg);
+        this.$message.error(msg)
       }
     },
 
-    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.publishOptions = data;
-        this.joinOptions = data;
-        this.changeKey(this.joinOptions);
+
+        this.publishOptions = data
+        this.joinOptions = data
+        this.changeKey(this.joinOptions)
+
       } else {
       }
+
+
     },
 
-    changeKey(arr) {
+    changeKey (arr) {
       for (var i = 0; i < arr.length; i++) {
-        arr[i].value = arr[i].userId;
-        arr[i].label = arr[i].userName;
+        arr[i].value = arr[i].userId
+        arr[i].label = arr[i].userName
         if (arr[i].children.length) {
-          this.changeKey(arr[i].children);
+          this.changeKey(arr[i].children)
         } else {
-          delete arr[i].children;
+          delete arr[i].children
         }
       }
     },
 
     //加载组织
-    async getJoinOrgTreeList() {
-      const url = "/resi/partymember/icPartyOrg/getOrgTreeHaveGroup";
+    async getJoinOrgTreeList () {
+      const url = '/resi/partymember/icPartyOrg/getOrgTreeHaveGroup'
       // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceOrg/selectlist'
       let params = {
-        agencyId: localStorage.getItem("agencyId"),
-      };
+        agencyId: localStorage.getItem('agencyId')
 
-      const { data, code, msg } = await requestPost(url, params);
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
         // this.joinOptions = data
       } else {
-        this.$message.error(msg);
+        this.$message.error(msg)
       }
     },
 
-    handlePreview(src) {
-      console.log(src);
+
+    handlePreview (src) {
+      console.log(src)
       if (src) {
         window.open(src);
       }
     },
 
-    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",
-      ];
+
+    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;
+        this.$message.error('只支持图片、word、pdf')
+        return false
       }
+
     },
 
-    handleFileRemove(file) {
+    handleFileRemove (file) {
+
       if (file && file.status === "success") {
-        this.fileList.splice(
-          this.fileList.findIndex((item) => item.uid === file.uid),
-          1
-        );
+        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];
+    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"];
+        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.format = "image";
+          file.format = 'image'
         } else if (videoarray.indexOf(fileType) > -1) {
-          file.format = "video";
+          file.format = 'video'
         } else if (docArray.indexOf(fileType) > -1) {
-          file.format = "doc";
+          file.format = 'doc'
         } else if (mp3Array.indexOf(fileType) > -1) {
-          file.format = "voice";
+          file.format = 'voice'
         }
 
-        file.url = res.data.url;
-        file.type = fileType;
+        file.url = res.data.url
+        file.type = fileType
 
         // file.attachmentName = file.name
         // file.attachmentType = file.type
         // file.attachmentUrl = file.url
-        file.format = file.attachmentFormat;
+        file.format = file.attachmentFormat
+
 
-        this.fileList.push(file);
-        console.log(this.fileList);
-      } else this.$message.error(res.msg);
+        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");
+    handleFileDownload (file) {
+
+      var a = document.createElement('a');
+      var event = new MouseEvent('click');
       a.download = file.name;
-      console.log(a);
+      console.log(a)
       a.href = file.url;
       a.dispatchEvent(event);
+
+
     },
-    handleCancle() {
-      this.resetData();
-      this.$emit("handleClose");
+    handleCancle () {
+      this.resetData()
+      this.$emit('handleClose')
+
     },
 
-    resetData() {
+
+
+    resetData () {
+
       this.formData = {
-        icPartyActId: "", //编辑活动时必传
-        actType: "", //	活动类型，来源于活动类型接口value
-        holdYearId: "", //活动开始时间所属年份：yyyy
-        holdMonthId: "", //活动开始时间所属月份：yyyyMM
-        holdTime: "", //活动开始时间：yyyy-MM-dd HH:mm:ss
-        topic: "", //	活动主题
-        address: "", //	活动地址
-        latitude: "", //活动地点纬度
-        longitude: "", //	活动地点经度
-        autoPublicType: "", //自动发布时间key; 来源于字典表接口
-        publishPartyOrgId: "", //	发布活动党组织id
-        publishPartyOrgName: "", //	发布活动党组织名称
-        publishOrgPid: "", //	参加活动党组织ID的上级节点
-        publishOrgType: "", //党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
-        publishOrgPathShow: "", //PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
-        joinUserType: "", //参加人员类型，0：全体党员；1：支部委员
-        isAutoInform: "", //	是否自动通知参加人员，0否；1是
-        introduce: "", //	活动介绍
+        icPartyActId: '',//编辑活动时必传	
+        actType: '',//	活动类型，来源于活动类型接口value	
+        holdYearId: '',//活动开始时间所属年份：yyyy	
+        holdMonthId: '',//活动开始时间所属月份：yyyyMM	
+        holdTime: '',//活动开始时间：yyyy-MM-dd HH:mm:ss	
+        topic: '',//	活动主题	
+        address: '',//	活动地址	
+        latitude: '',//活动地点纬度	
+        longitude: '',//	活动地点经度	
+        autoPublicType: '',//自动发布时间key; 来源于字典表接口	
+        publishPartyOrgId: '',//	发布活动党组织id	
+        publishPartyOrgName: '',//	发布活动党组织名称	
+        publishOrgPid: '',//	参加活动党组织ID的上级节点	
+        publishOrgType: '',//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组	
+        publishOrgPathShow: '',//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显	
+        joinUserType: '',//参加人员类型，0：全体党员；1：支部委员	
+        isAutoInform: '',//	是否自动通知参加人员，0否；1是	
+        introduce: '',//	活动介绍
         joinOrgList: [],
         attachmentList: [],
         joinIdArray: [],
-        publichIdArray: [],
-      };
+        publichIdArray: []
+
+      }
+
     },
     // 开启加载动画
-    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 {
+
         actType: [
-          { required: true, message: "活动类型不能为空", trigger: "change" },
+          { required: true, message: '活动类型不能为空', trigger: 'change' },
         ],
-        introduce: [
-          { required: true, message: "活动介绍不能为空", trigger: "change" },
+        holdTime: [
+          { required: true, message: '活动举办时间不能为空', trigger: 'change' }
         ],
-        // holdTime: [
-        //   {
-        //     required: true,
-        //     message: "活动举办时间不能为空",
-        //     trigger: "change",
-        //   },
-        // ],
 
         topic: [
-          { required: true, message: "活动主题不能为空", trigger: "change" },
+          { required: true, message: '活动主题不能为空', trigger: 'change' }
         ],
-        // address: [
-        //   { required: true, message: "活动地点不能为空", trigger: "change" },
-        // ],
-        // autoPublicType: [
-        //   {
-        //     required: true,
-        //     message: "自动发布时间不能为空",
-        //     trigger: "change",
-        //   },
-        // ],
-        // joinUserType: [
-        //   { required: true, message: "参加人员不能为空", trigger: "change" },
-        // ],
-        // joinIdArray: [
-        //   {
-        //     required: true,
-        //     message: "参加活动党组织不能为空",
-        //     trigger: "change",
-        //   },
-        // ],
-        // publichIdArray: [
-        //   {
-        //     required: true,
-        //     message: "发布活动党组织不能为空",
-        //     trigger: "change",
-        //   },
-        // ],
-      };
+        address: [
+          { required: true, message: '活动地点不能为空', trigger: 'change' }
+        ],
+        autoPublicType: [
+          { required: true, message: '自动发布时间不能为空', trigger: 'change' }
+        ],
+        joinUserType: [
+          { required: true, message: '参加人员不能为空', trigger: 'change' }
+        ],
+        joinIdArray: [
+          { required: true, message: '参加活动党组织不能为空', trigger: 'change' }
+        ],
+        publichIdArray: [
+          { required: true, message: '发布活动党组织不能为空', trigger: 'change' }
+        ],
+
+      }
     },
+
+
   },
   props: {
-    formType: {
-      //表单操作类型 add新增，edit编辑，detail详情
+
+    formType: { //表单操作类型 add新增，edit编辑，detail详情
       type: String,
-      required: "",
+      required: ''
     },
     icPartyActId: {
       type: String,
-      required: "",
+      required: ''
     },
     defaultTime: {
       type: String,
-      required: "",
+      required: ''
     },
-  },
-};
+
+  }
+}
 </script>
 
-<style lang="scss" scoped>
+
+<style lang="scss" scoped >
 @import "@/assets/scss/modules/management/form-main.scss";
 </style>