1.新增脐血库申请列表审批状态查询条件

2.脐血库借阅审批页面新增批量审批按钮
3.修改脐血库申请借阅后不能申请下载
4.修复脐血库新增扫描图像点击上传按钮报错bug
5.脐血库借阅审批页面审批信息可修改

src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp

@@ -138,7 +138,7 @@
             </div>
             <div class="searchInput left">
                 <div class="searchElement left">
-                    <label class="labelDiv">姓名：</label>
+                    <label class="labelDiv">产妇姓名：</label>
                 </div>
                 <div class="searchInputElement left">
                     <input type="test" class="form-control input-sm" id="searchName" maxlength="16">
@@ -181,6 +181,9 @@
             </div>
             <div class="btnsDiv">
                 <button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
+                <shiro:hasPermission name="/approve/updateApprove">
+                    <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>
                 </shiro:hasPermission>
@@ -221,7 +224,7 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">有效时间：</label>
                             <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" readonly id="effeTime">
+                                <input type="text" class="form-control input-sm input" name="effeTime" id="effeTime">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -230,7 +233,7 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">申请天数：</label>
                             <div class="col-sm-7">
-                                <input type="number" class="form-control input-sm input" readonly id="effeDays" oninput="if(value.length>4)value=value.slice(0,4)">
+                                <input type="number" class="form-control input-sm input" id="effeDays" name="effeDays" oninput="if(value.length>4)value=value.slice(0,4)">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -272,7 +275,7 @@
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
-                    </div>
+                    </div>+
                     <div class="row">
                         <div class="form-group">
                             <label class="col-sm-4 control-label collectLabel">脐血编号：</label>
@@ -300,12 +303,71 @@
         </div>
     </div>
 </div>
+<%-- 模态框2 批量审批--%>
+<div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabe2" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content" style="width:80%">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <font size="30">&times;</font>
+                </button>
+                <h4 class="modal-title" style="font-weight: bold">
+                    批量审批信息
+                </h4>
+            </div>
+            <div class="modal-body" style="height:700px">
+                <form class="form-horizontal" id="form2">
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">批注模板：</label>
+                            <div class="col-sm-7">
+                                <select class="form-control input-sm input" id="moreParentId" name="parentId">
+                                </select>
+                            </div>
+                            <div class="col-sm-1"></div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">批注：</label>
+                            <div class="col-sm-7">
+                                <textarea class="form-control input-sm input" id="moreApproveNotes" name="approveNotes" maxlength="250"></textarea>
+                            </div>
+                            <div class="col-sm-1"></div>
+                        </div>
+                    </div>
+                    <div class="">
+                        <button type="button" class="btn btn-sm btn-primary approveBtns" onclick="moreAdd(1)">批准</button>
+                        <button type="button" class="btn btn-sm btn-danger approveBtns" onclick="moreAdd(2)">驳回</button>
+                    </div>
+                </form>
+                <div id="tabDiv" style="height: 490px;overflow: auto;">
+                    <table id="moreApproveTable" class="table table-striped" bgcolor="#FFFAFA" border="0" cellspacing="0" cellpadding="0">
+                        <caption>所选批量审批信息</caption>
+                        <thead>
+                        <tr>
+                            <th>病案号</th>
+                            <th>姓名</th>
+                            <th>入院次数</th>
+                            <th>申请人</th>
+                        </tr>
+                        </thead>
+                        <tbody id="moreApproveBody">
+
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 <script>
     $(function () {
         $(".modal-dialog").draggable();//为模态对话框添加拖拽
     })
 </script>
 <script src="${path}/static/js/approveManage/approveManageList/approveManageList1.js?t=1"></script>
+<script type="text/javascript" src="${path}/static/js/approveManage/approveList/approveDateCommmomMethod.js"></script>
 <script src="${path}/static/js/commom.js"></script>
 <script src="${path}/static/js/dateUtil.js"></script>
 </body>

src/main/webapp/WEB-INF/views/approveManage/collection/collectManage.jsp

