Merge branch 'lx-dev' of gitee.com:cabbage_qd/web-base-admin into lx-test

src/api/statistics.js

@@ -142,14 +142,6 @@ export function getShippingSummaryDetail(params) {
     params
   })
 }
-// 直推统计列表
-export function directPushStatList(params) {
-  return request({
-    url: '/report/manager/member-awards/directPushStatList',
-    method: 'get',
-    params
-  })
-}
 // 会员订单分布统计
 export function memberOrderScatter(params) {
   return request({

src/views/settlementCenter/performanceRatio/performanceList.vue

@@ -249,30 +249,16 @@ export default {
           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: 3,
-          text: `${'注册专区'}(￥)`,
+          text: `注册专区`,
           checked: true,
           prop: 'mainRegAmount',
           total: 'mainRegAmountSum'
         },
         {
           id: 4,
-          text: `${'升级专区'}(￥)`,
+          text: `升级专区`,
           checked: true,
           prop: 'mainUpAmount',
           total: 'mainUpAmountSum'

src/views/settlementCenter/topPerformance/index.vue

@@ -208,107 +208,93 @@ export default {
           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: 3,
-          text: `${'注册专区'}(￥)`,
+          text: `${'注册专区'}`,
           checked: true,
           prop: 'mainRegAmount',
           total: 'mainRegAmountSum'
         },
         {
           id: 4,
-          text: `${'升级专区'}(￥)`,
+          text: `${'升级专区'}`,
           checked: true,
           prop: 'mainUpAmount',
           total: 'mainUpAmountSum'
         },
         {
           id: 7,
-          text: `${'首购金额'}(￥)`,
+          text: `${'首购金额'}`,
           checked: true,
           prop: 'firstPurchaseAll',
           total: 'firstPurchaseAllSum'
         },
         {
           id: 8,
-          text: `${'直推收益'}(￥)`,
+          text: `${'直推收益'}`,
           checked: true,
           prop: 'introduceBonus',
           total: 'introduceBonusSum'
         },
         {
           id: 9,
-          text: `${'拓展收益'}(￥)`,
+          text: `${'拓展收益'}`,
           checked: true,
           prop: 'orgBonus',
           total: 'orgBonusSum'
         },
         {
           id: 10,
-          text: `${'辅导收益'}(￥)`,
+          text: `${'辅导收益'}`,
           checked: true,
           prop: 'leaderBonus',
           total: 'leaderBonusSum'
         },
         {
           id: 12,
-          text: `${'服务补贴'}(￥)`,
+          text: `${'服务补贴'}`,
           checked: true,
           prop: 'serviceBonus',
           total: 'serviceBonusSum'
         },
         {
           id: 16,
-          text: `${'复购专区'}(￥)`,
+          text: `${'复购专区'}`,
           checked: true,
           prop: 'mainRepurAmount',
           total: 'mainRepurAmountSum'
         },
         {
           id: 18,
-          text: `${'复购金额'}(￥)`,
+          text: `${'复购金额'}`,
           checked: false,
           prop: 'repurchaseAllAmount',
           total: 'repurchaseAllAmountSum'
         },
         {
           id: 19,
-          text: `${'复购级差收益'}(￥)`,
+          text: `${'复购级差收益'}`,
           checked: false,
           prop: 'repurRangeBonus',
           total: 'repurRangeBonusSum'
         },
         {
           id: 20,
-          text: `${'复购拓展收益'}(￥)`,
+          text: `${'复购拓展收益'}`,
           checked: false,
           prop: 'repurOrgBonus',
           total: 'repurOrgBonusSum'
         },
         {
           id: 'repurLeaderBonus',
-          text: `${'复购辅导收益'}(￥)`,
+          text: `${'复购辅导收益'}`,
           checked: false,
           prop: 'repurLeaderBonus',
           total: 'repurLeaderBonusSum'
         },
         {
           id: 21,
-          text: `${'首购拨出金额'}(￥)`,
+          text: `${'首购拨出金额'}`,
           checked: false,
           prop: 'mainBonus',
           total: 'mainBonusSum'
@@ -322,7 +308,7 @@ export default {
         },
         {
           id: 23,
-          text: `${'复购拨出金额'}(￥)`,
+          text: `${'复购拨出金额'}`,
           checked: false,
           prop: 'repurBonus',
           total: 'repurBonusSum'
@@ -336,7 +322,7 @@ export default {
         },
         {
           id: 25,
-          text: `${'总拨出金额'}(￥)`,
+          text: `${'总拨出金额'}`,
           checked: false,
           prop: 'totalBonus',
           total: 'totalBonusSum'

src/views/settlementCenter/topPerformanceTotal/index.vue

@@ -240,21 +240,17 @@ export default {
           prop: 'memberName'
         },
         {
-          text: `${'首购金额'}(￥)`,
+          text: `${'首购金额'}`,
           prop: 'firstPurchaseAll'
         },
         {
-          text: `首购奖金(￥)`,
+          text: `首购奖金`,
           prop: 'mainBonus'
         },
         {
           text: `首购金额拨比(%)`,
           prop: 'mainBonusRate'
         },
-        {
-          text: '首购PV拨比(%)',
-          prop: 'mainBonusPvRate'
-        },
         {
           text: '直推拨比(%)',
           prop: 'introduceBonusRate'
@@ -272,21 +268,18 @@ export default {
           prop: 'serviceBonusRate'
         },
         {
-          text: '复购金额(￥)',
+          text: '复购金额',
           prop: 'repurchaseAllAmount'
         },
         {
-          text: '复购奖金(￥)',
+          text: '复购奖金',
           prop: 'repurBonus'
         },
         {
           text: '复购金额拨比(%)',
           prop: 'repurBonusRate'
         },
-        {
+
-          text: '复购PV拨比(%)',
-          prop: 'repurBonusPvRate'
-        },
         {
           text: '复购级差拨比(%)',
           prop: 'repurRangeBonusRate'

src/views/statistics/directStatistics.vue

@@ -1,340 +0,0 @@
-<template>
-  <div class="page">
-    <topBar
-      v-if="topList.length > 0"
-      :top-list="topList"
-      :moren="moren"
-    />
-    <div class="thetopbox">
-      <el-form label-width="100px">
-        <el-row>
-          <el-col :span="4">
-            <el-form-item :label="'订单业绩'">
-              <el-input
-                v-model="select.orderAchieve"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'订单类型'">
-              <el-select
-                v-model="select.orderType"
-              >
-                <el-option
-                  v-for="item in orderList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="'注册日期'">
-              <el-date-picker
-                v-model="creationTime"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                :clearable="false"
-                :range-separator="'至'"
-                :start-placeholder="'开始日期'"
-                :end-placeholder="'结束日期'"
-                @change="changeTime"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <div class="searchbox">
-              <el-button
-                class="my_search"
-                @click="getSearch"
-              >
-                {{ '搜索' }}</el-button>
-              <el-button
-                class="my_reset"
-                @click="reChongzhi"
-              >
-                {{ '重置' }}</el-button>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <div class="main">
-      <div class="maintop">
-        <div class="mainbtn">
-          <el-button
-            size="small"
-            class="thebtn1"
-            @click="handleExport"
-          >
-            {{ '导出' }}</el-button>
-        </div>
-      </div>
-      <div class="maintable">
-        <el-table
-          v-loading="loading"
-          :data="tableData"
-          height="700px"
-          style="width: 100%"
-          :header-cell-style="{ background: '#EEEEEE' }"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            prop="colsele"
-            type="selection"
-            width="55"
-          />
-
-          <el-table-column
-            align="center"
-            prop="memberCode"
-            :label="'会员编号'"
-            min-width="120px"
-          />
-          <el-table-column
-            align="center"
-            prop="memberName"
-            :label="'会员姓名'"
-          />
-
-          <el-table-column
-            align="center"
-            prop="phone"
-            :label="'联系方式'"
-            min-width="120px"
-          />
-          <el-table-column
-            align="center"
-            prop="pkRegisterGradeVal"
-            :label="'注册等级'"
-          />
-          <el-table-column
-            align="center"
-            prop="pkAwardsVal"
-            :label="'荣誉奖衔'"
-          />
-          <el-table-column
-            align="center"
-            prop="vertexName"
-            :label="'隶属体系'"
-          />
-          <el-table-column
-            align="center"
-            prop="teamName"
-            :label="'隶属团队'"
-          />
-
-          <el-table-column
-            align="center"
-            prop="parMemberCode"
-            min-width="120px"
-            :label="'推荐编号'"
-          />
-          <el-table-column
-            align="center"
-            prop="parMemberName"
-            :label="'推荐姓名'"
-          />
-          <el-table-column
-            align="center"
-            prop="placeMemberCode"
-            min-width="120px"
-            :label="'安置编号'"
-          />
-          <el-table-column
-            align="center"
-            prop="placeMemberName"
-            :label="'安置姓名'"
-          />
-          <el-table-column
-            align="center"
-            prop="orderAchieve"
-            min-width="100px"
-            :label="'订单业绩' + `(PV)`"
-          />
-          <el-table-column
-            align="center"
-            prop="orderTypeVal"
-            :label="'订单类型'"
-          />
-          <el-table-column
-            min-width="150px"
-            align="center"
-            prop="creationTime"
-            :label="'注册日期'"
-          />
-        </el-table>
-      </div>
-    </div>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getSearch"
-    />
-  </div>
-</template>
-
-<script>
-import topBar from '@/components/topBar'
-import * as api from '@/api/statistics'
-import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
-export default {
-  name: 'DirectStatistics',
-  components: {
-    topBar
-  },
-  data() {
-    return {
-      moren: 'directStatistics',
-      topList: [
-        {
-          name: '直推统计',
-          path: 'directStatistics'
-        }
-      ],
-      tableData: [],
-      loading: false,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 50
-      },
-      select: {
-        orderType: 1
-      },
-      creationTime: [],
-      total: 0,
-      multipleSelection: [],
-      tableData: [],
-      orderList: []
-    }
-  },
-  created() {
-    this.getSearch()
-    this.getData()
-  },
-  methods: {
-    getData() {
-      api.orderBusiness().then(res => {
-        this.orderList = res.data
-      })
-    },
-    isLocalSymbol,
-    isLocals,
-    changeTime(val) {
-      this.select.startDate = val ? val[0] : ''
-      this.select.endDate = val ? val[1] : ''
-    },
-    // 导出
-    handleExport() {
-      this.$confirm('是否确认导出所有数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then((_) => {
-        this.download(
-          '/report/manager/member-awards/export-directPush',
-          Object.assign({}, this.queryParams, this.select),
-          `${'直推统计'}${new Date().getTime()}.xlsx`
-        )
-      })
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    reChongzhi() {
-      this.select = {
-        orderType: 1
-      }
-      this.creationTime = []
-      this.getSearch()
-    },
-    getSearch() {
-      this.loading = true
-      api
-        .directPushStatList(Object.assign({}, this.queryParams, this.select))
-        .then((res) => {
-          this.tableData = res.rows
-          this.total = res.total
-          this.loading = false
-        })
-    }
-  }
-}
-</script>
-
-  <style lang="scss" scoped>
-::v-deep .el-image-viewer__close {
-  right: 500px;
-}
-::v-deep .dizhi .el-cascader {
-  width: 100%;
-}
-::v-deep .el-range-editor.el-input__inner {
-  width: 100%;
-}
-::v-deep .el-table thead {
-  color: #000000;
-}
-::v-deep .el-table .warning-row {
-  background: #f9f9f9;
-}
-.page {
-  padding: 10px 20px;
-  background: #f9f9f9;
-  font-size: 14px;
-  .thetopbox {
-    padding: 15px 20px 15px 0;
-    background: #ffffff;
-    border-radius: 8px;
-    .searchbox {
-      display: flex;
-      align-items: center;
-      margin-left: 40px;
-    }
-    .searchtitle {
-      margin-right: 10px;
-    }
-    .searchbtn {
-      background: #08143f;
-      color: #ffffff;
-    }
-  }
-  .main {
-    //margin-top: 20px;
-    background: #f9f9f9;
-    //border-radius: 8px;
-    //box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
-
-    .maintop {
-      display: flex;
-      // padding: 10px 0;
-      justify-content: space-between;
-      align-items: center;
-      .mainbtn {
-        .thebtn1 {
-          color: #ffffff;
-          background: #ffad41;
-          width: 68px;
-          height: 32px;
-        }
-        .thebtn2 {
-          color: #ffffff;
-          background: #009b58;
-          width: 68px;
-          height: 32px;
-        }
-        .thebtn3 {
-          color: #ffffff;
-          background: #c8161d;
-          width: 68px;
-          height: 32px;
-        }
-      }
-    }
-  }
-}
-</style>