From 33a6b279d5f10c700b09d515eebbdd3d937efd78 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Mon, 16 Jun 2025 13:59:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(totalBonus):=20=E7=A7=BB=E9=99=A4=E7=BE=8E?=
 =?UTF-8?q?=E5=85=83=E5=B8=81=E7=A7=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../information/removeOrderList/index.vue     | 582 +++++++-----------
 .../settlementCenter/totalBonus/index.vue     | 105 +---
 2 files changed, 222 insertions(+), 465 deletions(-)

diff --git a/src/views/information/removeOrderList/index.vue b/src/views/information/removeOrderList/index.vue
index 86cfef9..b61adc0 100644
--- a/src/views/information/removeOrderList/index.vue
+++ b/src/views/information/removeOrderList/index.vue
@@ -239,8 +239,7 @@
               style="background-color: #c8161d"
               @click="getDataList"
             >
-              {{ '搜索' }}</el-button
-            >
+              {{ '搜索' }}</el-button>
             <el-button @click="reset"> {{ '重置' }}</el-button>
           </el-col>
         </el-row>
@@ -252,13 +251,12 @@
       <div class="maintop">
         <div class="mainbtn">
           <el-button
+            v-hasButtons="['removeOrderExport']"
             size="small"
             class="thebtn2"
-            v-hasButtons="['removeOrderExport']"
             @click="exports"
           >
-            {{ '导出' }}</el-button
-          >
+            {{ '导出' }}</el-button>
         </div>
         <div>
           <el-dropdown :hide-on-click="false">
@@ -274,9 +272,7 @@
                 <el-checkbox
                   v-model="item.checked"
                   @change="getMenu($event, item.id)"
-                  >{{ item.text }}</el-checkbox
-                ></el-dropdown-item
-              >
+                >{{ item.text }}</el-checkbox></el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -284,9 +280,9 @@
       <div class="maintable">
         <div class="itemTrading">
           <el-table
+            v-loading="loading"
             :data="tableData.censusSummaryList"
             style="width: 100%"
-            v-loading="loading"
             :header-cell-style="{ background: '#EEEEEE' }"
             :row-class-name="tableRowClassName"
             :summary-method="getSummaries"
@@ -411,24 +407,9 @@
               :label="'消费业绩' + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
+
             <el-table-column
-              v-if="menuList[1].checked == true"
-              align="center"
-              prop="orderAmountDollar"
-              width="130"
-              :formatter="stateFormat"
-              :label="'消费金额' + `(${isLocals()})`"
-            />
-            <el-table-column
-              v-if="menuList[2].checked == true"
-              align="center"
-              prop="orderAchieveDollar"
-              width="130"
-              :formatter="stateFormat"
-              :label="'消费业绩' + `(${isLocals()})`"
-            />
-            <el-table-column
-              v-if="menuList[3].checked == true"
+              v-if="tableColumnVisible('vertexName')"
               align="center"
               prop="vertexName"
               width="130"
@@ -442,14 +423,14 @@
               :label="'隶属团队'"
             /> -->
             <el-table-column
-              v-if="menuList[4].checked == true"
+              v-if="tableColumnVisible('recName')"
               align="center"
               prop="recName"
               width="200"
               :label="'收货人'"
             />
             <el-table-column
-              v-if="menuList[5].checked == true"
+              v-if="tableColumnVisible('recPhone')"
               align="center"
               prop="recPhone"
               width="200"
@@ -463,28 +444,28 @@
             <!--            &lt;!&ndash;              :label="'收货电话'"&ndash;&gt;-->
             <!--            &lt;!&ndash;            />&ndash;&gt;-->
             <el-table-column
-              v-if="menuList[6].checked == true"
+              v-if="tableColumnVisible('recProvinceStr')"
               align="center"
               prop="recProvinceStr"
               width="130"
               :label="'省'"
             />
             <el-table-column
