Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-ui/src/views/member/memberGroup/index.vue

@@ -120,7 +120,7 @@
 
         <!-- 添加或修改会员组对话框 -->
         <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 ref="form" :model="form" :rules="dialogRules" label-width="120px">
                 <el-form-item label="选择运营商">
                     <el-select v-model="form.merchantId" clearable placeholder="请选择运营商"
                         @change="changeSelectStation(form.merchantId)">
@@ -209,9 +209,22 @@ export default {
             // 表单参数
             form: {},
             // 表单校验
-            rules: {
-            },
-            createMerchantVip: {}
+            rules: {},
+            createMerchantVip: {},
+            dialogRules: {
+                discount: [
+                    {
+                        required: true,
+                        message: "请输入折扣率",
+                        trigger: "blur",
+                    },
+                    {
+                        pattern: /^((0\.[1-9]{1})|(([1-9]{1})(\.\d{1})?))$/,
+                        message: "请输入0-10之间，仅允许保留一位小数",
+                        trigger: "blur",
+                    },
+                ],
+            }
         };
     },
     created() {