@@ -483,7 +483,6 @@
 <script>
     $(function(){
         $("td").click(function(event){
-            debugger
             //td中已经有了input,则不需要响应点击事件
             if($(this).children("input").length > 0)
                 return false;

src/main/webapp/WEB-INF/views/approveManage/collection/collectManage1.jsp

@@ -466,7 +466,6 @@
 <script>
     $(function(){
         $("td").click(function(event){
-            debugger
             //td中已经有了input,则不需要响应点击事件
             if($(this).children("input").length > 0)
                 return false;

src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp

@@ -494,7 +494,6 @@
 <script>
     $(function(){
         $("td").click(function(event){
-            debugger
             //td中已经有了input,则不需要响应点击事件
             if($(this).children("input").length > 0)
                 return false;

src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp

@@ -65,7 +65,7 @@
         <div class="col-sm-3">
             <button type="button" class="btn btn-sm btn-primary" onclick="onloadPdf()">加载PDF</button>
         </div>
-        <c:if test="${CURRENT_USER.userEmail == 1 || isDownload == 1}">
+        <c:if test="${CURRENT_USER.userEmail == '1' || isDownload == '1'}">
             <div class="col-sm-3">
                 <button type="button" class="btn btn-sm btn-primary" onclick="onloadJpgForPdf()">下载PDF</button>
             </div>

src/main/webapp/static/js/approveManage/approveList/approveList1.js

@@ -249,7 +249,7 @@ function refreshTable(){
 
 //添加按钮
 function addApprove(){
-    pickTime("effeTime");
+    pickTime("effeTime", null);
     setFormToken();
     $("#inpatientNo").removeAttr("readonly");
     $("#name").removeAttr("readonly");
@@ -262,7 +262,7 @@ function addApprove(){
 
 //批量添加按钮
 function addApproves(){
-    pickTime("effeTime5");
+    pickTime("effeTime5", null);
     form5.reset();
     //加载申请原因模板
     loadSelect(path+ '/approve/loadReasonModle','parentId5','');

src/main/webapp/static/js/approveManage/approveList/approveList174.js

@@ -248,7 +248,7 @@ function refreshTable(){
 
 //批量添加按钮
 function addApproves(){
-    pickTime("effeTime5");
+    pickTime("effeTime5", null);
     form5.reset();
     //加载申请原因模板
     loadSelect(path+ '/approve/loadReasonModle','parentId5','');
@@ -256,7 +256,7 @@ function addApproves(){
 
 //添加按钮
 function addApprove(){
-    pickTime("effeTime");
+    pickTime("effeTime", null);
     setFormToken();
     $("#inpatientNo").removeAttr("readonly");
     $("#name").removeAttr("readonly");
@@ -335,7 +335,7 @@ function addSimple(){
 }
 //编辑
 function updateApprove(id){
-    pickTime("effeTime")
+    pickTime("effeTime", null);
     //加载申请原因模板
     loadSelect(path+ '/approve/loadReasonModle','parentId','');
     $("#inpatientNo").prop("readonly",true);

src/main/webapp/static/js/approveManage/approveManageList/approveManageList1.js

@@ -68,7 +68,7 @@ $('#mytab').bootstrapTable({
             field:'effeDays',
         },
         {
-            title:'姓名',
+            title:'产妇姓名',
             field:'name',
         },
         {
@@ -248,6 +248,7 @@ function updateApprove(id){
                 $("#approveId").val(data.id);
                 $("#applyer").val(data.applyer);
                 $("#effeTime").val(data.effeTime);
+                pickTime("effeTime", data.effeTime);
                 $("#effeDays").val(data.effeDays);
                 $("#applyType").val(data.applyType);
                 $("#parentId").val(data.annoParentId);
@@ -316,3 +317,117 @@ $(function () {
 	initDateInput(1);
 	initDateInput(2);
 })
+
+/**
+ * 批量审批
+ */
+function addApprovesMore() {
+    debugger
+    clearContent();
+    tabChecks = getChecked();
+    if (tabChecks.length > 0){
+        //加载批注类别
+        loadSelect(path+ '/approve/loadAnnoModle','moreParentId','');
+        $('#addApprovesMore').attr("data-toggle", "modal");
+        $('#addApprovesMore').attr("data-target", "#myModal2");
+        $("#form2")[0].reset();
+    } else {
+        toastr.warning("至少选中一条!");
+    }
+
+}
+
+/**
+ * 添加内容，tr td
+ * @param inpatientNoArray
+ * @param admissTimesArray
+ * @param nameArray
+ * @param applyerArray
+ */
+function insertContent(inpatientNoArray, admissTimesArray, nameArray, applyerArray) {
+    for (var i = 0 ; i < inpatientNoArray.length; i++){
+        var tr = document.createElement("tr");
+        var td1 = document.createElement("td");
+        var td2 = document.createElement("td");
+        var td3 = document.createElement("td");
+        var td4 = document.createElement("td");
+        td1.innerHTML = inpatientNoArray[i];
+        td2.innerHTML = nameArray[i];
+        td3.innerHTML = admissTimesArray[i];
+        td4.innerHTML = applyerArray[i];
+        tr.appendChild(td1);
+        tr.appendChild(td2);
+        tr.appendChild(td3);
+        tr.appendChild(td4);
+        document.getElementById("moreApproveBody").appendChild(tr);
+    }
+}
+
+/**
+ * 清楚内容方法
+ */
+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--) {
+        table.removeChild(table.childNodes[i]);
+    }
+}
+
+/**
+ * 获取选中行
+ * @returns {string}
+ */
+function getChecked(){
+    tabChecks = "";
+    var inpatientNoArray = new Array();
+    var admissTimesArray = new Array();
+    var nameArray = new Array();
+    var applyerArray = new Array();
+    var idlist = $('#mytab').bootstrapTable('getAllSelections');
+    if(idlist.length > 0){
+        for (var i = 0; i < idlist.length; i++) {
+            tabChecks += idlist[i].id + ",";
+            inpatientNoArray.push(idlist[i].inpatientNo);
+            admissTimesArray.push(idlist[i].admissTimes);
+            nameArray.push(idlist[i].name);
+            applyerArray.push(idlist[i].applyer);
+        }
+        $("#checks").val(checks);
+    }
+    insertContent(inpatientNoArray, admissTimesArray, nameArray, applyerArray);
+    if (null != tabChecks){
+        tabChecks = tabChecks.substring(0,tabChecks.length-1);
+    }
+    return tabChecks;
+}
+
+/**
+ * 批量审核
+ * @param flag
+ */
+function moreAdd(flag){
+    var approve = $("#moreApproveNotes").val();
+    $.ajax({
+        type:'post',
+        url:path+'/approve/updateApproves',
+        data:{ids:tabChecks,state:flag,note:approve},
+        dataType:'json',
+        success:function(data){
+            if(data!=null && data.code == 0){
+                if(flag == 1){
+                    toastr.success("批准成功!");
+                }else{
+                    toastr.success("驳回成功!");
+                }
+                refreshTable();
+                $('#myModal2').modal('hide');
+                $('#mytab').bootstrapTable('selectPage', pageNumber);
+            }else{
+                toastr.warning(data.msg);
+            }
+        }
+    })
+}

src/main/webapp/static/js/dateUtil.js

@@ -4,6 +4,11 @@ $('.date').datepicker({
     format: "yyyy-mm-dd",
     autoclose: true//选中之后自动隐藏日期选择框
 })
+
+/**
+ * 日期选择器
+ * @param idVal
+ */
 function initDateInput(idVal){
     $('#startTime'+idVal).datepicker({
         language: "zh-CN",
@@ -39,7 +44,12 @@ function daysBetween(sDate1,sDate2){
     var nDays = Math.abs(parseInt((time2 - time1)/1000/3600/24));
     return  nDays;
 };
-//计算前几天后几天的日期，负数为前，正数为后
+
+/**
+ * 计算前几天后几天的日期，负数为前，正数为后
+ * @param days
+ * @returns {string}
+ */
 function showTime(days){
     var endDate = new Date();
     endDate.setTime(endDate.getTime()+days*24*60*60*1000);
@@ -56,7 +66,11 @@ function showTime(days){
     return eDate;
 }
 
-function pickTime(info){
+/**
+ * 设置默认日期天数和最大可选天数
+ * @param info
+ */
+function pickTime(info, showDate){
     var defaultDay = new Date();
     var maxDay = new Date();
     $.ajax({
@@ -65,14 +79,18 @@ function pickTime(info){
         dataType:'json',
         success:function(data){
             if(data != null || data != ''){
-                defaultDay.setDate(defaultDay.getDate() + data.defaultDay);
-                maxDay.setDate(maxDay.getDate() + data.maxDay);
                 $('#'+info).datepicker({
                     language: "zh-CN",
                     format: "yyyy-mm-dd",
                     autoclose: true,//选中之后自动隐藏日期选择框,
                 })
+                if (null == showDate) {
+                    defaultDay.setDate(defaultDay.getDate() + data.defaultDay);
                     $('#'+info).datepicker('setDate', defaultDay);
+                } else {
+                    $('#'+info).datepicker('setDate', new Date(Date.parse(showDate.replace(/-/g,"/"))));
+                }
+                maxDay.setDate(maxDay.getDate() + data.maxDay);
                 $('#'+info).datepicker('setEndDate', maxDay);
             }
         }

src/main/webapp/static/js/recordManage/commomSearch/showRecordBlood.js

@@ -1055,6 +1055,7 @@ function save(){
             }
             formData.append('patientId',$("#patientId").val());
             formData.append('assortId', assortId);
+			formData.append('flag', $("#flag").val());
             $.ajax({
                 url:path+'/commom/updatePic',
                 data:formData,

src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js

@@ -683,7 +683,7 @@ function borrowing(patientId){
 
 //批量申请借阅
 function borrowings(){
-    pickTime("effeTime");
+    pickTime("effeTime", null);
 	$("#typeId").val('approves');
 	//加载申请借阅类型
 	loadApplyType(1);