-              v-if="menuList[7].checked == true"
+              v-if="tableColumnVisible('recCityStr')"
               align="center"
               prop="recCityStr"
               width="130"
               :label="'市'"
             />
             <el-table-column
-              v-if="menuList[8].checked == true"
+              v-if="tableColumnVisible('recCountyStr')"
               align="center"
               prop="recCountyStr"
               width="130"
               :label="'区/县'"
             />
             <el-table-column
-              v-if="menuList[9].checked == true"
+              v-if="tableColumnVisible('recAddress')"
               align="center"
               prop="recAddress"
               width="130"
@@ -547,30 +528,6 @@
               :label="'订单总额' + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
             />
-            <el-table-column
-              v-if="menuList[10].checked == true"
-              align="center"
-              prop="pricesDollar"
-              width="130"
-              :label="'产品总额' + '($)'"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[11].checked == true"
-              align="center"
-              prop="postageDollar"
-              width="130"
-              :label="'订单邮费' + '($)'"
-              :formatter="stateFormat"
-            />
-            <el-table-column
-              v-if="menuList[12].checked == true"
-              align="center"
-              prop="orderAmountDollar"
-              width="130"
-              :label="'订单总额' + '($)'"
-              :formatter="stateFormat"
-            />
             <el-table-column
               align="center"
               prop="orderStatusStr"
@@ -578,7 +535,7 @@
               :label="'订单状态'"
             />
             <el-table-column
-              v-if="menuList[13].checked == true"
+              v-if="tableColumnVisible('logisticsCompany')"
               align="center"
               prop=""
               width="130"
@@ -591,7 +548,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="menuList[14].checked == true"
+              v-if="tableColumnVisible('logisticsCode')"
               align="center"
               prop=""
               width="130"
@@ -604,101 +561,98 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="menuList[15].checked == true"
+              v-if="tableColumnVisible('creationTime')"
               align="center"
               prop="creationTime"
               width="200"
               :label="'创建日期'"
             />
             <el-table-column
-              v-if="menuList[16].checked == true"
+              v-if="tableColumnVisible('payTime')"
               align="center"
               prop="payTime"
               width="200"
               :label="'支付日期'"
             />
             <el-table-column
-              v-if="menuList[17].checked == true"
+              v-if="tableColumnVisible('deliveryTime')"
               align="center"
               prop="deliveryTime"
               width="200"
               :label="'发货日期'"
-            >
-            </el-table-column>
+            />
             <el-table-column
-              v-if="menuList[18].checked == true"
+              v-if="tableColumnVisible('deliveryWayStr')"
               align="center"
               prop="deliveryWayStr"
               width="130"
               :label="'发货方式'"
             />
             <el-table-column
-              v-if="menuList[19].checked == true"
+              v-if="tableColumnVisible('operateScopeStr')"
               align="center"
               prop="operateScopeStr"
               width="130"
               :label="'销售方式'"
             />
             <el-table-column
-              v-if="menuList[20].checked == true"
+              v-if="tableColumnVisible('tranTypeStr')"
               align="center"
               prop="tranTypeStr"
               width="130"
               :label="'运输方式'"
             />
             <el-table-column
-              v-if="menuList[28].checked == true"
+              v-if="tableColumnVisible('preSaleStatusStr')"
               align="center"
               prop="preSaleStatusStr"
               width="130"
               :label="'预售状态'"
-            >
-            </el-table-column>
+            />
             <el-table-column
-              v-if="menuList[22].checked == true"
+              v-if="tableColumnVisible('payTypeStr')"
               align="center"
               prop="payTypeStr"
               width="130"
               :label="'支付方式'"
             />
             <el-table-column
-              v-if="menuList[23].checked == true"
+              v-if="tableColumnVisible('cancelOrderTime')"
               align="center"
               prop="cancelOrderTime"
               width="200"
               :label="'撤单日期'"
-            >
-            </el-table-column>
+            />
             <el-table-column
