diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 24ae94d..1200ada 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -1,4 +1,4 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <% @@ -2557,11 +2557,17 @@ // deptName = $("#deptName").val(); // } - var len = ($("#deptName").val()).length; + // var len = ($("#deptName").val()).length; + // if (len > 0) { + // var deptNameT = $("#deptName").val(); + // if (deptNameT.indexOf("") == -1) { + // deptName = $("#deptName").val().toString(); + // } + // } + var len = value.length; if (len > 0) { - var deptNameT = $("#deptName").val(); - if (deptNameT.indexOf("") == -1) { - deptName = $("#deptName").val().toString(); + if (value.indexOf("") == -1) { + deptName = value.toString(); } } @@ -3385,14 +3391,19 @@ } }); + var value = []; //查询 $('#searchBtn').click(function () { + if ($("#deptName").val().length > 0){ + value = $("#deptName").val(); + } if (tipLoad == 0) {//refreshOptions $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询,请稍等..."); } - $(".selectpicker").selectpicker( 'deselectAll' ); + + $("#deptName").val([]); }); //添加pdf记录 diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index dcb38d1..30524dd 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -2044,11 +2044,17 @@ } var url = window.location.href; var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - var len = ($("#deptName").val()).length; + // var len = ($("#deptName").val()).length; + // if (len > 0) { + // var deptNameT = $("#deptName").val(); + // if (deptNameT.indexOf("") == -1) { + // deptName = $("#deptName").val().toString(); + // } + // } + var len = value.length; if (len > 0) { - var deptNameT = $("#deptName").val(); - if (deptNameT.indexOf("") == -1) { - deptName = $("#deptName").val().toString(); + if (value.indexOf("") == -1) { + deptName = value.toString(); } } //console.log(deptName); @@ -2933,14 +2939,18 @@ } }); + var value = []; //查询 $('#searchBtn').click(function () { + if ($("#deptName").val().length > 0){ + value = $("#deptName").val(); + } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询,请稍等..."); } - $(".selectpicker").selectpicker( 'deselectAll' ); + $("#deptName").val([]); }); diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index eb152a0..4e6ecee 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -222,14 +222,24 @@ this.pageSize = currPageSize; } + // var url = window.location.href; + // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); + // + // var len = ($("#deptName").val()).length; + // if (len > 0) { + // var deptNameT = $("#deptName").val(); + // if (deptNameT.indexOf("") == -1) { + // deptName = $("#deptName").val().toString(); + // } + // } + var url = window.location.href; var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - var len = ($("#deptName").val()).length; + var len = value.length; if (len > 0) { - var deptNameT = $("#deptName").val(); - if (deptNameT.indexOf("") == -1) { - deptName = $("#deptName").val().toString(); + if (value.indexOf("") == -1) { + deptName = value.toString(); } } @@ -468,16 +478,19 @@ } - + var value = []; //查询 $('#searchBtn').click(function () { + if ($("#deptName").val().length > 0){ + value = $("#deptName").val(); + } //查询之后重新从第一页算起 if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新 } else { toastr.warning("正在查询,请稍等..."); } - $(".selectpicker").selectpicker( 'deselectAll' ); + $("#deptName").val([]); }); diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index e536896..942cfd7 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -1544,24 +1544,43 @@ // deptList.push("20050102"); // deptList.push("20070102"); + // var url = window.location.href; + // var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); + // var len = ($("#deptName").val()).length; + // var bol=0; + // var deptStr=""; + // if (len > 0) { + // var deptName = $("#deptName").val(); + // for(var m=0;m 0) { - var deptName = $("#deptName").val(); - for(var m=0;m 0){ + value = $("#deptName").val(); + } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询,请稍等..."); } - $(".selectpicker").selectpicker( 'deselectAll' ); + $("#deptName").val([]); }); //添加pdf记录 diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 08ef25d..f78bda4 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -1826,14 +1826,20 @@ // deptName = $("#deptName").val(); // } // - var deptName = $("#deptName").val(); + // var deptName = $("#deptName").val(); + // if (deptName.indexOf("") != -1) { + // deptName = ""; + // } else { + // deptName = $("#deptName").val().toString(); + // } + + var deptName = value; if (deptName.indexOf("") != -1) { deptName = ""; } else { - deptName = $("#deptName").val().toString(); + deptName = value.toString(); } - var temp = { limit: limit, //页面大小 offset: offset, //页码 @@ -2602,7 +2608,6 @@ $("#assortId").html(""); $("#source").html("嘉时扫描系统"); $("#table2").bootstrapTable("refreshOptions", {pageNumber: 1}); - $("#source").html(""); }); $("#flag").click(function () { @@ -2626,14 +2631,18 @@ } }); + var value = []; //查询 $('#searchBtn').click(function () { + if ($("#deptName").val().length > 0){ + value = $("#deptName").val(); + } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询,请稍等..."); } - $(".selectpicker").selectpicker( 'deselectAll' ); + $("#deptName").val([]); }); @@ -2789,6 +2798,7 @@ callback: { beforeClick: function (treeId, treeNode) { $("#assortId").html(treeNode.id); + $("#source").html(""); //查询之后重新从第一页算起 $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); //刷新 diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp index 8d09e99..06f2d7c 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp @@ -382,6 +382,14 @@ // deptName = $("#deptName").val().toString(); // } // } + var url = window.location.href; + var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); + var len = value.length; + if (len > 0) { + if (value.indexOf("") == -1) { + deptName = value.toString(); + } + } var temp = { limit: limit, //页面大小 @@ -393,7 +401,7 @@ name:""+$("#name").val(), archivestate: "" + $("#archivestate").val(), state:"" + $("#state").val(), - deptName: $("#deptName").val() + deptName: deptName.toString() }; return temp; }, @@ -608,14 +616,18 @@ $("#danganhao").html(archiveDetailId); } + var value = []; //查询 $('#searchBtn').click(function () { + if ($("#deptName").val().length > 0){ + value = $("#deptName").val(); + } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询,请稍等..."); } - $(".selectpicker").selectpicker( 'deselectAll' ); + $("#deptName").val([]); }); //获取table的高度 diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index b1d0828..7c36930 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -1791,18 +1791,25 @@ // deptName = $("#deptName").val(); // } - var deptName = $("#deptName").val(); + // var deptName = $("#deptName").val(); + // if (deptName.indexOf("") != -1) { + // deptName = ""; + // } else { + // deptName = $("#deptName").val().toString(); + // } + + var deptName = value; if (deptName.indexOf("") != -1) { deptName = ""; } else { - deptName = $("#deptName").val().toString(); + deptName = value.toString(); } - var deptAdmissionTo = $("#deptAdmissionTo").val(); + var deptAdmissionTo = value2; if (deptAdmissionTo.indexOf("") != -1) { deptAdmissionTo = ""; } else { - deptAdmissionTo = $("#deptAdmissionTo").val().toString(); + deptAdmissionTo = value2.toString(); } @@ -2485,14 +2492,24 @@ } }); + var value = []; + var value2 = []; //查询 $('#searchBtn').click(function () { + if ($("#deptName").val().length > 0){ + value = $("#deptName").val(); + } + + if ($("#deptAdmissionTo").val().length > 0){ + value2 = $("#deptAdmissionTo").val(); + } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询,请稍等..."); } - $(".selectpicker").selectpicker( 'deselectAll' ); + $("#deptName").val([]); + $("#deptAdmissionTo").val([]); }); //添加pdf记录