From 14c3a3d513f3b2288d38d3de78a8c521a7a29818 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Fri, 28 Aug 2020 16:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E5=87=BA=E6=A1=86?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E3=80=81=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jspf/comm.jspf        |   2 +-
 .../views/beHospitaledDir/beHospList.jsp      |  92 +++-------------
 .../views/holidaySetDir/holidaySetList.jsp    |   6 +-
 .../views/inHospitalDir/inHositalList.jsp     |  43 --------
 .../views/lastVerifyDir/lastVerifyList.jsp    |  83 +++-----------
 .../medicalRecallDir/medicalRecallList.jsp    |  16 +--
 .../unfileMedicalDir/unfileMedicalList.jsp    |  60 +---------
 src/main/webapp/static/css/comm.css           |  26 +++--
 .../static/js/holidaySet/holidaySetList.js    | 104 +-----------------
 9 files changed, 61 insertions(+), 371 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jspf/comm.jspf b/src/main/webapp/WEB-INF/jspf/comm.jspf
index 75c5b23..b871c06 100644
--- a/src/main/webapp/WEB-INF/jspf/comm.jspf
+++ b/src/main/webapp/WEB-INF/jspf/comm.jspf
@@ -11,7 +11,7 @@
     String now = df.format(d);
 %>
 <%--<!-- jquery -->--%>
-<link rel="stylesheet" href="${path}/static/css/comm.css?t=2020-08-18"/>
+<link rel="stylesheet" href="${path}/static/css/comm.css?t=2020-08-28"/>
 <%--<!-- 引入bootstrap样式 -->--%>
 <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/css/bootstrap.min.css"/>
 <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css?t=2020-08-18"/>
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 2db1f58..ad163d9 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -13,53 +13,31 @@
     <%@include file="../../jspf/comm.jspf" %>
     <%@ include file="../../jspf/ztreeCommom.jsp" %>
     <style>
-        .modal-footer {
-            padding: 5px;
-        }
-
         .divCss {
             margin-top: 5px;
         }
-
         .divCss2 {
             margin-top: 5px;
             margin-left: 5px;
         }
-
         .divCss8 {
             margin-top: 5px;
             margin-right: 20px;
         }
-
         .divCss3 {
             margin-top: 5px;
             margin-left: 20px;
             color: blue;
         }
-
-        .modal-content {
-            width: 165%;
-            overflow-x: hidden;
-            overflow-y: auto;
-
-        }
-
-        .modal {
-            margin-left: -39%;
-            overflow-x: auto;
-        }
-
         .divCss4 {
             border-top: 1px solid #e5e5e5;
             width: 97.5%;
             margin-top: 10px;
             margin-bottom: 5px;
         }
-
         .labCss {
             color: #c1c3c4;
         }
-
         .titleCss {
             text-align: left;
             vertical-align: middle;
@@ -70,87 +48,49 @@
             height: 30px;
             margin-bottom: 10px;
         }
-
         .treeBtn {
             margin-top: 10px;
             margin-left: 10px;
             margin-right: 10px;
         }
-
         .zTreeDemo {
             height: auto;
             min-height: 350px;
         }
-
         .divCss5 {
             border-left: 2px solid #e5e5e5;
             height: auto;
             min-height: 350px;
         }
-
         .btnGroupCss {
             text-align: right;
         }
-
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
         }
-
         #assortModal > div > div {
-            margin-top: 50%;
-            margin-left: 60%;
             width: 500px;
         }
-
         #exampleModal > div > div {
-            margin-top: 50%;
-            margin-left: 70%;
             width: 400px;
         }
-
+        #returnModal .modal-content {
+            width: 95%;
+        }
         .imgDivCss {
             min-height: 400px !important;
         }
-
         .showImg {
             width: 80%;
             height: 100%
         }
-
         .shadeImg {
             height: 950px;
         }