-              v-if="menuList[24].checked == true"
+              v-if="tableColumnVisible('creatorName')"
               align="center"
               prop="creatorName"
               width="130"
               :label="'撤单人'"
             />
             <el-table-column
-              v-if="menuList[21].checked == true"
+              v-if="tableColumnVisible('approvalStatus')"
               align="center"
               prop="approvalStatus"
               width="130"
               :label="'审核状态'"
             />
             <el-table-column
-              v-if="menuList[25].checked == true"
+              v-if="tableColumnVisible('lastInstanceDate')"
               align="center"
               prop="lastInstanceDate"
               width="200"
               :label="'终审日期'"
             />
             <el-table-column
-              v-if="menuList[26].checked == true"
+              v-if="tableColumnVisible('lastInstanceApprover')"
               align="center"
               prop="lastInstanceApprover"
               width="130"
               :label="'终审人'"
             />
             <el-table-column
-              v-if="menuList[27].checked == true"
+              v-if="tableColumnVisible('lastInstanceRemark')"
               align="center"
               prop="lastInstanceRemark"
               width="130"
@@ -716,79 +670,10 @@
               width="130"
               :label="'来源'"
             />
-            <!-- <el-table-column
-              align="center"
-              prop="orderChargeLogSourceStr"
-              width="130"
-              :label="'来源'"
-            />
-            <el-table-column
-              align="center"
-              prop="orderChargeLogSourceStr"
-              width="130"
-              :label="'来源'"
-            />
-            <el-table-column
-              align="center"
-              prop="orderChargeLogSourceStr"
-              width="130"
-              :label="'来源'"
-            />
-            <el-table-column
-              align="center"
-              prop="orderChargeLogSourceStr"
-              width="130"
-              :label="'来源'"
-            />
-            <el-table-column
-              align="center"
-              prop="orderChargeLogSourceStr"
-              width="130"
-              :label="'来源'"
-            /> -->
-            <!--                        <el-table-column v-for="item in menuList"-->
-            <!--                                         :key="item.id"-->
-            <!--                                         align="center"-->
-            <!--                                         width="180"-->
-            <!--                                         :prop="item.prop"-->
-            <!--                                         v-if="item.checked&&item.id != 0&&item.id < 32"-->
-            <!--                                         :label="item.text">-->
-            <!--                        </el-table-column>-->
-            <!--            <el-table-column align="center"-->
-            <!--                             prop="time"-->
-            <!--                             :label="'操作'" fixed="right" >-->
-            <!--              <template slot-scope="scope">-->
-            <!--                <el-button @click="toFixed(scope.row.pkId)"-->
-            <!--                           type="text"-->
-            <!--                           size="small">-->
-            <!--                  修改-->
-            <!--                </el-button>-->
-            <!--                <el-button @click="toFixed(scope.row.pkId)"-->
-            <!--                           type="text"-->
-            <!--                           size="small">-->
-            <!--                  查看-->
-            <!--                </el-button>-->
-            <!--                <el-button @click="handleDelete(scope.row.pkId)"-->
-            <!--                           type="text"-->
-            <!--                           size="small"-->
-            <!--                           style="color: #c73030">-->
-            <!--                  删除-->
-            <!--                </el-button>-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
+
           </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
@@ -802,31 +687,31 @@
 </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 * as man from "@/api/manage.js";
