Merge branch 'bd-dev' of http://47.94.45.65:3000/angelo/web-base-admin into bd-test

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)]
+}

src/views/framework/architecture/azjg2.vue

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

src/views/framework/architecture/azjg3.vue

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

src/views/framework/architecture/azjg5.vue

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

src/views/framework/architecture/index.vue

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

src/views/statistics/underDirectAdd.vue

@@ -270,6 +270,8 @@ 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: {
@@ -306,11 +308,10 @@ export default {
     }
   },
   mounted() {
-    var s1 = this.getStartTime()
+    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
-    var s2 = this.getEndTime()
+    this.select.startPayTime = startDate
-    this.select.startPayTime = s1
+    this.select.endPayTime = endDate
-    this.select.endPayTime = s2
+    this.creationTime = [startDate, endDate]
-    this.creationTime = [s1, s2]
     // 获取列表
     this.getDataList()
     this.getData()
@@ -323,25 +324,7 @@ 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) => {
@@ -360,25 +343,7 @@ 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,6 +230,7 @@ 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: {
@@ -268,11 +269,10 @@ export default {
     }
   },
   mounted() {
-    var s1 = this.getStartTime()
+    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
-    var s2 = this.getEndTime()
+    this.select.startPayTime = startDate
-    this.select.startPayTime = s1
+    this.select.endPayTime = endDate
-    this.select.endPayTime = s2
+    this.creationTime = [startDate, endDate]
-    this.creationTime = [s1, s2]
     // 获取列表
     this.getDataList()
     this.getData()

src/views/statistics/underPlacementPer.vue

@@ -262,6 +262,7 @@ 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: {
@@ -297,11 +298,10 @@ export default {
   created() {
     this.getSearch()
     this.getOthers()
-    var s1 = this.getStartTime()
+    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
-    var s2 = this.getEndTime()
+    this.queryParams.startPayTime = startDate
-    this.queryParams.startPayTime = s1
+    this.queryParams.endPayTime = endDate
-    this.queryParams.endPayTime = s2
+    this.queryParams.thetimes = [startDate, endDate]
-    this.queryParams.thetimes = [s1, s2]
   },
   methods: {
     isLocalSymbol,
@@ -312,25 +312,6 @@ 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,6 +259,7 @@ 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: {
@@ -294,11 +295,10 @@ export default {
   created() {
     this.getSearch()
     this.getOthers()
-    var s1 = this.getStartTime()
+    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
-    var s2 = this.getEndTime()
+    this.queryParams.startPayTime = startDate
-    this.queryParams.startPayTime = s1
+    this.queryParams.endPayTime = endDate
-    this.queryParams.endPayTime = s2
+    this.queryParams.thetimes = [startDate, endDate]
-    this.queryParams.thetimes = [s1, s2]
   },
   methods: {
     isLocalSymbol,
@@ -309,25 +309,6 @@ 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]