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 @@
- +
@@ -187,6 +187,20 @@
+
+
+ +
+
+ +
+
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();