Merge branch 'lx-dev' of http://47.94.45.65:3000/angelo/web-base-admin into lx-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
-        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
       })
     },
     // 鼠标移入

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
       })
     },
     // 鼠标移入

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
       })
     },
     // 鼠标移入

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
       })
     },
     // 鼠标移入

src/views/framework/recommend/index.vue

@@ -2,51 +2,46 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div class="thetopbox">
       <el-form ref="form" :model="queryParams" label-width="100px">
         <el-row>
           <el-col :span="4">
             <el-form-item :label="'会员编号'" prop="memberCode">
               <el-input
-                clearable
                 v-model="queryParams.memberCode"
-              ></el-input></el-form-item
-          ></el-col>
+                clearable
+              /></el-form-item></el-col>
           <el-col :span="4">
             <el-form-item :label="'结算期数'" prop="memberSettlePeriodId">
               <el-select
+                v-model="queryParams.memberSettlePeriodId"
                 clearable
                 :placeholder="'请选择'"
-                v-model="queryParams.memberSettlePeriodId"
               >
                 <el-option
                   v-for="item in memberSettlePeriodList"
                   :key="item.pkId"
                   :label="item.settleDate"
                   :value="item.pkId"
-                ></el-option> </el-select></el-form-item
-          ></el-col>
+                /> </el-select></el-form-item></el-col>
           <el-col :span="4">
             <el-form-item :label="'代数'" prop="level">
               <el-input
-                clearable
                 v-model="queryParams.level"
-              ></el-input></el-form-item
-          ></el-col>
+                clearable
+              /></el-form-item></el-col>
           <el-col :span="4" style="margin-left: 30px">
             <div class="searchbox">
               <el-button class="searchbtn" @click="getSearch">
-                {{ '搜索' }}</el-button
-              >
+                {{ '搜索' }}</el-button>
               <el-button @click="reChongzhi"> {{ '重置' }}</el-button>
               <el-button @click="goback"> {{ '返回' }}</el-button>
             </div>
           </el-col>
-        </el-row></el-form
-      >
+        </el-row></el-form>
     </div>
     <div>
       <div class="tree">
@@ -65,65 +60,65 @@
   </div>
 </template>
 
-  <script>
-import topBar from "@/components/topBar";
-import { getTjFramework, getMemberSettlePeriod } from "@/api/archityecture";
+<script>
+import topBar from '@/components/topBar'
+import { getTjFramework, getMemberSettlePeriod } from '@/api/archityecture'
 export default {
-  name: "Tjjg",
+  name: 'Tjjg',
   components: {
-    topBar,
+    topBar
   },
   data() {
     return {
-      moren: "tjjg",
+      moren: 'tjjg',
       topList: [
         {
           name: '方案一',
-          path: "tjjg",
+          path: 'tjjg'
         },
         {
           name: '方案二',
-          path: "tjjg2",
+          path: 'tjjg2'
         },
         {
           name: '方案三',
-          path: "tjjg3",
+          path: 'tjjg3'
         },
         {
           name: '方案四',
-          path: "tjjg4",
-        },
+          path: 'tjjg4'
+        }
       ],
       queryParams: {
-        memberSettlePeriodId: "", //期数
-        memberCode: "", //会员编号
-        level: "", //代数
-        type: 1,
+        memberSettlePeriodId: '', // 期数
+        memberCode: '', // 会员编号
+        level: '', // 代数
+        type: 1
       },
       data: [],
       defaultProps: {
-        label: "memberCode",
-        children: "children",
+        label: 'memberCode',
+        children: 'children'
       },
-      memberSettlePeriodList: [], //期数
-    };
+      memberSettlePeriodList: [] // 期数
+    }
   },
   created() {
-    this.getSearch();
-    this.getAvarerInfo();
+    this.getSearch()
+    this.getAvarerInfo()
   },
   methods: {
     async loadNode(node, resolve) {
       if (node.level == 0) {
-        return resolve([]);
+        return resolve([])
       } else {
         const response = await getTjFramework({
-          memberCode: node.data.memberCode,
-        });
+          memberCode: node.data.memberCode
+        })
         if (response.data[0].children && response.data[0].children.length > 0) {
-          resolve(response.data[0].children);
+          resolve(response.data[0].children)
         } else {
-          resolve([]);
+          resolve([])
         }
       }
       // if (!node.data.children) {
