From 5218becba166cae9c07ac28bd7cba19299502e7d Mon Sep 17 00:00:00 2001
From: wangsiyi <1509159964@qq.com>
Date: Sun, 17 May 2020 17:45:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=84=90=E8=A1=80=E5=BA=93?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E3=80=82=202.=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approveManage/approveList/approveList1.jsp   | 16 +++++++++++++++-
 .../js/approveManage/approveList/approveList1.js |  7 +++++--
 src/main/webapp/static/js/dateUtil.js            |  2 --
 .../templateSearch/searchCommomMethodBlood.js    |  6 ++++--
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList1.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList1.jsp
index 5956471..d6d2770 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList1.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList1.jsp
@@ -157,7 +157,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">
@@ -187,6 +187,20 @@
                     </select>
                 </div>
             </div>
+            <div class="searchInput left" style="margin-left: 10px;">
+                <div class="searchElement left" >
+                    <label class="labelDiv">申请状态：</label>
+                </div>
+                <div class="searchInputElement left">
+                    <select class="form-control input-sm" id="searchApproveState">
+                        <option value="">请选择</option>
+                        <option value="审核通过">审核通过</option>
+                        <option value="审核不通过">审核不通过</option>
+                        <option value="待审批">待审批</option>
+                        <option value="已过期">已过期</option>
+                    </select>
+                </div>
+            </div>
             <div class="searchInput left" style="margin-left: 2%">
                 <button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
             </div>
diff --git a/src/main/webapp/static/js/approveManage/approveList/approveList1.js b/src/main/webapp/static/js/approveManage/approveList/approveList1.js
index 97cdc61..34a2cf5 100644
--- a/src/main/webapp/static/js/approveManage/approveList/approveList1.js
+++ b/src/main/webapp/static/js/approveManage/approveList/approveList1.js
@@ -95,7 +95,7 @@ $('#mytab').bootstrapTable({
             field:'effeDays',
         },
         {
-            title:'姓名',
+            title:'产妇姓名',
             field:'name',
         },
         {
@@ -195,7 +195,8 @@ $('#mytab').bootstrapTable({
             applyer:$("#applyerSearch").val(),
             name:$("#searchName").val(),
             applyType:$("#searchApplyType").val(),
-            applyState:$("#searchApplyState").val()
+            applyState:$("#searchApplyState").val(),
+            approveState:$("#searchApproveState").val()
         }
     },
     responseHandler:function(res){
@@ -248,6 +249,7 @@ function refreshTable(){
 
 //添加按钮
 function addApprove(){
+    pickTime("effeTime");
     setFormToken();
     $("#inpatientNo").removeAttr("readonly");
     $("#name").removeAttr("readonly");
@@ -260,6 +262,7 @@ function addApprove(){
 
 //批量添加按钮
 function addApproves(){
+    pickTime("effeTime5");
     form5.reset();
     //加载申请原因模板
     loadSelect(path+ '/approve/loadReasonModle','parentId5','');
diff --git a/src/main/webapp/static/js/dateUtil.js b/src/main/webapp/static/js/dateUtil.js
index f73b147..7dc141f 100644
--- a/src/main/webapp/static/js/dateUtil.js
+++ b/src/main/webapp/static/js/dateUtil.js
@@ -67,8 +67,6 @@ function pickTime(info){
             if(data != null || data != ''){
                 defaultDay.setDate(defaultDay.getDate() + data.defaultDay);
                 maxDay.setDate(maxDay.getDate() + data.maxDay);
-                console.log("defaultDay = " + defaultDay);
-                console.log("maxDay =" + maxDay);
                 $('#'+info).datepicker({
                     language: "zh-CN",
                     format: "yyyy-mm-dd",
diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js
index 304199d..1d18d64 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js
@@ -548,6 +548,7 @@ function borrowing(patientId){
 }
 //批量申请借阅
 function borrowings(){
+	pickTime("effeTime");
 	$("#typeId").val('approves');
 	//加载申请借阅类型
 	loadApplyType(1);
@@ -610,7 +611,7 @@ function borrowings(){
 function downBorrowing(patientId){
 	$("#typeId").val('loads');
 	//加载申请借阅类型
-	loadApplyType(2);
+	loadApplyType(1);
 	setFormToken();
 	document.forms[1].reset();
 	$("#approveId").val("");
@@ -633,9 +634,10 @@ function downBorrowing(patientId){
 }
 //批量下载借阅
 function downBorrowings(){
+	pickTime("effeTime");
 	$("#typeId").val('loads');
 	//加载申请借阅类型
-	loadApplyType(2);
+	loadApplyType(1);
 	$("#name1").val("");
 	setFormToken();
 	document.forms[1].reset();