-
-
-
-
-
-
-
{{ item.day }}
-
张三，李四
-
王五，赵六
-
-
+
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index 61ec69266..a7e55f2a4 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -1,6 +1,52 @@
-
+
+
+
+
+
+
+ 主题当日 (已发布)
+
+
巴拉巴拉巴拉巴拉巴拉巴拉巴拉巴拉
+
+
@@ -15,12 +61,28 @@ export default {
calendar,
},
data() {
- return {};
+ let todayObj = new Date();
+
+ return {
+ currentYearStr: todayObj.getFullYear() + "",
+ currentMonth: todayObj.getMonth(),
+ };
+ },
+ computed: {
+ currentYear() {
+ return parseInt(this.currentYearStr);
+ },
},
async mounted() {
// await this.getPartyOggList()
},
methods: {
+ handleChangeDate(item) {
+ console.log("handleChangeDate");
+ this.currentYearStr = item.year + "";
+ this.currentMonth = item.month;
+ },
+
async getPartyOggList() {
const url = "/resi/partymember/icPartyOrg/getSearchTreelist";
let params = {
@@ -38,8 +100,133 @@ export default {
From a567f592c050a7fa5704cc62a84e3f043bec0dc0 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 17 Aug 2022 17:18:26 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E5=8F=88=E6=94=B9=E4=BA=86=E5=AF=BC?=
=?UTF-8?q?=E5=87=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/cpts/baobiao/index.vue | 44 ++++++++++++++++++++++--
1 file changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/views/modules/cpts/baobiao/index.vue b/src/views/modules/cpts/baobiao/index.vue
index f068168b1..d7adbdb5a 100644
--- a/src/views/modules/cpts/baobiao/index.vue
+++ b/src/views/modules/cpts/baobiao/index.vue
@@ -43,6 +43,7 @@
import { Loading } from "element-ui"; // 引入Loading服务
import { requestPost, requestGet } from "@/js/dai/request";
import { mapGetters } from "vuex";
+import axios from "axios";
export default {
data() {
@@ -130,9 +131,13 @@ export default {
if (code === 0) {
let token = localStorage.getItem("token");
let prefix = window.SITE_CONFIG["apiURL"].slice(0, -4);
- window.open(
- `${prefix}/jmreport/view/${reportId}?token=${token}¶mKey=${data.paramKey}`
- );
+ if (item.isList) {
+ this.exportAll(reportId, data.paramKey);
+ } else {
+ window.open(
+ `${prefix}/jmreport/view/${reportId}?token=${token}¶mKey=${data.paramKey}`
+ );
+ }
// this.visible = false;
this.$emit("afterFillIn");
@@ -140,6 +145,39 @@ export default {
this.$message.error(msg);
}
},
+
+ async exportAll(reportId, paramKey) {
+ const url = "/oper/customize/icCustomerReport/batch-export";
+ axios({
+ url: window.SITE_CONFIG["apiURL"] + url,
+ method: "post",
+ data: {
+ reportId,
+ paramKey,
+ },
+ 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/zip" });
+ 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("网络错误");
+ });
+ },
},
};
From 91ac5a34253f083c03bf38d89b6cbe160b5dc154 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 17 Aug 2022 17:44:54 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=8F=88=E8=AF=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/cpts/baobiao/index.vue | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/modules/cpts/baobiao/index.vue b/src/views/modules/cpts/baobiao/index.vue
index d7adbdb5a..95d3f21ac 100644
--- a/src/views/modules/cpts/baobiao/index.vue
+++ b/src/views/modules/cpts/baobiao/index.vue
@@ -119,7 +119,7 @@ export default {
},
async fillIn(item) {
- const { reportId } = item;
+ const { reportId, reportName } = item;
const url = "/oper/customize/icCustomerReport/preview";
const parmas = {
...this.elseParams,
@@ -132,7 +132,7 @@ export default {
let token = localStorage.getItem("token");
let prefix = window.SITE_CONFIG["apiURL"].slice(0, -4);
if (item.isList) {
- this.exportAll(reportId, data.paramKey);
+ this.exportAll(reportId, data.paramKey, reportName);
} else {
window.open(
`${prefix}/jmreport/view/${reportId}?token=${token}¶mKey=${data.paramKey}`
@@ -146,7 +146,7 @@ export default {
}
},
- async exportAll(reportId, paramKey) {
+ async exportAll(reportId, paramKey, reportName) {
const url = "/oper/customize/icCustomerReport/batch-export";
axios({
url: window.SITE_CONFIG["apiURL"] + url,
@@ -158,9 +158,11 @@ export default {
responseType: "blob",
})
.then((res) => {
- let fileName = window.decodeURI(
- res.headers["content-disposition"].split(";")[1].split("=")[1]
- );
+ console.log("批量导出接口返回", res);
+ // let fileName = window.decodeURI(
+ // res.headers["content-disposition"].split(";")[1].split("=")[1]
+ // );
+ let fileName = reportName;
console.log("filename", fileName);
let blob = new Blob([res.data], { type: "application/zip" });
var url = window.URL.createObjectURL(blob);
From d73cf39b1295c7280b96712225c49b2acc885d51 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 18 Aug 2022 09:11:33 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E6=94=B9=E6=94=B9=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/communityParty/calendar/cpts/calendar.vue | 3 ++-
src/views/modules/communityParty/calendar/index.vue | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index 2aeaebd44..bc0b1e4f3 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -66,7 +66,8 @@ export default {
// 获取第一天是周几
const weekDay = currentFirstDay.getDay();
// 用当前月份第一天减去周几前面几天，就是看见的日历的第一天
- const startDay = currentFirstDay - (weekDay - 1) * 24 * 3600 * 1000;
+ const startDay =
+ currentFirstDay - ((weekDay == 0 ? 7 : weekDay) - 1) * 24 * 3600 * 1000;
// 我们统一用42天来显示当前显示日历
let calendarArr = [];
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index a7e55f2a4..15d3deb77 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -26,7 +26,9 @@