From cbe984ba7a5872ef4ed716c04b7f6dcb0535c3f5 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 26 Sep 2022 17:23:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E7=AB=99=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=20=E7=BC=96=E8=BE=91=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/station/index.vue | 50 ++++++++++++++++--------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index cb86ae9..597471c 100644
--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@@ -489,7 +489,8 @@
         </el-form-item>
         <el-form-item label="护理站简介" prop="agencyIntroduce">
           <editor
-            style="width: 90%; margin: 0 auto"
+          :min-height="62"
+            style="width: 90%; margin: 0 auto;"
             v-model="form.agencyIntroduce"
           ></editor>
         </el-form-item>
@@ -771,28 +772,30 @@ export default {
   components: { stationAcatar, editor },
   name: "Station",
   data() {
-    // 验证手机号的规则
-    var checkMobile = (rule, value, cb) => {
-      var str = String(value);
+       var checkMobile = (rule, value, cb) => {
       // 验证手机号的正则表达式
       const regMobile =
-        /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/;
-      //  /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
-      // /^(?:(?:\+|0086))?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[0-9]))\d{8}$/;
-      const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
-      const isTel = reg.test(value);
-
-      if (str.length == 11) {
-        if (regMobile.test(str)) {
-          return cb();
-        }
-      } else if (11 < str.length <= 13) {
-        if (isTel) {
-          return cb();
-        }
+        /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
+      if (regMobile.test(value)) {
+        return cb();
       }
       cb(new Error("请输入正确的联系电话"));
     };
+    // 验证手机号的规则
+    var checkMobile2 = (rule, value, cb) => {
+      // 验证手机号的正则表达式
+      const regMobile =
+        /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
+        if (!value) { //所以当没有值的时候，我们直接callback，让他不校验直接执行下一步
+        return cb()
+      }else{
+           if (regMobile.test(value)) {
+        return cb();
+      }else{
+         cb(new Error("请输入正确的联系电话"));
+      }
+      } 
+    };
     return {
       imageUrl: "",
       imageUrl2: "",
@@ -908,17 +911,16 @@ export default {
           },
           // { required: true, message: "联系电话不能为空", trigger: "blur" },
         ],
-        dutyPerson: [
-          { required: true, message: "负责人不能为空", trigger: "blur" },
-        ],
+        // dutyPerson: [
+        //   { required: true, message: "负责人不能为空", trigger: "blur" },
+        // ],
         dutyPhone: [
           {
-            required: true,
-            validator: checkMobile,
+            validator: checkMobile2,
             trigger: "blur",
             message: "",
           },
-          // { required: true, message: "负责人电话不能为空", trigger: "blur" },
+          // { required: false, message: "负责人电话不能为空", trigger: "blur" },
         ],
         sort: [{ required: true, message: "排序不能为空", trigger: "blur" }],
         address: [{ required: true, message: "地址不能为空", trigger: "blur" }],