From f0596fb2bf8fd0ecd8332b176549dad290a6a78d Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sat, 15 Aug 2020 19:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html | 124 +++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 53 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 5c83c5c..c6adb27 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
@@ -216,7 +216,7 @@
} else {
layer.msg(data.msg, {
icon: 2,
- time: 500
+ time: 2000
});
}
@@ -251,7 +251,7 @@
} else {
layer.msg(data.msg, {
icon: 2,
- time: 500
+ time: 2000
});
}
@@ -266,8 +266,10 @@
//回显组织数据
let edithospitalData = admin.getTempData('t_hospital');
var hosIdForEdit = "";
+ var departmentId = "";
if (edithospitalData != null) {
hosIdForEdit = edithospitalData.hospitalId;
+ departmentId = edithospitalData.departmentId;
}
//装载销售人员 服务人员数据
loadServerUser();
@@ -277,14 +279,18 @@
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);
@@ -328,15 +334,15 @@
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()
};
- 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 +353,7 @@
admin.finishPopupCenter();
});
admin.putTempData("t_hospital", "");
- admin.putTempData("t_city", "");
+ admin.putTempData("t_area", "");
} else {
layer.msg(data.msg, {
icon: 2,
@@ -378,6 +384,7 @@
template_val: '{{d.hospitalName}}', //选择后文本框显示的数据字段
template_txt: "<div class='layui-table-cell'>{{d.hospitalName}}</div>", //下拉列表模板
onselect: function (resp) {
+ departmentId = "";
loadDatas(resp.id);
}
});
@@ -429,54 +436,59 @@
//装载资质 类型
$("#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);
+
+ 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 +527,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