From d69e0dd2141624ae395a9e615d369ecf52895a8a Mon Sep 17 00:00:00 2001
From: dujie <dujie@syxysoft.com>
Date: Wed, 2 Nov 2022 09:26:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E8=BE=93=E5=BA=A7=E6=9C=BA=E5=8F=B7=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/validate.js                                    | 7 ++++---
 .../modules/ContactManagementModule.vue                  | 9 ++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/utils/validate.js b/src/utils/validate.js
index 90a3023..2078514 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -18,7 +18,7 @@ export function isPhone(s) {
 }
 
 /**
- * URL地址
+ * URL地址s
  * @param {*} s
  */
 export function isURL(s) {
@@ -34,11 +34,12 @@ export function passwordReg(s) {
 }
 
 /**
- * 手机号
+ * 手机号或座机号
+ *
  * /^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\d{8}$/
  * */
 export function phoneReg(s) {
-	return /^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(s)
+	return /(^[1][3,4,5,6,7,8,9][0-9]{9}$)|(^0\d{2,3}-?\d{7,8}$)/.test(s)
 }
 
 /**
diff --git a/src/views/businessManagement/modules/ContactManagementModule.vue b/src/views/businessManagement/modules/ContactManagementModule.vue
index 5f80632..b120410 100644
--- a/src/views/businessManagement/modules/ContactManagementModule.vue
+++ b/src/views/businessManagement/modules/ContactManagementModule.vue
@@ -49,9 +49,8 @@
         <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入手机号"
+              <a-input placeholder="请输入手机号或座机号"
                        v-decorator="['phone',validatorRules.phone]"
-                       :maxLength='11'
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
           </a-col>
@@ -368,14 +367,14 @@ export default {
             if (res.success) {
               callback()
             } else {
-              callback('手机号已存在')
+              callback('手机号或座机号已存在')
             }
           })
           return
         }
-        callback('请输入正确的手机号')
+        callback('请输入正确的手机号或座机号')
       }
-      callback('请输入手机号')
+      callback('请输入手机号或座机号')
     },
     /**
      * 邮箱校验