From 1c7bca3c98eb76d2f31d74339763774bfdaf4c91 Mon Sep 17 00:00:00 2001
From: wangxh <java888888ly@163.com>
Date: Mon, 20 Apr 2020 11:37:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=89=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approveManageList/approveManageList174.jsp   |  2 +-
 .../approveManageList/approveManageList174.js    | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

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 @@
             <div class="btnsDiv">
                 <button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
                 <shiro:hasPermission name="/approve/updateApprove">
-                    <button type="button" class="btn btn-sm btn-warning btnl" onclick="addApprovesMore()" data-toggle="modal" data-target="#myModal2">  +  批量审批</button>
+                    <button id="addApprovesMore" type="button" class="btn btn-sm btn-warning btnl" onclick="addApprovesMore()">  +  批量审批</button>
                 </shiro:hasPermission>
                 <shiro:hasPermission name="/approve/exportExcelApproveList">
                     <button type="button" class="btn btn-sm btn-primary btns" onclick="exportExcel()"><i class="fa fa-reply"></i>导出</button>
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--) {