From abbc89deac449ad2db272a942b81058bb01c3e32 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 15 Oct 2022 11:52:01 +0800
Subject: [PATCH] 对用户信息进行操作时,非必填选项填入需符合格式;当未填写性别时,默认为未知(3)

---
 src/views/system/user.vue |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 8a9ed89..63e6c14 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -31,13 +31,13 @@
                    @refresh-change="refreshChange"
                    @on-load="onLoad">
           <template slot-scope="{type,row,size}" slot="menu">
-            <el-button 
+            <el-button
               :type="type"
               :size="size"
               icon="el-icon-edit"
               :disabled="row.roleId == '1123598816738675201' "
               @click="update(row)">编辑</el-button>
-            <el-button 
+            <el-button
               :type="type"
               :size="size"
               icon="el-icon-delete"
@@ -246,18 +246,26 @@
       };
 
       const validatePhone = (rule, value, callback) => {
-        if (!/^[1]([3-9])[0-9]{9}$/.test(value)) {
-          callback(new Error("请输入正确的手机号格式"));
-        } else {
+        if (value){
+          if (!/^[1]([3-9])[0-9]{9}$/.test(value)) {
+            callback(new Error("请输入正确的手机号格式"));
+          } else {
+            callback();
+          }
+        }else {
           callback();
         }
       };
 
       const validateEmail = (rule, value, callback) => {
         const mal = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/
-        if (!(mal.test(value))) {
-          callback(new Error('请输入正确邮箱'))
-        } else {
+        if (value){
+          if (!(mal.test(value))) {
+            callback(new Error('请输入正确邮箱'))
+          } else {
+            callback()
+          }
+        }else {
           callback()
         }
       };
@@ -855,6 +863,9 @@
         row.roleId = row.roleId.join(",");
         row.farmId = row.farmId.join(",");
         // row.postId = row.postId.join(",");
+        if (!row.sex){
+          row.sex = 3
+        }
         add(row).then(() => {
           this.initFlag = false;
           this.onLoad(this.page);

--
Gitblit v1.9.3