-import { classifyUpdate, classifySave } from "@/api/product";
-import * as log from "@/api/logistics";
-import * as del from "@/api/delivery";
-import { getPlacedeptList } from "@/api/specialBusiness";
-import { getorderStatus } from "@/api/member";
-import { isLocals, isLocalSymbol } from "@/utils/numberToCurrency";
+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 * as man from '@/api/manage.js'
+import { classifyUpdate, classifySave } from '@/api/product'
+import * as log from '@/api/logistics'
+import * as del from '@/api/delivery'
+import { getPlacedeptList } from '@/api/specialBusiness'
+import { getorderStatus } from '@/api/member'
+import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
 
 export default {
-  name: "Bzpz",
+  name: 'Bzpz',
   components: {
-    topBar,
+    topBar
   },
   filters: {
     isAgree(val) {
       if (!val) {
-        return '允许';
+        return '允许'
       } else {
-        return '禁止';
+        return '禁止'
       }
-    },
+    }
   },
   data() {
     return {
@@ -841,55 +726,43 @@ export default {
         // },
       ], // 注册类型
       regionParams: {
-        label: "name",
-        value: "id",
-        children: "children",
-        expandTrigger: "hover",
+        label: 'name',
+        value: 'id',
+        children: 'children',
+        expandTrigger: 'hover'
       },
       isActive: false,
       typeList: [
         {
           value: 0,
-          label: '前台',
+          label: '前台'
         },
         {
           value: 1,
-          label: '后台',
-        },
+          label: '后台'
+        }
       ],
       digList: [
         {
           value: 0,
-          label: '允许',
+          label: '允许'
         },
         {
           value: 1,
-          label: '禁止',
-        },
+          label: '禁止'
+        }
       ],
       menuList: [
         {
           id: 0,
           text: '全选',
-          checked: false,
-        },
-        {
-          id: 1,
-          text: '消费金额' + "($)",
-          checked: true,
-          prop: "orderAmountDollar",
-        },
-        {
-          id: 2,
-          text: '消费业绩' + "($)",
-          checked: true,
-          prop: "orderAchieveDollar",
+          checked: false
         },
         {
           id: 3,
           text: '隶属体系',
           checked: true,
-          prop: "vertexName",
+          prop: 'vertexName'
         },
         // {
         //   id: 4,
@@ -901,152 +774,134 @@ export default {
           id: 4,
           text: '收货人',
           checked: true,
-          prop: "recName",
+          prop: 'recName'
         },
         {
           id: 5,
           text: '收货电话',
           checked: true,
-          prop: "recPhone",
+          prop: 'recPhone'
         },
         {
           id: 6,
           text: '省',
           checked: true,
-          prop: "recProvinceStr",
+          prop: 'recProvinceStr'
         },
         {
           id: 7,
           text: '市',
           checked: true,
-          prop: "recCityStr",
+          prop: 'recCityStr'
         },
         {
           id: 8,
           text: '区/县',
           checked: true,
-          prop: "recCountyStr",
+          prop: 'recCountyStr'
         },
         {
           id: 9,
           text: '详细地址',
           checked: true,
-          prop: "recAddress",
-        },
-        {
-          id: 10,
-          text: '产品总额' + "($)",
-          checked: true,
-          prop: "priceDollar",
-        },
-        {
-          id: 11,
-          text: '订单邮费' + "($)",
-          checked: true,
-          prop: "postageDollar",
-        },
-        {
-          id: 12,
-          text: '订单总额' + "($)",
-          checked: true,
-          prop: "orderAmountDollar",
+          prop: 'recAddress'
         },
         {
           id: 13,
           text: '物流公司',
           checked: true,
-          prop: "",
+          prop: 'logisticsCompany'
         },
         {
           id: 14,
           text: '物流单号',
           checked: true,
-          prop: "",
+          prop: 'logisticsCode'
         },
         {
           id: 15,
           text: '创建日期',
           checked: true,
-          prop: "creationTime",
+          prop: 'creationTime'
         },
         {
           id: 16,
           text: '支付日期',
           checked: true,
-          prop: "payTime",
+          prop: 'payTime'
         },
         {
           id: 17,
           text: '发货日期',
           checked: true,
-          prop: "deliveryTime",
+          prop: 'deliveryTime'
         },
         {
           id: 18,
           text: '发货方式',
           checked: true,
-          prop: "deliveryWayStr",
+          prop: 'deliveryWayStr'
         },
         {
           id: 19,
           text: '销售方式',
           checked: true,
-          prop: "operateScopeStr",
+          prop: 'operateScopeStr'
         },
         {
           id: 20,
           text: '运输方式',
           checked: true,
-          prop: "tranTypeStr",
+          prop: 'tranTypeStr'
         },
         {
           id: 21,
           text: '审核状态',
           checked: true,
-          prop: "approvalStatus",
+          prop: 'approvalStatus'
         },
         {
           id: 22,
           text: '支付方式',
           checked: true,
-          prop: "payTypeStr",
+          prop: 'payTypeStr'
         },
         {
           id: 23,
           text: '撤单日期',
           checked: true,
-          prop: "cancelOrderTime",
+          prop: 'cancelOrderTime'
         },
         {
           id: 24,
           text: '撤单人',
           checked: true,
-          prop: "creatorName",
+          prop: 'creatorName'
         },
         {
           id: 25,
           text: '终审日期',
           checked: true,
-          prop: "lastInstanceDate",
+          prop: 'lastInstanceDate'
         },
         {
           id: 26,
           text: '终审人',
           checked: true,
-          prop: "lastInstanceApprover",
+          prop: 'lastInstanceApprover'
         },
         {
           id: 27,
           text: '终审意见',
           checked: true,
-          prop: "lastInstanceRemark",
+          prop: 'lastInstanceRemark'
         },
         {
           id: 28,
           text: '预售状态',
           checked: true,
-          prop: "preSaleStatusStr",
-        },
+          prop: 'preSaleStatusStr'
+        }
       ],
       creationTime: [],
       creationTime1: [],
