From eb856c050d5c20c69ba490046f597b1f993a06da Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Tue, 25 Aug 2020 15:53:58 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
index e6c44ee..e60539d 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
@@ -56,8 +56,8 @@
             <div class="layui-inline">
                 <label class="layui-form-label">Email</label>
                 <div class="layui-input-block" style="width: 150px;">
-                    <input name="doctorEmail" type="text" class="layui-input" maxlength="20" lay-verify="required|email"
-                        required />
+                    <input name="doctorEmail" type="text" class="layui-input" maxlength="50" lay-verify="v_email"
+                         />
                 </div>
             </div>
         </div>
@@ -89,9 +89,9 @@
     <div style="display:flex">
         <div class="layui-form-item">
             <label class="layui-form-label">医生简介</label>
-            <div class="layui-input-block">
+            <div class="layui-input-block" >
                 <textarea name="doctorAbout" id="doctorAbout" class="layui-textarea" maxlength="300"
-                    style="width: 650px;"></textarea>
+                    style="width: 697px;"></textarea>
             </div>
         </div>
     </div>
@@ -211,7 +211,16 @@
         var formSelects = layui.formSelects;
         var $ = layui.jquery;
 
-
+        //验证邮箱
+        admin.v_email = function(value, item){
+            var exp = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+            if(value && !exp.test(value) ){
+                return '邮箱格式不正确';
+            }
+        }
+        form.verify({
+            v_email:admin.v_email,
+        })
         //医生管理员
         var guanliyuan_role = undefined;
         //获取角色
@@ -280,6 +289,7 @@
 
         // 表单提交事件
         form.on('submit(user-form-submit)', function (data) {
+            debugger
             data.field.hospitalId = $("#hospitalId").val();
             if (data.field.roleId != null && data.field.roleId != "") {
                 data.field.roles = data.field.roleId.split(',');
@@ -340,11 +350,12 @@
                         }
                     }
                 }
-            }
-            data.field.roleId = null;
-            data.field.roles.forEach(element => {
+                data.field.roles.forEach(element => {
                 element = "" + element
             });
+            }
+            data.field.roleId = null;
+            
             layer.load(2);
             admin.req('api-user/sysdoctor', JSON.stringify(data.field), function (data) {
                 layer.closeAll('loading');
@@ -591,11 +602,11 @@
             getXiaoShouDaiBiao();
             //获取角色
             get_role(doctor.isAdminUser);
-
             form.val('app-form-add', doctor);
             $("#hospitalId").val(doctor.hospitalId);
             $("#password_div").hide();
             $("#passwordSure_div").hide();
+            $("#doctorTel-add").prop("disabled",true)
 
             //将密码项取消
             if (doctor.doctorType == 2) {

--
Gitblit v1.8.0