From 2f10692d098af93490c46aa561a353fc5870c789 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:51:22 +0800
Subject: [PATCH] 优化修复扣费成功后的日志代码，预防bug出现
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html | 226 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 149 insertions(+), 77 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
index 46041b2..bcf8ea3 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
@@ -1,4 +1,4 @@
-<form id="hospital-form" lay-filter="hospital-form" class="layui-form model-form" method="POST">
+<form id="hospital-form" lay-filter="hospital-form" autocomplete="off" class="layui-form model-form" method="POST">
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-col-sm7">
@@ -19,23 +19,60 @@
</div>
<div class="layui-form-item">
<div class="layui-row">
+ <div class="layui-col-sm5">
+ <label class="layui-form-label">医院联系人</label>
+ <div class="layui-input-block">
+ <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;"/>
+ </div>
+ </div>
+ <div class="layui-col-sm5">
+ <label class="layui-form-label">医院电话</label>
+ <div class="layui-input-block">
+ <input name="hospitalTel" id="hospitalTel" type="text" class="layui-input" maxlength="20" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
<div class="layui-col-sm4">
<label class="layui-form-label">科室名称</label>
<div class="layui-input-block">
<input name="departmentName" id="departmentName" placeholder="科室名称" type="text" class="layui-input"
maxlength="20" lay-verify="required" required style="width: 175px;" />
-  </div>
- </div>
- <div class="layui-col-sm3">
- <label class="layui-form-label">联系电话</label>
- <div class="layui-input-block">
- <input name="hospitalTel" id="hospitalTel" type="text" class="layui-input" maxlength="20" />
+  
</div>
</div>
<div class="layui-col-sm3">
- <label class="layui-form-label">联系人</label>
+ <label class="layui-form-label">科室电话</label>
<div class="layui-input-block">
- <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
+ <input name="departmentTel" id="departmentTel" type="text" class="layui-input" maxlength="20" />
+ </div>
+ </div>
+ <div class="layui-col-sm3">
+ <label class="layui-form-label">科室联系人</label>
+ <div class="layui-input-block">
+ <input name="departmentLink" id="departmentLink" type="text" class="layui-input" maxlength="20"
+ style="width: 200px;" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-sm6">
+ <label class="layui-form-label">是否筛查科室</label>
+ <div class="layui-input-block">
+ <input type="radio" name="isScreen" value="1" title="是">
+ <input type="radio" name="isScreen" value="0" title="否" >
+  
+ </div>
+ </div>
+ <div class="layui-col-sm6">
+ <label class="layui-form-label">是否新筛查</label>
+ <div class="layui-input-block">
+ <input type="radio" name="isNewScreenclient" value="1" title="是">
+ <input type="radio" name="isNewScreenclient" value="0" title="否" >
</div>
</div>
</div>
@@ -66,7 +103,7 @@
<label class="layui-form-label">帐号数量</label>
<div class="layui-input-block">
<input id="accountsCount" name="accountsCount" type="text" value="6" class="layui-input"
- maxlength="1" lay-verify="required|integer" style="width: 200px;" />
+ maxlength="2" lay-verify="required|integer" style="width: 200px;" />
</div>
</div>
</div>
@@ -78,12 +115,14 @@
<div class="layui-col-sm4">
<select lay-verify="required" required id="hospitalProvince" placeholder="省份"
lay-filter="hospitalProvince" style="width: 400px;">
- </select></div>
+ </select>
+ </div>
<div class="layui-col-sm4">
<select id="hospitalCity" lay-verify="required" required placeholder="市" lay-filter="hospitalCity"
style="width: 350px;">
<option value="">选择市</option>
- </select></div>
+ </select>
+ </div>
<div class="layui-col-sm4">
<select id="hospitalArea" lay-verify="required" required placeholder="区县" lay-filter="hospitalArea"
style="width: 350px;">
@@ -216,7 +255,7 @@
} else {
layer.msg(data.msg, {
icon: 2,
- time: 500
+ time: 2000
});
}
@@ -233,13 +272,8 @@
if (data.data.length > 0) {
$.each(data.data, function (index, item) {
//往下拉菜单里添加元素
- if (!strUtil.isEmpty(selectVal) && selectVal == item.id) {
- $('#saleUserName').append(new Option(item.nickname, item.id,
- false, true));
- } else {
- $('#saleUserName').append(new Option(item.nickname, item.id,
- false, false));
- }
+ $('#saleUserName').append(new Option(item.nickname, item.id,
+ false, (!strUtil.isEmpty(selectVal) && selectVal == item.id)));
});
if (hosIdForEdit == "") {
@@ -251,10 +285,9 @@
} else {
layer.msg(data.msg, {
icon: 2,
- time: 500
+ time: 2000
});
}
-
}, 'get');
}
//医院资质数据
@@ -266,25 +299,40 @@
//回显组织数据
let edithospitalData = admin.getTempData('t_hospital');
var hosIdForEdit = "";
+ var departmentId = "";
+ //当前登录人员的id
+ var selectVal = "";
if (edithospitalData != null) {
hosIdForEdit = edithospitalData.hospitalId;
+ departmentId = edithospitalData.departmentId;
+ }
+ else {
+ //先拿到当前登录用户的信息
+ var nowUser = config.getUser();
+ if (!strUtil.isEmpty(nowUser)) {
+ selectVal = nowUser.id;
+ }
}
//装载销售人员 服务人员数据
- loadServerUser();
- loadSaleUser();
+ loadServerUser(selectVal);
+ loadSaleUser(selectVal);
//装载市区数据
form.on("select(hospitalProvince)", function (data) {
area.areasClear("#hospitalArea", 3);
area.areaData("#hospitalCity", 2, data.value, "");
+ defaultValData();
});
//装载区县数据
form.on("select(hospitalCity)", function (data) {
area.areaData("#hospitalArea", 3, data.value, "");
+ defaultValData();
+ });
+ form.on("select(hospitalArea)", function (data) {
//区号，金纬度自动赋值
- var cityDataFor = admin.getTempData("t_city");
- if (cityDataFor != null) {
- cityDataFor.forEach(function (item) {
+ var areaDataFor = admin.getTempData("t_area");
+ if (areaDataFor != null) {
+ areaDataFor.forEach(function (item) {
if (data.value == item.id) {
$("#areaCode").val(item.areaCitycode);
$("#longitude").val(item.areaLng);
@@ -318,7 +366,10 @@
"#hospitalCity option:selected").text() : "";
data.field.hospitalArea = $("#hospitalArea option:selected").text() != "选择区县" ? $(
"#hospitalArea option:selected").text() : "";
-
+ let isScreen = data.field.isScreen
+ let isNewScreenclient = data.field.isNewScreenclient
+ delete data.field.isScreen
+ delete data.field.isNewScreenclient
admin.req('api-user/syshospital', JSON.stringify(data.field), function (data) {
if (data.code === 0) {
//存储科室数据
@@ -328,15 +379,19 @@
serverUserTel: $("#serverUserTel").val(),
departmentName: $("#departmentName").val(),
id: $("#departmentId").val(),
- orgId: ''+$("#departmentOrgId").val(),
- updateUserId: data.data.orgId,
- hospitalId: data.data.id,
- saleUserId: $("#saleUserName").val(),
+ orgId: '' + $("#departmentOrgId").val(),
+ updateUserId: '' + data.data.orgId,
+ hospitalId: '' + data.data.id,
+ saleUserId: '' + $("#saleUserName").val(),
saleUserName: $("#saleUserName option:selected").text(),
saleUserTel: $("#saleUserTel").val(),
- accountsCount: $("#accountsCount").val()
+ accountsCount: $("#accountsCount").val(),
+ departmentTel: $("#departmentTel").val(),
+ departmentLink: $("#departmentLink").val(),
+ isScreen,
+ isNewScreenclient,
};
- admin.req('api-user/sysdepartment', JSON.stringify(departmentData),
+ admin.req('api-user/sysdepartment/' + data.data.id, JSON.stringify(departmentData),
function (data) {
layer.closeAll('loading');
if (data.code == 0) {
@@ -347,7 +402,7 @@
admin.finishPopupCenter();
});
admin.putTempData("t_hospital", "");
- admin.putTempData("t_city", "");
+ admin.putTempData("t_area", "");
} else {
layer.msg(data.msg, {
icon: 2,
@@ -378,6 +433,7 @@
template_val: '{{d.hospitalName}}', //选择后文本框显示的数据字段
template_txt: "<div class='layui-table-cell'>{{d.hospitalName}}</div>", //下拉列表模板
onselect: function (resp) {
+ departmentId = "";
loadDatas(resp.id);
}
});
@@ -429,54 +485,64 @@
//装载资质 类型
$("#hospitalQualifiedName").val(hosData.hospitalQualifiedId);
$("#hospitalTypeName").val(hosData.hospitalTypeId);
+ if (!strUtil.isEmpty(departmentId)) {
+ //装载科室数据
+ admin.req('api-user/sysdepartment', {
+ id: departmentId,
+ isDel: 0,
+ page: 1,
+ limit: 20
+ }, function (data) {
+ if (data.code == 0) {
+ let departData = data.data.data;
+ if (departData.length > 0) {
+ if (departData.length > 1) {
+ layer.msg("该医院下有多个科室，默认显示第一个", {
+ icon: 1,
+ time: 2000
+ });
+ }
- //装载科室数据
- admin.req('api-user/sysdepartment', {
- hospitalId: hosId,
- isDel: 0,
- page: 1,
- limit: 20
- }, function (data) {
- if (data.code == 0) {
- let departData = data.data.data;
- if (departData.length > 0) {
- if (departData.length > 1) {
- layer.msg("该医院下有多个科室，默认显示第一个", {
- icon: 1,
- time: 2000
- });
+ $("#serverUserId").val(departData[0].serverUserId);
+ $('#serverUserName').val(departData[0]
+ .serverUserId);
+
+ $("#departmentName").val(departData[0]
+ .departmentName);
+ $("#departmentId").val(departData[0].id);
+ $("#departmentOrgId").val(departData[0].orgId);
+ $("#saleUserId").val(departData[0].saleUserId);
+ $("#accountsCount").val(departData[0]
+ .accountsCount);
+ $('#saleUserName').val(departData[0].saleUserId);
+ $('#departmentLink').val(departData[0].departmentLink);
+ $('#departmentTel').val(departData[0].departmentTel);
+ $("input[name=isScreen][value=1]").attr("checked", departData[0].isScreen == 1 ? true : false);
+ $("input[name=isScreen][value=0]").attr("checked", departData[0].isScreen == null || departData[0].isScreen==0 ? true : false);
+ $("input[name=isNewScreenclient][value=1]").attr("checked", departData[0].isNewScreenclient == 1 ? true : false);
+ $("input[name=isNewScreenclient][value=0]").attr("checked", departData[0].isNewScreenclient == null || departData[0].isNewScreenclient==0? true : false);
+ if (hosIdForEdit != "") {
+ $("#serverUserTel").val(departData[0]
+ .serverUserTel);
+ $("#saleUserTel").val(departData[0]
+ .saleUserTel);
+ }
+ form.render();
}
-
- $("#serverUserId").val(departData[0].serverUserId);
- $('#serverUserName').val(departData[0].serverUserId);
-
- $("#departmentName").val(departData[0].departmentName);
- $("#departmentId").val(departData[0].id);
- $("#departmentOrgId").val(departData[0].orgId);
- $("#saleUserId").val(departData[0].saleUserId);
- $("#accountsCount").val(departData[0].accountsCount);
- $('#saleUserName').val(departData[0].saleUserId);
-
- if (hosIdForEdit != "") {
- $("#serverUserTel").val(departData[0]
- .serverUserTel);
- $("#saleUserTel").val(departData[0].saleUserTel);
- }
- form.render();
+ } else {
+ layer.msg(data.msg, {
+ icon: 2,
+ time: 2000
+ });
}
- } else {
- layer.msg(data.msg, {
- icon: 2,
- time: 500
- });
- }
- }, 'get');
- form.render();
+ }, 'get');
+ }
+ form.render();
} else {
layer.msg(data.msg, {
icon: 2,
- time: 500
+ time: 2000
});
}
}, 'get');
@@ -515,10 +581,16 @@
} else {
layer.msg(data.msg, {
icon: 2,
- time: 500
+ time: 2000
});
}
}, 'get')
}
+ //重置区号 金纬度
+ var defaultValData = function () {
+ $("#areaCode").val("");
+ $("#longitude").val("");
+ $("#latitude").val("");
+ }
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0