From e7c3314727fc06444689c0e6ecab5fea337afeb0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:24:14 +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 | 121 +++++++++++++++++++++++++++++++---------
1 files changed, 94 insertions(+), 27 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 f1f730f..3b73c15 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
@@ -1,4 +1,4 @@
-<form id="app-form-add" lay-filter="app-form-add" class="layui-form model-form">
+<form id="app-form-add" lay-filter="app-form-add" autocomplete="off" class="layui-form model-form">
<input name="id" type="hidden" />
<div style="display:flex">
<div class="layui-form-item">
@@ -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"
+ autocomplete="off" />
</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;
//获取角色
@@ -232,8 +241,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 +289,6 @@
// 表单提交事件
form.on('submit(user-form-submit)', function (data) {
- layer.load(2);
data.field.hospitalId = $("#hospitalId").val();
if (data.field.roleId != null && data.field.roleId != "") {
data.field.roles = data.field.roleId.split(',');
@@ -292,20 +299,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) {
@@ -391,15 +441,15 @@
}, 'Post');
}
//获取销售代表
- var getXiaoShouDaiBiao = function () {
- admin.req('api-user/users/getThisUserOrganizationUser', {}, function (data) {
+ var getXiaoShouDaiBiao = function (selectVal) {
+ admin.req('api-user/users/getAppointUser', { type: 0 }, function (data) {
layer.closeAll('loading');
if (0 === data.code) {
user = data.data;
$.each(data.data, function (index, item) {
//往下拉菜单里添加元素
$('#serverUserId-add').append(new Option(item.nickname, item.id,
- false, false));
+ false, (!strUtil.isEmpty(selectVal) && selectVal == item.id)));
})
} else {
layer.msg(data.msg, {
@@ -416,13 +466,20 @@
$('.layui-layer-content').css('overflow', 'auto');
//将医院的数据保存到下拉表
let selected = false;
+ var selectVal="";
+ //先拿到当前登录用户的信息
+ var nowUser = config.getUser();
+ if (!strUtil.isEmpty(nowUser)) {
+ selectVal = nowUser.id;
+ }
//获取职称的
getZhiCheng();
//获取销售代表
- getXiaoShouDaiBiao();
+ getXiaoShouDaiBiao(selectVal);
//获取角色
get_role();
var upload = layui.upload;
+ $("#roleId_div").hide()
//执行实例
upload.render({
elem: '#phonto',
@@ -455,10 +512,6 @@
//将密码置空
$("#password").val("");
form.render();
- $("#username").blur(function () {
- username_is_usered("username");
- })
-
//医生类型的选择事件
// form.on('select(doctorType)', function (data) {
// // console.log("eeeeeeeeeeeeeeeee");
@@ -474,13 +527,26 @@
// }
// })
};
+ $("#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("请输入正确的手机号");
+ //将手机号还原
+ $("#doctorTel-add").val("")
+ $("#username").val("")
+
+ } else {
+ username_is_usered("username");
}
- username_is_usered("username");
})
//自动完成-医院名称
autocomplete.render({
@@ -506,7 +572,7 @@
$("#password_div").show();
$("#passwordSure_div").show();
$("#roleId_div").show()
- }else{
+ } else {
$(".account").hide();
$("#roleId_div").hide()
}
@@ -546,12 +612,12 @@
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)
+ $("#doctorTel-add").unbind("blur")
//将密码项取消
if (doctor.doctorType == 2) {
$(".account").hide();
@@ -566,7 +632,8 @@
$("#password").removeAttr("lay-verify")
$("#password").removeAttr("required")
$("#passwordSure").removeAttr("lay-verify")
-
+
+
form.render();
} else {
loadEditData();
--
Gitblit v1.8.0