Merge remote-tracking branch 'origin/master'

master
leijx 5 years ago
commit 82d7b45033

@ -254,14 +254,14 @@
} }
var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); // var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
var deptArr = deptAdmissionTo.split(','); // var deptArr = deptAdmissionTo.split(',');
//var n = (deptAdmissionTo.split(',')).length ; // //var n = (deptAdmissionTo.split(',')).length ;
if (deptAdmissionTo == null || deptAdmissionTo == '' || deptArr.length > 1) { // if (deptAdmissionTo == null || deptAdmissionTo == '' || deptArr.length > 1) {
$('#deptDiv').show(); // $('#deptDiv').show();
} else { // } else {
$('#deptDiv').hide(); // $('#deptDiv').hide();
} // }
function getDept() { function getDept() {
//获取科室列表 //获取科室列表
@ -272,17 +272,20 @@
success: function (result) { success: function (result) {
if (result != null) { if (result != null) {
for (var i = 0; i < result.length; i++) { for (var i = 0; i < result.length; i++) {
if (deptArr.length != 1 && deptArr[0] != "") { $("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
var bol = deptArr.indexOf(result[i].code);
if (bol != -1) {
$("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
}
} else {
$("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
}
} }
} }
$(".selectpicker").selectpicker('refresh'); // $('#deptName').selectpicker('refresh');
// for (var i = 0; i < result.length; i++) {
// if (deptArr.length != 1 && deptArr[0] != "") {
// var bol = deptArr.indexOf(result[i].code);
// if (bol != -1) {
// $("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
// }
// } else {
// $("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
// }
// }
} }
}); });
} }
@ -371,10 +374,11 @@
this.pageSize = currPageSize; this.pageSize = currPageSize;
} }
// var url = window.location.href; var url = window.location.href;
var deptName = '';
// var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
//
//
// var len = ($("#deptName").val()).length; // var len = ($("#deptName").val()).length;
// if (len > 0) { // if (len > 0) {
// var deptNameT = $("#deptName").val(); // var deptNameT = $("#deptName").val();
@ -382,8 +386,8 @@
// deptName = $("#deptName").val().toString(); // deptName = $("#deptName").val().toString();
// } // }
// } // }
var url = window.location.href; // var url = window.location.href;
var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
var len = value.length; var len = value.length;
if (len > 0) { if (len > 0) {
if (value.indexOf("") == -1) { if (value.indexOf("") == -1) {

Loading…
Cancel
Save