@@ -1056,30 +911,30 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
-      addOrEdit: "",
+      addOrEdit: '',
       total: 0,
       dialogVisible: false,
       loading: false,
       tableData: {
-        censusSummaryList: [],
+        censusSummaryList: []
       },
-      moren: "removeOrderList",
+      moren: 'removeOrderList',
       topList: [
         {
           name: '撤单列表',
-          path: "removeOrderList",
-        },
+          path: 'removeOrderList'
+        }
       ],
       form: {
-        name: "",
+        name: ''
       },
       areaData: [],
       rules: {
         name: [
-          { required: true, message: '请输入规格类型', trigger: "blur" },
-        ],
+          { required: true, message: '请输入规格类型', trigger: 'blur' }
+        ]
       },
       shoppingAddress: [],
       acList: [],
@@ -1092,7 +947,7 @@ export default {
       cancleTypeList: [],
       pkMemberTeam: [],
       pkVertex: [],
-      typeId: "",
+      typeId: '',
       paywayList: [],
       presaleStatusList: [],
       orderStatusList: [],
@@ -1100,274 +955,277 @@ export default {
       transportTypeList: [],
       gyList: [],
       deliveryWayList: [],
-      sourceList: [],
-    };
+      sourceList: []
+    }
   },
   mounted() {
     // 获取下拉
-    this.getData();
+    this.getData()
     // 获取列表
-    this.getDataList();
+    this.getDataList()
   },
   methods: {
     isLocalSymbol,
     isLocals,
+    tableColumnVisible(columnName) {
+      return this.menuList.find((item) => item.prop === columnName)?.checked
+    },
     exports() {
       this.download(
-        "/sale/manage/order-charge-log/export",
+        '/sale/manage/order-charge-log/export',
         Object.assign({}, this.queryParams, this.select),
         `${'撤单列表'}-${new Date().getTime()}.xlsx`
-      );
+      )
     },
     handleChange(res) {
-      this.form.recProvince = res[0];
-      this.form.recCity = res[1];
-      this.form.recCounty = res[2];
+      this.form.recProvince = res[0]
+      this.form.recCity = res[1]
+      this.form.recCounty = res[2]
     },
     // 展开折叠
     changeActive() {
-      this.isActive = !this.isActive;
+      this.isActive = !this.isActive
     },
     reset() {
-      this.select = {};
-      this.pkVertex = [];
-      this.pkMemberTeam = [];
-      this.typeId = "";
-      this.creationTime = [];
-      this.creationTime1 = [];
-      this.creationTime2 = [];
-      this.creationTime3 = [];
-      this.getDataList();
+      this.select = {}
+      this.pkVertex = []
+      this.pkMemberTeam = []
+      this.typeId = ''
+      this.creationTime = []
+      this.creationTime1 = []
+      this.creationTime2 = []
+      this.creationTime3 = []
+      this.getDataList()
     },
     getMenu(e, id) {
       if (e && id == 0) {
         this.menuList.forEach((item) => {
-          this.$set(item, "checked", true);
-        });
+          this.$set(item, 'checked', true)
+        })
       } else if (!e && id == 0) {
         this.menuList.forEach((item) => {
-          this.$set(item, "checked", false);
-        });
+          this.$set(item, 'checked', false)
+        })
       }
     },
     getData() {
       del.getOrderStatus().then((res) => {
-        this.orderStatusList = res.data;
-      });
+        this.orderStatusList = res.data
+      })
       del.getPresaleStatus().then((res) => {
-        this.presaleStatusList = res.data;
-      });
+        this.presaleStatusList = res.data
+      })
       log.getOrderPayType().then((res) => {
-        this.paywayList = res.data;
-      });
+        this.paywayList = res.data
+      })
       del.getTransportType().then((res) => {
-        this.transportTypeList = res.data;
-      });
+        this.transportTypeList = res.data
+      })
       api_s.supply_way().then((res) => {
-        this.gyList = res.data;
-      });
+        this.gyList = res.data
+      })
       // 获取隶属体系
       api.vertexList().then((res) => {
-        this.verList = res.data;
-      });
+        this.verList = res.data
+      })
       // 获取注册类型
       getorderStatus().then((res) => {
-        this.kdzcList = res.data;
-      });
+        this.kdzcList = res.data
+      })
       // 获取:label="'关联部门'"
       getPlacedeptList().then((res) => {
-        this.deptList = res.data;
-      });
+        this.deptList = res.data
+      })
       // 获取隶属团队
       api.memberTeam().then((res) => {
-        this.memberList = res.rows;
-      });
+        this.memberList = res.rows
+      })
       // 获取收益类型
       log.getYieldType().then((res) => {
-        this.yieldList = res.rows;
-      });
+        this.yieldList = res.rows
+      })
       // 获取订单类型
       log.getOrderType().then((res) => {
-        this.orderTypeList = res.data;
-      });
+        this.orderTypeList = res.data
+      })
       // 获取撤单类型
       log.getCancleType().then((res) => {
-        this.cancleTypeList = res.data;
-      });
+        this.cancleTypeList = res.data
+      })
       del.getDeliveryWayList().then((res) => {
-        this.deliveryWayList = res.data;
-      });
+        this.deliveryWayList = res.data
+      })
       apis.areaList().then((res) => {
-        this.areaData = res.data;
-      });
+        this.areaData = res.data
+      })
       man.noticeWebsite().then((res) => {
-        this.sourceList = res.data;
-      });
+        this.sourceList = res.data
+      })
     },
     changeTime(val) {
       if (!val) {
-        val = ["", ""];
+        val = ['', '']
       }
-      this.select.startCreationTime = val[0] || "";
-      this.select.endCreationTime = val[1] || "";
+      this.select.startCreationTime = val[0] || ''
+      this.select.endCreationTime = val[1] || ''
     },
     changeTime1(val) {
       if (!val) {
-        val = ["", ""];
+        val = ['', '']
       }
-      this.select.startPayTime = val[0] || "";
-      this.select.endPayTime = val[1] || "";
+      this.select.startPayTime = val[0] || ''
+      this.select.endPayTime = val[1] || ''
     },
     changeTime2(val) {
       if (!val) {
-        val = ["", ""];
+        val = ['', '']
       }
-      this.select.startLastInstanceDate = val[0] || "";
-      this.select.endLastInstanceDate = val[1] || "";
+      this.select.startLastInstanceDate = val[0] || ''
+      this.select.endLastInstanceDate = val[1] || ''
     },
     changeTime3(val) {
       if (!val) {
-        val = ["", ""];
+        val = ['', '']
       }
-      this.select.startCancelOrderTime = val[0] || "";
-      this.select.endCancelOrderTime = val[1] || "";
+      this.select.startCancelOrderTime = val[0] || ''
+      this.select.endCancelOrderTime = val[1] || ''
     },
     // 点击修改
     toFixed(id) {
-      this.addOrEdit = false;
-      this.dialogVisible = true;
+      this.addOrEdit = false
+      this.dialogVisible = true
       this.$router.push({
-        path: "noticeList/details",
+        path: 'noticeList/details',
         query: {
-          pkId: id,
-        },
-      });
+          pkId: id
+        }
+      })
     },
     getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