-
-        #returnModal .modal-content {
-            margin-left: 150px;
-            margin-top: 70px;
-            width: 120%;
-        }
-
-        #verifyModal .modal-content {
-            margin-left: 50%;
-            margin-top: 35%;
-            width: 100%;
-        }
-
-        #WZModal .modal-content {
-            margin-left: 50%;
-            margin-top: 35%;
-            width: 100%;
-        }
-
-        .hidden-xs {
-            max-width: 100px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-        }
-
         .wzContent {
             color: red;
         }
-
         /**
          *多选下拉框
          */
@@ -271,11 +211,11 @@
                 </div>
             </div>
         </div>
-        <!-- 模态框3（Modal）查看档案 -->
+        <!-- 模态框1（Modal）查看档案 -->
         <div class="modal fade" id="selModal" tabindex="1" role="dialog" aria-labelledby="myModalLabel"
              aria-hidden="true">
             <div class="modal-dialog">
-                <div class="modal-content">
+                <div class="modal-content modal-contentHigh">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                             &times;
@@ -388,10 +328,10 @@
         </div>
     </div>
 </div>
-<!-- 模态框3（Modal）分段信息 -->
+<!-- 模态框2（Modal）分段信息 -->
 <div class="modal fade" id="assortModal" tabindex="2" role="dialog" aria-hidden="true">
     <div class="modal-dialog">
-        <div class="modal-content">
+        <div class="modal-content modal-contentLow">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     &times;
@@ -456,7 +396,7 @@
 <div class="modal fade" id="pdfModal" tabindex="-1" role="dialog"
      aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content enterCss">
+        <div class="modal-content enterCss modal-contentHigh">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                         aria-hidden="true">×</span></button>
@@ -493,7 +433,7 @@
 <%--发大弹窗--%>
 <div class="modal fade" id="maxImg" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentLow">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                         aria-hidden="true">×</span></button>
@@ -514,7 +454,7 @@
 <%--确认框--%>
 <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentLow">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
@@ -539,7 +479,7 @@
 <%--退回弹窗--%>
 <div class="modal fade" id="returnModal" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentHigh">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
@@ -605,7 +545,7 @@
 <%--审核弹窗--%>
 <div class="modal fade" id="verifyModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content">
+        <div class="modal-content modal-contentLow">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
@@ -637,7 +577,7 @@
 <%--审核弹窗--%>
 <div class="modal fade" id="WZModal" tabindex="-5" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentLow">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
@@ -662,7 +602,7 @@
 <%--审核确认弹窗--%>
 <div class="modal fade verifyModal" id="sureModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentHigh">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
@@ -682,7 +622,7 @@
 <%--审核完成不完整表格弹窗--%>
 <div class="modal fade verifyModal" id="unSuccessModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentHigh">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
@@ -702,7 +642,7 @@
 <%--查看流程弹窗--%>
 <div class="modal fade" id="showFlowInfo" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentHigh">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
diff --git a/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp b/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp
index 0c274df..98a650e 100644
--- a/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp
+++ b/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp
@@ -16,22 +16,18 @@
         .divCss {
             margin-top: 5px;
         }
-
         .divCss10 {
             margin-top: 5px;
             margin-left: 63px;
         }
-
         .divCss8 {
             margin-top: 5px;
             margin-right: 20px;
         }
-
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
         }
-
         hr {
             margin: 5px !important;
         }
@@ -142,5 +138,5 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/holidaySet/holidaySetList.js?time=2020-08-18"></script>
+<script src="${path}/static/js/holidaySet/holidaySetList.js?time=2020-08-28"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
index c554d36..fb8b907 100644
--- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
+++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
@@ -13,56 +13,31 @@
     <%@include file="../../jspf/comm.jspf" %>
     <%@ include file="../../jspf/ztreeCommom.jsp" %>
     <style>
-        .modal-footer {
-            padding: 5px;
-        }
-
         .divCss {
             margin-top: 5px;
         }
