From 62e3108b7e367e0f866247d2a110b98634def783 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Mon, 19 Feb 2024 16:27:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=9A=E5=91=98=E7=BB=84?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=AB=99=E7=82=B9=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   | 38 ++++++++++++++++---
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/jsowell-ui/src/api/member/memberGroup.js b/jsowell-ui/src/api/member/memberGroup.js
index 268308d98..0f0e4f293 100644
--- a/jsowell-ui/src/api/member/memberGroup.js
+++ b/jsowell-ui/src/api/member/memberGroup.js
@@ -69,3 +69,12 @@ export function preferentialTemplates(data) {
         data,
     });
 }
+
+// 查询会员组中的站点列表
+export function queryStationList(data) {
+    return request({
+        url: '/member/memberGroup/queryStationList',
+        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 498177162..cc7e5b5dc 100644
--- a/jsowell-ui/src/views/member/memberGroup/detail.vue
+++ b/jsowell-ui/src/views/member/memberGroup/detail.vue
@@ -79,11 +79,20 @@
                             <el-button type="primary" size="mini" icon="el-icon-plus" @click="addasite">添加站点</el-button>
                         </el-col>
                         <el-table :data="sitesList" stripe style="width: 100%" v-loading="loading">
-                            <el-table-column label="站点名称" align="center" prop="memberId" />
+                            <el-table-column label="站点名称" align="center" prop="stationName" width="300" />
+                            <el-table-column label="描述" align="center" prop="remark" />
+                            <el-table-column label="操作" align="center" width="200">
+                                <template slot-scope="scope">
+                                    <el-button size="mini" type="text" icon="el-icon-edit"
+                                        @click="addasite(scope.row)">修改</el-button>
+                                    <el-button size="mini" type="text" icon="el-icon-delete"
+                                        @click="handleDelete(scope.row)">删除</el-button>
+                                </template>
+                            </el-table-column>
                         </el-table>
                         <!--分页-->
-                        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                            :limit.sync="queryParams.pageSize" @pagination="getMemberList" style="margin-bottom: 20px" />
+                        <pagination v-show="stationTotal > 0" :total="stationTotal" :page.sync="queryStation.pageNum"
+                            :limit.sync="queryStation.pageSize" @pagination="getStationList" style="margin-bottom: 20px" />
                     </el-tab-pane>
                 </el-tabs>
             </el-col>
@@ -96,7 +105,7 @@
                 <el-button type="primary" @click="submitForm">确 定</el-button>
             </div>
         </el-dialog>
-        <!-- 添加站点 -->
+        <!-- 添加修改站点 -->
         <el-dialog title="添加站点" :visible.sync="getSite" :before-close="getCancel" width="1000px" append-to-body>
             <el-form ref="exchangeRate" :model="exchangeRate" :rules="dialogRules">
                 <el-form-item label="请选择站点">
@@ -259,7 +268,7 @@
 </template>
 
 <script>
-import { addMember, queryMemberList, preferentialTemplates } from "@/api/member/memberGroup";
+import { addMember, queryMemberList, preferentialTemplates, queryStationList } from "@/api/member/memberGroup";
 import { listOrder } from "@/api/order/order";
 import { getStationListByMerchantId } from "@/api/pile/station";
 import { queryStationBillingTemplateList, getTemplate } from "@/api/billing/template.js";
@@ -406,7 +415,13 @@ export default {
             },
             sitesList: [],//站点列表
             stationId: '',//站点id
-            tagsTime: []
+            tagsTime: [],
+            queryStation: {
+                pageNum: 1,
+                pageSize: 10,
+                groupCode: this.$route.params.groupCode.split('&')[0],
+            },
+            stationTotal: 0
         };
     },
 
@@ -414,6 +429,7 @@ export default {
         console.log(this.$route.params.groupCode, this.$route.params.groupCode.split('&')[0], this.$route.params.groupCode.split('&')[1]);
         this.getMemberList();
         this.getOrderList();
+        this.getStationList()
     },
     computed: {
 
@@ -570,6 +586,16 @@ export default {
             this.tagsTime = tags
             console.log(this.tagsTime);
         },
+        // 站点列表
+        getStationList() {
+            this.loading = true;
+            queryStationList(this.queryStation).then(response => {
+                console.log('站点列表', response);
+                this.sitesList = response.rows;
+                this.stationTotal = response.total;
+                this.loading = false;
+            });
+        }
     },
 };
 </script>