+      const { columns, data } = param
+      const sums = []
       columns.forEach((column, index) => {
         if (index === 0) {
-          sums[index] = "";
-          return;
+          sums[index] = ''
+          return
         }
         // 测试提交
         if (index === 1) {
-          sums[index] = "";
-          return;
+          sums[index] = ''
+          return
         }
-        const values = data.map((item) => Number(item[column.property]));
+        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);
+            const value = Number(curr)
             if (!isNaN(value)) {
-              return;
+              return
             } else {
-              return;
+              return
             }
-          }, 0);
+          }, 0)
           // sums[index] += ' 元'
         } else {
-          sums[index] = "";
+          sums[index] = ''
         }
-      });
+      })
 
-      return sums;
+      return sums
     },
     // 删除
     handleDelete(id) {
       this.$confirm('确认删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then(() => {
         api.classifyDel(id).then((res) => {
-          this.getDataList();
-        });
-      });
+          this.getDataList()
+        })
+      })
     },
     onSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          let url = "";
+          let url = ''
           if (this.addOrEdit == true) {
-            url = classifySave;
+            url = classifySave
           } else {
-            url = classifyUpdate;
+            url = classifyUpdate
           }
           url(this.form).then((res) => {
             if (res.code == 200) {
               this.$message({
                 message: res.msg,
-                type: "success",
-              });
-              this.dialogVisible = false;
+                type: 'success'
+              })
+              this.dialogVisible = false
               // 充值数据
-              this.$refs[formName].resetFields();
+              this.$refs[formName].resetFields()
               // 获取列表
-              this.getDataList();
+              this.getDataList()
             }