-
         .divCss2 {
             margin-top: 5px;
             margin-left: 5px;
         }
-
-
         .divCss8 {
             margin-top: 5px;
             margin-right: 20px;
         }
-
         .divCss3 {
             margin-top: 5px;
             margin-left: 20px;
             color: blue;
         }
-
-        .modal-content {
-            width: 165%; /*width: 1300px;*/
-            overflow-x: hidden;
-            overflow-y: auto;
-
-        }
-
-        .modal {
-            margin-left: -39%;
-            overflow-x: auto;
-            /*z-index: 1049;*/
-        }
-
         .divCss4 {
             border-top: 1px solid #e5e5e5;
             width: 97.5%;
             margin-top: 10px;
             margin-bottom: 5px;
         }
-
         .labCss {
-            /*color: gainsboro;*/
             color: #c1c3c4;
         }
-
         .titleCss {
             text-align: left;
             vertical-align: middle;
@@ -73,67 +48,49 @@
             height: 30px;
             margin-bottom: 10px;
         }
-
         .treeBtn {
             margin-top: 10px;
             margin-left: 10px;
             margin-right: 10px;
         }
-
         .zTreeDemo {
             height: auto;
             min-height: 350px;
         }
-
         .divCss5 {
             border-left: 2px solid #e5e5e5;
             height: auto;
             min-height: 350px;
         }
-
         .btnGroupCss {
             text-align: right;
         }
-
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
         }
-
         #assortModal > div > div {
-            margin-top: 50%;
-            margin-left: 60%;
             width: 500px;
-        !important;
         }
-
         #exampleModal > div > div {
-            margin-top: 50%;
-            margin-left: 70%;
             width: 400px;
-        !important;
         }
-
         .imgDivCss {
             min-height: 400px !important;
         }
-
         .showImg {
             width: 80%;
             height: 100%
         }
-
         .shadeImg {
             height: 950px;
         }
-
         /**
          *多选下拉框
          */
         .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
             width: 168px !important;
         }
-
         .filter-option-inner-inner {
             font-size: 12px;
         }
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index 796ec81..6f38d64 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -17,57 +17,35 @@
         .modal-footer {
             padding: 5px;
         }
-
         .divCss {
             margin-top: 5px;
         }
-
         .divCss2 {
             margin-top: 5px;
             margin-left: 5px;
         }
-
         .divCss22 {
             margin-top: 5px;
             margin-left: -7px;
         }
-
         .divCss8 {
             margin-top: 5px;
             margin-right: 20px;
         }
-
         .divCss3 {
             margin-top: 5px;
             margin-left: 20px;
             color: blue;
         }
-
-        .modal-content {
-            width: 165%; /*width: 1300px;*/
-            overflow-x: hidden;
-            overflow-y: auto;
-
-        }
-
-        .modal {
-            margin-left: -39%;
-            overflow-x: auto;
-            /*z-index: 1049;*/
-        }
-
         .divCss4 {
             border-top: 1px solid #e5e5e5;
             width: 97.5%;
             margin-top: 10px;
             margin-bottom: 5px;
         }
-
         .labCss {
-            /*color: gainsboro;*/
             color: #c1c3c4;
         }
-
         .titleCss {
             text-align: left;
             vertical-align: middle;
@@ -78,47 +56,36 @@
             height: 30px;
             margin-bottom: 10px;
         }
-
         .treeBtn {
             margin-top: 10px;
             margin-left: 10px;
             margin-right: 10px;
         }
-
         .zTreeDemo {
             height: auto;
             min-height: 350px;
         }
-
         .divCss5 {
             border-left: 2px solid #e5e5e5;
             height: auto;
             min-height: 350px;
         }
-
         .btnGroupCss {
             text-align: right;
         }
-
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
         }
-
         #assortModal > div > div {
-            margin-top: 50%;
-            margin-left: 60%;
             width: 500px;
-        !important;
         }
-
         #exampleModal > div > div {
