From 9678bda4e95add4a6c2be2360b824293fb7d9b86 Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Tue, 20 Apr 2021 10:48:58 +0800
Subject: [PATCH] 价格增加大于0的判断
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html | 224 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 154 insertions(+), 70 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..cc78b87 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">
@@ -6,7 +6,7 @@
<label class="layui-form-label" style="width: 75px;">所在医院</label>
<div class="layui-input-block" style="width: 150px;">
<input name="hospitalName" id="hospitalName" placeholder="请输入医院名称" type="text" class="layui-input"
- maxlength="50" lay-verify="required" required style="width: 150px;" />
+ maxlength="50" lay-verify="required" required style="width: 150px;" />
<input type="hidden" name="hospitalId" id="hospitalId" />
<input type="hidden" name="id" id="id" />
</div>
@@ -15,9 +15,9 @@
<label class="layui-form-label">科室</label>
<div class="layui-input-block" style="width: 150px;">
<input name="departmentName" id="departmentName" placeholder="请选择科室" type="hidden"
- class="layui-input" maxlength="20" />
+ class="layui-input" maxlength="20" />
<select id="departmentId" name="departmentId" lay-filter="departmentId" placeholder="请选择科室"
- lay-verify="required" required>
+ lay-verify="required" required>
<option value="">-请选择科室-</option>
</select>
</div>
@@ -40,14 +40,14 @@
<label class="layui-form-label">姓名</label>
<div class="layui-input-block" style="width: 150px;">
<input name="doctorName" type="text" class="layui-input" maxlength="20" lay-verify="required"
- required style="width: 150px;" />
+ required style="width: 150px;" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">职称</label>
<div class="layui-input-block" style="width: 150px;">
<select id="doctorRankId" name="doctorRankId" lay-filter="doctorRankId" placeholder="选择一个职称"
- lay-verify="required" required>
+ lay-verify="required" required>
<option value="">-请选择-</option>
</select>
<input name="doctorRank" id='doctorRank' type="hidden" class="layui-input" maxlength="20" />
@@ -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>
@@ -68,7 +68,7 @@
<label class="layui-form-label">联系电话</label>
<div class="layui-input-block" style="width: 150px;">
<input name="doctorTel" id="doctorTel-add" type="text" class="layui-input" maxlength="20"
- lay-verify="required|phone" required style="width: 150px;" />
+ lay-verify="required|phone" required style="width: 150px;" />
</div>
</div>
<div class="layui-inline">
@@ -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>
@@ -100,9 +100,9 @@
<label class="layui-form-label">医生状态</label>
<div class="layui-input-block">
<input name="doctorState" id="doctorState-shi" type="radio" checked value="true" title="正常"
- class="layui-input" />
+ class="layui-input" />
<input name="doctorState" id="doctorState-fou" type="radio" value="false" title="试用"
- class="layui-input" />
+ class="layui-input" />
</div>
</div>
<div class="layui-form-item">
@@ -116,7 +116,7 @@
<label class="layui-form-label">医答</label>
<div class="layui-input-block">
<input name="isAnswer" id="isAnswer-shi" type="radio" checked value="true" title="是"
- class="layui-input" />
+ class="layui-input" />
<input name="isAnswer" id="isAnswer-fou" type="radio" value="false" title="否" class="layui-input" />
</div>
</div>
@@ -124,7 +124,7 @@
<label class="layui-form-label">签约</label>
<div class="layui-input-block">
<input name="isSigning" id="isSigning-shi" type="radio" checked value="true" title="是"
- class="layui-input" />
+ class="layui-input" />
<input name="isSigning" id="isSigning-fou" type="radio" value="false" title="否" class="layui-input" />
</div>
</div>
@@ -152,7 +152,7 @@
<!-- </div>
<div class="layui-form-item">
-
+
</div>
<div class="layui-form-item"> -->
@@ -177,14 +177,14 @@
<label class="layui-form-label">销售代表</label>
<div class="layui-input-block" style="width: 150px;">
<input name="serverUserName" id="serverUserName-add" type="hidden" class="layui-input"
- maxlength="15" />
+ maxlength="15" />
<select id="serverUserId-add" name="serverUserId" lay-filter="serverUserId-add"
- lay-verify="required" required>
+ lay-verify="required" required>
<option value="">-请选择-</option>
</select>
</div>
</div>
- <!--
+ <!--
</div>
<div class="layui-form-item"> -->
@@ -195,7 +195,7 @@
<div class="layui-form-item model-form-footer">
<button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
<button class="layui-btn permissions" permissions="sysdoctor-edit" id="sure" lay-filter="user-form-submit"
- lay-submit>保存</button>
+ lay-submit>保存</button>
</div>
</form>
@@ -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.roles) {
+ if (doctor != null && doctor.roles) {
formSelects.value('roleId', doctor.roles);
}
@@ -252,7 +260,7 @@
// 正则验证格式
eval("var reg = /^1[34578]\\d{9}$/;");
- var flag=RegExp(reg).test(content)
+ var flag = RegExp(reg).test(content)
return flag;
}
//判断用户名是否被使用
@@ -281,8 +289,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 +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) {
@@ -367,7 +416,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) {
@@ -392,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, {
@@ -417,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',
@@ -453,13 +509,9 @@
});
//将密码隐藏
$(".account").hide();
- //将密码置空
+ //将密码置空
$("#password").val("");
form.render();
- $("#username").blur(function () {
- username_is_usered("username");
- })
-
//医生类型的选择事件
// form.on('select(doctorType)', function (data) {
// // console.log("eeeeeeeeeeeeeeeee");
@@ -475,15 +527,27 @@
// }
// })
};
- $("#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("请输入正确的手机号");
+ //将手机号还原
+ $("#doctorTel-add").val("")
+ $("#username").val("")
+
+ } else {
+ username_is_usered("username");
+ }
+ })
//自动完成-医院名称
autocomplete.render({
elem: $('#hospitalName')[0],
@@ -502,28 +566,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');
@@ -537,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();
@@ -558,6 +633,15 @@
$("#password").removeAttr("required")
$("#passwordSure").removeAttr("lay-verify")
+ $("#doctorState-shi").attr("checked", doctor.doctorState? true : false);
+ $("#doctorState-fou").attr("checked", !doctor.doctorState ? true : false);
+ $("#isTop-shi").attr("checked", doctor.isTop? true : false);
+ $("#isTop-fou").attr("checked", !doctor.isTop ? true : false);
+ $("#isAnswer-shi").attr("checked", doctor.isAnswer? true : false);
+ $("#isAnswer-fou").attr("checked", !doctor.isAnswer ? true : false);
+
+ $("#isSigning-shi").attr("checked", doctor.isSigning? true : false);
+ $("#isSigning-fou").attr("checked", !doctor.isSigning ? true : false);
form.render();
} else {
loadEditData();
--
Gitblit v1.8.0