-          });
+          })
         } else {
-          return false;
+          return false
         }
-      });
+      })
     },
     handleClose() {
-      this.dialogVisible = false;
-      this.$refs["form"].clearValidate();
-      this.$refs["form"].resetFields();
+      this.dialogVisible = false
+      this.$refs['form'].clearValidate()
+      this.$refs['form'].resetFields()
     },
     openDig() {
       // 导出撤单列表
       this.$router.push({
-        path: "noticeList/details",
-      });
+        path: 'noticeList/details'
+      })
     },
     getDataList() {
-      this.loading = true;
+      this.loading = true
       api_s
         .orderChargeLog(Object.assign({}, this.queryParams, this.select))
         .then((res) => {
           res.rows.forEach((element) => {
             if (element.approvalStatus == 1) {
-              element.approvalStatus = '审核中';
+              element.approvalStatus = '审核中'
             } else if (element.approvalStatus == 2) {
-              element.approvalStatus = '审核通过';
+              element.approvalStatus = '审核通过'
             } else if (element.approvalStatus == 3) {
-              element.approvalStatus = '审核驳回';
+              element.approvalStatus = '审核驳回'
             }
-          });
-          this.tableData.censusSummaryList = res.rows;
+          })
+          this.tableData.censusSummaryList = res.rows
           // console.error(this.tableData.censusSummaryList)
-          this.total = res.total;
-          this.loading = false;
-        });
+          this.total = res.total
+          this.loading = false
+        })
     },
     handleSelectionChange(val) {},
     handleExport() {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        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";
+        return 'warning-row'
       } else if (rowIndex % 2 == 0) {
-        return "success-row";
+        return 'success-row'
       }
