## 奖金汇总、奖金明细字段调整；

src/views/settlementCenter/bonusDetail/index.vue

@@ -6,7 +6,7 @@
 -->
 <template>
   <div class="page">
-    <topBar v-if="topList.length > 0" :top-list="topList" :moren="moren" />
+    <topBar v-if="topList.length > 0" :top-list="topList" :moren="moren"/>
     <div class="main">
       <el-form
         ref="select"
@@ -17,12 +17,12 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item :label="'会员编号'">
-              <el-input v-model="select.memberCode" clearable />
+              <el-input v-model="select.memberCode" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'会员姓名'">
-              <el-input v-model="select.memberName" clearable />
+              <el-input v-model="select.memberName" clearable/>
             </el-form-item>
           </el-col>
           <!--          <el-col :span="4" style="margin-left: 38px">-->
@@ -57,7 +57,7 @@
             <el-form-item :label="'结算期数'">
               <div style="display: flex">
                 <div>
-                  <el-input v-model="select.period" clearable />
+                  <el-input v-model="select.period" clearable/>
                 </div>
                 <!--               <span style="margin: 0 10px">至</span>-->
                 <!--               <div>-->
@@ -95,9 +95,11 @@
 
           <el-col :span="4">
             <el-button type="primary" class="my_search" @click="getDataList">
-              {{ '搜索' }}</el-button>
+              {{ '搜索' }}
+            </el-button>
             <el-button class="my_reset" @click="reset">
-              {{ '重置' }}</el-button>
+              {{ '重置' }}
+            </el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -109,14 +111,16 @@
             style="background-color: #ff6723"
             class="thebtn2"
           >
-            {{ '导入' }}</el-button>
+            {{ '导入' }}
+          </el-button>
           <el-button
             v-hasButtons="['BonusDetailExport']"
             size="small"
             class="thebtn2"
             @click="handleExport"
           >
-            {{ '导出' }}</el-button>
+            {{ '导出' }}
+          </el-button>
         </div>
         <!-- <div>
           <el-dropdown :hide-on-click="false">
@@ -144,7 +148,7 @@
             :row-class-name="tableRowClassName"
             @selection-change="handleSelectionChange"
           >
-            <el-table-column type="selection" width="100" />
+            <el-table-column type="selection" width="100"/>
             <el-table-column
               align="center"
               prop="memberCode"
@@ -185,127 +189,16 @@
               align="center"
               prop="retailRangeIncomeOri"
               width="130"
-              :label="$t('直推收益') + `(${isLocalSymbol()})`"
+              :label="$t('直推级差收益') + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
             <el-table-column
               align="center"
-              prop="retailSameLevelIncomeOri"
+              prop="repurRangeIncomeOri"
               width="130"
-              :label="$t('平级收益') + `(${isLocalSymbol()})`"
+              :label="$t('复购级差收益') + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
-            <el-table-column
-              align="center"
-              prop="retailAreaIncomeOri"
-              width="130"
-              :label="$t('区域收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              align="center"
-              prop="retailBenefitRangeIncomeOri"
-              width="130"
-              :label="$t('福利极差收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="retailBenefitIncomeOri"
-              width="130"
-              :label="$t('福利分红收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="backPointsOri"
-              width="130"
-              :label="$t('重消收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="retailRealSubtotalOri"
-              width="130"
-              :label="$t('小计') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="repurCouponOri"
-              width="130"
-              :formatter="stateFormat"
-              :label="'复购券' + `(${isLocalSymbol()})`"
-            />
-
-            <el-table-column
-              align="center"
-              prop="repurCouponShareOri"
-              width="130"
-              :formatter="stateFormat"
-              :label="'复购券均分'"
-            />
-
-            <el-table-column
-              align="center"
-              prop="backPointsOri"
-              width="130"
-              :formatter="stateFormat"
-              :label="'商城重消' + `(${isLocalSymbol()})`"
-            />
-
-            <el-table-column
-              align="center"
-              prop="serviceSpendOri"
-              width="130"
-              :formatter="stateFormat"
-              :label="'平台服务费' + `(${isLocalSymbol()})`"
-            />
-
-            <el-table-column
-              align="center"
-              prop="globalPointsOri"
-              width="130"
-              :label="$t('直推极差') + '(￥)'"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="purRealSubtotalOri"
-              width="130"
-              :formatter="stateFormat"
-              :label="'首购实发小计' + `(${isLocalSymbol()})`"
-            />
-
-            <el-table-column
-              align="center"
-              prop="cloudRealSubtotalOri"
-              width="130"
-              :formatter="stateFormat"
-              :label="$t('极差小计') + '(¥)'"
-            />
-
-            <el-table-column
-              align="center"
-              prop="repurRealSubtotalOri"
-              width="130"
-              :formatter="stateFormat"
-              :label="'复购实发小计' + `(${isLocalSymbol()})`"
-            />
-
-            <el-table-column
-              align="center"
-              prop="repurCouponSubtotalOri"
-              width="160"
-              :formatter="stateFormat"
-              :label="'复购券实发小计' + `(${isLocalSymbol()})`"
-            />
-
             <el-table-column
               align="center"
               prop="realIncomeTotalOri"
@@ -330,10 +223,11 @@
 <script>
 import topBar from '@/components/topBar'
 import * as api from '@/api/settle.js'