-            margin-top: 50%;
-            margin-left: 70%;
             width: 400px;
-        !important;
         }
-
+        #returnModal .modal-content {
+            width: 95%;
+        }
         .imgDivCss {
             min-height: 400px !important;
         }
@@ -127,33 +94,12 @@
             width: 80%;
             height: 100%;
         }
-
         .shadeImg {
             height: 950px;
         }
-
-        #returnModal .modal-content {
-            margin-left: 150px;
-            margin-top: 70px;
-            width: 120%;
-        }
-
-        #firstModal .modal-content {
-            margin-left: 50%;
-            margin-top: 35%;
-            width: 100%;
-        }
-
-        .verifyModal .modal-content {
-            margin-left: 35%;
-            margin-top: 10%;
-            width: 100%;
-        }
-
         .returntoRole {
             margin-left: 15px !important;
         }
-
         /**
          *多选下拉框
          */
@@ -259,10 +205,10 @@
         </div>
     </div>
 </div>
-<!-- 模态框3（Modal）查看档案 -->
+<!-- 模态框1（Modal）查看档案 -->
 <div class="modal fade" id="selModal" tabindex="1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
-        <div class="modal-content">
+        <div class="modal-content modal-contentHigh">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     &times;
@@ -367,10 +313,10 @@
     </div>
 </div>
 
-<!-- 模态框3（Modal）分段信息 -->
+<!-- 模态框2（Modal）分段信息 -->
 <div class="modal fade" id="assortModal" tabindex="2" role="dialog" aria-hidden="true">
     <div class="modal-dialog">
-        <div class="modal-content">
+        <div class="modal-content modal-contentLow">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     &times;
@@ -435,7 +381,7 @@
 <div class="modal fade" id="pdfModal" tabindex="-1" role="dialog"
      aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content enterCss">
+        <div class="modal-content enterCss modal-contentHigh">
             <div class="modal-header">
 
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
@@ -476,7 +422,7 @@
 <%--发大弹窗--%>
 <div class="modal fade" id="maxImg" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentLow">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                         aria-hidden="true">×</span></button>
@@ -497,7 +443,7 @@
 <%--确认框--%>
 <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentLow">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
@@ -519,11 +465,10 @@
         </div>
     </div>
 </div>
-
 <%--退回弹窗--%>
 <div class="modal fade" id="returnModal" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentHigh">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
@@ -584,7 +529,7 @@
 <%--审核弹窗--%>
 <div class="modal fade verifyModal" id="verifyModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentLow">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
@@ -625,7 +570,7 @@
 <%--审核确认弹窗--%>
 <div class="modal fade verifyModal" id="sureModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentLow">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
@@ -645,7 +590,7 @@
 <%--查看流程弹窗--%>
 <div class="modal fade" id="showFlowInfo" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentHigh">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
index 5f897ec..8695ee2 100644
--- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
@@ -14,41 +14,31 @@
     <%@include file="../../jspf/comm.jspf" %>
 </head>
 <style>
-    .modal-footer {
-        padding: 5px;
-    }
-
     .divCss {
         margin-top: 5px;
     }
-
     .divCss2 {
         margin-top: 5px;
         margin-left: 20px;
     }
-
     .divCss8 {
         margin-top: 5px;
         margin-right: 20px;
     }
-
     /* dataTables表头居中 */
     .table > thead:first-child > tr:first-child > th {
         text-align: center !important;
     }
-
     .enterCss2 {
         height: 160px;
         width: 500px;
     }
-
     /**
      *多选下拉框
      */
     .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
         width: 168px !important;
     }
-
     .filter-option-inner-inner {
         font-size: 12px;
     }
@@ -138,10 +128,10 @@
         </div>
     </div>
 </div>
-<!-- 模态框3（Modal）召回日志 -->
+<!-- 模态框1（Modal）召回日志 -->
 <div class="modal fade" id="logModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