@@ -133,56 +128,53 @@ 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
+      })
     },
-    //返回
+    // 返回
     goback() {
-      this.queryParams.memberCode = this.data[0].parentMemberCode;
-      this.getSearch();
+      this.queryParams.memberCode = this.data[0].parentMemberCode
+      this.getSearch()
     },
-    //复制
+    // 复制
     copyItem(content) {
       if (window.clipboardData) {
-        window.clipboardData.setData("text", content);
+        window.clipboardData.setData('text', content)
       } else {
-        (function (content) {
-          //oncopy 事件在用户拷贝元素上的内容时触发。
-          document.oncopy = function (e) {
-            e.clipboardData.setData("text", content);
-            e.preventDefault();
-            document.oncopy = null;
-          };
-        })(content);
-        document.execCommand("Copy");
+        (function(content) {
+          // oncopy 事件在用户拷贝元素上的内容时触发。
+          document.oncopy = function(e) {
+            e.clipboardData.setData('text', content)
+            e.preventDefault()
+            document.oncopy = null
+          }
+        })(content)
+        document.execCommand('Copy')
       }
       this.$message({
         message: '复制成功',
-        type: "success",
-      });
+        type: 'success'
+      })
     },
 
     handleNodeClick() {},
     getSearch() {
       getTjFramework(this.queryParams).then((res) => {
-        this.data = res.data;
-      });
+        this.data = res.data
+      })
     },
     reChongzhi() {
       this.queryParams = {
-        memberSettlePeriodId: "", //期数
-        memberCode: "", //会员编号
-        level: "", //代数
-      };
-      this.getSearch();
-    },
-  },
-};
+        memberSettlePeriodId: '', // 期数
+        memberCode: '', // 会员编号
+        level: '' // 代数
+      }
+      this.getSearch()
+    }
+  }
+}
 </script>
 
   <style lang="scss" scoped>

src/views/framework/recommend/tjjg2.vue

@@ -305,12 +305,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
       })
     },
     // 返回

src/views/framework/recommend/tjjg3.vue

@@ -317,12 +317,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
       })
     },
     // 返回

src/views/framework/recommend/tjjg4.vue

@@ -315,12 +315,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
       })
     },
     // 返回

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()
-    var s2 = this.getEndTime()
-    this.select.startPayTime = s1
-    this.select.endPayTime = s2
-    this.creationTime = [s1, s2]
+    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
+    this.select.startPayTime = startDate
+    this.select.endPayTime = endDate
+    this.creationTime = [startDate, endDate]
     // 获取列表
     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()
-    var s2 = this.getEndTime()
-    this.select.startPayTime = s1
-    this.select.endPayTime = s2
-    this.creationTime = [s1, s2]
+    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
+    this.select.startPayTime = startDate
+    this.select.endPayTime = endDate
+    this.creationTime = [startDate, endDate]
     // 获取列表
     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()
-    var s2 = this.getEndTime()
-    this.queryParams.startPayTime = s1
-    this.queryParams.endPayTime = s2
-    this.queryParams.thetimes = [s1, s2]
+    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
+    this.queryParams.startPayTime = startDate
+    this.queryParams.endPayTime = endDate
+    this.queryParams.thetimes = [startDate, endDate]
   },
   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()
-    var s2 = this.getEndTime()
-    this.queryParams.startPayTime = s1
-    this.queryParams.endPayTime = s2
-    this.queryParams.thetimes = [s1, s2]
+    const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
+    this.queryParams.startPayTime = startDate
+    this.queryParams.endPayTime = endDate
+    this.queryParams.thetimes = [startDate, endDate]
   },
   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]