Merge branch 'test' of http://47.94.45.65:3000/angelo/web-zk-admin into online

src/router/index.js

@@ -732,25 +732,25 @@ export const constantRoutes = [
         meta: { title: '顶点奖金拨比汇总' },
         hidden: true
       },
-      {
+      // {
-        path: 'topPerformancepv',
+      //   path: 'topPerformancepv',
-        name: 'TopPerformancepv',
+      //   name: 'TopPerformancepv',
-        component: () => import('@/views/settlementCenter/topPerformancepv/index'),
+      //   component: () => import('@/views/settlementCenter/topPerformancepv/index'),
-        meta: { title: '顶点奖金拨比业绩统计' },
+      //   meta: { title: '顶点奖金拨比业绩统计' },
-        hidden: true
+      //   hidden: true
-      },
+      // },
-      {
+      // {
-        path: 'lenTopPerformance',
+      //   path: 'lenTopPerformance',
-        name: 'LenTopPerformance',
+      //   name: 'LenTopPerformance',
-        component: () => import('@/views/settlementCenter/lenTopPerformance/index'),
+      //   component: () => import('@/views/settlementCenter/lenTopPerformance/index'),
-        meta: { title: '乐享顶点奖金拨比列表' }
+      //   meta: { title: '乐享顶点奖金拨比列表' }
-      },
+      // },
-      {
+      // {
-        path: 'personalAllocation',
+      //   path: 'personalAllocation',
-        name: 'PersonalAllocation',
+      //   name: 'PersonalAllocation',
-        component: () => import('@/views/settlementCenter/performanceRatio/personalAllocation'),
+      //   component: () => import('@/views/settlementCenter/performanceRatio/personalAllocation'),
-        meta: { title: '个人伞下拨比查询' }
+      //   meta: { title: '个人伞下拨比查询' }
-      },
+      // },
       {
         path: 'sourceBonus',
         name: 'sourceBonus',

src/views/framework/architecture/azjg2.vue

@@ -366,8 +366,8 @@ export default {
       this.loading = true
       getAzFrameworkList(this.queryParams).then((res) => {
         if (res.code === 200) {
-          this.tableData = res.data.rows
+          this.tableData = res.rows
-          this.total = res.data.total
+          this.total = res.total
         }
       }).finally(() => {
         this.loading = false

src/views/framework/architecture/index.vue

@@ -370,7 +370,6 @@ export default {
     onExpand(e, data) {
     },
     getSearch() {
-      console.log(this.queryParams, '...this.')
       if (!this.queryParams.childNode || !this.queryParams.memberCode) {
         this.$message.warning('会员编号和子点位不能为空')
         return

src/views/information/memberPointInfo/index.vue

@@ -172,8 +172,8 @@ export default {
       this.loading = true
       getMemberPointList(this.queryParams).then((res) => {
         if (res.code === 200) {
-          this.tableData = res.data.rows
+          this.tableData = res.rows
-          this.total = res.data.total
+          this.total = res.total
         }
       }).finally(() => {
         this.loading = false

src/views/settlementCenter/topPerformance/index.vue

@@ -210,26 +210,6 @@ export default {
   data() {
     return {
       loading: false,
-      typeList: [
-        {
-          value: 0,
-          label: '前台'
-        },
-        {
-          value: 1,
-          label: '后台'
-        }
-      ],
-      digList: [
-        {
-          value: 0,
-          label: '允许'
-        },
-        {
-          value: 1,
-          label: '禁止'
-        }
-      ],
       menuList: [
         {
           id: 0,
@@ -254,69 +234,147 @@ export default {
           checked: false,
           prop: 'creationTime'
         },
-        // {
-        //   id: 2,
-        //   text: '隶属团队',
-        //   checked: true,
-        //   prop: "teamName",
-        // },
-        // {
-        //   id: 28,
-        //   text: "首购PV拨比(%)",
-        //   checked: true,
-        //   prop: "mainBonusPvRate",
-        //   total: "mainBonusPvRateSum",
-        // },
-        // {
-        //   id: 29,
-        //   text: "复购PV拨比(%)",
-        //   checked: true,
-        //   prop: "repurBonusPvRate",
-        //   total: "repurBonusPvRateSum",
-        // },
         {
           id: 4,
-          text: `${'注册专区'}`,
+          text: `${'精品专区'}`,
           checked: true,
           prop: 'mainRegAmount',
-          total: 'mainRegAmountSum'
+          total: 'mainRegAmount'
         },
         {
           id: 5,
-          text: `${'升级专区'}`,
+          text: `${'商城专区'}`,
           checked: true,
-          prop: 'mainUpAmount',
+          prop: 'mainRepurAmount',
-          total: 'mainUpAmountSum'
+          total: 'mainRepurAmount'
         },
-        // {
-        //   id: 5,
-        //   text: `${'云代注册'}(￥)`,
-        //   checked: true,
-        //   prop: "agentRegAmount",
-        //   total: "agentRegAmountSum",
-        // },
-        // {
-        //   id: 6,
-        //   text: `${'云代升级'}(￥)`,
-        //   checked: true,
-        //   prop: "agentUpAmount",
-        //   total: "agentUpAmountSum",
-        // },
         {
           id: 6,
-          text: `${'首购金额'}(￥)`,
+          text: `${'五折专区'}`,
           checked: true,
-          prop: 'firstPurchaseAll',
+          prop: 'retailConsumeAmount',
-          total: 'firstPurchaseAllSum'
+          total: 'retailConsumeAmount'
+        },
+        {
+          id: 7,
+          text: `${'合计金额'}`,
+          checked: false,
+          prop: 'totalAmount',
+          total: 'totalAmount'
+        },
+        {
+          id: 8,
+          text: `${'直推收益'}`,
+          checked: true,
+          prop: 'introduceBonus',
+          total: 'introduceBonus'
+        },
+        {
+          id: 9,
+          text: `${'直推收益拨比(%)'}`,
+          checked: true,
+          prop: 'introduceBonusRate',
+          total: 'introduceBonusRate'
+        },
+        {
+          id: 10,
+          text: `${'阶段收益'}`,
+          checked: true,
+          prop: 'storeIncome',
+          total: 'storeIncome'
+        },
+        {
+          id: 11,
+          text: `${'阶段收益拨比(%)'}`,
+          checked: true,
+          prop: 'storeIncomeRate',
+          total: 'storeIncomeRate'
+        },
+        {
+          id: 12,
+          text: `${'精品级差收益'}`,
+          checked: true,
+          prop: 'rangeIncome41',
+          total: 'rangeIncome41'
+        },
+        {
+          id: 13,
+          text: `${'精品级差收益拨比(%)'}`,
+          checked: true,
+          prop: 'rangeIncome41Rate',
+          total: 'rangeIncome41Rate'
+        },
+        {
+          id: 14,
+          text: `${'精品平级收益'}`,
+          checked: true,
+          prop: 'sameLevelIncome41',
+          total: 'sameLevelIncome41'
+        },
+        {
+          id: 15,
+          text: `${'精品平级收益拨比(%)'}`,
+          checked: true,
+          prop: 'sameLevelIncome41Rate',
+          total: 'sameLevelIncome41Rate'
+        },
+        {
+          id: 16,
+          text: `${'见点收益'}`,
+          checked: true,
+          prop: 'globalPoints',
+          total: 'globalPoints'
+        },
+        {
+          id: 17,
+          text: `${'见点收益拨比(%)'}`,
+          checked: true,
+          prop: 'globalPointsRate',
+          total: 'globalPointsRate'
+        },
+        {
+          id: 18,
+          text: `${'商城级差收益'}`,
+          checked: true,
+          prop: 'rangeIncome43',
+          total: 'rangeIncome43'
+        },
+        {
+          id: 19,
+          text: `${'商城级差收益拨比(%)'}`,
+          checked: true,
+          prop: 'rangeIncome43Rate',
+          total: 'rangeIncome43Rate'
+        },
+        {
+          id: 20,
+          text: `${'商城平级收益'}`,
+          checked: true,
+          prop: 'sameLevelIncome43',
+          total: 'sameLevelIncome43'
+        },
+        {
+          id: 21,
+          text: `${'商城平级收益拨比(%)'}`,
+          checked: true,
+          prop: 'sameLevelIncome43Rate',
+          total: 'sameLevelIncome43Rate'
+        },
+        {
+          id: 22,
+          text: `${'五折级差收益'}`,
+          checked: true,
+          prop: 'rangeIncome47',
+          total: 'rangeIncome47'
+        },
+        {
+          id: 23,
+          text: `${'五折级差收益拨比(%)'}`,
+          checked: true,
+          prop: 'rangeIncome47Rate',
+          total: 'rangeIncome47Rate'
         },
 
-        // {
-        //   id: 8,
-        //   text: `${'直推收益'}(￥)`,
-        //   checked: true,
-        //   prop: "introduceBonus",
-        //   total: "introduceBonusSum",
-        // },
         // {
         //   id: 9,
         //   text: `${'拓展收益'}(￥)`,
@@ -387,41 +445,34 @@ export default {
         //   checked: false,
         //   prop: 'agentRepurAmount',
         // },
-        {
+        // {
-          id: 7,
+        //   id: 7,
-          text: `${'复购金额'}(￥)`,
+        //   text: `${'复购金额'}(￥)`,
-          checked: false,
+        //   checked: false,
-          prop: 'mainRepurAmount',
+        //   prop: 'mainRepurAmount',
-          total: 'mainRepurAmountSum'
+        //   total: 'mainRepurAmountSum'
-        },
+        // },
-        {
+        // {
-          id: 8,
+        //   id: 8,
-          text: `${this.$t('重消金额')}(￥)`,
+        //   text: `${this.$t('重消金额')}(￥)`,
-          checked: false,
+        //   checked: false,
-          prop: 'retailConsumeAmount',
+        //   prop: 'retailConsumeAmount',
-          total: 'retailConsumeAmountSum'
+        //   total: 'retailConsumeAmountSum'
-        },
+        // },
-        {
+        // {
-          id: 9,
+        //   id: 10,
-          text: `${this.$t('合计金额')}(￥)`,
+        //   text: `${this.$t('极差收益')}(￥)`,
-          checked: false,
+        //   checked: false,
-          prop: 'totalAmount',
+        //   prop: 'retailRangeIncome',
-          total: 'totalAmountSum'
+        //   total: 'retailRangeIncomeSum'
-        },
+        // },
-        {
+        // {
-          id: 10,
+        //   id: 11,
-          text: `${this.$t('极差收益')}(￥)`,
+        //   text: '极差收益拨比(%)',
-          checked: false,
+        //   checked: false,
-          prop: 'retailRangeIncome',
+        //   prop: 'retailRangeIncomeRate',
-          total: 'retailRangeIncomeSum'
+        //   total: 'retailRangeIncomeRateSum'
-        },
+        // },
-        {
-          id: 11,
-          text: '极差收益拨比(%)',
-          checked: false,
-          prop: 'retailRangeIncomeRate',
-          total: 'retailRangeIncomeRateSum'
-        },
         // {
         //   id: 12,
         //   text: `${this.$t("平级收益")}(￥)`,
@@ -429,105 +480,6 @@ export default {
         //   prop: "retailSameLevelIncome",
         //   total: "retailSameLevelIncomeSum",
         // },
-        {
-          id: 12,
-          text: `${this.$t('平级收益V1-V4')}(￥)`,
-          checked: false,
-          prop: 'retailSameLevelIncomeV1V4',
-          total: 'retailSameLevelIncomeV1V4Sum'
-        },
-        {
-          id: 13,
-          text: `${this.$t('平级收益V1-V4拨比')}(%)`,
-          checked: false,
-          prop: 'retailSameLevelIncomeV1V4Rate',
-          total: 'sameLevelIncomeV1V4RateSum'
-        },
-        {
-          id: 14,
-          text: `${this.$t('平级收益V5')}(￥)`,
-          checked: false,
-          prop: 'retailSameLevelIncomeV5',
-          total: 'retailSameLevelIncomeV5Sum'
-        },
-        {
-          id: 15,
-          text: `${this.$t('平级收益V5拨比')}(%)`,
-          checked: false,
-          prop: 'retailSameLevelIncomeV5Rate',
-          total: 'sameLevelIncomeV5RateSum'
-        },
-        {
-          id: 16,
-          text: `${this.$t('区域收益')}(￥)`,
-          checked: false,
-          prop: 'retailAreaIncome',
-          total: 'retailAreaIncomeSum'
-        },
-        {
-          id: 17,
-          text: `${this.$t('区域收益拨比')}(%)`,
-          checked: false,
-          prop: 'retailAreaIncomeRate',
-          total: 'retailAreaIncomeRateSum'
-        },
-
-        {
-          id: 18,
-          text: `${this.$t('福利平均收益')}(￥)`,
-          checked: false,
-          prop: 'retailBenefitAvgIncome',
-          total: 'retailBenefitAvgIncomeSum'
-        },
-        {
-          id: 19,
-          text: `${this.$t('福利平均收益拨比')}(%)`,
-          checked: false,
-          prop: 'retailBenefitAvgIncomeRate',
-          total: 'retailBenefitAvgIncomeRateSum'
-        },
-        {
-          id: 20,
-          text: `${this.$t('福利加权收益')}(￥)`,
-          checked: false,
-          prop: 'retailBenefitIncome',
-          total: 'retailBenefitIncomeSum'
-        },
-        {
-          id: 21,
-          text: `${this.$t('福利加权收益拨比')}(%)`,
-          checked: false,
-          prop: 'retailBenefitIncomeRate',
-          total: 'retailBenefitIncomeRateSum'
-        },
-        {
-          id: 22,
-          text: `${this.$t('福利极差收益')}(￥)`,
-          checked: false,
-          prop: 'retailBenefitRangeIncome',
-          total: 'retailBenefitRangeIncomeSum'
-        },
-        {
-          id: 23,
-          text: `${this.$t('福利极差收益拨比')}(%)`,
-          checked: false,
-          prop: 'retailBenefitRangeIncomeRate',
-          total: 'benefitRangeIncomeRateSum'
-        },
-        {
-          id: 24,
-          text: `${this.$t('商城重消')}(￥)`,
-          checked: false,
-          prop: 'backPoints',
-          total: 'backPointsSum'
-        },
-        {
-          id: 25,
-          text: `${this.$t('商城重消拨比')}(%)`,
-          checked: false,
-          prop: 'backPointsRate',
-          total: 'backPointsRateSum'
-        },
         // {
         //   id: 19,
         //   text: `${'复购极差收益'}(￥)`,
@@ -575,22 +527,15 @@ export default {
           text: `${'总拨出金额'}(￥)`,
           checked: false,
           prop: 'totalBonus',
-          total: 'totalBonusSum'
+          total: 'totalBonus'
         },
         {
           id: 27,
           text: '总拨出比例' + '(%)',
           checked: false,
           prop: 'totalBonusRate',
-          total: 'totalBonusRateSum'
+          total: 'totalBonusRate'
         }
-
-        // {
-        //   id: 28,
-        //   text: '截止日期',
-        //   checked: false,
-        //   prop: 'endDate',
-        // },
       ],
       creationTime: [],
       creationTime1: [],
@@ -631,6 +576,8 @@ export default {
     }
   },
   mounted() {
+    // 初始化日期为昨天
+    this.creationTime = this.getYesterdayRange()
     // 获取下拉
     this.getData()
     // 获取列表
@@ -638,6 +585,15 @@ export default {
     // this.getUserRoute();
   },
   methods: {
+    // 获取昨天日期范围 [昨天, 昨天]
+    getYesterdayRange() {
+      const yesterday = new Date()
+      yesterday.setDate(yesterday.getDate() - 1)
+      const yesterdayStr = yesterday.getFullYear() + '-' +
+        String(yesterday.getMonth() + 1).padStart(2, '0') + '-' +
+        String(yesterday.getDate()).padStart(2, '0')
+      return [yesterdayStr, yesterdayStr]
+    },
     getPkBdVertexStr(e) {
       const arr = e.map((item) => item[1])
       const pkBdVertexStr = arr.join(',')
@@ -695,7 +651,7 @@ export default {
         pkTeamCodeStr: '',
         pkBdVertexStr: ''
       }
-      this.creationTime = []
+      this.creationTime = this.getYesterdayRange()
     },
     getData() {
       api.accountList().then((res) => {

src/views/settlementCenter/topPerformanceTotal/index.vue

@@ -240,67 +240,53 @@ export default {
           prop: 'memberName'
         },
         {
-          text: `${'首购金额'}(￥)`,
+          text: `${'精品专区金额'}`,
-          prop: 'firstPurchaseAll'
+          prop: 'mainRegAmount'
         },
         {
-          text: `首购金额占比(%)`,
+          text: `精品专区奖金`,
-          prop: 'firstPurchaseRatio'
-        },
-
-        {
-          text: `首购奖金(￥)`,
           prop: 'mainBonus'
         },
         {
-          text: `首购金额拨比(%)`,
+          text: `精品专区拨比(%)`,
           prop: 'mainBonusRate'
         },
         {
-          text: '首购PV拨比(%)',
+          text: `${'商城专区金额'}`,
-          prop: 'mainBonusPvRate'
+          prop: 'mainRepurAmount'
         },
         {
-          text: '直推拨比(%)',
+          text: `商城专区奖金`,
-          prop: 'introduceBonusRate'
+          prop: 'mainRepurBonus'
         },
         {
-          text: '拓展拨比(%)',
+          text: `商城专区拨比(%)`,
-          prop: 'orgBonusRate'
+          prop: 'mainRepurBonusRate'
         },
         {
-          text: '服务补贴拨比(%)',
+          text: `${'五折专区金额'}`,
-          prop: 'serviceBonusRate'
+          prop: 'retailConsumeAmount'
-        },
-
-        {
-          text: '复购金额(￥)',
-          prop: 'repurchaseAllAmount'
         },
         {
-          text: '复购奖金(￥)',
+          text: `五折专区奖金`,
-          prop: 'repurBonus'
+          prop: 'retailConsumeBonus'
         },
         {
-          text: '复购金额拨比(%)',
+          text: `五折专区拨比(%)`,
-          prop: 'repurBonusRate'
+          prop: 'retailConsumeBonusRate'
         },
         {
-          text: '复购PV拨比(%)',
+          text: `合计金额`,
-          prop: 'repurBonusPvRate'
+          prop: 'totalAmount'
         },
         {
-          text: `拓展平均碰次`,
+          text: `${'总拨出金额'}`,
-          prop: 'orgAvTouch'
+          prop: 'totalBonus'
         },
         {
-          text: `拓展最高碰次`,
+          text: `总拨出比例(%)`,
-          prop: 'orgMaxTouch'
+          prop: 'totalBonusRate'
         },
-        {
-          text: `拓展封顶人数`,
-          prop: 'orgTopNumber'
-        }
       ],
       creationTime: [],
       creationTime1: [],
@@ -340,12 +326,21 @@ export default {
   },
   mounted() {
     // 获取下拉
+    this.creationTime = this.getYesterdayRange()
     this.getData()
     // 获取列表
     this.getDataList()
     // this.getUserRoute();
   },
   methods: {
+    getYesterdayRange() {
+      const yesterday = new Date()
+      yesterday.setDate(yesterday.getDate() - 1)
+      const yesterdayStr = yesterday.getFullYear() + '-' +
+        String(yesterday.getMonth() + 1).padStart(2, '0') + '-' +
+        String(yesterday.getDate()).padStart(2, '0')
+      return [yesterdayStr, yesterdayStr]
+    },
     getTotal() {
       api
         .topSubtotal(Object.assign({}, this.queryParams, this.select))
@@ -383,7 +378,7 @@ export default {
         pkTeamCodeStr: '',
         pkBdVertexStr: ''
       }
-      this.creationTime = []
+      this.creationTime = this.getYesterdayRange()
     },
     getData() {
       api.accountList().then((res) => {