-        <div class="modal-content">
+        <div class="modal-content modal-contentHigh">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     &times;
@@ -204,7 +194,7 @@
 <%--确认框--%>
 <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
-        <div class="modal-content ">
+        <div class="modal-content modal-contentLow">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                         aria-hidden="true">×</span></button>
diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
index fa45cce..33a47ad 100644
--- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
+++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
@@ -13,56 +13,31 @@
     <%@include file="../../jspf/comm.jspf" %>
     <%@ include file="../../jspf/ztreeCommom.jsp" %>
     <style>
-        .modal-footer {
-            padding: 5px;
-        }
-
         .divCss {
             margin-top: 5px;
         }
-
         .divCss2 {
             margin-top: 5px;
             margin-left: 5px;
         }
-
-
         .divCss8 {
             margin-top: 5px;
             margin-right: 20px;
         }
-
         .divCss3 {
             margin-top: 5px;
             margin-left: 20px;
             color: blue;
         }
-
-        .modal-content {
-            width: 165%; /*width: 1300px;*/
-            overflow-x: hidden;
-            overflow-y: auto;
-
-        }
-
-        .modal {
-            margin-left: -39%;
-            overflow-x: auto;
-            /*z-index: 1049;*/
-        }
-
         .divCss4 {
             border-top: 1px solid #e5e5e5;
             width: 97.5%;
             margin-top: 10px;
             margin-bottom: 5px;
         }
-
         .labCss {
-            /*color: gainsboro;*/
             color: #c1c3c4;
         }
-
         .titleCss {
             text-align: left;
             vertical-align: middle;
@@ -73,79 +48,46 @@
             height: 30px;
             margin-bottom: 10px;
         }
-
         .treeBtn {
             margin-top: 10px;
             margin-left: 10px;
             margin-right: 10px;
         }
-
         .zTreeDemo {
             height: auto;
             min-height: 350px;
         }
-
         .divCss5 {
             border-left: 2px solid #e5e5e5;
             height: auto;
             min-height: 350px;
         }
-
         .btnGroupCss {
             text-align: right;
         }
-
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
         }
-
         #assortModal > div > div {
-            margin-top: 50%;
-            margin-left: 60%;
             width: 500px;
-        !important;
         }
-
         #exampleModal > div > div {
-            margin-top: 50%;
-            margin-left: 70%;
             width: 400px;
-        !important;
         }
-
         .imgDivCss {
             min-height: 400px !important;
         }
-
         .showImg {
             width: 80%;
             height: 100%
         }
-
         .shadeImg {
             height: 950px;
         }
-
-        #firstModal .modal-content {
-            margin-left: 50%;
-            margin-top: 35%;
-            width: 100%;
-        }
-
         #returnModal .modal-content {
-            margin-left: 50%;
-            margin-top: 35%;
-            width: 120%;
+            width: 95%;
         }
-
-        .hidden-xs {
-            max-width: 100px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-        }
-
         /**
          *多选下拉框
          */
diff --git a/src/main/webapp/static/css/comm.css b/src/main/webapp/static/css/comm.css
index 301701f..a8ab035 100644
--- a/src/main/webapp/static/css/comm.css
+++ b/src/main/webapp/static/css/comm.css
@@ -60,7 +60,6 @@ body {
     background-color: #f9f9f9
 }
 
