src/utils/date.js

@@ -13,12 +13,3 @@ 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)]
-}

src/views/framework/architecture/azjg2.vue

@@ -419,9 +419,12 @@ export default {
         this.avaerInfoList = res.data
       })
       getMemberSettlePeriod().then((res) => {
-        const tempList = res.data || []
-        this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
-        this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
+        this.memberSettlePeriodList = res.data
+        this.memberSettlePeriodList.forEach((ele) => {
+          if (ele.isThisDay == 0) {
+            this.queryParams.memberSettlePeriodId = ele.pkId
+          }
+        })
       })
     },
     // 鼠标移入

src/views/framework/architecture/azjg3.vue

@@ -385,9 +385,12 @@ export default {
         this.avaerInfoList = res.data
       })
       getMemberSettlePeriod().then((res) => {
-        const tempList = res.data || []
-        this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
-        this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
+        this.memberSettlePeriodList = res.data
+        this.memberSettlePeriodList.forEach((ele) => {
+          if (ele.isThisDay == 0) {
+            this.queryParams.memberSettlePeriodId = ele.pkId
+          }
+        })
       })
     },
     // 鼠标移入

src/views/framework/architecture/azjg5.vue

@@ -219,9 +219,12 @@ export default {
     },
     getAvarerInfo() {
       getMemberSettlePeriod().then((res) => {
-        const tempList = res.data || []
-        this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
-        this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
+        this.memberSettlePeriodList = res.data
+        this.memberSettlePeriodList.forEach((ele) => {
+          if (ele.isThisDay == 0) {
+            this.queryParams.memberSettlePeriodId = ele.pkId
+          }
+        })
       })
     },
     // 鼠标移入

src/views/framework/architecture/index.vue

@@ -445,9 +445,12 @@ export default {
         this.avaerInfoList = res.data
       })
       getMemberSettlePeriod().then((res) => {
-        const tempList = res.data || []
-        this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
-        this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
+        this.memberSettlePeriodList = res.data
+        this.memberSettlePeriodList.forEach((ele) => {
+          if (ele.isThisDay == 0) {
+            this.queryParams.memberSettlePeriodId = ele.pkId
+          }
+        })
       })
     },
     // 鼠标移入

src/views/statistics/underDirectAdd.vue

@@ -270,8 +270,6 @@ import { getAwardsListChiose } from '@/api/level'
 import { getvertexValue } from '@/api/financialCase'
 import { userCountryList } from '@/api/site.js'
 import TopMemberSelect from '@/components/top-member-select'