-      return "";
-    },
-  },
-};
+      return ''
+    }
+  }
+}
 </script>
 <style scoped lang="scss">
 ::v-deep .el-table__footer {
diff --git a/src/views/settlementCenter/totalBonus/index.vue b/src/views/settlementCenter/totalBonus/index.vue
index 33fcd4a..bb1fa78 100644
--- a/src/views/settlementCenter/totalBonus/index.vue
+++ b/src/views/settlementCenter/totalBonus/index.vue
@@ -234,13 +234,6 @@
               :label="$t('直推级差') + '(￥)'"
               :formatter="stateFormat"
             />
-            <el-table-column
-              align="center"
-              prop="globalPoints"
-              width="130"
-              :label="$t('直推级差') + '($)'"
-              :formatter="stateFormat"
-            />
 
             <el-table-column
               align="center"
@@ -378,109 +371,15 @@ export default {
           text: '全选',
           checked: true
         },
-        {
-          id: 21,
-          text: '直推收益' + '($)',
-          checked: true,
-          prop: 'firstBuyAmountDollar'
-        },
-        {
-          id: 22,
-          text: '拓展收益' + '($)',
-          checked: true,
-          prop: 'expandIncome'
-        },
-        {
-          id: 23,
-          text: '辅导收益' + '($)',
-          checked: true,
-          prop: 'coachIncome'
-        },
-        {
-          id: 24,
-          text: '分红收益' + '($)',
-          checked: true,
-          prop: 'shareIncome'
-        },
-        {
-          id: 25,
-          text: '报单收益' + '($)',
-          checked: true,
-          prop: 'serviceIncome'
-        },
-        {
-          id: 26,
-          text: '云代直推收益' + '($)',
-          checked: true,
-          prop: 'cloudDirectIncome'
-        },
-        {
-          id: 27,
-          text: '云代首购收益' + '($)',
-          checked: true,
-          prop: 'cloudPurIncome'
-        },
-        {
-          id: 28,
-          text: '云代复购收益' + '($)',
-          checked: true,
-          prop: 'cloudRepurIncome'
-        },
-        {
-          id: 39,
-          text: '复购级差收益' + '($)',
-          checked: true,
-          prop: 'repurRangeIncome'
-        },
-        {
-          id: 30,
-          text: '复购拓展收益' + '($)',
-          checked: true,
-          prop: 'repurExpandIncome'
-        },
+
         {
           id: 31,
           text: '复购券',
           checked: true,
           prop: 'repurCoupon',
           flag: 1
-        },
-        {
-          id: 32,
-          text: '商城重消' + '($)',
-          checked: true,
-          prop: 'backPoints'
-        },
-        {
-          id: 35,
-          text: '平台服务费' + '($)',
-          checked: true,
-          prop: 'backPoints'
-        },
-        {
-          id: 44,
-          text: '首购实发小计' + '($)',
-          checked: true,
-          prop: 'purRealSubtotal'
-        },
-        {
-          id: 45,
-          text: '云代实发小计' + '($)',
-          checked: true,
-          prop: 'cloudRealSubtotal'
-        },
-        {
-          id: 46,
-          text: '复购实发小计' + '($)',
-          checked: true,
-          prop: 'repurRealSubtotal'
-        },
-        {
-          id: 47,
-          text: '实发收益总计' + '($)',
-          checked: true,
-          prop: 'realIncomeTotal'
         }
+
       ],
       creationTime: [],
       creationTime1: [],