Merge branch 'dev-calendar' into dev

src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue

@@ -72,9 +72,9 @@
                      class="diy-button--delete"
                      size="small"
                      @click="deleteBatch">批量删除</el-button>
-          <!--<el-button @click="handleExport"
-                     class="diy-button&#45;&#45;reset"
-                     size="small">导出</el-button>-->
+          <el-button @click="handleExport"
+                     class="diy-button--reset"
+                     size="small">导出</el-button>
         </div>
 
         <el-table :data="tableData"
@@ -110,6 +110,19 @@
                            :show-overflow-tooltip="true">
           </el-table-column>
 
+          <el-table-column prop="isPublic"
+                           label="是否公开"
+                           align="center"
+                           :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+            <span v-for="(item, index) in isPublicList"
+                  :key="item.value"
+                  :value="item.label"
+                  v-if="scope.row.isPublic == item.value">
+              {{ item.label }}</span>
+            </template>
+          </el-table-column>
+
           <el-table-column prop="remark"
                            align="center"
                            width="150"
@@ -407,6 +420,42 @@ export default {
       this.showAdd = true;
     },
 
+    async handleExport () {
+      const url = "/resi/partymember/icSchedule/export";
+      // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/export-act";
+      const { pageSize, pageNo, formData } = this;
+      axios({
+        url: window.SITE_CONFIG["apiURL"] + url,
+        method: "post",
+        data: {
+          pageSize,
+          pageNo,
+          ...formData,
+        },
+        responseType: "blob",
+      })
+        .then((res) => {
+          let fileName = window.decodeURI(
+                  res.headers["content-disposition"].split(";")[1].split("=")[1]
+          );
+          console.log("filename", fileName);
+          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+          var url = window.URL.createObjectURL(blob);
+          var aLink = document.createElement("a");
+          aLink.style.display = "none";
+          aLink.href = url;
+          aLink.setAttribute("download", fileName);
+          document.body.appendChild(aLink);
+          aLink.click();
+          document.body.removeChild(aLink); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log("获取导出情失败", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
     async handlePublish (row) {
       this.icPartyActId = row.icPartyActId