-import { classifyUpdate, classifySave } from '@/api/product'
+import {classifyUpdate, classifySave} from '@/api/product'
-import { queryBonusDetail, queryBonusTotal } from '@/api/bonus'
+import {queryBonusDetail, queryBonusTotal} from '@/api/bonus'
-import { isLocals, isLocalSymbol, stateFormat } from '@/utils/numberToCurrency'
+import {isLocals, isLocalSymbol, stateFormat} from '@/utils/numberToCurrency'
-import { getRoleMenu } from '@/api/notice'
+import {getRoleMenu} from '@/api/notice'
+
 export default {
   name: 'Bzpz',
   components: {
@@ -510,7 +404,7 @@ export default {
       },
       rules: {
         name: [
-          { required: true, message: '请输入规格类型', trigger: 'blur' }
+          {required: true, message: '请输入规格类型', trigger: 'blur'}
         ]
       },
       acList: [],
@@ -908,7 +802,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.table.doLayout()
       })
-      const { columns, data } = param
+      const {columns, data} = param
       const sums = []
       columns.forEach((column, index) => {
         if (index === 0) {
@@ -1005,7 +899,7 @@ export default {
       queryBonusDetail(
         Object.assign(
           {},
-          { pkVertex: this.pkVertId, pkTeamCode: this.pkTeamId },
+          {pkVertex: this.pkVertId, pkTeamCode: this.pkTeamId},
           this.select
         ),
         `?pageNum=${this.queryParams.pageNum}&pageSize=${this.queryParams.pageSize}`
@@ -1015,7 +909,8 @@ export default {
         this.total = res.total
       })
     },
-    handleSelectionChange(val) {},
+    handleSelectionChange(val) {
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.$confirm('是否确认导出所有数据项?', '警告', {
@@ -1030,7 +925,7 @@ export default {
         )
       })
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName({row, rowIndex}) {
       if (rowIndex % 2 == 1) {
         return 'warning-row'
       } else if (rowIndex % 2 == 0) {
@@ -1047,44 +942,56 @@ export default {
   display: flex;
   flex-direction: column;
 }
+
 .custom-table {
   flex: 1;
   overflow: hidden;
 }
+
 ::v-deep .el-table__header-wrapper {
   position: sticky;
   top: 0; //这个值根据实际情况而定
   z-index: 10;
 }
+
 ::v-deep .el-range-editor.el-input__inner {
   width: 100%;
 }
+
 ::v-deep .el-button {
   padding: 8px 20px;
 }
+
 ::v-deep .el-date-editor .el-range__close-icon {
   margin-top: -10px;
 }
+
 ::v-deep .el-date-editor .el-range-separator {
   margin-top: -10px;
 }
+
 ::v-deep .el-date-editor .el-range__icon {
   margin-top: -10px;
 }
+
 ::v-deep .el-input__inner {
   //height:28px;
   //line-height: 28px;
 }
+
 ::v-deep .el-form-item {
   margin-bottom: 0;
 }
+
 ::v-deep .el-cascader {
   width: 100%;
 }
+
 ::v-deep .el-form-item__label {
   color: #333;
   font-weight: inherit;
 }
+
 ::v-deep .el-table .warning-row {
   background: #f9f9f9;
 }
@@ -1092,91 +999,111 @@ export default {
 ::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: 20px;
   background: #f9f9f9;
   font-size: 14px;
+
   .main {
     background: #f9f9f9;
     overflow: hidden;
     display: flex;
     flex-direction: column;
+
     .maintop {
       display: flex;
       //padding: 10px 0px;
       justify-content: space-between;
       align-items: center;
+
       .mainbtn {
         .thebtn1 {
           background: #3181e5;
           color: #ffffff;
         }
+
         .thebtn2 {
           background: #ffad41;
           color: #ffffff;
           height: 32px;
         }
       }
+
       .maintitle {
         font-size: 10px;
         font-family: MicrosoftYaHei;
         color: #999999;
       }
     }
+
     .maintable {
       flex: 1;
       overflow-y: auto;
     }
   }
+
   .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 {
   text-align: right;
   margin-right: 10px;
   color: #3181e5;
 }
+
 .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;

src/views/settlementCenter/totalBonus/index.vue

@@ -160,94 +160,22 @@
               align="center"
               prop="retailRangeIncomeOri"
               width="130"
-              :label="$t('级差收益') + `(${isLocalSymbol()})`"
+              :label="$t('直推级差收益') + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
             <el-table-column
               align="center"
-              prop="retailSameLevelIncomeOri"
+              prop="repurRangeIncomeOri"
               width="130"
-              :label="$t('平级收益') + `(${isLocalSymbol()})`"
+              :label="$t('复购级差收益') + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
 
             <el-table-column
               align="center"
-              prop="retailAreaIncomeOri"
+              prop="realIncomeTotalOri"
               width="130"
-              :label="$t('区域收益') + `(${isLocalSymbol()})`"
+              :label="$t('实发收益总计') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="retailBenefitRangeIncomeOri"
-              width="130"
-              :label="$t('福利级差收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="retailBenefitIncomeOri"
-              width="130"
-              :label="$t('福利分红收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="backPointsOri"
-              width="130"
-              :label="$t('重消收益') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="retailRealSubtotalOri"
-              width="130"
-              :label="$t('小计') + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="backPointsOri"
-              width="130"
-              :label="'商城重消' + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="serviceSpendOri"
-              width="130"
-              :label="'平台服务费' + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="globalPointsOri"
-              width="130"
-              :label="$t('直推级差') + '(￥)'"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="purRealSubtotalOri"
-              width="130"
-              :label="'首购实发小计' + `(${isLocalSymbol()})`"
-              :formatter="stateFormat"
-            />
-
-            <el-table-column
-              align="center"
-              prop="repurRealSubtotalOri"
-              width="130"
-              :label="'复购实发小计' + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />