From 959b3783aa01b26ef267e25258ab7089b45c0710 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 15 Apr 2020 11:55:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
index 1a6002c..52f92b7 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
@@ -72,7 +72,9 @@
{ field: 'departmentName', width: 100, title: '科室' },
{
field: 'hospitalArea', width: 200, title: '所在地区', templet: function (d) {
- return d.hospitalProvince + "-" + d.hospitalCity + "-" + hospitalArea
+ return ((d.hospitalProvince==null)?"":d.hospitalProvince) + " "
+ + ((d.hospitalCity==null)?"":d.hospitalCity) + " " +
+ ((d.hospitalArea==null)?"":d.hospitalArea)
}
},
{ field: 'hospitalLink', width: 100, title: '联系人' },
@@ -115,9 +117,9 @@
var hospitalstate = $('#hospitalstate').val();
var hospitalName = $('#hospitalName').val();
- var hospitalProvince = $('#province').val();
- var hospitalCity = $('#city').val();
- var hospitalArea = $('#areas').val();
+ var hospitalProvince = ($("#province").val()!="")?$('#province option:selected').text():"";
+ var hospitalCity = ($("#city").val()!="")?$('#city option:selected').text():"";
+ var hospitalArea = ($("#areas").val()!="")?$('#areas option:selected').text():"";
var whereModel = {
isScreen: isscreen,
--
Gitblit v1.8.0