From 145c966b6e670b2eb7da4a2711ff51ce656ccb0f Mon Sep 17 00:00:00 2001
From: TianYu <332368756@qq.com>
Date: Wed, 31 May 2023 15:00:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=BD=E4=BD=A3=E6=98=8E=E7=BB=86-?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=85=85=E5=80=BC=E5=A2=9E=E5=8A=A0=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/api/shop/rechargeOrder.js  | 10 ++++++++
 .../commissionDetails/memberRecharge.vue      | 24 ++++++++++++-------
 .../src/views/member/promoter/index.vue       |  1 +
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/yudao-ui-admin/src/api/shop/rechargeOrder.js b/yudao-ui-admin/src/api/shop/rechargeOrder.js
index fd779866b..56ff58af4 100644
--- a/yudao-ui-admin/src/api/shop/rechargeOrder.js
+++ b/yudao-ui-admin/src/api/shop/rechargeOrder.js
@@ -70,3 +70,13 @@ export function exportRechargeOrderExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 导出抽佣明细-会员充值
+export function exportCommissionDetailsExcel(query) {
+  return request({
+    url: '/shop/recharge-order/promoterDraw-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
diff --git a/yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue b/yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue
index ba6f91183..6226df1f4 100644
--- a/yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue
+++ b/yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue
@@ -31,15 +31,15 @@
       <!--        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"-->
       <!--                   v-hasPermi="['shop:recharge-order:create']">新增</el-button>-->
       <!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"-->
-<!--                   v-hasPermi="['shop:recharge-order:export']">导出</el-button>-->
-<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['commission:recharge:export']">导出</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
+    <el-table v-loading="loading" :data="list" @sort-change="onSortChange">
       <el-table-column label="组织名称" align="center" prop="deptName" />
       <el-table-column label="推广员" align="center" prop="parentOrganizationName" >
         <template v-slot="scope">
@@ -55,7 +55,7 @@
       </el-table-column>
       <el-table-column label="成交定单数" align="center" prop="orderCount" />
       <el-table-column label="成交金额" align="center" prop="dealAmount" />
-      <el-table-column label="累计金额" align="center" prop="totalAmount" />
+      <el-table-column label="累计金额" align="center" prop="totalAmount" sortable="custom"/>
       <el-table-column label="可提现金额" align="center" prop="drawAmount" />
     </el-table>
     <!-- 分页组件 -->
@@ -69,7 +69,7 @@
 <script>
 import {
   getCommissionDetailsPage,
-  exportRechargeOrderExcel
+  exportRechargeOrderExcel, exportCommissionDetailsExcel
 } from '@/api/shop/rechargeOrder';
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import ElementForm from "@/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue";
@@ -117,6 +117,14 @@ export default {
     this.getList();
   },
   methods: {
+    onSortChange({order}){
+      if(order){
+        this.queryParams.sort = order === 'ascending' ? 1 : 2
+      } else {
+        delete this.queryParams.sort
+      }
+      this.handleQuery()
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;
@@ -145,7 +153,7 @@ export default {
       params.pageSize = undefined;
       this.$modal.confirm('是否确认导出所有数据项?').then(() => {
         this.exportLoading = true;
-        return exportRechargeOrderExcel(params);
+        return exportCommissionDetailsExcel(params);
       }).then(response => {
         this.$download.excel(response, '抽佣明细-会员充值.xls');
         this.exportLoading = false;
diff --git a/yudao-ui-admin/src/views/member/promoter/index.vue b/yudao-ui-admin/src/views/member/promoter/index.vue
index 403cc91e9..e73389f91 100644
--- a/yudao-ui-admin/src/views/member/promoter/index.vue
+++ b/yudao-ui-admin/src/views/member/promoter/index.vue
@@ -357,6 +357,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.status = 0
       this.open = true;
       this.title = '添加推广员';
     },
-- 
2.40.1