-import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
-
 export default {
   name: 'Bzpz',
   components: {
@@ -308,10 +306,11 @@ export default {
     }
   },
   mounted() {
-    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
-    this.select.startPayTime = startDate
-    this.select.endPayTime = endDate
-    this.creationTime = [startDate, endDate]
+    var s1 = this.getStartTime()
+    var s2 = this.getEndTime()
+    this.select.startPayTime = s1
+    this.select.endPayTime = s2
+    this.creationTime = [s1, s2]
     // 获取列表
     this.getDataList()
     this.getData()
@@ -324,7 +323,25 @@ export default {
         this.getDataList()
       }
     },
-
+    getStartTime() {
+      const date = new Date()
+      date.setDate(1) // 将当前时间的日期设置成第一天
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day
+    },
+    getEndTime() {
+      const date = new Date()
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day + ' '
+    },
     // 真实奖衔下拉选
     getData() {
       getAwardsListChiose().then((res) => {
@@ -343,7 +360,25 @@ export default {
         this.orderTypeList = res.data
       })
     },
-
+    getStartTime() {
+      const date = new Date()
+      date.setDate(1) // 将当前时间的日期设置成第一天
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day
+    },
+    getEndTime() {
+      const date = new Date()
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getDate() === 1 ? date.getMonth() : date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day + ' '
+    },
     reset() {
       this.$refs.topMemberSelect.reset()
       this.select = {

src/views/statistics/underDirectAddNew.vue

@@ -230,7 +230,6 @@ import TopMemberSelect from '@/components/top-member-select'
 import { getAwardsListChiose } from '@/api/level'
 import { getvertexValue } from '@/api/financialCase'
 import { userCountryList } from '@/api/site.js'
-import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
 export default {
   name: 'UnderDirectAddNew',
   components: {
@@ -269,10 +268,11 @@ export default {
     }
   },
   mounted() {
-    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
-    this.select.startPayTime = startDate
-    this.select.endPayTime = endDate
-    this.creationTime = [startDate, endDate]
+    var s1 = this.getStartTime()
+    var s2 = this.getEndTime()
+    this.select.startPayTime = s1
+    this.select.endPayTime = s2
+    this.creationTime = [s1, s2]
     // 获取列表
     this.getDataList()
     this.getData()

src/views/statistics/underPlacementPer.vue

@@ -262,7 +262,6 @@ import { getcountryAllList } from '@/api/exchangerate'
 import { getvertexValue, getmemberTeamList } from '@/api/financialCase'
 import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
 import TopMemberSelect from '@/components/top-member-select/index.vue'
-import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
 export default {
   name: 'UnderPlacementPer',
   components: {
@@ -298,10 +297,11 @@ export default {
   created() {
     this.getSearch()
     this.getOthers()
-    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
-    this.queryParams.startPayTime = startDate
-    this.queryParams.endPayTime = endDate
-    this.queryParams.thetimes = [startDate, endDate]
+    var s1 = this.getStartTime()
+    var s2 = this.getEndTime()
+    this.queryParams.startPayTime = s1
+    this.queryParams.endPayTime = s2
+    this.queryParams.thetimes = [s1, s2]
   },
   methods: {
     isLocalSymbol,
@@ -312,6 +312,25 @@ export default {
         this.getSearch()
       }
     },
+    getStartTime() {
+      const date = new Date()
+      date.setDate(1) // 将当前时间的日期设置成第一天
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day
+    },
+    getEndTime() {
+      const date = new Date()
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day + ' '
+    },
     changeTime(val) {
       this.queryParams.startPayTime = val[0]
       this.queryParams.endPayTime = val[1]

src/views/statistics/underPlacementPerNew.vue

@@ -259,7 +259,6 @@ import { getcountryAllList } from '@/api/exchangerate'
 import { getvertexValue, getmemberTeamList } from '@/api/financialCase'
 import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
 import TopMemberSelect from '@/components/top-member-select/index.vue'
-import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
 export default {
   name: 'UnderPlacementPerNew',
   components: {
@@ -295,10 +294,11 @@ export default {
   created() {
     this.getSearch()
     this.getOthers()
-    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
-    this.queryParams.startPayTime = startDate
-    this.queryParams.endPayTime = endDate
-    this.queryParams.thetimes = [startDate, endDate]
+    var s1 = this.getStartTime()
+    var s2 = this.getEndTime()
+    this.queryParams.startPayTime = s1
+    this.queryParams.endPayTime = s2
+    this.queryParams.thetimes = [s1, s2]
   },
   methods: {
     isLocalSymbol,
@@ -309,6 +309,25 @@ export default {
         this.getSearch()
       }
     },
+    getStartTime() {
+      const date = new Date()
+      date.setDate(1) // 将当前时间的日期设置成第一天
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day
+    },
+    getEndTime() {
+      const date = new Date()
+      const year = date.getFullYear() // 得到当前年份
+      let month = date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      month = month >= 10 ? month : '0' + month // 补零
+      let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
+      day = day >= 10 ? day : '0' + day // 补零
+      return year + '-' + month + '-' + day + ' '
+    },
     changeTime(val) {
       this.queryParams.startPayTime = val[0]
       this.queryParams.endPayTime = val[1]