From 5d97b0934973737a903f45d1d89e095b2e255694 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Fri, 21 Aug 2020 10:12:36 +0800
Subject: [PATCH] 提交到Gitblit

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html |   83 ++++++++++++++++++++++++++++++++---------
 1 files changed, 64 insertions(+), 19 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 0aca3c9..c393eeb 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,7 +56,7 @@
             <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"
+                    <input name="doctorEmail" type="text" class="layui-input" maxlength="50" lay-verify="required|email"
                         required />
                 </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>
@@ -232,8 +232,7 @@
                         arr: roleSelectData
                     });
                     // 回显user数据
-                    var doctor = admin.getTempData('t_doctor');
-                    if (doctor!=null&&doctor.roles) {
+                    if (doctor != null && doctor.roles) {
                         formSelects.value('roleId', doctor.roles);
                     }
 
@@ -281,7 +280,6 @@
 
         // 表单提交事件
         form.on('submit(user-form-submit)', function (data) {
-            layer.load(2);
             debugger
             data.field.hospitalId = $("#hospitalId").val();
             if (data.field.roleId != null && data.field.roleId != "") {
@@ -293,20 +291,63 @@
                 data.field.password = "";
                 data.field.passwordSure = "";
             } else {
-                if (data.field.roles.length == 0) {
+                if (data.field.roles == null || data.field.roles.length == 0) {
                     layer.msg("请选择角色");
-                    return
+                    return false;
                 }
                 if (data.field.roles.includes(guanliyuan_role)) {
                     data.field.isAdminUser = true;
                 } else {
                     data.field.isAdminUser = false;
                 }
+                var doctor = admin.getTempData('t_doctor');
+                //判断只有输入密码的时候进行密码判断
+                if (doctor != null) {
+                    if (doctor.doctorType == 2 && doctorType != 2) {
+                        if (data.field.username == null || data.field.username.trim() == "") {
+                            layer.msg("请输入手机号");
+                            return false;
+                        }
+                        if (data.field.password == null || data.field.password.trim() == "") {
+                            layer.msg("请输入登录密码");
+                            return false;
+                        }
+                        if (data.field.passwordSure == null || data.field.passwordSure.trim() == "") {
+                            layer.msg("请输入确认密码");
+                            return false;
+                        } else {
+                            if (data.field.password != data.field.passwordSure) {
+                                layer.msg("两次密码不一致,请重新输入");
+                                return false;
+                            }
+                        }
+                    }
+                } else {
+                    if (data.field.username == null || data.field.username.trim() == "") {
+                        layer.msg("请输入手机号");
+                        return false;
+                    }
+                    if (data.field.password == null || data.field.password.trim() == "") {
+                        layer.msg("请输入登录密码");
+                        return false;
+                    }
+                    if (data.field.passwordSure == null || data.field.passwordSure.trim() == "") {
+                        layer.msg("请输入确认密码");
+                        return false;
+                    } else {
+                        if (data.field.password != data.field.passwordSure) {
+                            layer.msg("两次密码不一致,请重新输入");
+                            return false;
+                        }
+                    }
+                }
+                data.field.roles.forEach(element => {
+                element = "" + element
+            });
             }
-            // guanliyuan_role
-            // data.field.hospitalId = ""+data.field.hospitalId;
             data.field.roleId = null;
-
+            
+            layer.load(2);
             admin.req('api-user/sysdoctor', JSON.stringify(data.field), function (data) {
                 layer.closeAll('loading');
                 if (data.code == 0) {
@@ -393,7 +434,7 @@
         }
         //获取销售代表
         var getXiaoShouDaiBiao = function () {
-            admin.req('api-user/users/getThisUserOrganizationUser', {}, function (data) {
+            admin.req('api-user/users/getAppointUser', { type: 0 }, function (data) {
                 layer.closeAll('loading');
                 if (0 === data.code) {
                     user = data.data;
@@ -424,6 +465,7 @@
             //获取角色
             get_role();
             var upload = layui.upload;
+            $("#roleId_div").hide()
             //执行实例
             upload.render({
                 elem: '#phonto',
@@ -456,10 +498,6 @@
             //将密码置空 
             $("#password").val("");
             form.render();
-            $("#username").blur(function () {
-                username_is_usered("username");
-            })
-
             //医生类型的选择事件
             // form.on('select(doctorType)', function (data) {
             //     // console.log("eeeeeeeeeeeeeeeee");
@@ -475,14 +513,21 @@
             //     }
             // })
         };
+        $("#username").blur(function () {
+            if (!validatorTel(doctorTel_add)) {
+                layer.msg("请输入正确的手机号");
+            } else {
+                username_is_usered("username");
+            }
+        })
         $("#doctorTel-add").blur(function () {
             $("#username").val($("#doctorTel-add").val())
             var doctorTel_add = $("#doctorTel-add").val();
-            debugger
             if (!validatorTel(doctorTel_add)) {
                 layer.msg("请输入正确的手机号");
+            } else {
+                username_is_usered("username");
             }
-            username_is_usered("username");
         })
         //自动完成-医院名称
         autocomplete.render({
@@ -508,7 +553,7 @@
                     $("#password_div").show();
                     $("#passwordSure_div").show();
                     $("#roleId_div").show()
-                }else{
+                } else {
                     $(".account").hide();
                     $("#roleId_div").hide()
                 }

--
Gitblit v1.8.0