From c58a42aa1acc821e0c3e748de7205e58af6c350b Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Tue, 01 Sep 2020 16:44:25 +0800 Subject: [PATCH] 1.修改充值页面,可支持修改起始结束时间 2.修改添加医院/医生页面,增加自动选择当前服务/销售人员 3.调整页面部分显示细节问题 --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 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 9ff1930..e02b7a9 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" + autocomplete="off" /> </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'); @@ -431,7 +442,7 @@ }, 'Post'); } //获取销售代表 - var getXiaoShouDaiBiao = function () { + var getXiaoShouDaiBiao = function (selectVal) { admin.req('api-user/users/getAppointUser', { type: 0 }, function (data) { layer.closeAll('loading'); if (0 === data.code) { @@ -439,7 +450,7 @@ $.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, { @@ -456,10 +467,16 @@ $('.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; @@ -591,11 +608,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) { @@ -611,7 +628,8 @@ $("#password").removeAttr("lay-verify") $("#password").removeAttr("required") $("#passwordSure").removeAttr("lay-verify") - + + form.render(); } else { loadEditData(); -- Gitblit v1.8.0