-
 .modal-header {
     text-align: center !important;
     vertical-align: middle !important;
@@ -70,15 +69,28 @@ body {
     font-weight: bold;
     padding: 5px 5px 5px 5px !important;
 }
-
-
+.modal-footer {
+    padding: 5px;
+}
+.modal-dialog {
+    width: 85%!important;
+}
+.modal-contentLow {
+    width: 80%;
+    margin: 25% auto!important;
+}
+.modal-contentHigh{
+    margin-top: 10%!important;
+}
 .enterCss {
-    width: 400px;
     min-height: 800px;
-    _height: 800px;
-
 }
-
+.hidden-xs {
+    max-width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 /*img*/
 .shade {
     position: absolute;
diff --git a/src/main/webapp/static/js/holidaySet/holidaySetList.js b/src/main/webapp/static/js/holidaySet/holidaySetList.js
index d6fc5cc..3acafad 100644
--- a/src/main/webapp/static/js/holidaySet/holidaySetList.js
+++ b/src/main/webapp/static/js/holidaySet/holidaySetList.js
@@ -88,20 +88,6 @@ $("#saveHolidaySet").click(function(){
     saveMethod(2)
 })
 var tipLoad = 1;
-/**
- * 描述：关闭弹出层
- */
-function closeShade() {
-    // $(".shade").fadeOut(500);
-}
-
-/**
- *描述：关闭弹出层
- */
-function closeShadeImg() {
-    // $(".shadeImg").fadeOut(500);
-}
-
 var opts = {
     lines: 13, // The number of lines to draw |小长条的数量
     length: 20, // The length of each line |小长条的长度
@@ -226,6 +212,12 @@ function initTable() {
                     field: 'flagCh',
                     align: 'center',
                     valign: 'middle',
+                    formatter: function (value) {
+                        if(value == '非工作日'){
+                            return '<span style="color: red">'+value+'</span>';
+                        }
+                        return value;
+                    }
                 },
                 {
                     title: '操作',
@@ -275,8 +267,6 @@ function initTable() {
     }
 }
 
-
-
 $("#selModal").keydown(function (e) {
     if (e.keyCode == 13) {
         event.preventDefault();//禁用默认回车事件
@@ -310,85 +300,3 @@ $(document).keydown(function (event) {
         searchNode();
     }
 });
-
-
-function submitForm(i) {
-    var formDate = new FormData($("#form2")[0]);
-    $.ajax({
-        url: 'upload_importFile.do?ccqoid=' + i,
-        type: 'POST',
-        data: formDate,
-        async: false,
-        cache: false,
-        contentType: false,
-        processData: false,
-        success: function (data) {
-            if (data.success) {
-                //$.messager.alert('提示', '导入成功!');
-            }
-        },
-        error: function (returndata) {
-
-        }
-    });
-};
-
-$("#stateBtn").click(function () {
-    $('#exampleModal').modal('hide');  //手动关闭
-    var id = $("#idT").val();
-    //console.log("===作废事件=======" + id);
-    $.ajax({
-        url: "${path}/inHosp/updateState",
-        type: "POST",
-        data: {"id": id, flag: "1"},
-        success: function (result) {
-            if (result == 1) {
-                //刷新
-                $('#table2').bootstrapTable('refresh');
-                toastr.success("作废成功！");
-            } else {
-                toastr.error("作废失败，无该条记录！");
-            }
-        }, error: function () {
-            toastr.error("操作失败！");
-        }
-    });
-
-});
-
-
-function inpFun() {
-    var temp = {};
-    temp.id = $("#inpId").val();
-    temp.title = $("#inpTitle").val();
-    temp.assortid = $("#inpType").val();
-    temp.source = $("#inpSource").val();
-    temp.flag = $("#inpFlag").val();
-    temp.masterid = $("#idLab").html();
-    temp.sys = "emr_medical_record";
-    return temp
-}
-
-$("#saveBtn").click(function () {
-    if ($("#inpTitle").val().length > 100) {
-        toastr.warning("内容长度不超过100！");
-        return;
-    }
-    $.ajax({
-        url: "${path}/inHosp/saveInfo",
-        type: "POST",
-        data: inpFun(),
-        success: function (result) {
-            if (result.indexOf("成功") != -1) {
-                $('#assortModal').modal('hide');  //手动关闭
-                //获取选中节点
-                initTree($("#idLab").html());
-                toastr.success(result);
-            } else {
-                toastr.error(result);
-            }
-        }, error: function () {
-            toastr.error("操作失败！");
-        }
-    });
-});