From d526d571cbe0a950e777fb325978d72f3ddb302b Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Thu, 13 Aug 2020 21:38:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html | 142 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 98 insertions(+), 44 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 ba26922..e6c44ee 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 @@ -232,8 +232,7 @@ arr: roleSelectData }); // 回显user数据 - var doctor = admin.getTempData('t_doctor'); - if (doctor.roles) { + if (doctor != null && doctor.roles) { formSelects.value('roleId', doctor.roles); } @@ -252,7 +251,7 @@ // 正则验证格式 eval("var reg = /^1[34578]\\d{9}$/;"); - var flag=RegExp(reg).test(content) + var flag = RegExp(reg).test(content) return flag; } //判断用户名是否被使用 @@ -281,8 +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 != "") { data.field.roles = data.field.roleId.split(','); @@ -293,20 +290,62 @@ 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; + } + } + } } - // guanliyuan_role - // data.field.hospitalId = ""+data.field.hospitalId; data.field.roleId = null; - + data.field.roles.forEach(element => { + element = "" + element + }); + layer.load(2); admin.req('api-user/sysdoctor', JSON.stringify(data.field), function (data) { layer.closeAll('loading'); if (data.code == 0) { @@ -367,7 +406,7 @@ //职称添加数据 var getZhiCheng = function () { admin.req('api-user/sysdictionaries/findAll', JSON.stringify({ - dictionariesClassId: "1248150699682988034" + dictionariesClassId: "DOCTOR_RANK" }), function (data) { layer.closeAll('loading'); if (0 === data.code) { @@ -393,7 +432,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 +463,7 @@ //获取角色 get_role(); var upload = layui.upload; + $("#roleId_div").hide() //执行实例 upload.render({ elem: '#phonto', @@ -456,10 +496,6 @@ //将密码置空 $("#password").val(""); form.render(); - $("#username").blur(function () { - username_is_usered("username"); - }) - //医生类型的选择事件 // form.on('select(doctorType)', function (data) { // // console.log("eeeeeeeeeeeeeeeee"); @@ -475,15 +511,22 @@ // } // }) }; - $("#doctorTel-add").blur(function () { - $("#username").val($("#doctorTel-add").val()) - var doctorTel_add = $("#doctorTel-add").val(); - debugger - if (!validatorTel(doctorTel_add)) { - layer.msg("请输入正确的手机号"); - } + $("#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(); + if (!validatorTel(doctorTel_add)) { + layer.msg("请输入正确的手机号"); + } else { + username_is_usered("username"); + } + }) //自动完成-医院名称 autocomplete.render({ elem: $('#hospitalName')[0], @@ -502,28 +545,39 @@ form.on('select(doctorType)', function (data) { var doctor = admin.getTempData('t_doctor'); var doctorType = $('#doctorType').val(); - if (doctor.doctorType == 2 && doctorType == 2) { - $(".account").hide(); - $("#roleId_div").hide() - } else if (doctor.doctorType == 2 && doctorType != 2) { - $(".account").show(); - $("#password_div").show(); - $("#passwordSure_div").show(); - $("#roleId_div").show() - if (doctor.username == null) { - $("#username").val(doctor.doctorTel); - form.render(); + if (doctor == null) { + if (doctorType != 2) { + $(".account").show(); + $("#password_div").show(); + $("#passwordSure_div").show(); + $("#roleId_div").show() + } else { + $(".account").hide(); + $("#roleId_div").hide() } - } else if (doctor.doctorType != 2 && doctorType != 2) { - $(".account").show(); - $("#password_div").hide(); - $("#passwordSure_div").hide(); - $("#roleId_div").show() - } else if (doctor.doctorType != 2 && doctorType == 2) { - $(".account").hide(); - $("#roleId_div").hide() + } else { + if (doctor.doctorType == 2 && doctorType == 2) { + $(".account").hide(); + $("#roleId_div").hide() + } else if (doctor.doctorType == 2 && doctorType != 2) { + $(".account").show(); + $("#password_div").show(); + $("#passwordSure_div").show(); + $("#roleId_div").show() + if (doctor.username == null) { + $("#username").val(doctor.doctorTel); + form.render(); + } + } else if (doctor.doctorType != 2 && doctorType != 2) { + $(".account").show(); + $("#password_div").hide(); + $("#passwordSure_div").hide(); + $("#roleId_div").show() + } else if (doctor.doctorType != 2 && doctorType == 2) { + $(".account").hide(); + $("#roleId_div").hide() + } } - }) //数据的回显 var doctor = admin.getTempData('t_doctor'); -- Gitblit v1.8.0