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 1/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=84=90=E8=A1=80?=
=?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E3=80=82=202.?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E6=9F=A5?=
=?UTF-8?q?=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 @@
+
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();
From 80919dd7a82adad6515d4f0eb157d3d1044558a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E6=87=BF?= <1509159964@qq.com>
Date: Tue, 19 May 2020 12:08:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=84=90=E8=A1=80?=
=?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E5=AE=A1=E6=89=B9?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=202.?=
=?UTF-8?q?=E8=84=90=E8=A1=80=E5=BA=93=E5=80=9F=E9=98=85=E5=AE=A1=E6=89=B9?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9=E6=8C=89=E9=92=AE=203.=E4=BF=AE=E6=94=B9=E8=84=90?=
=?UTF-8?q?=E8=A1=80=E5=BA=93=E7=94=B3=E8=AF=B7=E5=80=9F=E9=98=85=E5=90=8E?=
=?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=B3=E8=AF=B7=E4=B8=8B=E8=BD=BD=204.?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=84=90=E8=A1=80=E5=BA=93=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=9B=BE=E5=83=8F=E7=82=B9=E5=87=BB=E4=B8=8A?=
=?UTF-8?q?=E4=BC=A0=E6=8C=89=E9=92=AE=E6=8A=A5=E9=94=99bug=205.=E8=84=90?=
=?UTF-8?q?=E8=A1=80=E5=BA=93=E5=80=9F=E9=98=85=E5=AE=A1=E6=89=B9=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=AE=A1=E6=89=B9=E4=BF=A1=E6=81=AF=E5=8F=AF=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../approveManageList/approveManageList1.jsp | 70 +-
.../collection/collectManage.jsp | 1 -
.../collection/collectManage1.jsp | 1 -
.../collection/collectManage174.jsp | 1 -
.../commomSearch/showRecordIframeBlood.jsp | 2 +-
.../approveManage/approveList/approveList1.js | 4 +-
.../approveList/approveList174.js | 6 +-
.../approveManageList/approveManageList1.js | 119 +-
src/main/webapp/static/js/dateUtil.js | 28 +-
.../commomSearch/showRecordBlood.js | 1 +
.../templateSearch/searchCommomMethodBlood.js | 2012 +++++++++--------
.../templateSearch/searchCommomMethodqf.js | 2 +-
12 files changed, 1241 insertions(+), 1006 deletions(-)
diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp
index 60d0f59..642baee 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp
@@ -138,7 +138,7 @@
-
+ +
@@ -300,12 +303,71 @@
+<%-- 模态框2 批量审批--%>
+
+
+
+
+
+
+
+
+ 所选批量审批信息
+
+
+ | 病案号 |
+ 姓名 |
+ 入院次数 |
+ 申请人 |
+
+
+
+
+
+
+
+
+
+
+
+