diff --git a/src/utils/date.js b/src/utils/date.js index a89836b..8c0331e 100644 --- a/src/utils/date.js +++ b/src/utils/date.js @@ -13,3 +13,12 @@ export function getMonthFirstDay() { export function getMonthLastDay() { return dayjs().endOf('month').format('YYYY-MM-DD') } + +// 获取本月第一天和当前天前一天的日期,如果当天为本月第一天,则返回上月第一天和上月最后一天 +export function getMonthFirstDayAndBeforeDay() { + const isFirstDate = new Date().getDate() === 1 + if (isFirstDate) { + return [dayjs().add(-1, 'month').startOf('month').format('YYYY-MM-DD'), dayjs().add(-1, 'month').endOf('month').format('YYYY-MM-DD')] + } + return [getMonthFirstDay(), getBeforeDays(1)] +} diff --git a/src/views/framework/architecture/azjg2.vue b/src/views/framework/architecture/azjg2.vue index 4dab8c4..59e9e9b 100644 --- a/src/views/framework/architecture/azjg2.vue +++ b/src/views/framework/architecture/azjg2.vue @@ -419,12 +419,9 @@ export default { this.avaerInfoList = res.data }) getMemberSettlePeriod().then((res) => { - this.memberSettlePeriodList = res.data - this.memberSettlePeriodList.forEach((ele) => { - if (ele.isThisDay == 0) { - this.queryParams.memberSettlePeriodId = ele.pkId - } - }) + const tempList = res.data || [] + this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1) + this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId }) }, // 鼠标移入 diff --git a/src/views/framework/architecture/azjg3.vue b/src/views/framework/architecture/azjg3.vue index e8867ff..ad43570 100644 --- a/src/views/framework/architecture/azjg3.vue +++ b/src/views/framework/architecture/azjg3.vue @@ -385,12 +385,9 @@ export default { this.avaerInfoList = res.data }) getMemberSettlePeriod().then((res) => { - this.memberSettlePeriodList = res.data - this.memberSettlePeriodList.forEach((ele) => { - if (ele.isThisDay == 0) { - this.queryParams.memberSettlePeriodId = ele.pkId - } - }) + const tempList = res.data || [] + this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1) + this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId }) }, // 鼠标移入 diff --git a/src/views/framework/architecture/azjg5.vue b/src/views/framework/architecture/azjg5.vue index bde8c87..863e76c 100644 --- a/src/views/framework/architecture/azjg5.vue +++ b/src/views/framework/architecture/azjg5.vue @@ -219,12 +219,9 @@ export default { }, getAvarerInfo() { getMemberSettlePeriod().then((res) => { - this.memberSettlePeriodList = res.data - this.memberSettlePeriodList.forEach((ele) => { - if (ele.isThisDay == 0) { - this.queryParams.memberSettlePeriodId = ele.pkId - } - }) + const tempList = res.data || [] + this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1) + this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId }) }, // 鼠标移入 diff --git a/src/views/framework/architecture/index.vue b/src/views/framework/architecture/index.vue index 7cbf3fd..6d5b8f8 100644 --- a/src/views/framework/architecture/index.vue +++ b/src/views/framework/architecture/index.vue @@ -445,12 +445,9 @@ export default { this.avaerInfoList = res.data }) getMemberSettlePeriod().then((res) => { - this.memberSettlePeriodList = res.data - this.memberSettlePeriodList.forEach((ele) => { - if (ele.isThisDay == 0) { - this.queryParams.memberSettlePeriodId = ele.pkId - } - }) + const tempList = res.data || [] + this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1) + this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId }) }, // 鼠标移入 diff --git a/src/views/framework/recommend/index.vue b/src/views/framework/recommend/index.vue index c90b472..ff7f804 100644 --- a/src/views/framework/recommend/index.vue +++ b/src/views/framework/recommend/index.vue @@ -2,51 +2,46 @@
+ />
+ clearable + /> + /> + clearable + /> - +
@@ -65,65 +60,65 @@
-