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] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=84=90=E8=A1=80=E5=BA=93?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E5=AE=A1=E6=89=B9=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=202.=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=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=8C=89=E9=92=AE=203.=E4=BF=AE=E6=94=B9=E8=84=90=E8=A1=80?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=E5=80=9F=E9=98=85=E5=90=8E=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E7=94=B3=E8=AF=B7=E4=B8=8B=E8=BD=BD=204.=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=84=90=E8=A1=80=E5=BA=93=E6=96=B0=E5=A2=9E=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=9B=BE=E5=83=8F=E7=82=B9=E5=87=BB=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8A=A5=E9=94=99bug=205.=E8=84=90=E8=A1=80?= =?UTF-8?q?=E5=BA=93=E5=80=9F=E9=98=85=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BF=A1=E6=81=AF=E5=8F=AF=E4=BF=AE=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 @@
- +
@@ -181,6 +181,9 @@
+ + + @@ -221,7 +224,7 @@
- +
@@ -230,7 +233,7 @@
- +
@@ -272,7 +275,7 @@
- + +
@@ -300,12 +303,71 @@
+<%-- 模态框2 批量审批--%> + + diff --git a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage.jsp b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage.jsp index 00aef69..855bae6 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage.jsp @@ -483,7 +483,6 @@