From f83f1d9893ed3997007ad57c8b676a08c234ca19 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Thu, 3 Jul 2025 15:12:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(statistics):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A8=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=9B=A2=E9=98=9F?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=20=E7=9C=9F=E5=AE=9E=E5=A5=96?=
 =?UTF-8?q?=E8=A1=94=E5=88=86=E6=9E=90=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/product.js                        |   10 +-
 src/api/statistics.js                     |   36 +-
 src/router/index.js                       |   28 -
 src/views/information/member/index.vue    |   43 +-
 src/views/information/teamInfo/index.vue  | 1159 ---------------------
 src/views/statistics/awardAnalysis.vue    |  468 ---------
 src/views/statistics/directStatistics.vue |  340 ------
 7 files changed, 26 insertions(+), 2058 deletions(-)
 delete mode 100644 src/views/information/teamInfo/index.vue
 delete mode 100644 src/views/statistics/awardAnalysis.vue
 delete mode 100644 src/views/statistics/directStatistics.vue

diff --git a/src/api/product.js b/src/api/product.js
index 06407a0..9b4cfcc 100644
--- a/src/api/product.js
+++ b/src/api/product.js
@@ -677,14 +677,8 @@ export function repurchaseType(params) {
     params
   })
 }
-// 团队信息
-export function memberTeamInfo(params) {
-  return request({
-    url: '/member/manager/member/member-team-info',
-    method: 'get',
-    params
-  })
-}
+
+
 // 计算商品业绩
 export function computePrice(data) {
   return request({
diff --git a/src/api/statistics.js b/src/api/statistics.js
index 3e7a050..4f4bd54 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -18,24 +18,6 @@ export function getUmbrellaAwardsList(params) {
   })
 }
 
-// 真实奖衔分析
-export function getUmbrellaAnalysisList(params) {
-  return request({
-    url: '/report/manager/member-awards/analysis-list',
-    method: 'get',
-    params
-  })
-}
-
-// 真实奖衔分析穿透
-export function getUmbrellaAnalysisDetailList(params) {
-  return request({
-    url: '/report/manager/member-awards/analysis-details-list',
-    method: 'get',
-    params
-  })
-}
-
 // 安置反查
 export function getPlaceCheckList(data) {
   return request({
@@ -142,14 +124,7 @@ 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({
@@ -556,14 +531,7 @@ export function getProductSalesStat(params) {
     params
   })
 }
-// 晋升方式
-export function getUpListList(params) {
-  return request({
-    url: '/system/pub/enums/upgradeType',
-    method: 'get',
-    params
-  })
-}
+
 // 专区商品销量统计
 export function waresSales(params) {
   return request({
diff --git a/src/router/index.js b/src/router/index.js
index b258f9c..0a91ef2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -132,22 +132,6 @@ export const constantRoutes = [
 
         ]
       },
-      {
-        path: 'teamInfo',
-        name: 'TeamInfo',
-        meta: { title: '团队信息' },
-        component: ParentView,
-        redirect: 'teamInfo/index',
-        children: [
-          {
-            path: 'teamInfo',
-            name: 'TeamInfo',
-            component: () => import('@/views/information/teamInfo/index'),
-            meta: { title: '团队信息' }
-          }
-
-        ]
-      },
       {
         path: 'realInfo',
         name: 'RealInfo',
@@ -2221,12 +2205,6 @@ export const constantRoutes = [
         component: () => import('@/views/statistics/realPerAddAwards'),
         meta: { title: '真实业绩新增奖衔' }
       },
-      {
-        path: 'awardAnalysis',
-        name: 'AwardAnalysis',
-        component: () => import('@/views/statistics/awardAnalysis'),
-        meta: { title: '真实奖衔分析' }
-      },
       {
         path: 'levelUpRecords',
         name: 'LevelUpRecords',
@@ -2270,12 +2248,6 @@ export const constantRoutes = [
         component: () => import('@/views/statistics/reportSummary'),
         meta: { title: '报单汇总' }
       },
-      {
-        path: 'directStatistics',
-        name: 'DirectStatistics',
-        component: () => import('@/views/statistics/directStatistics'),
-        meta: { title: '直推统计' }
-      },
       {
         path: 'incomeDetail',
         name: 'IncomeDetail',
diff --git a/src/views/information/member/index.vue b/src/views/information/member/index.vue
index 160a599..1351e28 100644
--- a/src/views/information/member/index.vue
+++ b/src/views/information/member/index.vue
@@ -474,6 +474,27 @@
             :label="'会员姓名'"
             width="180"
           />
+          <el-table-column
+            v-if="getColumnsVisible('pkSettleGradeVal') && allTxt.pkSettleGradeVal"
+            align="center"
+            prop="pkSettleGradeVal"
+            :label="'结算等级'"
+            width="180"
+          />
+          <el-table-column
+            v-if="allTxt.pkAwardsVal"
+            align="center"
+            prop="pkAwardsVal"
+            :label="'荣誉奖衔'"
+            width="180"
+          />
+          <el-table-column
+            v-if="getColumnsVisible('vertexName') && allTxt.vertexName"
+            align="center"
+            prop="vertexName"
+            :label="'隶属体系'"
+            width="180"
+          />
           <el-table-column
             v-if="allTxt.phone"
             align="center"
@@ -517,13 +538,6 @@
             :label="'安置姓名'"
             width="180"
           />
-          <el-table-column
-            v-if="allTxt.pkAwardsVal"
-            align="center"
-            prop="pkAwardsVal"
-            :label="'荣誉奖衔'"
-            width="180"
-          />
 
           <el-table-column
             v-if="allTxt.orderSourceVal"
@@ -555,13 +569,7 @@
             :label="'注册等级'"
             width="180"
           />
-          <el-table-column
-            v-if="getColumnsVisible('pkSettleGradeVal') && allTxt.pkSettleGradeVal"
-            align="center"
-            prop="pkSettleGradeVal"
-            :label="'结算等级'"
-            width="180"
-          />
+
           <el-table-column
             v-if="getColumnsVisible('consumeMoney') && allTxt.consumeMoney"
             align="center"
@@ -584,13 +592,6 @@
               {{ scope.row.consumeAchieve | numberToCurrency }}
             </template>
           </el-table-column>
-          <el-table-column
-            v-if="getColumnsVisible('vertexName') && allTxt.vertexName"
-            align="center"
-            prop="vertexName"
-            :label="'隶属体系'"
-            width="180"
-          />
           <el-table-column
             v-if="getColumnsVisible('teamName') && allTxt.teamName"
             align="center"
diff --git a/src/views/information/teamInfo/index.vue b/src/views/information/teamInfo/index.vue
deleted file mode 100644
index d1f6a94..0000000
--- a/src/views/information/teamInfo/index.vue
+++ /dev/null
@@ -1,1159 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2022-10-24 15:45:01
--->
-<template>
-  <div class="page">
-    <topBar
-      v-if="topList.length > 0"
-      :top-list="topList"
-      :moren="moren"
-    />
-    <div class="main">
-      <el-form
-        ref="select"
-        :model="select"
-        label-width="100px"
-        style="background-color: #fff;padding: 0px 10px 0 10px"
-      >
-        <el-row>
-          <!-- 一层 -->
-          <el-col :span="4">
-            <el-form-item :label="'会员编号'">
-              <el-input
-                v-model="select.memberCode"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'真实奖衔'">
-              <el-select
-                v-model="select.pkAwards"
-                clearable
-                placeholder=""
-              >
-                <el-option
-                  v-for="item in awardsList"
-                  :key="item.pkId"
-                  :label="item.awardsName"
-                  :value="item.pkId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'关系类型'">
-              <el-select
-                v-model="select.relaType"
-                clearable
-                placeholder=""
-              >
-                <el-option
-                  v-for="item in kdzcList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!--          <el-col :span="4">-->
-          <!--            <el-form-item :label="'安置部门'">-->
-          <!--              <el-select-->
-          <!--                v-model="select.placeDept"-->
-          <!--                clearable-->
-          <!--                placeholder=""-->
-          <!--              >-->
-          <!--                <el-option-->
-          <!--                  v-for="item in deptList"-->
-          <!--                  :key="item.deptId"-->
-          <!--                  :label="item.deptName"-->
-          <!--                  :value="item.deptId"-->
-          <!--                />-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <el-col :span="4">
-            <el-form-item :label="'血缘代数'">
-              <el-input
-                v-model="select.consanguinityAlgebra"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'安置层数'">
-              <el-input
-                v-model="select.resettleLevel"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'安置位置'">
-              <el-select
-                v-model="select.placeDept"
-                clearable
-                placeholder=""
-              >
-                <el-option
-                  v-for="item in deptList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="4">
-            <el-form-item :label="'奖金收益'">
-              <el-input v-model="select.realIncomeTotal" clearable />
-            </el-form-item>
-          </el-col> -->
-          <el-col :span="4">
-            <el-form-item
-              :label="'查询日期'"
-              prop="creationTime"
-              class="el-check_s"
-            >
-              <el-date-picker
-                v-model="creationTime3"
-                value-format="yyyy-MM-dd"
-                type="date"
-                :placeholder="'请选择'"
-                @change="changeTime2"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="4"
-            style="margin-left: 30px"
-          >
-            <el-button
-              type="primary"
-              style="background-color: #c8161d"
-              @click="getDataList"
-            > {{ '搜索' }}</el-button>
-            <el-button @click="reset"> {{ '重置' }}</el-button>
-          </el-col>
-
-        </el-row>
-      </el-form>
-      <div class="maintop">
-        <div class="mainbtn">
-          <el-button
-            v-hasButtons="['teamInfoExport']"
-            size="small"
-            class="thebtn2"
-            @click="exports"
-          > {{ '导出' }}</el-button>
-        </div>
-        <div>
-          <el-dropdown :hide-on-click="false">
-            <span
-              class="el-dropdown-link kuang"
-              style="margin-right: 10px"
-            >
-              {{ '筛选字段' }}<i class="el-icon-arrow-down el-icon--right" />
-            </span>
-            <el-dropdown-menu
-              slot="dropdown"
-              style="overflow: auto;height: 70%"
-            >
-              <el-dropdown-item
-                v-for="item in menuList"
-                :key="item.id"
-              >
-                <el-checkbox
-                  v-model="item.checked"
-                  @change="getMenu($event,item.id)"
-                >{{ item.text }}</el-checkbox></el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </div>
-      </div>
-      <div class="maintable">
-        <div class="itemTrading">
-          <el-table
-            ref="table"
-            v-loading="loading"
-            :data="tableData.censusSummaryList"
-            style="width: 100%"
-            :header-cell-style="{ background: '#EEEEEE' }"
-            :row-class-name="tableRowClassName"
-            :summary-method="getSummaries"
-            show-summary
-            height="720px"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column
-              type="selection"
-              width="55"
-            />
-            <el-table-column
-              v-if="allTxt.memberCode"
-              align="center"
-              prop="memberCode"
-              width="130"
-              :label="'会员编号'"
-            />
-            <el-table-column
-              v-if="allTxt.memberName"
-              align="center"
-              prop="memberName"
-              width="130"
-              :label="'会员姓名'"
-            />
-            <el-table-column
-              v-if="allTxt.pkAwardsStr"
-              align="center"
-              prop="pkAwardsStr"
-              width="130"
-              :label="'真实奖衔'"
-            />
-            <el-table-column
-              v-if="menuList[1].checked==true&&allTxt.resettleLevel"
-              align="center"
-              prop="resettleLevel"
-              width="130"
-              :label="'安置层数'"
-            />
-            <el-table-column
-              v-if="menuList[3].checked==true&&allTxt.placeDeptStr"
-              align="center"
-              prop="placeDeptStr"
-              width="130"
-              :label="'安置位置'"
-            />
-            <el-table-column
-              v-if="allTxt.placeParentCode"
-              align="center"
-              prop="placeParentCode"
-              width="130"
-              :label="'安置编号'"
-            />
-            <el-table-column
-              v-if="menuList[2].checked==true&&allTxt.consanguinityAlgebra"
-              align="center"
-              prop="consanguinityAlgebra"
-              width="130"
-              :label="'血缘代数'"
-            />
-            <el-table-column
-              v-if="menuList[4].checked==true&&allTxt.afirstPv"
-              align="center"
-              prop="afirstPv"
-              width="130"
-              :label="'左区首购业绩'+`(${isLocals()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[5].checked==true&&allTxt.bfirstPv"
-              align="center"
-              prop="bfirstPv"
-              width="130"
-              :label="'右区首购业绩'+`(${isLocals()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[6].checked==true&&allTxt.consanguinityFirstPv"
-              align="center"
-              prop="consanguinityFirstPv"
-              width="130"
-              :label="'血缘首购业绩'+`(${isLocals()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[7].checked==true&&allTxt.repASumPv"
-              align="center"
-              prop="repASumPv"
-              width="130"
-              :label="'左区复购业绩'+`(${isLocals()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[8].checked==true&&allTxt.repBSumPv"
-              align="center"
-              prop="repBSumPv"
-              width="130"
-              :label="'右区复购业绩'+`(${isLocals()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[9].checked==true&&allTxt.consanguinityRepBSumPv"
-              align="center"
-              prop="consanguinityRepBSumPv"
-              width="130"
-              :label="'血缘复购业绩'+`(${isLocals()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[10].checked==true&&allTxt.aSumRealPv"
-              align="center"
-              prop="aSumRealPv"
-              width="130"
-              :label="'左区真实业绩'+`(${isLocals()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[11].checked==true&&allTxt.bSumRealPv"
-              align="center"
-              prop="bSumRealPv"
-              width="130"
-              :label="'右区真实业绩'+`(${isLocals()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[12].checked==true&&allTxt.consanguinityRealPv"
-              align="center"
-              prop="consanguinityRealPv"
-              width="130"
-              :label="'血缘真实业绩'+`(${isLocals()})`"
-              :formatter="stateFormat"
-            />
-            <!-- <el-table-column
-              align="center"
-              prop=""
-              width="130"
-              :label="'奖金收益'+'($)'"
-              :formatter="stateFormat"
-              v-if="menuList[13].checked==true"
-            /> -->
-            <el-table-column
-              v-if="menuList[15].checked==true&&allTxt.bonusTeamProportion"
-              align="center"
-              prop="bonusTeamProportion"
-              width="130"
-              :label="'奖金团队占比'+'(%)'"
-            />
-            <el-table-column
-              v-if="menuList[14].checked==true&&allTxt.bonusLargeMarketProportion"
-              align="center"
-              prop="bonusLargeMarketProportion"
-              width="130"
-              :label="'奖金大盘占比' +('%')"
-            />
-            <el-table-column
-              v-if="menuList[16].checked==true&&allTxt.directPushPeopleNumber"
-              align="center"
-              prop="directPushPeopleNumber"
-              width="130"
-              :label="'直推人数'"
-            />
-            <el-table-column
-              v-if="menuList[17].checked==true&&allTxt.directPushPeoplePv"
-              align="center"
-              prop="directPushPeoplePv"
-              width="130"
-              :label="'直推业绩'"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[18].checked==true&&allTxt.repurchaseAmount"
-              align="center"
-              prop="repurchaseAmount"
-              width="130"
-              :label="'复购金额'+('$')"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[19].checked==true&&allTxt.repurchasePv"
-              align="center"
-              prop="repurchasePv"
-              width="130"
-              :label="'复购业绩'"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[20].checked==true&&allTxt.repurchaseIntegral"
-              align="center"
-              prop="repurchaseIntegral"
-              width="130"
-              :label="'复购积分'"
-            />
-            <el-table-column
-              v-if="menuList[21].checked==true&&allTxt.benefitAmount"
-              align="center"
-              prop="benefitAmount"
-              width="130"
-              :label="'福利金额'+`(${isLocals()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[22].checked==true&&allTxt.benefitPv"
-              align="center"
-              prop="benefitPv"
-              width="130"
-              :label="'福利业绩'+`(${isLocals()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[23].checked==true&&allTxt.welfarePoints"
-              align="center"
-              prop="welfarePoints"
-              width="130"
-              :label="'福利积分'"
-            />
-            <el-table-column
-              v-if="menuList[24].checked==true&&allTxt.memberTransferCount"
-              align="center"
-              prop="memberTransferCount"
-              width="130"
-              :label="'转账次数'"
-            />
-            <el-table-column
-              v-if="menuList[25].checked==true&&allTxt.transferAmount"
-              align="center"
-              prop="transferAmount"
-              width="130"
-              :label="'转账金额'+'($)'"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[26].checked==true&&allTxt.rechargeAmount"
-              align="center"
-              prop="rechargeAmount"
-              width="130"
-              :label="'充值金额'+'($)'"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[27].checked==true&&allTxt.withdrawalNumber"
-              align="center"
-              prop="withdrawalNumber"
-              width="130"
-              :label="'提现次数'"
-            />
-            <!-- <el-table-column align="center"
-                             prop="withdrawalAmount"
-                             width="130"
-                             :label="'提现金额'+'($)'"
-                             v-if="allTxt.withdrawalAmount" /> -->
-            <el-table-column
-              v-if="menuList[28].checked==true&&allTxt.withdrawalAmount"
-              align="center"
-              prop="withdrawalAmount"
-              width="130"
-              :label="'提现金额'+'($)'"
-            />
-            <el-table-column
-              v-if="menuList[29].checked==true&&allTxt.lastLoginTime"
-              align="center"
-              prop="lastLoginTime"
-              width="130"
-              :label="'最近登录'"
-            />
-            <el-table-column
-              v-if="menuList[13].checked==true&&allTxt.loginNumber"
-              align="center"
-              prop="loginNumber"
-              width="130"
-              :label="'登录次数'"
-            />
-            <el-table-column
-              v-if="allTxt.creationTime"
-              align="center"
-              prop="creationTime"
-              width="200"
-              :label="'创建日期'"
-            />
-            <el-table-column
-              v-if="allTxt.payTime"
-              align="center"
-              prop="payTime"
-              width="200"
-              :label="'支付日期'"
-            />
-            <el-table-column
-              v-if="allTxt.directPushNumber"
-              align="center"
-              prop="directPushNumber"
-              width="120"
-              :label="'修改直推次数'"
-            />
-          </el-table>
-        </div>
-        <!--        <div class="heji">-->
-        <!--          <div-->
-        <!--            v-for="item in menuList"-->
-        <!--            v-if="item.checked && item.id != 0 && item.id > 13"-->
-        <!--            :key="item.id"-->
-        <!--            class="dis"-->
-        <!--          >-->
-        <!--            <div>{{ item.text }}</div>-->
-        <!--            <div>{{ tableData[item.prop] }}</div>-->
-        <!--          </div>-->
-        <!--        </div>-->
-      </div>
-    </div>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getDataList"
-    />
-  </div>
-</template>
-
-<script>
-import topBar from '@/components/topBar'
-import * as api from '@/api/settle.js'
-import * as api_s from '@/api/product.js'
-import * as apis from '@/api/site.js'
-import { classifyUpdate, classifySave } from '@/api/product'
-import * as log from '@/api/logistics'
-import { getcountryAllList } from '@/api/exchangerate'
-import { bonusSource } from '@/api/bonus'
-import * as del from '@/api/delivery'
-import { getPlacedeptList } from '@/api/specialBusiness'
-import { deptAll, exportClassIfy, memberTeamInfo } from '@/api/product.js'
-import { isLocal, isLocals, stateFormat } from '@/utils/numberToCurrency'
-import { getAwardsListChiose } from '@/api/level'
-import store from '@/store'
-import { getRoleMenu } from '@/api/notice'
-
-export default {
-  name: 'Bzpz',
-  components: {
-    topBar
-  },
-  filters: {
-    isAgree(val) {
-      if (!val) {
-        return '允许'
-      } else {
-        return '禁止'
-      }
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      kdzcList: [
-        {
-          value: '1',
-          label: '血缘'
-        },
-        {
-          value: '2',
-          label: '安置'
-        }
-      ], // 注册类型
-      regionParams: {
-        label: 'name',
-        value: 'id',
-        children: 'children',
-        expandTrigger: 'hover'
-      },
-      isActive: false,
-      typeList: [
-        {
-          value: 0,
-          label: '前台'
-        },
-        {
-          value: 1,
-          label: '后台'
-        }
-      ],
-      digList: [
-        {
-          value: 0,
-          label: '允许'
-        },
-        {
-          value: 1,
-          label: '禁止'
-        }
-      ],
-      menuList: [
-        {
-          id: 0,
-          text: '全选',
-          checked: false
-        },
-        {
-          id: 1,
-          text: '安置层数',
-          checked: true
-        },
-        {
-          id: 2,
-          text: '血缘代数',
-          checked: true
-        },
-        {
-          id: 3,
-          text: '安置位置',
-          checked: true,
-          prop: ''
-        },
-        {
-          id: 4,
-          text: '左区首购业绩',
-          checked: true,
-          prop: ''
-        },
-        {
-          id: 5,
-          text: '右区首购业绩',
-          checked: true,
-          prop: ''
-        },
-        {
-          id: 6,
-          text: '血缘首购业绩',
-          checked: true,
-          prop: ''
-        },
-        {
-          id: 7,
-          text: '左区复购业绩',
-          checked: true,
-          prop: ''
-        },
-        {
-          id: 8,
-          text: '右区复购业绩',
-          checked: true,
-          prop: ''
-        },
-        {
-          id: 9,
-          text: '血缘复购业绩',
-          checked: true
-        },
-        {
-          id: 10,
-          text: '左区真实业绩',
-          checked: true,
-          prop: ''
-        },
-        {
-          id: 11,
-          text: '右区真实业绩',
-          checked: true,
-          prop: 'priceDollar'
-        },
-        {
-          id: 12,
-          text: '血缘真实业绩',
-          checked: true,
-          prop: 'postageDollar'
-        },
-        {
-          id: 30,
-          text: '登录次数',
-          checked: true,
-          prop: 'lastInstanceRemark'
-        },
-        {
-          id: 14,
-          text: '奖金团队占比',
-          checked: true,
-          prop: ''
-        },
-        {
-          id: 15,
-          text: '奖金大盘占比',
-          checked: true,
-          prop: ''
-        },
-        {
-          id: 16,
-          text: '直推人数',
-          checked: true,
-          prop: 'creationTime'
-        },
-        {
-          id: 17,
-          text: '直推业绩',
-          checked: true,
-          prop: 'payTime'
-        },
-        {
-          id: 18,
-          text: '复购金额',
-          checked: true,
-          prop: 'deliveryTime'
-        },
-        {
-          id: 19,
-          text: '复购业绩',
-          checked: true,
-          prop: 'deliveryWayStr'
-        },
-        {
-          id: 20,
-          text: '复购积分',
-          checked: true,
-          prop: ''
-        },
-        {
-          id: 21,
-          text: '福利金额',
-          checked: true,
-          prop: 'tranTypeStr'
-        },
-        {
-          id: 22,
-          text: '福利业绩',
-          checked: true,
-          prop: 'approvalStatus'
-        },
-        {
-          id: 23,
-          text: '福利积分',
-          checked: true,
-          prop: 'payTypeStr'
-        },
-        {
-          id: 24,
-          text: '转账次数',
-          checked: true,
-          prop: 'creationTime'
-        },
-        {
-          id: 25,
-          text: '转账金额',
-          checked: true,
-          prop: 'creatorName'
-        },
-        {
-          id: 26,
-          text: '充值金额',
-          checked: true,
-          prop: 'lastInstanceDate'
-        },
-        {
-          id: 27,
-          text: '提现次数',
-          checked: true,
-          prop: 'lastInstanceApprover'
-        },
-        {
-          id: 28,
-          text: '提现金额',
-          checked: true,
-          prop: 'withdrawalAmount'
-        },
-        {
-          id: 29,
-          text: '最近登录',
-          checked: true,
-          prop: 'lastLoginTime '
-        }
-
-      ],
-      creationTime: [],
-      creationTime1: [],
-      creationTime2: [],
-      creationTime3: '',
-      select: {},
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 50
-      },
-      addOrEdit: '',
-      total: 0,
-      dialogVisible: false,
-      tableData: {
-        censusSummaryList: []
-      },
-      moren: 'teamInfo',
-      topList: [
-        {
-          name: '团队信息',
-          path: 'teamInfo'
-        }
-      ],
-      form: {
-        name: ''
-      },
-      areaData: [],
-      rules: {
-        name: [
-          { required: true, message: '请输入规格类型', trigger: 'blur' }
-        ]
-      },
-      shoppingAddress: [],
-      acList: [],
-      verList: [],
-      memberList: [],
-      yieldList: [],
-      yieldStatus: [],
-      countryList: [],
-      orderTypeList: [],
-      pkMemberTeam: [],
-      pkVertex: [],
-      typeId: '',
-      paywayList: [],
-      presaleStatusList: [],
-      orderStatusList: [],
-      deptList: [],
-      transportTypeList: [],
-      gyList: [],
-      awardsList: [],
-      allTxt: {}
-    }
-  },
-  computed: {
-    store() {
-      return store
-    }
-  },
-  mounted() {
-    // 获取下拉
-    this.getData()
-    // 获取列表
-    this.getDataList()
-    this.getUserRole()
-  },
-  methods: {
-    getUserRole() {
-      getRoleMenu('TeamInfo').then((res) => {
-        const obj = {}
-        res.data.forEach((item) => {
-          obj[item] = 1
-        })
-        this.allTxt = obj
-        this.$nextTick(() => {
-          this.$refs.table.doLayout()
-        })
-      })
-    },
-    isLocals,
-    isLocal,
-    stateFormat,
-    exports() {
-      this.$confirm('是否确认导出所有数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then((_) => {
-        this.download(
-          '/member/manager/member/member-team-info-export',
-          Object.assign({}, this.queryParams, this.select),
-          `团队信息${new Date().getTime()}.xlsx`
-        )
-      })
-      // this.download(
-      //   "/member/manager/member/member-team-info-export",
-      //   { ...this.queryParams },
-      //   `${'团队信息'}-${new Date().getTime()}.xlsx`
-      // );
-    },
-    handleChange(res) {
-      this.form.recProvince = res[0]
-      this.form.recCity = res[1]
-      this.form.recCounty = res[2]
-    },
-    // 展开折叠
-    changeActive() {
-      this.isActive = !this.isActive
-    },
-    reset() {
-      this.select = {}
-      this.pkVertex = []
-      this.pkMemberTeam = []
-      this.typeId = ''
-      this.creationTime3 = ''
-      this.getDataList()
-    },
-    getMenu(e, id) {
-      if (e && id == 0) {
-        this.menuList.forEach((item) => {
-          this.$set(item, 'checked', true)
-        })
-      } else if (!e && id == 0) {
-        this.menuList.forEach((item) => {
-          this.$set(item, 'checked', false)
-        })
-      }
-    },
-    getData() {
-      getAwardsListChiose().then((res) => {
-        this.awardsList = res.rows
-      })
-      // 获取左区右区
-      getPlacedeptList().then((res) => {
-        this.deptList = res.data
-      })
-    },
-    changeTime(val) {
-      this.select.startCreationTime = val[0]
-      this.select.endCreationTime = val[1]
-    },
-    changeTime1(val) {
-      this.select.startPayTime = val[0]
-      this.select.endPayTime = val[1]
-    },
-    changeTime2(val) {
-      this.select.queryDate = val
-    },
-    changeTime3(val) {
-      this.select.startCreationTime = val[0]
-      this.select.endCreationTime = val[1]
-    },
-    // 点击修改
-    toFixed(id) {
-      this.addOrEdit = false
-      this.dialogVisible = true
-      this.$router.push({
-        path: 'noticeList/details',
-        query: {
-          pkId: id
-        }
-      })
-    },
-    getSummaries(param) {
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = ''
-          return
-        }
-        if (index === 1) {
-          sums[index] = ''
-          return
-        }
-        const values = data.map((item) => Number(item[column.property]))
-        if (!values.every((value) => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return
-            } else {
-              return
-            }
-          }, 0)
-          // sums[index] += ' 元'
-        } else {
-          sums[index] = ''
-        }
-      })
-
-      return sums
-    },
-    onSubmit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          let url = ''
-          if (this.addOrEdit == true) {
-            url = classifySave
-          } else {
-            url = classifyUpdate
-          }
-          url(this.form).then((res) => {
-            if (res.code == 200) {
-              this.$message({
-                message: res.msg,
-                type: 'success'
-              })
-              this.dialogVisible = false
-              // 充值数据
-              this.$refs[formName].resetFields()
-              // 获取列表
-              this.getDataList()
-            }
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    handleClose() {
-      this.dialogVisible = false
-      this.$refs['form'].clearValidate()
-      this.$refs['form'].resetFields()
-    },
-    openDig() {
-      // 导出撤单列表
-      this.$router.push({
-        path: 'noticeList/details'
-      })
-    },
-    getDataList() {
-      this.loading = true
-      if (this.creationTime3 == '' || this.creationTime3 == null) {
-        this.select.queryDate = ''
-      }
-      api_s
-        .memberTeamInfo(Object.assign({}, this.queryParams, this.select))
-        .then((res) => {
-          this.loading = false
-          this.tableData.censusSummaryList = res.rows
-          this.total = res.total
-        })
-    },
-    handleSelectionChange(val) {},
-    handleExport() {
-      this.$confirm('是否确认导出所有数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then((_) => {
-        // this.download(
-        //   '/member/manager/trade/export',
-        //   Object.assign({}, this.queryParams, this.select),
-        //   `撤单列表${new Date().getTime()}.xlsx`
-        // )
-      })
-    },
-    tableRowClassName({ row, rowIndex }) {
-      if (rowIndex % 2 == 1) {
-        return 'warning-row'
-      } else if (rowIndex % 2 == 0) {
-        return 'success-row'
-      }
-      return ''
-    }
-  }
-}
-</script>
-<style scoped lang="scss">
-::v-deep .el-date-editor.el-input,
-.el-date-editor.el-input__inner {
-  width: 100%;
-}
-::v-deep .el-dropdown-menu {
-  height: 1000px !important;
-  overflow: auto !important;
-}
-::v-deep .el-input__inner {
-  //text-align: center;
-}
-::v-deep .el-check_s .el-input__inner {
-  width: 100%;
-}
-::v-deep .el-cascader {
-  width: 100%;
-}
-//缩短间隔
-::v-deep .el-form-item {
-  margin-bottom: 10px;
-}
-
-::v-deep .el-table .warning-row {
-  background: #f9f9f9;
-}
-
-::v-deep .el-table .success-row {
-  background: #ffffff;
-}
-::v-deep .el-table thead {
-  color: #000000;
-}
-::v-deep .el-select {
-  width: 100%;
-}
-.uploadIcon ::v-deep .el-upload--picture-card {
-  display: none !important; /* 上传按钮隐藏 */
-}
-.page {
-  padding: 10px 20px;
-  background: #f9f9f9;
-  font-size: 14px;
-  .main {
-    background: #f9f9f9;
-    overflow: hidden;
-    //border-radius: 8px;
-    //box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
-    //padding-top: 20px;
-    .maintop {
-      display: flex;
-      //padding: 10px 0;
-      justify-content: space-between;
-      align-items: center;
-      .mainbtn {
-        .thebtn1 {
-          background: #3181e5;
-          color: #ffffff;
-        }
-        .thebtn2 {
-          width: 68px;
-          height: 32px;
-          background: #ffad41;
-          color: #ffffff;
-        }
-      }
-      .maintitle {
-        font-size: 10px;
-        font-family: MicrosoftYaHei;
-        color: #999999;
-      }
-    }
-  }
-  .tem {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    img {
-      width: 28px;
-      height: 20px;
-      margin-right: 3px;
-    }
-  }
-  .isRed {
-    color: #ed1d25;
-  }
-  .isGreen {
-    color: #1ab62b;
-  }
-  .bgImg {
-    width: 48px;
-    height: 48px;
-  }
-}
-.openClose {
-  margin-right: 10px;
-  color: #666666;
-  text-align: center;
-  padding-bottom: 10px;
-}
-.kuang {
-  padding: 5px 20px;
-  background: rgba(255, 255, 255, 0);
-  border-radius: 4px;
-  border: 1px solid #cccccc;
-}
-.heji {
-  margin-top: 10px;
-  .dis {
-    display: flex;
-    justify-content: right;
-    padding: 5px 10px;
-    font-size: 14px;
-    color: #333333;
-    :nth-child(1) {
-      font-size: 14px;
-      font-weight: bold;
-      color: #333333;
-      margin-right: 20px;
-    }
-  }
-}
-</style>
-<style>
-/* .itemTrading .el-table {
-  overflow: auto;
-}
-.itemTrading .el-table__body-wrapper,
-.itemTrading .el-table__header-wrapper,
-.itemTrading .el-table__footer-wrapper {
-  overflow: visible;
-}
-.itemTrading .el-table::after {
-  position: relative !important;
-}
-
-.body-theme-grenn .el-table--scrollable-x .el-table__body-wrapper {
-  overflow: visible;
-} */
-</style>
diff --git a/src/views/statistics/awardAnalysis.vue b/src/views/statistics/awardAnalysis.vue
deleted file mode 100644
index e47e254..0000000
--- a/src/views/statistics/awardAnalysis.vue
+++ /dev/null
@@ -1,468 +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="queryParams.memberCode" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'会员姓名'">
-              <el-input v-model="queryParams.memberName" clearable />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="4">
-            <el-form-item :label="'联系方式'">
-              <el-input v-model="queryParams.phone" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'注册等级'">
-              <el-select
-                v-model="queryParams.pkRegisterGrade"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in gradeRangList"
-                  :key="item.pkId"
-                  :label="item.gradeName"
-                  :value="item.pkId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'荣誉奖衔'">
-              <el-select
-                v-model="queryParams.pkAwards"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in awardsList"
-                  :key="item.pkId"
-                  :label="item.awardsName"
-                  :value="item.pkId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'隶属体系'">
-              <el-select
-                v-model="queryParams.pkVertex"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in vertexList"
-                  :key="item.pkId"
-                  :label="item.vertexName"
-                  :value="item.pkId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'隶属团队'">
-              <el-select
-                v-model="queryParams.pkTeamCode"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in memberTeamList"
-                  :key="item.pkId"
-                  :label="item.teamName"
-                  :value="item.pkId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="晋升方式">
-              <el-select
-                v-model="queryParams.upType"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in upList"
-                  :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="queryParams.thetimes"
-                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();
-                    getCzNum();
-                  }
-                "
-              >
-                {{ '搜索' }}</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="680px"
-          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="'会员姓名'"
-            min-width="120px"
-          />
-
-          <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="asumRealPv"
-            min-width="130px"
-            :label="'左区真实累计业绩' + `(PV)`"
-          >
-            <template slot-scope="scope">
-              <span
-                style="
-                  color: #48b2fd;
-                  cursor: pointer;
-                  text-decoration: underline;
-                "
-                @click="goDetail(1, scope.row)"
-              >{{ scope.row.asumRealPv | numFilter }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="bsumRealPv"
-            min-width="130px"
-            :label="'右区真实累计业绩' + `(PV)`"
-          >
-            <template slot-scope="scope">
-              <span
-                style="
-                  color: #48b2fd;
-                  cursor: pointer;
-                  text-decoration: underline;
-                "
-                @click="goDetail(2, scope.row)"
-              >
-                {{ scope.row.bsumRealPv | numFilter }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            align="center"
-            prop="upTypeVal"
-            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 sta from '@/api/statistics'
-import { getAwardsListChiose, getgradeRanglist } from '@/api/level'
-import { getvertexValue, getmemberTeamList } from '@/api/financialCase'
-import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
-export default {
-  name: 'AwardAnalysis',
-  components: {
-    topBar
-  },
-  filters: {
-    numFilter(value) {
-      // 截取当前数据到小数点后两位
-      const realVal = parseFloat(value).toFixed(2)
-      return realVal
-    }
-  },
-  data() {
-    return {
-      moren: 'awardAnalysis',
-      topList: [
-        {
-          name: '荣誉奖衔分析',
-          path: 'awardAnalysis'
-        }
-      ],
-      tableData: [],
-      loading: false,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 50,
-        thetimes: [],
-        placeDept: '',
-        pkMember: ''
-      },
-      total: 0,
-      multipleSelection: [],
-      awardsList: [],
-      memberTeamList: [],
-      vertexList: [],
-      gradeRangList: [],
-      upList: []
-    }
-  },
-  created() {
-    this.getSearch()
-    this.getOthers()
-  },
-  methods: {
-    // 穿透到详情页 左区1右区2
-    goDetail(index, row) {
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 50,
-        thetimes: [],
-        placeDept: '',
-        pkMember: ''
-      }
-      this.queryParams.placeDept = index
-      this.queryParams.pkMember = row.pkMember
-      sta.getUmbrellaAnalysisDetailList(this.queryParams).then((res) => {
-        this.tableData = res.rows
-      })
-    },
-    isLocalSymbol,
-    isLocals,
-    changeTime(val) {
-      this.queryParams.startDate = val[0]
-      this.queryParams.endDate = val[1]
-    },
-    getOthers() {
-      getAwardsListChiose().then((res) => {
-        this.awardsList = res.rows
-      })
-      sta.getUpListList().then((res) => {
-        this.upList = res.data
-      })
-      getmemberTeamList().then((res) => {
-        this.memberTeamList = res.rows
-      })
-      getvertexValue().then((res) => {
-        this.vertexList = res.data
-      })
-      getgradeRanglist().then((res) => {
-        this.gradeRangList = res.data
-      })
-    },
-    // 导出
-    handleExport() {
-      this.$confirm('是否确认导出所有数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then((_) => {
-        if (this.queryParams.pkMember) {
-          // 穿透页导出
-          this.download(
-            '/report/manager/member-awards/export-analysis-details',
-            { ...this.queryParams },
-            `${'荣誉奖衔分析'}${new Date().getTime()}.xlsx`
-          )
-        } else {
-          this.download(
-            '/report/manager/member-awards/export-analysis',
-            { ...this.queryParams },
-            `${'荣誉奖衔分析'}${new Date().getTime()}.xlsx`
-          )
-        }
-      })
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    reChongzhi() {
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 50,
-        thetimes: [],
-        placeDept: '',
-        pkMember: ''
-      }
-      this.getSearch()
-    },
-    getSearch() {
-      this.loading = true
-      sta.getUmbrellaAnalysisList(this.queryParams).then((res) => {
-        this.tableData = res.rows
-        this.total = res.total
-        this.loading = false
-      })
-    },
-    getCzNum() {
-      this.queryParams.pageNum = 1
-    }
-  }
-}
-</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>
diff --git a/src/views/statistics/directStatistics.vue b/src/views/statistics/directStatistics.vue
deleted file mode 100644
index 4863eda..0000000
--- a/src/views/statistics/directStatistics.vue
+++ /dev/null
@@ -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>

From 9221ed12215b6719bf7a11687b742d3ffbb78343 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Thu, 3 Jul 2025 17:25:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(business/order):=20=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=92=A4=E9=94=80=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/information/business/order.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/information/business/order.vue b/src/views/information/business/order.vue
index 837e349..f4b0f81 100644
--- a/src/views/information/business/order.vue
+++ b/src/views/information/business/order.vue
@@ -420,14 +420,14 @@
                     scope.row.howLong < 7
                     && scope.row.orderType != 30
                 " -->
-              <el-button
+              <!-- <el-button
                 v-if="![1, 2, 7, 24, 25, 26, 30].includes(scope.row.orderType) && scope.row.howLong < 7"
                 v-hasButtons="['OrderBusinessCancel']"
                 style="color: rgba(72, 178, 253, 1)"
                 type="text"
                 size="small"
                 @click="backOrder(scope.row.orderCode, 4)"
-              >撤销产品</el-button>
+              >撤销产品</el-button> -->
               <el-button
                 v-show="(scope.row.orderType == 1 || scope.row.orderType == 24 || scope.row.orderType == 7) && scope.row.returnFlag ==0 && scope.row.orderType != 30"
                 v-hasButtons="['OrderBusinessReturn']"

From d922faf02726b47a072a028d530f63c7dd8e0319 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Sat, 5 Jul 2025 14:09:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat(goods):=20=E5=95=86=E5=93=81-=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E8=AE=BE=E7=BD=AE=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/goodsManage/goodsList/goodsEdit/jcsz.vue | 7 +++++--
 src/views/goodsManage/goodsRelease/jcsz.vue        | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
index 3e1e660..30ad23b 100644
--- a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
+++ b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
@@ -540,13 +540,16 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item :label="'标签提示'">
+              <el-col :span="8">
+                <el-form-item :label="'自定义标签'">
                   <el-input
                     v-model="form.warnMessage"
                     clearable
                     :disabled="methods==0"
                     :placeholder="'请输入'"
+                    :maxlength="4"
+                    :minlength="2"
+                    show-word-limit
                   />
                 </el-form-item>
               </el-col>
diff --git a/src/views/goodsManage/goodsRelease/jcsz.vue b/src/views/goodsManage/goodsRelease/jcsz.vue
index 5ad33d0..efa4add 100644
--- a/src/views/goodsManage/goodsRelease/jcsz.vue
+++ b/src/views/goodsManage/goodsRelease/jcsz.vue
@@ -510,12 +510,15 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item :label="'标签提示'">
+              <el-col :span="8">
+                <el-form-item :label="'自定义标签'">
                   <el-input
                     v-model="form.warnMessage"
                     clearable
                     :placeholder="'请输入'"
+                    :maxlength="4"
+                    :minlength="2"
+                    show-word-limit
                   />
                 </el-form-item>
               </el-col>