From dfe629bc12d91b5f6874c7a487c37bb7610e4859 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Sat, 30 Dec 2023 15:13:49 +0800
Subject: [PATCH] update

---
 .../src/views/member/memberGroup/index.vue    | 71 +++++++++++++------
 jsowell-ui/src/views/order/order/index.vue    |  4 +-
 2 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/jsowell-ui/src/views/member/memberGroup/index.vue b/jsowell-ui/src/views/member/memberGroup/index.vue
index e849d6467..173ea9354 100644
--- a/jsowell-ui/src/views/member/memberGroup/index.vue
+++ b/jsowell-ui/src/views/member/memberGroup/index.vue
@@ -47,7 +47,7 @@
             </el-form-item>
         </el-form>-->
 
-<!--        <el-row :gutter="10" class="mb8">
+        <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
                 <el-button
                     type="primary"
@@ -58,7 +58,7 @@
                     v-hasPermi="['member:memberGroup:add']"
                 >新增</el-button>
             </el-col>
-            <el-col :span="1.5">
+            <!--<el-col :span="1.5">
                 <el-button
                     type="success"
                     plain
@@ -68,8 +68,8 @@
                     @click="handleUpdate"
                     v-hasPermi="['member:memberGroup:edit']"
                 >修改</el-button>
-            </el-col>
-            <el-col :span="1.5">
+            </el-col>-->
+            <!--<el-col :span="1.5">
                 <el-button
                     type="danger"
                     plain
@@ -79,8 +79,8 @@
                     @click="handleDelete"
                     v-hasPermi="['member:memberGroup:remove']"
                 >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
+            </el-col>-->
+            <!--<el-col :span="1.5">
                 <el-button
                     type="warning"
                     plain
@@ -89,9 +89,9 @@
                     @click="handleExport"
                     v-hasPermi="['member:memberGroup:export']"
                 >导出</el-button>
-            </el-col>
+            </el-col>-->
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>-->
+        </el-row>
 
         <el-table v-loading="loading" :data="memberGroupList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center" />
@@ -132,25 +132,34 @@
 
         <!-- 添加或修改会员组对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                <el-form-item label="会员组编号" prop="groupCode">
-                    <el-input v-model="form.groupCode" placeholder="请输入会员组编号" />
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+                <el-form-item label="选择运营商">
+                    <el-select v-model="form.merchantId" clearable placeholder="请选择运营商"
+                               @change="changeSelectStation(form.merchantId)">
+                        <el-option v-for="item in merchantList"
+                                   :key="item.merchantId"
+                                   :label="item.merchantName"
+                                   :value="item.merchantId">
+                        </el-option>
+                    </el-select>
                 </el-form-item>
-                <el-form-item label="运营商id" prop="merchantId">
-                    <el-input v-model="form.merchantId" placeholder="请输入运营商id" />
-                </el-form-item>
-                <el-form-item label="站点id" prop="stationId">
+                <!--<el-form-item label="站点" prop="stationId">
                     <el-input v-model="form.stationId" placeholder="请输入站点id" />
+                </el-form-item>-->
+                <el-form-item label="站点" prop="stationId">
+                    <el-select v-model="form.stationId" placeholder="请选择站点" clearable filterable style="width: 140px">
+                        <el-option v-for="(station, index) in stationList"
+                                   :key="index"
+                                   :label="station.stationName"
+                                   :value="station.id" />
+                    </el-select>
                 </el-form-item>
-                <el-form-item label="会员组等级" prop="groupLevel">
+                <!--<el-form-item label="会员组等级" prop="groupLevel">
                     <el-input v-model="form.groupLevel" placeholder="请输入会员组等级" />
-                </el-form-item>
+                </el-form-item>-->
                 <el-form-item label="折扣率" prop="discount">
                     <el-input v-model="form.discount" placeholder="请输入折扣率" />
                 </el-form-item>
-                <el-form-item label="删除标识" prop="delFlag">
-                    <el-input v-model="form.delFlag" placeholder="请输入删除标识" />
-                </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -162,6 +171,8 @@
 
 <script>
 import { listMemberGroup, getMemberGroup, delMemberGroup, addMemberGroup, updateMemberGroup } from "@/api/member/memberGroup";
+import {getMerchantList} from "@/api/member/info";
+import {getStationListByMerchantId} from "@/api/pile/station";
 
 export default {
     name: "MemberGroup",
@@ -185,6 +196,10 @@ export default {
             title: "",
             // 是否显示弹出层
             open: false,
+            // 运营商列表
+            merchantList: [],
+            // 站点列表
+            stationList: [],
             // 查询参数
             queryParams: {
                 pageNum: 1,
@@ -205,8 +220,24 @@ export default {
     },
     created() {
         this.getList();
+        this.getMerchantList();
     },
     methods: {
+        // 获取运营商列表
+        getMerchantList() {
+            getMerchantList().then((response) => {
+                console.log("response", response)
+                this.merchantList = response.obj;
+                this.createMerchantVip.targetMerchantId = this.merchantList[0].merchantId
+            })
+        },
+        changeSelectStation(value) {
+            console.log(value);
+            // 通过接口查
+            getStationListByMerchantId(value).then((response) => {
+                this.stationList = response.data;
+            });
+        },
         /** 查询会员组列表 */
         getList() {
             this.loading = true;
diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index 2b70f3e1d..d97882fcc 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -4,7 +4,7 @@
             @submit.native.prevent>
             <el-form-item label="所属运营商" prop="merchantId" label-width="120">
                 <el-select v-model="queryParams.merchantId" filterable clearable placeholder="请选择运营商"
-                    @change="changeSelectMerchant(queryParams.merchantId)">
+                    @change="changeSelectStation(queryParams.merchantId)">
                     <el-option v-for="item in merchantList" :key="item.merchantName" :label="item.merchantName"
                         :value="item.id" />
                 </el-select>
@@ -267,7 +267,7 @@ export default {
                 console.log("merchantList", this.merchantList)
             });
         },
-        changeSelectMerchant(value) {
+        changeSelectStation(value) {
             console.log(value);
             // 通过接口查
             getStationListByMerchantId(value).then((response) => {