diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp index 7c207d7..5c09bf2 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp @@ -201,7 +201,7 @@
- + diff --git a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js index d4014b6..a11928c 100644 --- a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js +++ b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js @@ -323,9 +323,16 @@ function add(flag){ //批量审批 function addApprovesMore() { clearContent(); - //加载批注类别 - loadSelect(path+ '/approve/loadAnnoModle','moreParentId',''); tabChecks = getChecked(); + if (tabChecks.length > 0){ + //加载批注类别 + loadSelect(path+ '/approve/loadAnnoModle','moreParentId',''); + $('#addApprovesMore').attr("data-toggle", "modal"); + $('#addApprovesMore').attr("data-target", "#myModal2"); + } else { + toastr.warning("至少选中一条!"); + } + } //获取选中行 @@ -345,9 +352,6 @@ function getChecked(){ applyerArray.push(idlist[i].applyer); } $("#checks").val(checks); - }else{ - toastr.warning("请选中信息!"); - $("#checks").val(""); } insertContent(inpatientNoArray, admissTimesArray, nameArray, applyerArray); if (null != tabChecks){ @@ -378,6 +382,8 @@ function insertContent(inpatientNoArray, admissTimesArray, nameArray, applyerArr //清楚内容方法 function clearContent() { + $('#addApprovesMore').removeAttr("data-toggle", "modal"); + $('#addApprovesMore').removeAttr("data-target", "#myModal2"); var table = document.getElementById("moreApproveBody"); var len = table.childNodes.length; for (var i = len - 1; i >= 0; i--) {