From d37d3612ceb507cf3090cc1c183370890108615f Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Mon, 15 Jan 2024 09:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/router/index.js                |  13 +++
 .../src/views/member/memberGroup/detail.vue   |  27 +++++
 .../src/views/member/memberGroup/index.vue    | 104 +++++++-----------
 3 files changed, 77 insertions(+), 67 deletions(-)
 create mode 100644 jsowell-ui/src/views/member/memberGroup/detail.vue

diff --git a/jsowell-ui/src/router/index.js b/jsowell-ui/src/router/index.js
index 162d056d5..22b707a78 100644
--- a/jsowell-ui/src/router/index.js
+++ b/jsowell-ui/src/router/index.js
@@ -192,6 +192,19 @@ export const constantRoutes = [
       },
     ],
   },
+  {
+    path: "/member/detail",
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        name: "memberDetail",
+        path: "detail/:groupCode",
+        component: () => import("@/views/member/memberGroup/detail"),
+        meta: { title: "集团详情", activeMenu: "/member/memberGroup" },
+      },
+    ],
+  },
 ];
 
 // 动态路由，基于用户权限动态去加载
diff --git a/jsowell-ui/src/views/member/memberGroup/detail.vue b/jsowell-ui/src/views/member/memberGroup/detail.vue
new file mode 100644
index 000000000..23086942d
--- /dev/null
+++ b/jsowell-ui/src/views/member/memberGroup/detail.vue
@@ -0,0 +1,27 @@
+<template>
+    <div>
+        详情
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'JsowellUiDetail',
+
+    data() {
+        return {
+
+        };
+    },
+
+    mounted() {
+
+    },
+
+    methods: {
+
+    },
+};
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/jsowell-ui/src/views/member/memberGroup/index.vue b/jsowell-ui/src/views/member/memberGroup/index.vue
index 9093f8fe2..58ed5c04a 100644
--- a/jsowell-ui/src/views/member/memberGroup/index.vue
+++ b/jsowell-ui/src/views/member/memberGroup/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-<!--        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <!--        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
             <el-form-item label="会员组编号" prop="groupCode">
                 <el-input
                     v-model="queryParams.groupCode"
@@ -49,14 +49,8 @@
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button
-                    type="primary"
-                    plain
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleAdd"
-                    v-hasPermi="['member:memberGroup:add']"
-                >新增</el-button>
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                    v-hasPermi="['member:memberGroup:add']">新增</el-button>
             </el-col>
             <!--<el-col :span="1.5">
                 <el-button
@@ -95,67 +89,45 @@
 
         <el-table v-loading="loading" :data="memberGroupList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center" />
-            <!--<el-table-column label="主键" align="center" prop="id" />-->
-            <el-table-column label="集团编号" align="center" prop="groupCode" />
-            <!--<el-table-column label="运营商id" align="center" prop="merchantId" />-->
-            <el-table-column label="运营商名称" align="center" prop="merchantName" />
-            <!--<el-table-column label="站点id" align="center" prop="stationId" />-->
-            <el-table-column label="站点名称" align="center" prop="stationName" />
-            <!--<el-table-column label="会员组等级" align="center" prop="groupLevel" />-->
-            <el-table-column label="类型" align="center" prop="groupType" >
+            <!-- <el-table-column label="集团编号" align="center" prop="groupCode" /> -->
+            <el-table-column prop="groupCode" label="集团编号" align="center">
                 <template slot-scope="scope">
-                    <dict-tag
-                        :options="dict.type.group_type"
-                        :value="scope.row.groupType"
-                    />
+                    <router-link :to="'/member/memberGroup/detail/' + scope.row.groupCode" class="link-type">
+                        <span>{{ scope.row.groupCode }}</span>
+                    </router-link>
+                </template>
+            </el-table-column>
+            <el-table-column label="运营商名称" align="center" prop="merchantName" />
+            <el-table-column label="站点名称" align="center" prop="stationName" />
+            <el-table-column label="类型" align="center" prop="groupType">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.group_type" :value="scope.row.groupType" />
                 </template>
             </el-table-column>
             <el-table-column label="折扣率" align="center" prop="discount" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-edit"
-                        @click="handleUpdate(scope.row)"
-                        v-hasPermi="['member:memberGroup:edit']"
-                    >修改</el-button>
-                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="handleDelete(scope.row)"
-                        v-hasPermi="['member:memberGroup:remove']"
-                    >删除</el-button>
-                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-plus"
-                        @click="handleAddMember(scope.row)"
-                        v-hasPermi="['member:memberGroup:edit']"
-                    >添加会员</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['member:memberGroup:edit']">修改</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['member:memberGroup:remove']">删除</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAddMember(scope.row)"
+                        v-hasPermi="['member:memberGroup:edit']">添加会员</el-button>
                 </template>
             </el-table-column>
         </el-table>
 
-        <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList" />
 
         <!-- 添加或修改会员组对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
             <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">
+                        @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>
@@ -164,17 +136,14 @@
                 </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-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="groupType">
                     <el-radio-group v-model="form.groupType">
-                        <el-radio v-for="item in dict.type.group_type"
-                                  :key="item.value" :label="item.value">
-                            {{item.label}}
+                        <el-radio v-for="item in dict.type.group_type" :key="item.value" :label="item.value">
+                            {{ item.label }}
                         </el-radio>
                     </el-radio-group>
                 </el-form-item>
@@ -197,8 +166,8 @@
 
 <script>
 import { listMemberGroup, getMemberGroup, delMemberGroup, addMemberGroup, updateMemberGroup } from "@/api/member/memberGroup";
-import {getMerchantList} from "@/api/member/info";
-import {getStationListByMerchantId} from "@/api/pile/station";
+import { getMerchantList } from "@/api/member/info";
+import { getStationListByMerchantId } from "@/api/pile/station";
 
 export default {
     name: "MemberGroup",
@@ -243,7 +212,8 @@ export default {
             form: {},
             // 表单校验
             rules: {
-            }
+            },
+            createMerchantVip: {}
         };
     },
     created() {
@@ -311,7 +281,7 @@ export default {
         // 多选框选中数据
         handleSelectionChange(selection) {
             this.ids = selection.map(item => item.id)
-            this.single = selection.length!==1
+            this.single = selection.length !== 1
             this.multiple = !selection.length
         },
         /** 新增按钮操作 */
@@ -353,12 +323,12 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) {
             const ids = row.id || this.ids;
-            this.$modal.confirm('是否确认删除会员组编号为"' + ids + '"的数据项？').then(function() {
+            this.$modal.confirm('是否确认删除会员组编号为"' + ids + '"的数据项？').then(function () {
                 return delMemberGroup(ids);
             }).then(() => {
                 this.getList();
                 this.$modal.msgSuccess("删除成功");
-            }).catch(() => {});
+            }).catch(() => { });
         },
         /** 导出按钮操作 */
         handleExport() {