From c73bc074cdb24353c2a819aa61e0135abcd59b23 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Mon, 11 Mar 2024 15:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9B=86=E5=9B=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/member/memberGroup/index.vue    | 50 ++++++++-----------
 .../src/views/member/merchantVIP/index.vue    | 12 ++---
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/jsowell-ui/src/views/member/memberGroup/index.vue b/jsowell-ui/src/views/member/memberGroup/index.vue
index 8a2810ff1..08db32df1 100644
--- a/jsowell-ui/src/views/member/memberGroup/index.vue
+++ b/jsowell-ui/src/views/member/memberGroup/index.vue
@@ -18,6 +18,7 @@
                     </router-link>
                 </template>
             </el-table-column>
+            <el-table-column label="集团名称" align="center" prop="groupName" />
             <el-table-column label="运营商名称" align="center" prop="merchantName" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
@@ -27,8 +28,8 @@
             </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>
@@ -41,29 +42,15 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <!-- <el-form-item label="站点" prop="stationId">
-                    <el-select v-model="form.stationId" placeholder="请选择站点" clearable filterable>
-                        <el-option v-for="(station, index) in stationList" :key="index" :label="station.stationName"
-                            :value="station.id" />
-                    </el-select>
+                <el-form-item label="集团名称" prop="groupName">
+                    <el-input v-model="form.groupName" placeholder="请输入集团名称" />
                 </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>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="折扣率" prop="discount">
-                    <el-input v-model="form.discount" placeholder="请输入折扣率" />
-                </el-form-item> -->
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="submitForm">确 定</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
-
         <!--添加会员-->
         <el-dialog title="添加会员" :visible.sync="openAddMember" width="500px" append-to-body>
             添加会员
@@ -80,6 +67,16 @@ export default {
     name: "MemberGroup",
     dicts: ["group_type"],
     data() {
+        // 自定义校验
+        var validatePass = (rule, value, callback) => {
+            if (value === undefined || value === null || value.trim() === '') {
+                callback(new Error('请输入集团名称'));
+            } else if (value.length > 30) {
+                callback(new Error('最多输入30个字'));
+            } else {
+                callback();
+            }
+        };
         return {
             openAddMember: false,
             // 遮罩层
@@ -116,22 +113,15 @@ export default {
                 discount: null,
             },
             // 表单参数
-            form: {},
+            form: {
+                groupName: null
+            },
             // 表单校验
             rules: {},
             createMerchantVip: {},
             dialogRules: {
-                discount: [
-                    {
-                        required: true,
-                        message: "请输入折扣率",
-                        trigger: "blur",
-                    },
-                    {
-                        pattern: /^((0\.[1-9]{1})|(([1-9]{1})(\.\d{1})?))$/,
-                        message: "请输入0-10之间，仅允许保留一位小数",
-                        trigger: "blur",
-                    },
+                groupName: [
+                    { validator: validatePass, trigger: 'blur' }
                 ],
             }
         };
diff --git a/jsowell-ui/src/views/member/merchantVIP/index.vue b/jsowell-ui/src/views/member/merchantVIP/index.vue
index bb918b124..ec95d546e 100644
--- a/jsowell-ui/src/views/member/merchantVIP/index.vue
+++ b/jsowell-ui/src/views/member/merchantVIP/index.vue
@@ -186,15 +186,15 @@
                 </el-col>
             </el-form>
             <el-table :data="detailList" stripe style="width: 100%" v-loading="loadings">
-                <el-table-column label="后管充值" align="center" prop="amount">
-                    <template slot-scope="scope">
+                <el-table-column label="支付金" align="center" prop="amount">
+                    <!-- <template slot-scope="scope">
                         <span v-if="scope.row.subType == '充值'">{{ scope.row.amount }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
-                <el-table-column label="后管扣款" align="center" prop="amount">
-                    <template slot-scope="scope">
+                <el-table-column label="操作类型" align="center" prop="subType">
+                    <!-- <template slot-scope="scope">
                         <span v-if="scope.row.subType == '后管扣款'">{{ scope.row.amount }}</span>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column label="支付金额" align="center" prop="payAmount" />
                 <el-table-column label="订单金额" align="center" prop="orderAmount" />