From dfe61226fc61042c83dadf3e79c558db703cf188 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Tue, 27 Feb 2024 15:45:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/api/member/memberGroup.js      |  9 +++
 .../src/views/member/memberGroup/detail.vue   | 59 ++++++++++++++++---
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/jsowell-ui/src/api/member/memberGroup.js b/jsowell-ui/src/api/member/memberGroup.js
index eec448ee7..b1a5f73b2 100644
--- a/jsowell-ui/src/api/member/memberGroup.js
+++ b/jsowell-ui/src/api/member/memberGroup.js
@@ -95,4 +95,13 @@ export function removeMemberFromMemberGroup(data) {
         method: 'post',
         data: data
     })
+}
+
+// 查询会员组中车辆消费记录
+export function queryMemberGroupConsumptionList(data) {
+    return request({
+        url: '/member/memberGroup/queryMemberGroupConsumptionList',
+        method: 'post',
+        data: data
+    })
 }
\ No newline at end of file
diff --git a/jsowell-ui/src/views/member/memberGroup/detail.vue b/jsowell-ui/src/views/member/memberGroup/detail.vue
index 40ca2178f..196c1d8f7 100644
--- a/jsowell-ui/src/views/member/memberGroup/detail.vue
+++ b/jsowell-ui/src/views/member/memberGroup/detail.vue
@@ -170,19 +170,20 @@
                     <!-- 车辆列表 -->
                     <el-tab-pane label="车辆列表">
                         <el-table :data="carList" stripe style="width: 100%" v-loading="loading">
-                            <el-table-column label="车牌号" align="center" prop="" width="300" />
-                            <el-table-column label="VIN码" align="center" prop="" />
-                            <el-table-column label="总消费金额" align="center" prop="" />
-                            <el-table-column label="更新时间" align="center" prop="" />
+                            <el-table-column label="车牌号" align="center" prop="licensePlateNumber" />
+                            <el-table-column label="VIN码" align="center" prop="vinCode" />
+                            <el-table-column label="总消费金额" align="center" prop="totalConsumptionAmount" />
+                            <el-table-column label="更新时间" align="center" prop="lastDate" />
                             <el-table-column label="操作" align="center" width="200">
                                 <template slot-scope="scope">
-                                    <el-button size="mini" type="text">明细</el-button>
+                                    <el-button size="mini" type="text" @click="details(scope.row)">明细</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
                         <!--分页-->
-                        <pagination v-show="stationTotal > 0" :total="stationTotal" :page.sync="queryStation.pageNum"
-                            :limit.sync="queryStation.pageSize" @pagination="getStationList" style="margin-bottom: 20px" />
+                        <pagination v-show="consumptionTotal > 0" :total="consumptionTotal" :page.sync="queryCar.pageNum"
+                            :limit.sync="queryCar.pageSize" @pagination="getQueryMemberGroupConsumptionList"
+                            style="margin-bottom: 20px" />
                     </el-tab-pane>
 
                 </el-tabs>
@@ -356,11 +357,21 @@
                 <el-button type="primary" @click="siteConfirmation">确 定</el-button>
             </div>
         </el-dialog>
+        <!-- 车辆列表明细 -->
+        <el-dialog title="订单明细" :visible.sync="vehicleDetails" :before-close="closeDetails" width="1000px" append-to-body>
+            <el-table :data="closeList" stripe style="width: 100%" v-loading="loading">
+                <el-table-column label="车牌号" align="center" prop="" width="300" />
+            </el-table>
+            <!--分页-->
+            <pagination v-show="closeTotal > 0" :total="closeTotal" :page.sync="queryCar.pageNum"
+                :limit.sync="queryCar.pageSize" @pagination="getQueryMemberGroupConsumptionList"
+                style="margin-bottom: 20px" />
+        </el-dialog>
     </div>
 </template>
 
 <script>
-import { addMember, queryMemberList, preferentialTemplates, queryStationList, removeStationFromMemberGroup, removeMemberFromMemberGroup } from "@/api/member/memberGroup";
+import { addMember, queryMemberList, preferentialTemplates, queryStationList, removeStationFromMemberGroup, removeMemberFromMemberGroup, queryMemberGroupConsumptionList } from "@/api/member/memberGroup";
 import { listOrder, totalData } from "@/api/order/order";
 import { getStationListByMerchantId } from "@/api/pile/station";
 import { queryStationBillingTemplateList, getTemplate, queryStationPreferentialBillingTemplateList, updateBillingTemplate } from "@/api/billing/template.js";
@@ -528,11 +539,21 @@ export default {
             getTitle: '',
             stationBillingTemplate: null,
             carList: [], //车辆列表
+            consumptionTotal: 0,
+            queryCar: {
+                pageNum: 1,
+                pageSize: 10,
+                groupCode: this.$route.params.groupCode.split('&')[0],
+            },
             // 订单创建时间范围
             createTimeRange: [],
             // 订单创建结束范围
             settleTimeRange: [],
-            totalDateList: []
+            totalDateList: [],
+            // 明细列表
+            vehicleDetails: false,
+            closeList: [],
+            closeTotal: 0,
         };
     },
     async mounted() {
@@ -541,6 +562,7 @@ export default {
         this.getStationList();
         await this.defaultDate();
         this.handleQuery();
+        this.getQueryMemberGroupConsumptionList()
     },
     computed: {},
     watch: {
@@ -838,6 +860,25 @@ export default {
                 `order_${new Date().getTime()}.xlsx`
             );
         },
+        // 获取订单总金额数据
+        getQueryMemberGroupConsumptionList() {
+            console.log(this.queryCar, 'this.queryCar');
+            queryMemberGroupConsumptionList(this.queryCar).then((response) => {
+                console.log("queryMemberGroupConsumptionList ", response);
+                this.carList = response.data;
+                this.consumptionTotal = response.total;
+            });
+        },
+        // 打开车辆列表明细
+        details(row) {
+            console.log(row);
+            this.vehicleDetails = true;
+        },
+        // 关闭明细弹框
+        closeDetails() {
+            this.vehicleDetails = false;
+            this.closeList = [];
+        }
     },
 };
 </script>