Merge branch 'test'

src/css/common.less

@@ -1,22 +1,4 @@
 @import './reset.less';
-// .partDetailControl {
-//     .monthYear {
-//       border: 0 none;
-//       border-radius: 0;
-//       .mon {
-//         border: 1px solid #777;
-//         float: left;
-//         border-radius: 4px 0 0 4px;
-//         box-sizing: border-box;
-//         border-right: 0;
-//         color: #777;
-//       }
-//       .year {
-//         border-radius: 0 4px 4px 0;
-//       }
-//     }
-//   }
-    
 .ellipsis{
     overflow: hidden;
     text-overflow:ellipsis;
@@ -35,4 +17,165 @@ input:disabled {
     margin: 0;
     padding: 20px 25px;
     border:10px @disColor solid;
+}
+
+th[code]{
+    cursor: pointer;
+    &:after{
+        content:"";
+        display:inline-block;
+        width: 11px;
+        height: 14px;
+        margin-left: 4px;
+        vertical-align: middle;
+        background-size: 100%;
+        background-image: url("../images/grey.png");
+    }
+    &.asc:after{
+        background: url("../images/up_blue.png");
+        background-size: 100%;
+    }
+    &.desc:after{
+        background: url("../images/down_blue.png");
+        background-size: 100%;
+    }
+}
+
+.dataSelectLight {
+    .partDetailControl .filterItem input {
+        width: 120px;
+        height: 40px;
+        border-radius: 4px;
+        border: 1px solid #E2E5EF;
+        outline: none;
+        margin-right: 10px;
+        padding: 0 10px;
+        box-sizing: border-box;
+    }
+    .partDetailControl .filterItem span {
+        display: inline-block;
+        line-height: 40px;
+        position: relative;
+    }
+    .datapickerBox input {
+        margin-right: 0px !important;
+    }
+    .iconCalen{
+        position: absolute;
+        width: 15px;
+        top: 10px !important;
+        right: 10px;
+    }
+    .divide {
+        margin: 0 10px;
+    }
+}
+.dataSelectDark {
+    // position: relative;
+    // display: inline-block;
+    margin: 4px 20px 10px 0;
+    top: 0px !important;
+    height: 34px !important;
+    line-height: 34px !important;
+    float: right !important;
+    span {
+        position: relative;
+        display: inline-block;
+        height: 34px !important;
+        line-height: 34px !important;
+        float: left;
+    }
+    input {
+        width: 120px;
+        height: 32px;
+        border-radius: 4px;
+        border: 1px solid @themeBorderClr;
+        outline: none;
+        padding: 0 10px;
+        box-sizing: border-box;
+        background-color: @themeColor;
+        color: @secColor;
+    }
+    .iconCalen{
+        position: absolute;
+        width: 15px;
+        top: 8px;
+        right: 10px;
+    }
+    .divide {
+        margin: 0 10px;
+        color: #fff;
+    }
+}
+.managerContainer .filter,.filterclear.abnormalClear {
+    margin-bottom: 20px;
+}
+.ui-datepicker-calendar {
+    border: 0 none;
+    min-width: 0;
+}
+.ui-datepicker thead {
+    background-color: #fff;
+    color: #c3cbd6;
+}
+.ui-datepicker td {
+    padding: 0;
+    height: auto;
+    color: #657180;
+}
+.ui-datepicker td span, .ui-datepicker td a {
+    text-align: center;
+    height: 30px;
+    line-height: 30px;
+}
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+    border: 0;
+    background-color: #fff;
+    &:hover {
+        background-color: #c4d8fe;
+    }
+}
+
+.iconCalen{
+    position: absolute;
+    width: 15px;
+    top: 10px;
+    right: 10px;
+}
+.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    color: #333;
+    font-weight: normal;
+    height: 30px;
+    line-height: 30px;
+    margin: 0 5px;
+    width: 40%;
+    border-radius: 3px;
+}
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
+    top: 5px;
+}
+.ui-state-active, .ui-widget-content .ui-state-active {
+    background-color: @activeColor !important;
+    color: #fff;
+}
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {
+    background-color: #fff5bf !important;
+    color: #657180;
+}
+.ui-widget-header {
+    background-color: #fff;
+    border: 0 none;
+}
+
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+}
+.datapickerBox input {
+    height: 34px !important;
+    line-height: 34px !important;
+    box-sizing: border-box;
+}
+input[type="number"] {
+    -moz-appearance: textfield;
 }

src/css/console.less

@@ -4,6 +4,84 @@ body.console {
   overflow: auto;
   overflow-y: hidden;
   background: @activeBg;
+
+  .ui-widget.ui-widget-content,
+  .ui-widget-header,.ui-datepicker thead,.ui-state-default, 
+  .ui-datepicker-month,.ui-datepicker-year,
+  .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+    background-color: @themeColor;
+    font-family: 'Microsoft YaHei', arial, tahoma, sans-serif;
+    color: @fstColor;
+  }
+  .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next{
+    &:hover {
+      background-color: #142753;
+      border: 0 none;
+    }
+  }
+  .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span {
+    display: block;
+    position: absolute;
+    left: 50%;
+    margin-left: -8px;
+    top: 50%;
+    margin-top: -8px;
+}
+  .ui-state-active, .ui-widget-content .ui-state-active {
+    background-color: #00A0FE;
+  }
+  .ui-state-default:hover, .ui-widget-content .ui-state-default:hover, .ui-widget-header .ui-state-default:hover {
+    background-color: #142753;
+  }
+  .ui-state-hover .ui-icon {
+    background-image:"url(../images/add.png)";
+  }
+  .dataSelectDark .iconCalen {
+    top:10px;
+  }
+  .dataSelectDark input {
+    height: 28px;
+  }
+  .ui-widget-header .ui-icon {
+    background:url(../images/calendarkL.png) no-repeat;
+    background-size: 14px 14px;
+  }
+  .ui-datepicker-next .ui-icon.ui-icon-circle-triangle-e {
+    background:url(../images/calendarkR.png) no-repeat;
+    background-size: 14px 14px;
+  }
+  .ui-datepicker th span {
+    color: @fstColor;
+  }
+  .ui-datepicker-month,.ui-datepicker-year,
+  .ui-widget.ui-widget-content{
+    border-color: @themeBorderClr;
+  }
+  .ui-state-highlight, .ui-widget-content .ui-state-highlight {
+    background-color: #5B70A4 !important;
+  }
+
+  .sureDate {
+    cursor: pointer;
+    background-color: #00A1FF;
+    color: @fstColor;
+    border-left: 0 none;
+    border-radius: 4px;
+    overflow: hidden;
+    box-sizing: border-box;
+    height: 28px !important;
+    line-height: 28px !important;
+    box-sizing: border-box;
+    width: 48px;
+    margin: 3px 20px 0 10px;
+    text-align: center;
+    box-sizing: border-box;
+  }
+  .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    height: 28px;
+    line-height: 28px;
+    box-sizing: border-box;
+  }
   .innerOuter {
     display: none;
   }
@@ -179,8 +257,8 @@ body.console {
   .monthYear {
     float: right;
     margin-right: 20px;
-    height: 30px;
-    line-height: 30px;
+    height: 28px;
+    line-height: 28px;
     cursor: pointer;
     margin-top: 7px;
     border: 0 none;
@@ -200,9 +278,11 @@ body.console {
       border-left: 0 none;
       border-radius:0 4px 4px 0;
       overflow: hidden;
+      box-sizing: border-box;
     }
     .mon {
       border: 1px solid @secColor;
+      box-sizing: border-box;
       border-radius: 4px 0 0 4px;
       border-right: 0 none;
       color: @secColor;
@@ -425,7 +505,7 @@ body.console {
       width: 40px;
     }
     .td04 {
-      width: 45px;
+      width: 60px;
     }
   }
 }
@@ -497,6 +577,7 @@ body.console {
   width: 33%;
   background-color: #fff;
   box-sizing: border-box;
+  position: relative;
   .barChartLine {
     box-sizing: border-box;
     width: 100%;
@@ -522,6 +603,7 @@ body.console {
   color:@themeFontClr;
   font-size: 16px;
   cursor: pointer;
+  position: relative;
   span{
     color: @themeFontClr;
   }

src/css/deptConsole.less

@@ -3,6 +3,86 @@
 body.console {
   overflow: auto;
   background-color: @themeColor;
+  .ui-widget.ui-widget-content,
+  .ui-widget-header,.ui-datepicker thead,.ui-state-default, 
+  .ui-datepicker-month,.ui-datepicker-year,
+  .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+    background-color: @themeColor;
+    font-family: 'Microsoft YaHei', arial, tahoma, sans-serif;
+    color: @fstColor;
+  }
+  .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next{
+    &:hover {
+      background-color: #142753;
+      border: 0 none;
+    }
+  }
+  .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span {
+    display: block;
+    position: absolute;
+    left: 50%;
+    margin-left: -8px;
+    top: 50%;
+    margin-top: -8px;
+}
+  .ui-state-active, .ui-widget-content .ui-state-active {
+    background-color: #00A0FE;
+  }
+  .ui-state-default:hover, .ui-widget-content .ui-state-default:hover, .ui-widget-header .ui-state-default:hover {
+    background-color: #142753;
+  }
+  .ui-state-hover .ui-icon {
+    background-image:"url(../images/add.png)";
+  }
+  .dataSelectDark .iconCalen {
+    top:10px;
+  }
+  .dataSelectDark input {
+    height: 28px;
+  }
+  .ui-widget-header .ui-icon {
+    background:url(../images/calendarkL.png) no-repeat;
+    background-size: 14px 14px;
+  }
+  .ui-datepicker-next .ui-icon.ui-icon-circle-triangle-e {
+    background:url(../images/calendarkR.png) no-repeat;
+    background-size: 14px 14px;
+  }
+  .ui-datepicker th span {
+    color: @fstColor;
+  }
+  .ui-datepicker-month,.ui-datepicker-year,
+  .ui-widget.ui-widget-content{
+    border-color: @themeBorderClr;
+  }
+  .ui-state-highlight, .ui-widget-content .ui-state-highlight {
+    background-color: #5B70A4 !important;
+  }
+
+  .sureDate {
+    cursor: pointer;
+    background-color: #00A1FF;
+    color: @fstColor;
+    border-left: 0 none;
+    border-radius: 4px;
+    overflow: hidden;
+    box-sizing: border-box;
+    height: 28px !important;
+    line-height: 28px !important;
+    box-sizing: border-box;
+    width: 48px;
+    margin: 3px 20px 0 10px;
+    text-align: center;
+    box-sizing: border-box;
+  }
+  .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    height: 28px;
+    line-height: 28px;
+    box-sizing: border-box;
+  }
+
+
+
   .chuyuanEmpty {
     border-bottom: 10px solid @activeBg;
     height: 162px;
@@ -147,15 +227,15 @@ body.console {
   .monthYear {
     float: right;
     margin-right: 20px;
-    height: 30px;
-    line-height: 30px;
+    height: 28px;
+    line-height: 26px;
     cursor: pointer;
     margin-top: 7px;
     border: 0 none;
     span {
       width: 48px;
       height: 28px;
-      line-height: 28px;
+      line-height: 26px;
       display: inline-block;
       text-align: center;
       font-weight: normal;
@@ -168,15 +248,24 @@ body.console {
       border-left: 0 none;
       border-radius:0 4px 4px 0;
       overflow: hidden;
+      box-sizing: border-box;
     }
     .mon {
       border: 1px solid @secColor;
       border-radius: 4px 0 0 4px;
       border-right: 0 none;
       color: @secColor;
+      box-sizing: border-box;
     }
   }
 }
+.deptConsoleLis {
+  width: 170px;
+  li {
+    width: 170px !important;
+    box-sizing: border-box;
+  }
+}
 .partTitles {
   height: 44px;
   line-height: 44px;
@@ -502,7 +591,7 @@ body.console {
   margin-top: 6px;
   p {
     width: 170px;
-    height: 30px;
+    height: 28px;
     line-height: 28px;
     border: 1px solid #E2E5EF;
     padding-right: 20px;
@@ -511,10 +600,11 @@ body.console {
     font-size: 14px;
     border-radius: 4px;
     font-weight: normal;
+    box-sizing: border-box;
     span {
       width: 155px;
-      height: 30px;
-      line-height: 30px;
+      height: 28px;
+      line-height: 28px;
       display: inline-block;
       overflow: hidden;
       text-overflow: ellipsis;

src/css/deptScoreDetailControl.less

@@ -41,7 +41,7 @@
     .main-body{
         .main-body-com;
         min-width: 1090px;
-        box-sizing: border-box;
+        // box-sizing: border-box;
         /*width: 100%;*/
     }
     table{

src/css/index.less

@@ -357,6 +357,13 @@
       height: 100%;
       overflow: auto;
     }
+    
+    .dateDetail {
+      font-size: 12px;
+      color: @secColor;
+      margin-right: 30px;
+      font-weight: normal;
+    }
   }
   //修改密码
   .modalAction {

src/css/partDetail.less

@@ -53,24 +53,6 @@
         th{
             white-space: nowrap;
         }
-        th[code]{
-            cursor: pointer;
-            &:after{
-                content:"";
-                display:inline-block;
-                width: 11px;
-                height: 14px;
-                margin-left: 4px;
-                vertical-align: middle;
-                background: url("../images/grey.png");
-            }
-            &.asc:after{
-                background: url("../images/up_blue.png");
-            }
-            &.desc:after{
-                background: url("../images/down_blue.png");
-            }
-        }
         td{
             white-space: nowrap;
         }

src/css/partDetailControl.less

@@ -53,24 +53,6 @@
         th{
             white-space: nowrap;
         }
-        th[code]{
-            cursor: pointer;
-            &:after{
-                content:"";
-                display:inline-block;
-                width: 11px;
-                height: 14px;
-                margin-left: 4px;
-                vertical-align: middle;
-                background: url("../images/grey.png");
-            }
-            &.asc:after{
-                background: url("../images/up_blue.png");
-            }
-            &.desc:after{
-                background: url("../images/down_blue.png");
-            }
-        }
         td{
             white-space: nowrap;
         }
@@ -230,21 +212,7 @@
     .divide{
         margin: 0 10px;
     }
-    .datapickerBox{
-        position: relative;
-        display: inline-block;
-        width: 120px;
-        height: 40px;
-        input{
-            position: absolute;
-        }
-    }
-    .iconCalen{
-        position: absolute;
-        width: 15px;
-        top: 12px;
-        right: 10px;
-    }
+
     .textCenter{
         text-align: center;
     }

src/css/qcList.less

@@ -17,7 +17,7 @@ h2{
     .main-body-com;
     border: none;
     border-left:10px @disColor solid;
-    margin: 44px 0 0;
+    margin: 54px 0 0;
     min-width: 1090px;
     min-height: calc(100% - 84px);
     // overflow: auto;
@@ -110,7 +110,7 @@ table{
 }
 .filter-toggler{
     position: absolute;
-    left: 960px;
+    left: 1008px;
     top: 8px;
     color: #777;
     font-size: 14px;
@@ -259,7 +259,7 @@ table{
 .iconCalen{
     position: absolute;
     width: 15px;
-    top: 8px;
+    top: 10px;
     right: 10px;
 }
 .textCenter{
@@ -322,62 +322,3 @@ table{
 
 
 
-.ui-datepicker-calendar {
-    border: 0 none;
-    min-width: 0;
-}
-.ui-datepicker thead {
-    background-color: #fff;
-    color: #c3cbd6;
-}
-.ui-datepicker td {
-    padding: 0;
-    height: auto;
-    color: #657180;
-}
-.ui-datepicker td span, .ui-datepicker td a {
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-}
-
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
-    border: 0;
-    background-color: #fff;
-    &:hover {
-        background-color: #c4d8fe;
-    }
-}
-.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
-    color: #333;
-    font-weight: normal;
-    height: 30px;
-    line-height: 30px;
-    margin: 0 5px;
-    width: 40%;
-    border-radius: 3px;
-}
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
-    top: 5px;
-}
-.ui-state-active, .ui-widget-content .ui-state-active {
-    background-color: @activeColor !important;
-    color: #fff;
-}
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {
-    background-color: #fff5bf !important;
-    color: #657180;
-}
-.ui-widget-header {
-    background-color: #fff;
-    border: 0 none;
-}
-
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-}
-
-input[type="number"] {
-    -moz-appearance: textfield;
-}

src/css/qcListDept.less

@@ -17,7 +17,7 @@ h2{
     .main-body-com;
     border: none;
     border-left:10px @disColor solid;
-    margin: 44px 0 0;
+    margin: 54px 0 0;
     min-width: 1090px;
     min-height: calc(100% - 84px);
     /*width: 100%;*/
@@ -108,7 +108,7 @@ table{
 }
 .filter-toggler{
     position: absolute;
-    left: 960px;
+    left: 1008px;
     top: 8px;
     color: #777;
     font-size: 14px;

src/css/qcListPerson.less

@@ -17,7 +17,7 @@ h2{
     .main-body-com;
     border: none;
     border-left:10px @disColor solid;
-    margin: 44px 0 0;
+    margin: 54px 0 0;
     min-width: 1090px;
     min-height: calc(100% - 84px);
     /*width: 100%;*/
@@ -113,7 +113,7 @@ table{
 }
 .filter-toggler{
     position: absolute;
-    left: 960px;
+    left: 1008px;
     top: 8px;
     color: #777;
     font-size: 14px;

src/css/qcScore.less

@@ -10,7 +10,8 @@
 }
 #loading{
   text-align: center;
-  /*margin-top: 30px;*/
+  height: 2000px;
+  margin-top: 30px;
 }
 .waring {
   color: #FF4D4F;
@@ -461,22 +462,36 @@
     }
     .flaw-box{
       margin-top: 45px;
-      padding-top: 20px;
+      padding-top: 5px;
       height: 100%;
       overflow-y: auto;
     }
     .flaw-item{
       display: none;
-      margin: 0 20px 10px 12px ;
-      border-bottom:1px #E2E5EF solid;
-      padding-bottom: 10px;
+      position: relative;
+      margin: 0 12px 10px 12px ;
+      /*border-bottom:1px #E2E5EF solid;*/
+      padding-bottom: 6px;
+      &:after{
+        display: block;
+        content: "";
+        width: 98%;
+        height: 1px;
+        background: @borderColor;
+        position: absolute;
+        bottom: -5px;
+        left: 1%;
+
+      }
       p{
         text-indent: 5px;
       }
+      .opers{
+        padding-right: 5px;
+      }
       .title{
-        margin-bottom: 5px;
         box-sizing: border-box;
-        padding-left: 5px;
+        padding:5px;
         .add-icon{
           font-size: 12px;
           display: inline-block;
@@ -489,9 +504,9 @@
           border-radius:8px;
           margin-right: 6px;
         }
-        &.active{
-          background: #FEE6C4;
-        }
+      }
+      &.active .title{
+        background: #FEE6C4;
       }
     }
   }
@@ -729,6 +744,12 @@
     }
   }
 }
+.high-light{
+  background: @highlighBg;
+  &.active{
+    background: none;
+  }
+}
 .scroll-table{
   thead,tbody{
     display: block;

src/css/quexianDetail.less

@@ -90,7 +90,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 40px;
+        // margin: 20px 40px;
         padding-bottom: 0px !important;
     }
     table{

src/css/quexianDetailControl.less

@@ -89,7 +89,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 40px;
+        // margin: 20px 40px;
         padding-bottom: 0px !important;
     }
     table{
@@ -253,7 +253,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/quexianDetailControlHome.less

@@ -94,7 +94,6 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 40px;
         padding-bottom: 0px !important;
     }
     table{
@@ -258,7 +257,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/quexianDetailHome.less

@@ -90,7 +90,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 40px;
+        // margin: 20px 40px;
         padding-bottom: 0px !important;
     }
     table{
@@ -254,7 +254,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/reset.less

@@ -50,7 +50,7 @@ li {
   list-style: none;
 }
 a {
-  color: #000;
+  color: #333;
 }
 button {
   cursor: pointer;
@@ -140,6 +140,7 @@ textarea {
 @tableBorderColor:#E2E5EF;  /**表格边框**/
 @disColor:#EFF1F6;  /**背景颜色**/
 @trHeight:30px;   /**表格行高**/
+@highlighBg:#F4C9C3;/**单选否决高亮**/
 .h2{
   width: 100%;
   /*box-sizing: border-box;*/

src/html/console.html

@@ -11,10 +11,17 @@
     <div class="monthYear clearfix">
       <span class="mon">本月</span>
       <span class="year">本年</span>
-    </div> 
+    </div>
     <div class="dateDetail fr">
       
     </div>
+    <span class="dataSelectDark filterItem typeFilter clearfix">
+        <!-- <span class="fl">出院日期：</span> -->
+        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/><img class="iconCalen" src="../images/icon_calen_grey.png" /></span>
+        <span class="divide fl">-</span>
+        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/><img class="iconCalen" src="../images/icon_calen_grey.png" /></span>
+        <span class="sureDate">查询</span>
+    </span>
   </div>
   <div class="partTitleT"></div>
   <!--<div class="grayLine"></div>-->
@@ -125,6 +132,14 @@
         <p class="partTitlePub clearfix">
           <span class="name">病案首页合格率占比</span> <img class="detailGo" src="../images/details.png" alt="">
         </p>
+        <div class="toggleSlide">
+          <p><span>合格率</span><img src="../images/arrow_down.png" alt=""> </p>
+          <ul>
+            <li class="toggleAverge toggleSlide1" data-str="合格率" data-level="合格率" data-type="7">合格率</li>
+            <li class="toggleAverge toggleSlide2" data-str="完整率" data-level="完整率" data-type="8">完整率</li>
+            <li class="toggleAverge toggleSlide2" data-str="完善率" data-level="完善率" data-type="9">完善率</li>
+          </ul>
+        </div>
         <div class="barChartLineBox">
           <div id="lineChart" class="barChartLine"></div>
           <div class="barChartLineEmpty"></div>

src/html/deptConsole.html

@@ -17,7 +17,7 @@
       <span class="mon">本月</span>
       <span class="year">本年</span>
     </div> 
-    <div class="toggleSlide fr">
+    <div class="toggleSlide deptConsoleLis fr">
       <p><span>平均住院天数</span><img src="../images/arrow_down.png" alt=""> </p>
       <ul>
         <li class="toggleAverge toggleSlide1" data-str="平均住院天数" data-type="1">平均住院天数</li>
@@ -27,6 +27,13 @@
     <div class="dateDetail fr">
       
     </div>
+    <span class="dataSelectDark filterItem typeFilter clearfix">
+        <!-- <span class="fl">出院日期：</span> -->
+        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/><img class="iconCalen" src="../images/icon_calen_grey.png" /></span>
+        <span class="divide fl">-</span>
+        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/><img class="iconCalen" src="../images/icon_calen_grey.png" /></span>
+        <span class="sureDate">查询</span>
+    </span>
   </div>
   <div class="partTitleT"></div>
   <!--<div class="grayLine"></div>-->

src/html/deptScoreDetail.html

@@ -34,6 +34,12 @@
                         
                     </ul>
                 </span>
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/html/deptScoreDetailControl.html

@@ -36,6 +36,12 @@
                         <li class="deptItem ellipsis" title="外科系统" data-id="外科" data-name="外科系统">外科系统</li>
                     </ul>
                 </span>
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/html/index.html

@@ -73,6 +73,9 @@
                           <li><a class="login-out" href="./login.html">退出</a></li>
                       </ul>
                   </div>
+                  <div class="dateDetail fr">
+                
+                  </div>
               </div>
               <iframe src="./console.html" frameborder="0" id="contentIframe"></iframe>
           </div>

src/html/jiaji.html

@@ -27,6 +27,12 @@
                     <span>科室名称：</span>
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
                 </span>
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/html/mukuai.html

@@ -37,6 +37,12 @@
                         
                     </ul>
                 </span>
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/html/mukuaiControl.html

@@ -37,6 +37,12 @@
                         
                     </ul>
                 </span> -->
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/html/partDetail.html

@@ -34,6 +34,12 @@
                         
                     </ul>
                 </span>
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>
@@ -41,15 +47,15 @@
                 <table>
                     <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="beHospitalId textCenter">主管医生</th>
-                    <th class="beHospitalId textCenter">缺陷总数</th>
-                    <th class="beHospitalId textCenter">合格率</th>
-                    <th class="beHospitalId textCenter">空项数</th>
-                    <th class="beHospitalId textCenter">完整率</th>
-                    <th class="beHospitalId textCenter">错误数</th>
-                    <th class="beHospitalId textCenter">完善率</th>
-                    <th class="beHospitalId textCenter">质控平均分</th>
-                    <th class="beHospitalId textCenter">质控病历数</th>
+                    <th class="beHospitalId textCenter" code="deptName">主管医生</th>
+                    <th class="beHospitalId textCenter" code="entryNum">缺陷总数</th>
+                    <th class="beHospitalId textCenter" code="firstLevelPercent">合格率</th>
+                    <th class="beHospitalId textCenter" code="emptyNum">空项数</th>
+                    <th class="beHospitalId textCenter" code="emptyPercent">完整率</th>
+                    <th class="beHospitalId textCenter" code="errorNum">错误数</th>
+                    <th class="beHospitalId textCenter" code="errorPercent">完善率</th>
+                    <th class="beHospitalId textCenter" code="averageValue">质控平均分</th>
+                    <th class="beHospitalId textCenter" code="mrNum">质控病历数</th>
                     </thead>
                     <tbody>
 

src/html/partDetailControl.html

@@ -36,6 +36,12 @@
                         <li class="deptItem ellipsis" title="不合格" data-id="不合格" data-name="不合格">不合格</li>
                     </ul>
                 </span> -->
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>
@@ -43,15 +49,15 @@
                 <table>
                     <thead>
                         <th class="moduleName" style="width: 65px;">序号</th>
-                        <th class="beHospitalId textCenter">科室名称</th>
-                        <th class="beHospitalId textCenter">缺陷总数</th>
-                        <th class="beHospitalId textCenter">合格率</th>
-                        <th class="beHospitalId textCenter">空项数</th>
-                        <th class="beHospitalId textCenter">完整率</th>
-                        <th class="beHospitalId textCenter">错误数</th>
-                        <th class="beHospitalId textCenter">完善率</th>
-                        <th class="beHospitalId textCenter">质控平均分</th>
-                        <th class="beHospitalId textCenter">质控病历数</th>
+                        <th class="beHospitalId textCenter" code="deptName">科室名称</th>
+                        <th class="beHospitalId textCenter" code="entryNum">缺陷总数</th>
+                        <th class="beHospitalId textCenter" code="firstLevelPercent">合格率</th>
+                        <th class="beHospitalId textCenter" code="emptyNum">空项数</th>
+                        <th class="beHospitalId textCenter" code="emptyPercent">完整率</th>
+                        <th class="beHospitalId textCenter" code="errorNum">错误数</th>
+                        <th class="beHospitalId textCenter" code="errorPercent">完善率</th>
+                        <th class="beHospitalId textCenter" code="averageValue">质控平均分</th>
+                        <th class="beHospitalId textCenter" code="mrNum">质控病历数</th>
                     </thead>
                     <tbody>
 

src/html/payDetail.html

@@ -44,6 +44,7 @@
                         <Li class="levelItem" data-name="去年平均住院花费" data-status="2" data-id="2">去年平均住院花费</Li>
                     </ul>
                 </span> -->
+                
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/html/qcList.html

@@ -15,52 +15,52 @@
         <div class="main-body">
             <div class="filterBox">
                 <div class="clearfix">
-                    <span class="filterItem typeFilter">
-                    <span>病人住院序号：</span>
-                    <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
-                </span>
-                    <span class="filterItem typeFilter">
-                    <span>病人姓名：</span>
-                    <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
-                </span>
                     <span class="filterItem typeFilter deptListWrap">
-                    <span>科室：</span>
-                    <span class="selectDept">
-                        全部
-                    </span>
+                        <span>科室：</span>
+                        <span class="selectDept">
+                            全部
+                        </span>
 
-                    <ul class="deptList filterDropList"></ul>
-                </span>
+                        <ul class="deptList filterDropList"></ul>
+                    </span>
+                    <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
+                        <span class="fl">出院日期：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                    </span>
+                    <span class="filterItem">
+                        <span>病历等级：</span>
+                        <span class="selectLevel">全部</span>
+                        <ul class="levelList filterDropList">
+                            <Li class="levelItem" data-name="全部" data-id="全部">全部</Li>
+                            <Li class="levelItem" data-name="未评分" data-id="未评分">未评分</Li>
+                            <Li class="levelItem" data-name="甲" data-id="甲">甲</Li>
+                            <li class="levelItem" data-name="乙" data-id=乙>乙</li>
+                            <li class="levelItem" data-name="丙" data-id=丙>丙</li>
+                        </ul>
+                    </span>
                     <span class="filter">查询</span>
                     <span class="export">导出</span>
                     <span class="filterclear abnormalClear filterclearT">重置</span>
                 </div>
                 <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">展开筛选</a>
                 <div class="toggle-item clearfix">
+                    <span class="filterItem typeFilter">
+                        <span>病人姓名：</span>
+                        <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
+                    </span>
+                    <span class="filterItem typeFilter">
+                        <span>病人住院序号：</span>
+                        <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
+                    </span>
                     <span class="filterItem doctorFilter">
-                    <span>医生姓名：</span>
-                    <input class="doctorInp" type="text" placeholder="请输入医生姓名">
-                </span>
+                        <span>医生姓名：</span>
+                        <input class="doctorInp" type="text" placeholder="请输入医生姓名">
+                    </span>
                     <span class="filterItem doctorFilter">
                     <span>医生工号：</span>
                     <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
-                </span>
-                    <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
-                    <span class="fl">出院日期：</span>
-                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
-                    <span  class="divide fl">-</span>
-                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>
-                </span>
-                    <span class="filterItem">
-                    <span>病历等级：</span>
-                    <span class="selectLevel">全部</span>
-                    <ul class="levelList filterDropList">
-                        <Li class="levelItem" data-name="全部" data-id="全部">全部</Li>
-                        <Li class="levelItem" data-name="未评分" data-id="未评分">未评分</Li>
-                        <Li class="levelItem" data-name="甲" data-id="甲">甲</Li>
-                        <li class="levelItem" data-name="乙" data-id=乙>乙</li>
-                        <li class="levelItem" data-name="丙" data-id=丙>丙</li>
-                    </ul>
                 </span>
                 </div>
             </div>
@@ -68,7 +68,7 @@
                 <table>
                     <thead>
                     <tr>
-                        <td colspan="18" style="background: #fff">
+                        <td colspan="19" style="background: #fff">
                             <div class="tabFoot">
                                 <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                 <span class="recordScoreBtn">评分</span>
@@ -77,6 +77,8 @@
                     </tr>
                     <th class="textCenter" ></th>
                     <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
+                    <th class="recordLevel textCenter" code="level">病历等级</th>
+                    <th class="recordScore textCenter" code="score_res">病历得分</th>
                     <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
                     <th class="patientNo textCenter" code="file_code">病案号</th>
                     <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
@@ -85,13 +87,12 @@
                     <th class="bedNum textCenter" code="bed_code">床号</th>
                     <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
                     <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
+                    <th class="placefileDate textCenter" code="placefile_date">归档日期</th>
                     <th class="diagnose textCenter" code="diagnose">主诊断</th>
                     <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                     <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                     <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>
                     <th class="deptName textCenter" code="beh_dept_name">科室</th>
-                    <th class="recordLevel textCenter" code="level">病历等级</th>
-                    <th class="recordScore textCenter" code="score_res">病历得分</th>
                     <th class="scoreTime textCenter" code="grade_time">评分时间</th>
                     </thead>
                     <tbody>

src/html/qcListDept.html

@@ -15,14 +15,6 @@
         <div class="main-body">
             <div class="filterBox">
                 <div class="clearfix">
-                    <span class="filterItem typeFilter">
-                        <span>病人住院序号：</span>
-                        <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
-                    </span>
-                    <span class="filterItem typeFilter">
-                        <span>病人姓名：</span>
-                        <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
-                    </span>
                     <span class="filterItem typeFilter">
                         <span>科室：</span>
                         <span class="selectDept">
@@ -31,25 +23,11 @@
 
                         <ul class="deptList filterDropList"></ul>
                     </span>
-                    <span class="filter">查询</span>
-                    <span class="export">导出</span>
-                    <span class="filterclear abnormalClear filterclearT">重置</span>
-                </div>
-                <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">展开筛选</a>
-                <div class="toggle-item clearfix">
-                    <span class="filterItem typeFilter">
-                        <span>医生姓名：</span>
-                        <input class="doctorInp" type="text" placeholder="请输入医生姓名">
-                    </span>
-                    <span class="filterItem doctorFilter">
-                        <span>医生工号：</span>
-                        <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
-                    </span>
                     <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
                         <span class="fl">出院日期：</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
                         <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
                     </span>
                     <span class="filterItem">
                         <span>病历等级：</span>
@@ -62,13 +40,35 @@
                             <li class="levelItem" data-name="丙" data-id=丙>丙</li>
                         </ul>
                     </span>
+                    <span class="filter">查询</span>
+                    <span class="export">导出</span>
+                    <span class="filterclear abnormalClear filterclearT">重置</span>
+                </div>
+                <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">展开筛选</a>
+                <div class="toggle-item clearfix">
+                    <span class="filterItem typeFilter">
+                        <span>病人姓名：</span>
+                        <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
+                    </span>
+                    <span class="filterItem typeFilter">
+                        <span>病人住院序号：</span>
+                        <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
+                    </span>
+                    <span class="filterItem typeFilter">
+                        <span>医生姓名：</span>
+                        <input class="doctorInp" type="text" placeholder="请输入医生姓名">
+                    </span>
+                    <span class="filterItem doctorFilter">
+                        <span>医生工号：</span>
+                        <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
+                    </span>
                 </div>
             </div>
             <div class="overAuto">
                 <table>
                     <thead>
                         <tr>
-                            <td colspan="18" style="background: #fff">
+                            <td colspan="19" style="background: #fff">
                                 <div class="tabFoot">
                                     <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                     <span class="recordScoreBtn">评分</span>
@@ -77,6 +77,8 @@
                         </tr>
                         <th class="textCenter" ></th>
                         <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
+                        <th class="recordLevel textCenter" code="level">病历等级</th>
+                        <th class="recordScore textCenter" code="score_res">病历得分</th>
                         <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
                         <th class="patientNo textCenter" code="file_code">病案号</th>
                         <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
@@ -85,13 +87,12 @@
                         <th class="bedNum textCenter" code="bed_code">床号</th>
                         <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
                         <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
+                        <th class="placefileDate textCenter" code="placefile_date">归档日期</th>
                         <th class="diagnose textCenter" code="diagnose">主诊断</th>
                         <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                         <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                         <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>
                         <th class="deptName textCenter" code="beh_dept_name">科室</th>
-                        <th class="recordLevel textCenter" code="level">病历等级</th>
-                        <th class="recordScore textCenter" code="score_res">病历得分</th>
                         <th class="scoreTime textCenter" code="grade_time">评分时间</th>
                     </thead>
                     <tbody>

src/html/qcListPerson.html

@@ -15,40 +15,18 @@
         <div class="main-body">
             <div class="filterBox">
                 <div class="clearfix">
-                <span class="filterItem typeFilter">
-                    <span>病人住院序号：</span>
-                    <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
-                </span>
-                <span class="filterItem typeFilter">
-                    <span>病人姓名：</span>
-                    <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
-                </span>
                 <span class="filterItem typeFilter">
                     <span>科室：</span>
                     <span class="selectDept">
                         全部
                     </span>
-                   
                     <ul class="deptList filterDropList"></ul>
                 </span>
-                <span class="filter">查询</span>
-                <span class="filterclear abnormalClear filterclearT">重置</span>
-            </div>
-            <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">展开筛选</a>
-            <div class="toggle-item clearfix">
-                <span class="filterItem doctorFilter">
-                    <span>医生：</span>
-                    <span class="selectDoctor"> 
-                        
-                    </span>
-                    <!-- <input class="doctorInp" type="text" placeholder="请输入医生姓名"> -->
-                </span>
-               
-                <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
+                 <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
                     <span class="fl">出院日期：</span>
-                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
                     <span  class="divide fl">-</span>
-                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
                 </span>
                 <span class="filterItem">
                     <span>病历等级：</span>
@@ -61,13 +39,33 @@
                         <li class="levelItem" data-name="丙" data-id=丙>丙</li>
                     </ul>
                 </span>
+                <span class="filter">查询</span>
+                <span class="filterclear abnormalClear filterclearT">重置</span>
+            </div>
+            <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">展开筛选</a>
+            <div class="toggle-item clearfix">
+                <span class="filterItem typeFilter">
+                    <span>病人姓名：</span>
+                    <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
+                </span>
+                <span class="filterItem typeFilter">
+                    <span>病人住院序号：</span>
+                    <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
+                </span>
+                <span class="filterItem doctorFilter">
+                    <span>医生：</span>
+                    <span class="selectDoctor"> 
+                        
+                    </span>
+                    <!-- <input class="doctorInp" type="text" placeholder="请输入医生姓名"> -->
+                </span>
             </div>
             </div>
             <div class="overAuto">
                 <table>
                     <thead>
                         <tr>
-                            <td colspan="18" style="background: #fff">
+                            <td colspan="19" style="background: #fff">
                                 <div class="tabFoot">
                                     <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                     <span class="recordScoreBtn">评分</span>
@@ -76,6 +74,8 @@
                         </tr>
                         <th class="textCenter" ></th>
                         <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
+                        <th class="recordLevel textCenter" code="level">病历等级</th>
+                        <th class="recordScore textCenter" code="score_res">病历得分</th>
                         <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
                         <th class="patientNo textCenter" code="file_code">病案号</th>
                         <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
@@ -84,13 +84,12 @@
                         <th class="bedNum textCenter" code="bed_code">床号</th>
                         <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
                         <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
+                        <th class="placefileDate textCenter" code="placefile_date">归档日期</th>
                         <th class="diagnose textCenter" code="diagnose">主诊断</th>
                         <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                         <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                         <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>
                         <th class="deptName textCenter" code="beh_dept_name">科室</th>
-                        <th class="recordLevel textCenter" code="level">病历等级</th>
-                        <th class="recordScore textCenter" code="score_res">病历得分</th>
                         <th class="scoreTime textCenter" code="grade_time">评分时间</th>    
                     </thead>
                     <tbody>

src/html/qcScore.html

@@ -81,7 +81,6 @@
                              <td>${诊断名称}</td>
                              <td>${诊断编码}</td>
                              <td>${入院情况}</td>
-                             <td>${出院情况}</td>
                          </tr>
                          {{/if}}
                          {{/each}}
@@ -133,15 +132,15 @@
          {{/if}}
     </script>
     <script type="text/html" id="flawTmpl">
-        <div class="flaw-item" code="${modelName.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,'')}">
+        <div {{if isReject==='1'}} class="flaw-item high-light" {{else}} class="flaw-item" {{/if}} code="${modelName.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,'')}">
             <div class="title">
                 {{if gradeType===2}}
                 <i class="add-icon">人工</i>
                 {{/if}}
                 {{if info}}
-                <a {{if pageKeyList[0]}} anchors="${pageKeyList}" href="#anchor${pageKeyList[0]}" {{/if}}>${msg}(${info})</a>
+                <a {{if pageKeyList[0]}} anchors="${pageKeyList}" code="${id}" href="#anchor${pageKeyList[0]}" {{/if}}>${msg}(${info})</a>
                 {{else}}
-                <a {{if pageKeyList[0]}} anchors="${pageKeyList}" href="#anchor${pageKeyList[0]}" {{/if}}>${msg}</a>
+                <a {{if pageKeyList[0]}} anchors="${pageKeyList}" code="${id}" href="#anchor${pageKeyList[0]}" {{/if}}>${msg}</a>
                 {{/if}}
             </div>
             <div class="opers clearfix">
@@ -151,7 +150,7 @@
                 <p class="fl">评分：<span class="red">-${score}</span></p>
                 {{/if}}
                 <div class="oper fr">
-                    <a class="edit-flaw blue" code="${id}" href="javascript:void(0);" style="margin-right: 20px;">修改</a>
+                    <a class="edit-flaw blue" code="${id}" href="javascript:void(0);" style="margin-right: 18px;">修改</a>
                     <a class="del-flaw red" code="${id}" href="javascript:void(0);">删除</a>
                 </div>
             </div>
@@ -246,9 +245,9 @@
                 {{each(i,val) data}}
                 <tr><td colspan="3" class="slide-up">${i}</td></tr>
                 {{each val}}
-                <tr code="${i}">
+                <tr code="${i}" {{if isReject==="1"}} class="high-light" {{/if}}>
                     <td style="text-indent: 14px;">${modelName}</td>
-                    <td>${standardMsg}</td>
+                    <td><a href="javascript:void(0);" class="page-anchor" code="${id}">${standardMsg}</a></td>
                     <td class="red">${score}</td>
                 </tr>
                 {{/each}}

src/html/quexianDetail.html

@@ -22,7 +22,7 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
+        <!-- <div class="grayLine"></div> -->
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem typeFilter deptListWrap">
@@ -45,6 +45,12 @@
                         <li class="deptItem ellipsis" title="丙级病历" data-id="丙" data-name="丙级病历">丙级病历</li>
                     </ul>
                 </span>
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/html/quexianDetailControl.html

@@ -22,7 +22,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem typeFilter deptListWrap">
@@ -45,6 +44,12 @@
                         <li class="deptItem ellipsis" title="丙级病历" data-id="丙" data-name="丙级病历">丙级病历</li>
                     </ul>
                 </span>
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/html/quexianDetailControlHome.html

@@ -22,7 +22,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem typeFilter deptListWrap">
@@ -41,6 +40,12 @@
                         <input class="moduleItemInp" type="text" placeholder="请输入缺陷名称">
                     </span>
                 </span>
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>
@@ -52,7 +57,7 @@
                     <th class="moduleItemName textCenter">数量</th>
                     <th class="moduleScore" style="width: 80px;">缺陷占比</th>
                 </thead>
-                <tbody>
+                <tbody class="tbodys">
     
                 </tbody>
             </table>

src/html/quexianDetailHome.html

@@ -22,7 +22,7 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
+        <!-- <div class="grayLine"></div> -->
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem">
@@ -31,6 +31,12 @@
                         <input class="moduleItemInp" type="text" placeholder="请输入缺陷名称">
                     </span>
                 </span>
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/html/singleVeto.html

@@ -45,6 +45,12 @@
                         <li  class="rejectItem" data-name="否" data-id=0>否</li>
                     </ul>
                 </span>
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">出院日期：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/html/userManager.html

@@ -29,15 +29,6 @@
                     <span class="selectReject ellipsis">全部</span>
                     <ul class="rejectList filterDropList"></ul>
                 </span>
-                <!-- <span class="filterItem">
-                    <span>启用状态：</span>
-                    <span class="selectUsed">全部</span>
-                    <ul class="usedList filterDropList">
-                        <Li class="usedItem" data-name="全部" data-id="">全部</Li>
-                        <li class="usedItem" data-name="是" data-id=1>是</li>
-                        <li class="usedItem" data-name="否" data-id=0>否</li>
-                    </ul>
-                </span> -->
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/js/console.js

@@ -1,14 +1,19 @@
 const $ = require('jquery');
+
 require("../css/reset.less")
 require("../css/console.less")
 require("../images/logo.png")
 require("../images/arrow_down.png")
+require('./modal.js');
 
 // import 'zrender/lib/svg/svg';
 const {api} = require('./api.js')
 const echarts = require('echarts');
+require('./../resource/jquery-ui/jquery-ui.min.js');
+require('./../resource/jquery-ui/jquery-ui.min.css');
 const {post,setCookie,delCookie,getCookie,focusMenuItem,picEmptyData} = require('../js/utils.js');
-let payMoney = [],dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital"),deptType="内科",deptId="",level="甲";
+let payMoney = [],behosDateStart="",behosDateEnd="",dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital"),deptType="内科",deptId="",level="甲",lineType="合格率",lineType1=[],lineType2=[],lineType3=[],lineType4=[];
+
 $(function(){
     if(!hasData('YH-KZT')){
         $("body").html('')
@@ -21,12 +26,12 @@ $(function(){
     //     $(".innerOuter").css("display","none")
     // }
     $(".partTitle p span").html(hospital)
-    setInterval(() => {
-        getTimeDetail()
-    }, 1000);
+    // setInterval(() => {
+    //     getTimeDetail()
+    // }, 1000);
     resizeBox()
     initConsole()//质控列表
-    getBarData(2)//图标数据获取
+    // getBarData(2)//图标数据获取
     dateChange()
     $(window).resize(function(){
         resizeBox()
@@ -91,6 +96,18 @@ $(function(){
             deptType="外科"
             getAverageScoreLis()
             $(this).parent().slideToggle().prev().find("span").html(str+"系统")
+        }else if(type == 7){//病案首页firstLevelPercent emptyPercent  errorPercent
+            lineType="合格率"
+            getHomeData('firstLevelPercent')
+            $(this).parent().slideToggle().prev().find("span").html(str)
+        }else if(type == 8){//病案首页
+            lineType = "完整率"
+            getHomeData('emptyPercent')
+            $(this).parent().slideToggle().prev().find("span").html(str)
+        }else if(type == 9){//病案首页
+            lineType = "完善率"
+            getHomeData('errorPercent')
+            $(this).parent().slideToggle().prev().find("span").html(str)
         }
     })
     $(".part02").on("mouseenter",".bingli li.sec",function(){
@@ -100,7 +117,6 @@ $(function(){
       $(this).find(".explainNum").css("color","#A5ADBF")
     })
     getDetails()
-    getAverageScoreLis()
     getEveryDeptLevel()
 })
 function getDetails(){
@@ -130,9 +146,8 @@ function getDetails(){
         //     focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
         //     $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType)
         // }
-        
         focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType+"&lineType="+lineType)
     })
     $(".paymoney.pubEchart .title").click(function(){
         // if($(this).text().indexOf("花费")!==-1){
@@ -151,7 +166,7 @@ function getDetails(){
     })
     $(".circleB .title").click(function(){
         focusMenuItem("YH-ZKK-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&dateType="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&shijian="+dateType)
     })
 }
 
@@ -182,9 +197,7 @@ function resizeBox(){
                 backgroundColor:'#203463'
             })
             dateType = 1
-            getBarData(1)
-            getAverageScoreLis()
-            getEveryDeptLevel()
+            dateConsole(1)
         })
         $(".monthYear .year").click(function(){
             $(this).css({
@@ -197,11 +210,11 @@ function resizeBox(){
                 backgroundColor:'#203463'
             })
             dateType = 2
-            getBarData(2)
-            getAverageScoreLis()
-            getEveryDeptLevel()
+            dateConsole(2)
         })
     }
+
+
 //控制台数
 function initConsole(result){
     let url = {
@@ -253,7 +266,9 @@ function getAverageScoreLis(){
     }
     post(url,{//各科室质控平均分
         "type": dateType||1,//1月2年
-        "deptClass":deptType
+        "deptClass":deptType,
+        "startDate":behosDateStart,
+        "endDate":behosDateEnd
     }).then((res)=>{
         let data = res.data;
         if(data.code == 0){
@@ -269,10 +284,12 @@ function getAverageScoreLis(){
 }
 //获取各科室病历等级占比
 function getEveryDeptLevel(){
-    if(1){
+    if(1){//权限暂无
         post(api.qcResultLevelPercent,{//各科室病历等级占比
             "type": dateType||2,//1月2年
-            "level":level
+            "level":level,
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -289,6 +306,35 @@ function getEveryDeptLevel(){
         $(".toggleSlide1").css("opacity",0.5)
     }
 }
+//病案首页合格率  firstLevelPercent emptyPercent  errorPercent
+function getHomeData(name){
+    if(hasData("FUNC000075")){
+        post(api.homePageLevelLimit,{//病案首页
+            "type": dateType||2,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd,
+            "desc": name
+        }).then((res)=>{
+            let data = res.data;
+            if(data.code == 0){
+                let result1 = data.data||[]
+                let dataX=[],dataY1=[],dataY2=[],dataY3=[]
+                for(let i = 0;i < result1.length;i++){
+                    dataX.push(result1[i].deptName)
+                    dataY1.push((result1[i].firstLevelPercentStr.replace('%','')-0))
+                    dataY2.push((result1[i].emptyPercentStr.replace('%','')-0))
+                    dataY3.push((result1[i].errorPercentStr.replace('%','')-0))
+                }
+                // lineType1 = dataY1.sort(function(a, b){return b - a})
+                // lineType2 = dataY2.sort(function(a, b){return b - a})
+                // lineType3 = dataY3.sort(function(a, b){return b - a})
+                lineType4 = dataX
+                let datay = (lineType == "合格率")?dataY1:(lineType=="完整率"?dataY2:dataY3)
+                lineChartHome(dataX,datay)
+            }
+        })
+    }
+}
 //获取图表数据
 function getBarData(type){
     // if(hasData('FUNC000045')){
@@ -355,27 +401,11 @@ function getBarData(type){
     //         }
     //     })
     // }
-    if(hasData("FUNC000075")){
-        post(api.homePageLevelLimit,{//病案首页
-            "type": type||1//1月2年
-        }).then((res)=>{
-            let data = res.data;
-            if(data.code == 0){
-                let result1 = data.data||[]
-                let dataX1=[],dataY1=[],dataY2=[],dataY3=[]
-                for(let i = 0;i < result1.length;i++){
-                    dataX1.push(result1[i].deptName)
-                    dataY1.push((result1[i].firstLevelPercentStr.replace('%','')-0))
-                    dataY2.push((result1[i].emptyPercentStr.replace('%','')-0))
-                    dataY3.push((result1[i].errorPercentStr.replace('%','')-0))
-                }
-                lineChartHome(dataX1,dataY1,dataY2,dataY3)
-            }
-        })
-    }
     if(hasData('FUNC000049')){
         post(api.leaveHosCount,{//出院人数统计
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -388,7 +418,9 @@ function getBarData(type){
     }
     if(hasData('FUNC000050')){
         post(api.mrCount,{//质控病历统计
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data
             if(data.code == 0){
@@ -399,7 +431,9 @@ function getBarData(type){
     }
     if(hasData('FUNC000051')){
         post(api.entryCountGroupByCase,{//各模块缺陷占比排行
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -411,7 +445,9 @@ function getBarData(type){
     }
     if(hasData('FUNC000052')){
         post(api.entryCountGroupByEntry,{//条目缺陷占比
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -444,6 +480,8 @@ function getBarData(type){
             "type": type||2,//1月2年
             "deptClass": "",
             "level": "",
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -790,8 +828,8 @@ function lineChartSpecial(dataX,dataY){
     myCharts.setOption(option);
 }
 //折线图病案首页
-function lineChartHome(dataX,dataY1,dataY2,dataY3){
-    console.log(dataX,dataY1,dataY2,dataY3)
+function lineChartHome(dataX,dataY){
+    // console.log(dataX,dataY)
     if(dataX.length==0){
         $(".barChartLine").css("display","none")
         picEmptyData(".barChartLineEmpty")
@@ -805,7 +843,7 @@ function lineChartHome(dataX,dataY1,dataY2,dataY3){
         myCharts.resize()
     });
     option = {
-        color:['#00A1FF','#FF2B92','#3EFFD1'],   
+        color:(lineType == "合格率")?'#00A1FF':(lineType=="完整率"?'#FF2B92':'#3EFFD1'),   
         title: {
             text: '百分比',
             top: 15,
@@ -824,37 +862,35 @@ function lineChartHome(dataX,dataY1,dataY2,dataY3){
             },
             formatter: function(param) {           
                 return `<div style="color:#fff;">${param[0].name}<br>
-                    <i style="background:#00A1FF;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页合格率：${param[0]&&param[0].value}%<br>
-                    <i style="background:#FF2B92;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页完整率：${param[1]&&param[1].value}%<br>
-                    <i style="background:#3EFFD1;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页完善率：${param[2]&&param[2].value}%<br>
+                    <i style="background:${(lineType == "合格率")?'#00A1FF':(lineType=="完整率"?'#FF2B92':'#3EFFD1')};margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页${lineType}：${param[0]&&param[0].value}%<br>
                 </div>`
             }
         },
-        legend: {
-            selectedMode :false,
-            right:15,
-            top:15,
-            data: [
-                {
-                    name: '合格率',
-                    textStyle: {
-                        color: '#A5ADBF'
-                    }
-                },
-                {
-                    name: '完整率',
-                    textStyle: {
-                        color: '#A5ADBF'
-                    }
-                },
-                {
-                    name: '完善率',
-                    textStyle: {
-                        color: '#A5ADBF'
-                    }
-                }
-            ]
-        },
+        // legend: {
+        //     selectedMode :false,
+        //     right:15,
+        //     top:15,
+        //     data: [
+        //         {
+        //             name: '合格率',
+        //             textStyle: {
+        //                 color: '#A5ADBF'
+        //             }
+        //         },
+        //         {
+        //             name: '完整率',
+        //             textStyle: {
+        //                 color: '#A5ADBF'
+        //             }
+        //         },
+        //         {
+        //             name: '完善率',
+        //             textStyle: {
+        //                 color: '#A5ADBF'
+        //             }
+        //         }
+        //     ]
+        // },
         grid: {
             left: '3%',
             right: '4%',
@@ -890,6 +926,7 @@ function lineChartHome(dataX,dataY1,dataY2,dataY3){
         yAxis: {
             type: 'value',
             min:0,
+            max:100,
             boundaryGap: [0.01, 0.01],axisLabel: {  
                 show: true,  
                 },  
@@ -915,23 +952,23 @@ function lineChartHome(dataX,dataY1,dataY2,dataY3){
         },
         series: [
             {
-                name: '合格率',
-                type: 'line',
-                // stack: '总量',
-                data: dataY1
-            },
-            {
-                name: '完整率',
+                name: lineType,
                 type: 'line',
                 // stack: '总量',
-                data: dataY2
+                data: dataY
             },
-            {
-                name: '完善率',
-                type: 'line',
-                // stack: '总量',
-                data: dataY3
-            }
+            // {
+            //     name: '完整率',
+            //     type: 'line',
+            //     // stack: '总量',
+            //     data: dataY2
+            // },
+            // {
+            //     name: '完善率',
+            //     type: 'line',
+            //     // stack: '总量',
+            //     data: dataY3
+            // }
         ]
     };   
     myCharts.setOption(option); 
@@ -1583,7 +1620,7 @@ function queList(data){
         <tr class="thead">
         <td class="td01">排名</td>
         <td class="td02">缺陷详情</td>
-        <td class="td04">错误率</td>
+        <td class="td04">缺陷占比</td>
         </tr>`
     if(data.length == 0){
         $(".qtable").css("display","none")
@@ -1660,4 +1697,107 @@ function getTimeDetail(){
     let hour = d.getHours()
     let str = `${d.getFullYear()}年${d.getMonth()+1}月${d.getDate()}日 / ${days[d.getDay()]} / ${hour>9?hour:'0'+hour}:${min>9?min:'0'+min}:${sec>9?sec:'0'+sec}`
     $(".dateDetail").html(str)
-}
+}
+$(".sureDate").click(function(){
+    if(!getStaticDate()){
+        return
+    }
+    getAverageScoreLis()
+    getBarData(dateType)
+    getEveryDeptLevel()
+    getHomeData('firstLevelPercent')
+})
+//日期联动
+function dateConsole(dateType){
+    let startDate = "", endDate=new Date()
+    let year = new Date().getFullYear()
+    let month = new Date().getMonth() + 1
+    if(dateType == '1'){
+        startDate = new Date(`${year}-${month}-01`)
+    }else if(dateType == '2'){
+        startDate = new Date(`${year}-01-01`)
+    } else {
+        startDate = "-1m"
+    }
+    $( "#datepicker" ).datepicker({
+        yearRange: "2015:"+year,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", startDate);
+    $( "#datepicker2" ).datepicker({
+        yearRange: "2015:"+year,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate",endDate);
+    getStaticDate()
+    getAverageScoreLis()
+    getBarData(dateType)
+    getHomeData('firstLevelPercent')
+    getEveryDeptLevel()
+}
+function getStaticDate(){
+    behosDateStart = $("#datepicker").val().trim()
+    behosDateEnd = $("#datepicker2").val().trim()
+    const start = new Date(behosDateStart).getTime()
+    const end = new Date(behosDateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return false
+    }
+    if(behosDateStart){
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+    }
+    if(behosDateEnd){
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+    }
+    return true
+}
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $.datepicker.regional['zh-CN'] = {
+    clearText: '清除',
+    clearStatus: '清除已选e799bee5baa6e59b9ee7ad9431333361303131日期',
+    closeText: '关闭',
+    closeStatus: '不改变当前选择',
+    prevText: '<上月',
+    prevStatus: '显示上月',
+    prevBigText: '<<',
+    prevBigStatus: '显示上一年',
+    nextText: '下月>',
+    nextStatus: '显示下月',
+    nextBigText: '>>',
+    nextBigStatus: '显示下一年',
+    currentText: '今天',
+    currentStatus: '显示本月',
+    monthNames: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    yearNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthStatus: '选择月份',
+    yearStatus: '选择年份',
+    weekHeader: '周',
+    weekStatus: '年内周次',
+    dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+    dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+    dayNamesMin: ['日','一','二','三','四','五','六'],
+    dayStatus: '设置 DD 为一周起始',
+    dateStatus: '选择 m月 d日, DD',
+    dateFormat: 'yy-mm-dd',
+    firstDay: 1,
+    initStatus: '请选择日期',
+    isRTL: false};
+    $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
+    dateConsole(dateType)
+    // $(".filter").click();   //初始查询
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/deptConsole.js

@@ -3,12 +3,15 @@ require("../css/reset.less")
 require("../css/deptConsole.less")
 require("../images/logo.png")
 require("../images/arrow_down.png")
+require('./modal.js');
 
 // import 'zrender/lib/svg/svg';
 const {api} = require('./api.js')
 const echarts = require('echarts');
+require('./../resource/jquery-ui/jquery-ui.min.js');
+require('./../resource/jquery-ui/jquery-ui.min.css');
 const {post,setCookie,delCookie,getCookie,focusMenuItem,picEmptyData } = require('../js/utils.js');
-let payMoney = [],dayLis = [],dateType = 2,curDept = '',curDeptId='',datafst=[],datasec=[],datatrd=[],datafour=[],hospital=getCookie("hospital");
+let payMoney = [],behosDateStart="",behosDateEnd="",dayLis = [],dateType = 2,curDept = '',curDeptId='',datafst=[],datasec=[],datatrd=[],datafour=[],hospital=getCookie("hospital");
 $(function(){
     if(!hasData('YH-KZT')&&!hasData('YH-KZTKS')){
         $("body").html('')
@@ -21,9 +24,9 @@ $(function(){
         $(".circleBLis").css("display","block")
     }
     $(".partTitle p span").html(hospital)
-    setInterval(() => {
-        getTimeDetail()
-    }, 1000);
+    // setInterval(() => {
+    //     getTimeDetail()
+    // }, 1000);
     // resizeBox()
     initConsole()//质控列表
     getOwnDept()
@@ -97,7 +100,7 @@ function dateChange(){
             backgroundColor:'#203463'
         })
         dateType = 1
-        getBarData(1)
+        dateConsole(1)
     })
     $(".monthYear .year").click(function(){
         $(this).css({
@@ -110,7 +113,7 @@ function dateChange(){
             backgroundColor:'#203463'
         })
         dateType = 2
-        getBarData(2)
+        dateConsole(2)
     })
 }
 //控制台数
@@ -208,7 +211,9 @@ function renderDeptLis(data){
 function getBarData(type){
     if(hasData('FUNC000054')){
         post(api.leaveHosCountByDept,{//出院人数统计
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -220,7 +225,9 @@ function getBarData(type){
     }
     if(hasData('FUNC000055')){
         post(api.mrCountByDept,{//质控病历统计
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data
             if(data.code == 0){
@@ -232,7 +239,9 @@ function getBarData(type){
     }
     if(hasData('FUNC000056')){
         post(api.entryCountGroupByCaseAndDept,{//各模块缺陷占比排行
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -245,7 +254,9 @@ function getBarData(type){
     if(hasData('FUNC000057')){
         if(hospital=="台州市立"){
             post(api.entryCountGroupByEntryAndDept,{//条目缺陷占比
-                "type": type||1//1月2年
+                "type": type||1,//1月2年
+                "startDate":behosDateStart,
+                "endDate":behosDateEnd
             }).then((res)=>{
                 let data = res.data;
                 if(data.code == 0){
@@ -260,7 +271,9 @@ function getBarData(type){
             })
         }else{
             post(api.entryCountGroupByEntryAndDept,{//条目缺陷占比
-                "type": type||1//1月2年
+                "type": type||1,//1月2年
+                "startDate":behosDateStart,
+                "endDate":behosDateEnd
             }).then((res)=>{
                 let data = res.data;
                 if(data.code == 0){
@@ -281,7 +294,9 @@ function getHomePageLevelStatisticsByDept(type){
     if(hospital=="长兴医院"&&hasData("FUNC000076")){
         post(api.homePageLevelStatisticsByDept,{//病案首页
             "type": dateType||2,//1月2年
-            "deptName":curDept
+            "deptName":curDept,
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -721,7 +736,7 @@ function queList(data){
         <tr class="thead">
         <td class="td01">排名</td>
         <td class="td02">缺陷详情</td>
-        <td class="td04">错误率</td>
+        <td class="td04">缺陷占比</td>
         </tr>`
     if(data.length == 0){
         $(".qtable").css("display","none")
@@ -745,7 +760,7 @@ function queList(data){
     $(".homegodetail").click(function(){
         let name = $(this).attr("data-name")
         focusMenuItem("YH-KSZR-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&shijian="+dateType+"&model="+name)
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=2&special=1&shijian="+dateType+"&model="+name)
     })
 }
 //饼图列表注释渲染
@@ -804,5 +819,99 @@ function getTimeDetail(){
     let str = `${d.getFullYear()}年${d.getMonth()+1}月${d.getDate()}日 / ${days[d.getDay()]} / ${hour>9?hour:'0'+hour}:${min>9?min:'0'+min}:${sec>9?sec:'0'+sec}`
     $(".dateDetail").html(str)
 }
-
-
+$(".sureDate").click(function(){
+    if(!getStaticDate()){
+        return
+    }
+    getBarData(dateType)
+})
+//日期联动
+function dateConsole(dateType){
+    let startDate = "", endDate=new Date()
+    let year = new Date().getFullYear()
+    let month = new Date().getMonth() + 1
+    if(dateType == '1'){
+        startDate = new Date(`${year}-${month}-01`)
+    }else if(dateType == '2'){
+        startDate = new Date(`${year}-01-01`)
+    } else {
+        startDate = "-1m"
+    }
+    $( "#datepicker" ).datepicker({
+        yearRange: "2015:"+year,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", startDate);
+    $( "#datepicker2" ).datepicker({
+        yearRange: "2015:"+year,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate",endDate);
+    getStaticDate()
+    getBarData(dateType)
+}
+function getStaticDate(){
+    behosDateStart = $("#datepicker").val().trim()
+    behosDateEnd = $("#datepicker2").val().trim()
+    const start = new Date(behosDateStart).getTime()
+    const end = new Date(behosDateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return false
+    }
+    if(behosDateStart){
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+    }
+    if(behosDateEnd){
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+    }
+    return true
+}
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $.datepicker.regional['zh-CN'] = {
+    clearText: '清除',
+    clearStatus: '清除已选e799bee5baa6e59b9ee7ad9431333361303131日期',
+    closeText: '关闭',
+    closeStatus: '不改变当前选择',
+    prevText: '<上月',
+    prevStatus: '显示上月',
+    prevBigText: '<<',
+    prevBigStatus: '显示上一年',
+    nextText: '下月>',
+    nextStatus: '显示下月',
+    nextBigText: '>>',
+    nextBigStatus: '显示下一年',
+    currentText: '今天',
+    currentStatus: '显示本月',
+    monthNames: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    yearNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthStatus: '选择月份',
+    yearStatus: '选择年份',
+    weekHeader: '周',
+    weekStatus: '年内周次',
+    dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+    dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+    dayNamesMin: ['日','一','二','三','四','五','六'],
+    dayStatus: '设置 DD 为一周起始',
+    dateStatus: '选择 m月 d日, DD',
+    dateFormat: 'yy-mm-dd',
+    firstDay: 1,
+    initStatus: '请选择日期',
+    isRTL: false};
+    $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
+    dateConsole(dateType)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/deptScoreDetail.js

@@ -2,13 +2,11 @@ const $ = require('jquery');
 require("../css/deptScoreDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,focusMenuItem,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,focusMenuItem,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
 const iconUnCheck = require("./../images/icon_unchecked.png")
-const  iconCalenBlue= require("./../images/icon_calen_blue.png")
-const  iconCalenGrey= require("./../images/icon_calen_grey.png")
 const iconDown= require("./../images/arrow_down.png")
 const iconUp = require("./../images/arrow_up.png")
 const loadingImg = require("./../images/loading.gif")
@@ -35,6 +33,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
     }else{
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
@@ -43,6 +42,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
     }
     if(deptId){
         $(".selectDept").html(deptId).attr({
@@ -63,6 +63,7 @@ $(".abnormalClear").click(function(){
     deptId = deptIdTemp = deptList[0].deptName
     curDeptId = deptList[0].deptId
     behospitalCode=behospitalCodeTemp = ""
+    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
     $(".patientNumInp").val("")
     $(".selectDept").html(deptId).attr({
         "data-id":deptId,
@@ -80,16 +81,6 @@ $(".partTitle a").click(function(){
     }
     $(".container",parent.document).addClass("console-cont");
 })
-$('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
-$('.iconCalen').on("mouseenter", function(e){
-    $(this).attr("src", iconCalenBlue)
-})
-$('.iconCalen').on("mouseleave", function(e){
-    $(this).attr("src", iconCalenGrey)
-})
-$('.iconCalen').on("click", function(e){
-    $(this).parent().find("input").focus()
-})
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 //科室处理
 // getDeptList()
@@ -121,6 +112,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","block")
         $(".dayDetail .dayFilter").css("display","none")
         statisticsType = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -134,6 +126,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","none")
         $(".dayDetail .dayFilter").css("display","block")
         statisticsType = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -151,13 +144,23 @@ function dateChange(){
 }
 
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
         "asc": "",
         "deptName": deptId||"",
         "desc": "",
         "level": "",
         "name": behospitalCode||"",
-        "type": statisticsType||2
+        "type": statisticsType||2,
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     post(api.levelStatisticsByDept,param).then(res =>{
         if(res.data.code == '0'){
@@ -614,5 +617,17 @@ $(document).on("click", function(){
     $(".selectDept .arrow").attr("src",iconDown)    
 })
 
-$((function($){
-})($));
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/deptScoreDetailControl.js

@@ -2,13 +2,11 @@ const $ = require('jquery');
 require("../css/deptScoreDetailControl.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,focusMenuItem,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,focusMenuItem,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
 const iconUnCheck = require("./../images/icon_unchecked.png")
-const  iconCalenBlue= require("./../images/icon_calen_blue.png")
-const  iconCalenGrey= require("./../images/icon_calen_grey.png")
 const iconDown= require("./../images/arrow_down.png")
 const iconUp = require("./../images/arrow_up.png")
 const loadingImg = require("./../images/loading.gif")
@@ -27,7 +25,7 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
     $(".deptListWrap").css("display","inline-block")
     $(".deptListWrap .selectDept").html(deptType?(deptType+'系统'):"全部").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     deptId = deptIdTemp = deptType
-}else{
+  }else{
     $(".deptListWrap").css("display","none")
   }
   if(statisticsType == 1){
@@ -38,6 +36,7 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
           color:'#00A1FF',
           backgroundColor:'#fff'
       })
+      setDatePicker($("#datepicker"),$("#datepicker2"),1)
   }else{
       $(".monthYear .year").css({
           backgroundColor:'#00A1FF',
@@ -46,9 +45,10 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
           color:'#00A1FF',
           backgroundColor:'#fff'
       })
+      setDatePicker($("#datepicker"),$("#datepicker2"),2)
   }
 $(".abnormalClear").click(function(){
-    // window.location.reload()
+    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
     behospitalCode=behospitalCodeTemp = ""
     deptId =deptIdTemp= ""
     $(".selectDept").attr({'title':"全部",'data-id':''}).html("全部").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -61,16 +61,7 @@ $(".partTitle a").click(function(){
     $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
     $(".container",parent.document).addClass("console-cont");
 })
-$('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
-$('.iconCalen').on("mouseenter", function(e){
-    $(this).attr("src", iconCalenBlue)
-})
-$('.iconCalen').on("mouseleave", function(e){
-    $(this).attr("src", iconCalenGrey)
-})
-$('.iconCalen').on("click", function(e){
-    $(this).parent().find("input").focus()
-})
+
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 dateChange()
 //所有数据切换日期筛选
@@ -86,6 +77,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","block")
         $(".dayDetail .dayFilter").css("display","none")
         statisticsType = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -99,6 +91,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","none")
         $(".dayDetail .dayFilter").css("display","block")
         statisticsType = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -116,12 +109,22 @@ function dateChange(){
     return false;
 }
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
         "asc": "",
         "desc": "",
         "name": behospitalCode||"",
         "deptClass": deptId||'',
         "type": statisticsType||2, //1-本月，2-本年
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     let url = ''
 
@@ -488,51 +491,6 @@ $(".doctorNumInp").on("input", function(e){
   const val = $(this).val().trim();
     doctorNumTemp = val
 })
-$(function() {
-    $.datepicker.regional['zh-CN'] = {
-    clearText: '清除',
-    clearStatus: '清除已选e799bee5baa6e59b9ee7ad9431333361303131日期',
-    closeText: '关闭',
-    closeStatus: '不改变当前选择',
-    prevText: '<上月',
-    prevStatus: '显示上月',
-    prevBigText: '<<',
-    prevBigStatus: '显示上一年',
-    nextText: '下月>',
-    nextStatus: '显示下月',
-    nextBigText: '>>',
-    nextBigStatus: '显示下一年',
-    currentText: '今天',
-    currentStatus: '显示本月',
-    monthNames: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
-    monthNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
-    yearNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
-    monthStatus: '选择月份',
-    yearStatus: '选择年份',
-    weekHeader: '周',
-    weekStatus: '年内周次',
-    dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
-    dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
-    dayNamesMin: ['日','一','二','三','四','五','六'],
-    dayStatus: '设置 DD 为一周起始',
-    dateStatus: '选择 m月 d日, DD',
-    dateFormat: 'yy-mm-dd',
-    firstDay: 1,
-    initStatus: '请选择日期',
-    isRTL: false};
-    $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
-
-    $( "#datepicker" ).datepicker({
-        changeMonth: true,
-        changeYear: true,
-        dateFormat:"yy/mm/dd"
-    });
-    $( "#datepicker2" ).datepicker({
-        changeMonth: true,
-        changeYear: true,
-        dateFormat:"yy/mm/dd"
-    });
-});
 
 //分页渲染
 function renderPagination(totalPage,activePage,totalNum){
@@ -602,5 +560,17 @@ $(document).on("click", function(){
     
 })
 
-$((function($){
-})($));
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/index.js

@@ -9,6 +9,9 @@ let userInfo={};
 $(function(){
   getMenu();
   getOwnDept();
+  setInterval(() => {
+      getTimeDetail()
+  }, 1000);
   //菜单展开收起
   sureChangeWord()
   $(".main").css({
@@ -57,8 +60,9 @@ function initMenu(data,userInfo){
   //用户数据填充
   $("#userName").text(userInfo.linkman);
   //初始菜单选中
-  $(".menu .page").eq(0).addClass("active");
-  if($(".menu .page").eq(0).is(".YH-KZT")||$(".menu .page").eq(0).is(".YH-KZTKS")){
+  const firstM = $(".menu .page").eq(0);
+  firstM.addClass("active");
+  if(firstM.is(".YH-KZT")||firstM.is(".YH-KZTKS")){
   // if($(".menu .page").eq(0).is(".YH-KZT")){
     $(".container").addClass("console-cont");
   }
@@ -101,6 +105,12 @@ function initMenu(data,userInfo){
   $(".page").on("click",function(){
     $(".menu .active,.menu-mini .active").removeClass('active');
     const code=$(this).attr("code");
+    if(code === 'YH-KZT'||code === 'YH-KZTKS'){
+      // if(code === 'YH-KZT'){
+      $(".container").addClass("console-cont");
+    }else{
+      $(".container").removeClass("console-cont");
+    }
     const mItems = $(".menu .page[code="+code+"],.menu-mini .page[code="+code+"]");
     mItems.addClass("active");
     mItems.parents(".list-1").addClass("active");
@@ -108,12 +118,6 @@ function initMenu(data,userInfo){
     if(code === 'YH-BLZK-ZKPFGR'){
       url += `?doctorName=${userInfo.linkman}`
     }
-    if(code === 'YH-KZT'||code === 'YH-KZTKS'){
-    // if(code === 'YH-KZT'){
-      $(".container").addClass("console-cont");
-    }else{
-      $(".container").removeClass("console-cont");
-    }
     $("#contentIframe").attr("src",url);
   });
 }
@@ -244,3 +248,14 @@ $("#changeWord").click(function(e){
 $(".login-out").click(function(){
   delCookie('accessToken')
 })
+
+//时间获取
+function getTimeDetail(){
+  const d = new Date();
+  const days = ["星期日","星期一","星期二","星期三","星期四","星期五","星期六"];
+  let sec = d.getSeconds()
+  let min = d.getMinutes()
+  let hour = d.getHours()
+  let str = `${d.getFullYear()}年${d.getMonth()+1}月${d.getDate()}日 / ${days[d.getDay()]} / ${hour>9?hour:'0'+hour}:${min>9?min:'0'+min}:${sec>9?sec:'0'+sec}`
+  $(".dateDetail").html(str)
+}

src/js/jiaji.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/jiaji.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -31,6 +31,7 @@ if(statisticsType == 1){
         color:'#00A1FF',
         backgroundColor:'#fff'
     })
+    setDatePicker($("#datepicker"),$("#datepicker2"),1)
 }else{
     $(".monthYear .year").css({
         backgroundColor:'#00A1FF',
@@ -39,9 +40,11 @@ if(statisticsType == 1){
         color:'#00A1FF',
         backgroundColor:'#fff'
     })
+    setDatePicker($("#datepicker"),$("#datepicker2"),2)
 }
 $(".abnormalClear").click(function(){
     behospitalCode =behospitalCodeTemp= ""
+    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
     $(".patientNumInp").val("")
     getTabData(1)
 })
@@ -75,6 +78,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","block")
         $(".dayDetail .dayFilter").css("display","none")
         statisticsType = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -88,6 +92,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","none")
         $(".dayDetail .dayFilter").css("display","block")
         statisticsType = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -104,12 +109,22 @@ function dateChange(){
     return false;
 }
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
         current:activePage,
         size: 15,
         name: behospitalCode||"",
         type: statisticsType||2, //1-本月，2-本年
         dateType: level||"",//(3-上月，4-去年本月，5-去年(必填))
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     post(api.levelPercentGroupByDeptPage,param).then(res =>{
         if(res.data.code == '0'){
@@ -547,6 +562,17 @@ $(document).on("click", function(){
     $(".selectLevel .arrow").attr("src",iconDown)
     
 })
-
-$((function($){
-})($));
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/mukuai.js

@@ -3,7 +3,7 @@ require("../css/mukuai.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -28,7 +28,6 @@ $(function(){
     if(name){
         $(".moduleItemInp").val(name)
     }
-    getTabData(1)//条目缺陷
     if(isReject == 1){
         $(".monthYear .mon").css({
             backgroundColor:'#00A1FF',
@@ -37,6 +36,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
     }else{
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
@@ -45,6 +45,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
     }
     if(deptId){
         $(".selectDept").html(deptId).attr({
@@ -61,7 +62,7 @@ $(function(){
         $(".container",parent.document).addClass("console-cont");
     })
     $(".abnormalClear").click(function(){
-        // window.location.reload()
+        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
         deptId =deptIdTemp= deptList[0].deptName
         name = ""
         $(".patientNumInp").val("")
@@ -71,6 +72,7 @@ $(function(){
         }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         getTabData(1)
     })
+    getTabData(1)//条目缺陷
 })
 
 function focusMenuItem(code){
@@ -81,7 +83,7 @@ function focusMenuItem(code){
     }
     //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
     ele.click();
-  }
+}
 bindDeptSelect()
 //科室选择
 function bindDeptSelect(){
@@ -146,8 +148,8 @@ function dateChange(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
-        isReject = 1
-        isRejectTemp = 1
+        isReject = isRejectTemp = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -158,19 +160,29 @@ function dateChange(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
-        isReject = 2
-        isRejectTemp = 2
+        isReject = isRejectTemp = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
 //获取表格数据
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
         current:activePage,
         type: isReject,
         name: name, //条目名
         deptName: deptId||(deptList.length>0?deptList[0].deptName:''), //科室名
-        size: 15
+        size: 15,
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     post(from == 1?api.entryCountGroupByCasePage:api.entryCountGroupByCaseAndDeptPage,param).then(res =>{
         if(res.data.code == '0'){
@@ -264,8 +276,8 @@ function renderTab(data,activePage){
     bindEdit(data,activePage)
     $(".goHomeDetail").click(function(){
         let model = $(this).attr("data-model")
-        focusMenuItem("YH-ZKK-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&model="+model+"&shijian="+isReject)
+        focusMenuItem("YH-KSZR-TMQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=2&special=1&model="+model+"&shijian="+isReject)
     })
 }
 
@@ -511,4 +523,18 @@ $(document).on("click", function(){
     $(".selectUsed .arrow").attr("src",iconDown)
     $(".deptList").css("display", "none")
     $(".selectDept .arrow").attr("src",iconDown)
-})
+})
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/mukuaiControl.js

@@ -3,7 +3,7 @@ require("../css/mukuai.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -29,7 +29,6 @@ $(function(){
     if(name){
         $(".moduleItemInp").val(name)
     }
-    getTabData(1)//条目缺陷
     
     $(".partTitle a").click(function(){
         //初始菜单选中
@@ -38,6 +37,7 @@ $(function(){
     })
     $(".abnormalClear").click(function(){
         // window.location.reload()
+        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
         name=nameTemp = ""
         data_asc=[],
         data_desc=['percentStr']
@@ -55,6 +55,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
     }else{
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
@@ -63,7 +64,10 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
     }
+    
+    getTabData(1)//条目缺陷
 })
 function focusMenuItem(code){
     const ele = $(parent.document).find(".menu .page[code="+code+"]");
@@ -140,6 +144,7 @@ function dateChange(){
         })
         isReject = 1
         isRejectTemp = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -152,6 +157,7 @@ function dateChange(){
         })
         isReject = 2
         isRejectTemp = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -173,6 +179,14 @@ $("th[code]").on("click",function(e){
 });
 //获取表格数据
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
         current:activePage,
         type: isReject,
@@ -181,6 +195,8 @@ function getTabData(activePage){
         size: 15,
         asc:data_asc,     //升序
         desc: data_desc,       //降序
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     post(from == 1?api.entryCountGroupByCasePage:api.entryCountGroupByCaseAndDeptPage,param).then(res =>{
         if(res.data.code == '0'){
@@ -520,4 +536,20 @@ $(document).on("click", function(){
     $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
-})
+})
+
+
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/partDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/partDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -19,7 +19,7 @@ $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  data_desc=[],data_asc=[];
+  data_desc='',data_asc='';
 let deptList = JSON.parse(getCookie("deptList"))||[]
 $(function(){
     let srcUrl = $("#contentIframe",parent.document).attr("src")
@@ -33,6 +33,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
     }else{
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
@@ -41,6 +42,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
     }
     if(deptId){
         $(".selectDept").html(deptId).attr({
@@ -56,6 +58,7 @@ $(function(){
 $(".abnormalClear").click(function(){
     deptId=deptIdTemp = deptList[0].deptName
     behospitalCode=behospitalCodeTemp = ""
+    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
     $(".patientNumInp").val("")
     $(".selectDept").html(deptId).attr({
         "data-id":deptId,
@@ -78,16 +81,21 @@ function focusMenuItem(code){
     //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
     ele.click();
   }
-$('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
-$('.iconCalen').on("mouseenter", function(e){
-    $(this).attr("src", iconCalenBlue)
-})
-$('.iconCalen').on("mouseleave", function(e){
-    $(this).attr("src", iconCalenGrey)
-})
-$('.iconCalen').on("click", function(e){
-    $(this).parent().find("input").focus()
-})
+$(function() {
+    const  iconCalenBlue= require("./../images/icon_calen_blue.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});
+
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 
 //科室处理
@@ -120,6 +128,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","block")
         $(".dayDetail .dayFilter").css("display","none")
         statisticsType = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -133,6 +142,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","none")
         $(".dayDetail .dayFilter").css("display","block")
         statisticsType = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -149,12 +159,22 @@ function dateChange(){
     return false;
 }
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
-        "asc": "",
-        "desc": "",
+        "asc": data_asc,
+        "desc": data_desc,
         "deptName": deptId||"",
         "name": behospitalCode||"",
         "type": statisticsType||2, //1-本月，2-本年
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     post(api.homePageLevelByDeptLimit,param).then(res =>{
         if(res.data.code == '0'){
@@ -190,11 +210,11 @@ function renderTab(data,hisId,activePage){
             <tr  data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td >${item.doctorName || "-"}</td>
-                <td data-doc="${item.doctorName || ""}" data-ruleType="" class="goHomeDetail">${item.entryNum || "-"}</td>
+                <td data-doc="${i==0?"":item.doctorName || ""}" data-ruleType="" class="goHomeDetail">${item.entryNum || "-"}</td>
                 <td >${item.firstLevelPercentStr || "-"}</td>
-                <td  class="goHomeDetail" data-ruleType="1" data-dept="${item.deptName || ""}">${item.emptyNum+'' || "-"}</td>
+                <td  data-doc="${item.doctorName || ""}" class="goHomeDetail" data-ruleType="1" data-dept="${item.deptName || ""}">${item.emptyNum+'' || "-"}</td>
                 <td >${item.emptyPercentStr+'' || "-"}</td>
-                <td  class="goHomeDetail" data-ruleType="2" data-dept="${item.deptName || ""}">${item.errorNum+'' || "-"}</td>
+                <td  data-doc="${item.doctorName || ""}" class="goHomeDetail" data-ruleType="2" data-dept="${item.deptName || ""}">${item.errorNum+'' || "-"}</td>
                 <td >${item.errorPercentStr+'' || "-"}</td>
                 <td >${item.averageValue || "-"}</td>
                 <td >${item.mrNum || "-"}</td>
@@ -431,14 +451,14 @@ $('.recordScoreBtn').on("click",function(e){
 })
 $("th[code]").on("click",function(e){
     const code=$(this).attr("code");
-    if(data_asc[0]===code){
-      data_desc=[code];
-      data_asc=[];
+    if(data_asc===code){
+      data_desc=code;
+      data_asc='';
       $("th[code]").removeClass("asc desc");
       $(this).addClass("desc");
     }else{
-      data_desc=[];
-      data_asc=[code];
+      data_desc='';
+      data_asc=code;
       $("th[code]").removeClass("asc desc");
       $(this).addClass("asc");
     }

src/js/partDetailControl.js

@@ -2,27 +2,29 @@ const $ = require('jquery');
 require("../css/partDetailControl.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,setTitleTxt} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setTitleTxt,setDatePicker,getPickerDate} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
 const iconUnCheck = require("./../images/icon_unchecked.png")
-const  iconCalenBlue= require("./../images/icon_calen_blue.png")
-const  iconCalenGrey= require("./../images/icon_calen_grey.png")
 const iconDown= require("./../images/arrow_down.png")
 const iconUp = require("./../images/arrow_up.png")
 const loadingImg = require("./../images/loading.gif")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
-
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  data_desc=[],data_asc=[];
+  data_desc="",data_asc="";
   let srcUrl = $("#contentIframe",parent.document).attr("src")
   statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
   from = getUrlArgObjectNew("from",srcUrl)||""
+  lineType = getUrlArgObjectNew("lineType",srcUrl)||""
+  data_desc = (lineType == "合格率")?"firstLevelPercent":(lineType=="完整率"?"emptyPercent":"errorPercent")
+  if(lineType){
+        $("th[code="+data_desc+"]").addClass("desc");
+  }
   //setTitleTxt('',from)         //导航栏面包屑
   if(statisticsType == 1){
       $(".monthYear .mon").css({
@@ -32,6 +34,7 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
           color:'#00A1FF',
           backgroundColor:'#fff'
       })
+      setDatePicker($("#datepicker"),$("#datepicker2"),1)
   }else{
       $(".monthYear .year").css({
           backgroundColor:'#00A1FF',
@@ -40,9 +43,12 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
           color:'#00A1FF',
           backgroundColor:'#fff'
       })
+      setDatePicker($("#datepicker"),$("#datepicker2"),2)
   }
 $(".abnormalClear").click(function(){
-    // window.location.reload()
+    data_desc=""
+    data_asc=""
+    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
     $(".patientNumInp").val("")
     behospitalCode =behospitalCodeTemp= ""
     getTabData(1)
@@ -52,16 +58,7 @@ $(".partTitle a").click(function(){
     $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
     $(".container",parent.document).addClass("console-cont");
 })
-$('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
-$('.iconCalen').on("mouseenter", function(e){
-    $(this).attr("src", iconCalenBlue)
-})
-$('.iconCalen').on("mouseleave", function(e){
-    $(this).attr("src", iconCalenGrey)
-})
-$('.iconCalen').on("click", function(e){
-    $(this).parent().find("input").focus()
-})
+
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 dateChange()
 //所有数据切换日期筛选
@@ -77,6 +74,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","block")
         $(".dayDetail .dayFilter").css("display","none")
         statisticsType = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -90,6 +88,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","none")
         $(".dayDetail .dayFilter").css("display","block")
         statisticsType = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -106,12 +105,22 @@ function dateChange(){
     return false;
 }
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
-        "asc": "",
-        "desc": "",
         "level": deptId||"",
         "name": behospitalCode||"",
+        "asc":data_asc,     //升序
+        "desc":data_desc,       //降序
         "type": statisticsType||2, //1-本月，2-本年
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     post(api.homePageLevelStatistics,param).then(res =>{
         if(res.data.code == '0'){
@@ -159,7 +168,6 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    // console.log(str)
     $('tbody').html(str?str:emptyBox())
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
@@ -397,14 +405,14 @@ $('.recordScoreBtn').on("click",function(e){
 })
 $("th[code]").on("click",function(e){
     const code=$(this).attr("code");
-    if(data_asc[0]===code){
-      data_desc=[code];
-      data_asc=[];
+    if(data_asc==code){
+      data_desc=code;
+      data_asc="";
       $("th[code]").removeClass("asc desc");
       $(this).addClass("desc");
     }else{
-      data_desc=[];
-      data_asc=[code];
+      data_desc="";
+      data_asc=code;
       $("th[code]").removeClass("asc desc");
       $(this).addClass("asc");
     }
@@ -446,51 +454,6 @@ $(".doctorNumInp").on("input", function(e){
   const val = $(this).val().trim();
     doctorNumTemp = val
 })
-$(function() {
-    $.datepicker.regional['zh-CN'] = {
-    clearText: '清除',
-    clearStatus: '清除已选e799bee5baa6e59b9ee7ad9431333361303131日期',
-    closeText: '关闭',
-    closeStatus: '不改变当前选择',
-    prevText: '<上月',
-    prevStatus: '显示上月',
-    prevBigText: '<<',
-    prevBigStatus: '显示上一年',
-    nextText: '下月>',
-    nextStatus: '显示下月',
-    nextBigText: '>>',
-    nextBigStatus: '显示下一年',
-    currentText: '今天',
-    currentStatus: '显示本月',
-    monthNames: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
-    monthNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
-    yearNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
-    monthStatus: '选择月份',
-    yearStatus: '选择年份',
-    weekHeader: '周',
-    weekStatus: '年内周次',
-    dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
-    dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
-    dayNamesMin: ['日','一','二','三','四','五','六'],
-    dayStatus: '设置 DD 为一周起始',
-    dateStatus: '选择 m月 d日, DD',
-    dateFormat: 'yy-mm-dd',
-    firstDay: 1,
-    initStatus: '请选择日期',
-    isRTL: false};
-    $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
-
-    $( "#datepicker" ).datepicker({
-        changeMonth: true,
-        changeYear: true,
-        dateFormat:"yy/mm/dd"
-    });
-    $( "#datepicker2" ).datepicker({
-        changeMonth: true,
-        changeYear: true,
-        dateFormat:"yy/mm/dd"
-    });
-});
 
 //分页渲染
 function renderPagination(totalPage,activePage,totalNum){
@@ -559,5 +522,18 @@ $(document).on("click", function(){
     $(".selectDept .arrow").attr("src",iconDown)
 })
 
-$((function($){
-})($));
+
+$(function() {
+    const  iconCalenBlue= require("./../images/icon_calen_blue.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/qcList.js

@@ -21,6 +21,7 @@ let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
 let deptIdPram = getUrlArgObjectNew("deptId",srcUrl)||""
 let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
 let docName = getUrlArgObjectNew("docName",srcUrl)||""
+
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,
@@ -213,6 +214,8 @@ function renderTab(data,hisId){
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
                 <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
+                <td  class="textCenter">${item.level || "-"}</td>
+                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td >${item.behospitalCode || "-"}</td>
                 <td>${item.fileCode || "-"}</td>
                 <td  class="textCenter"><span data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
@@ -221,13 +224,12 @@ function renderTab(data,hisId){
                 <td  class="textCenter">${item.bedCode || "-"}</td>
                 <td  class="textCenter">${item.behospitalDate&&item.behospitalDate.slice(0,10) || "-"}</td>
                 <td  class="textCenter">${item.leaveHospitalDate&&item.leaveHospitalDate.slice(0,10)|| "-"}</td>
+                <td  class="textCenter">${item.placefileDate&&item.placefileDate.slice(0,10)|| "-"}</td>
                 <td  class="textCenter">${item.diagnose|| "-"}</td>
                 <td  class="textCenter">${item.behDoctorName   || "-"}</td>
                 <td  class="textCenter">${item.doctorName || "-"}</td>
                 <td  class="textCenter">${item.directorDoctorName || "-"}</td>
                 <td  class="textCenter">${item.behDeptName || "-"}</td>
-                <td  class="textCenter">${item.level || "-"}</td>
-                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td  class="textCenter">${item.gradeTime&&item.gradeTime.slice(0,10) || "-"}</td>
             </tr>
         `

src/js/qcListDept.js

@@ -231,6 +231,8 @@ function renderTab(data){
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
                 <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
+                <td  class="textCenter">${item.level || "-"}</td>
+                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td >${item.behospitalCode || "-"}</td>
                 <td>${item.fileCode || "-"}</td>
                 <td  class="textCenter"><span  data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
@@ -239,13 +241,12 @@ function renderTab(data){
                 <td  class="textCenter">${item.bedCode || "-"}</td>
                 <td  class="textCenter">${item.behospitalDate&&item.behospitalDate.slice(0,10) || "-"}</td>
                 <td  class="textCenter">${item.leaveHospitalDate&&item.leaveHospitalDate.slice(0,10)|| "-"}</td>
+                <td  class="textCenter">${item.placefileDate&&item.placefileDate.slice(0,10)|| "-"}</td>
                 <td  class="textCenter">${item.diagnose|| "-"}</td>
                 <td  class="textCenter">${item.behDoctorName   || "-"}</td>
                 <td  class="textCenter">${item.doctorName || "-"}</td>
                 <td  class="textCenter">${item.directorDoctorName || "-"}</td>
                 <td  class="textCenter">${item.behDeptName || "-"}</td>
-                <td  class="textCenter">${item.level || "-"}</td>
-                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td  class="textCenter">${item.gradeTime&&item.gradeTime.slice(0,10) || "-"}</td>
             </tr>
         `

src/js/qcListPerson.js

@@ -230,6 +230,8 @@ function renderTab(data){
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
                 <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
+                <td  class="textCenter">${item.level || "-"}</td>
+                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td >${item.behospitalCode || "-"}</td>
                 <td>${item.fileCode || "-"}</td>
                 <td  class="textCenter"><span  data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
@@ -238,13 +240,12 @@ function renderTab(data){
                 <td  class="textCenter">${item.bedCode || "-"}</td>
                 <td  class="textCenter">${item.behospitalDate&&item.behospitalDate.slice(0,10) || "-"}</td>
                 <td  class="textCenter">${item.leaveHospitalDate&&item.leaveHospitalDate.slice(0,10)|| "-"}</td>
+                <td  class="textCenter">${item.placefileDate&&item.placefileDate.slice(0,10)|| "-"}</td>
                 <td  class="textCenter">${item.diagnose|| "-"}</td>
                 <td  class="textCenter">${item.behDoctorName   || "-"}</td>
                 <td  class="textCenter">${item.doctorName || "-"}</td>
                 <td  class="textCenter">${item.directorDoctorName || "-"}</td>
                 <td  class="textCenter">${item.behDeptName || "-"}</td>
-                <td  class="textCenter">${item.level || "-"}</td>
-                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td  class="textCenter">${item.gradeTime&&item.gradeTime.slice(0,10) || "-"}</td>
             </tr>
         `

src/js/qcScore.js

@@ -51,6 +51,7 @@ function initMenu(data){
   });
   //右侧内容切换
   $(".page").on("click",function(){
+    $(".info-item .cont,.flaw-item").removeClass("active");   //清空缺陷定位背景
     const title = $(this).attr("code");
     if(title==="缺陷总览"||title==="谈话告知书"||title==="知情同意书"){
       $(".flaw-table .page-item").hide();
@@ -164,6 +165,21 @@ function formatInfoData(k,data){
 //知情同意书、谈话告知书
   function formatSpecPage(data,title){
     $("#appointBookTmpl").tmpl({title,data}).appendTo(".flaw-table");
+    $(".page-anchor").on("click",function(){
+      const code=$(this).attr("code");
+      const pCode=$(this).parents("tr").attr("code");
+      //菜单同步状态
+      $(".sub-menu .page[code="+pCode+"]").parents(".list-1").click();
+      $(".sub-menu .page[code="+pCode+"],.menu-mini .page[code="+pCode+"").click();
+      //缺陷定位
+      $(".info-item .cont,.flaw-item").removeClass("active");
+      const flawItem=$(".flaw-item .title a[code="+code+"]");
+      if(!flawItem.length){
+        $.alerModal({"message":'模块数据缺失~',type:"tip",time:'1000',isFather: true, fatherWrapper: $(".flaw-table", parent.document)});
+        return;
+      }
+      $(".flaw-item .title a[code="+code+"]").click();
+    });
   }
 
 function initList(data){
@@ -206,9 +222,9 @@ function initScoreItem(data){
     let ans = anchors.map((it)=>{
       return "#anchor"+it;
     });
-    $(".info-item .cont,.flaw-item .title").removeClass("active");
+    $(".info-item .cont,.flaw-item").removeClass("active");
     $(ans.join(",")).addClass("active");
-    $(this).parent().addClass("active");
+    $(this).parents(".flaw-item").addClass("active");
   });
 }
 

src/js/quexianDetail.js

@@ -3,7 +3,7 @@ require("../css/quexianDetail.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -34,6 +34,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
     }else{
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
@@ -42,9 +43,9 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
     }
-    $(".selectDepts").html(deptName)
-    getTabData(1)//条目缺陷    
+    $(".selectDepts").html(deptName)   
     from = getUrlArgObjectNew("from",srcUrl)||""
     if(from == 1){
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="partDetail.html">病案首页合格率占比 / </a>缺陷详情`)
@@ -66,6 +67,7 @@ $(function(){
         })
     }
     $(".abnormalClear").click(function(){
+        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
         name =nameTemp= ""
         deptIdTemp=deptId =''
         $(".selectDept").html("全部").attr("data-id","").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -73,6 +75,7 @@ $(function(){
         getTabData(1)
     })
     getMolist()
+    getTabData(1)//条目缺陷
 })
 function getMolist(){
     post(api.getQcCases).then(res =>{
@@ -157,6 +160,14 @@ $("th[code]").on("click",function(e){
     // console.log(code)
 });
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
         current:activePage,
         type: isReject,
@@ -167,7 +178,9 @@ function getTabData(activePage){
         casesId:casesIds||"",
         ascs:data_asc,
         descs:data_desc,
-        size: 15
+        size: 15,
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     post(api.entryCountGroupByEntryAndDeptPage,param).then(res =>{
         if(res.data.code == '0'){
@@ -197,6 +210,7 @@ function dateChange(){
         })
         isReject = 1
         isRejectTemp = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -209,6 +223,7 @@ function dateChange(){
         })
         isReject = 2
         isRejectTemp = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -542,4 +557,18 @@ $(document).on("click", function(){
     $(".selectReject .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
     $(".deptList").css("display", "none")
-})
+})
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/quexianDetailControl.js

@@ -3,7 +3,7 @@ require("../css/quexianDetailControl.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -11,7 +11,6 @@ const iconUp = require("./../images/arrow_up.png")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
-
 let casesId="", name="", isReject ="2",deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -34,6 +33,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
     }else{
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
@@ -42,6 +42,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
     }
     $(".selectDepts").html(deptName)
     // if(from == 1){
@@ -61,6 +62,7 @@ $(function(){
     getTabData(1)//条目缺陷
     
     $(".abnormalClear").click(function(){
+        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
         name =nameTemp= ""
         deptId = deptIdTemp = ""
         $(".selectDept").html("全部").attr("data-id","").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -144,6 +146,14 @@ $("th[code]").on("click",function(e){
     // console.log(code)
 });
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
         current:activePage,
         type: isReject,
@@ -155,7 +165,9 @@ function getTabData(activePage){
         globalType:1,
         ascs:data_asc,
         descs:data_desc,
-        size: 15
+        size: 15,
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     post(api.entryCountGroupByEntryPage,param).then(res =>{
         if(res.data.code == '0'){
@@ -183,8 +195,8 @@ function dateChange(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
-        isReject = 1
-        isRejectTemp = 1
+        isReject = isRejectTemp = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -195,8 +207,8 @@ function dateChange(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
-        isReject = 2
-        isRejectTemp = 2
+        isReject = isRejectTemp = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -530,4 +542,18 @@ $(document).on("click", function(){
     $(".selectReject .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
     $(".deptList").css("display", "none")
-})
+})
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/quexianDetailControlHome.js

@@ -3,7 +3,7 @@ require("../css/quexianDetailControlHome.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -36,6 +36,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
     }else{
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
@@ -44,6 +45,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
     }
     if(from == 1){
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html">病案首页合格率占比 / </a>缺陷详情`)
@@ -62,6 +64,7 @@ $(function(){
     
     $(".abnormalClear").click(function(){
         name = ""
+        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
         $(".patientNumInp").val("")
         getTabData(1)
     })
@@ -142,6 +145,14 @@ $("th[code]").on("click",function(e){
     // console.log(code)
 });
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
         current:activePage,
         type: isReject,
@@ -154,7 +165,9 @@ function getTabData(activePage){
         globalType:1,
         ascs:data_asc,
         descs:data_desc,
-        size: 15
+        size: 15,
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     post(api.entryCountGroupByEntryPage,param).then(res =>{
         if(res.data.code == '0'){
@@ -164,7 +177,7 @@ function getTabData(activePage){
             renderTab(data,activePage)
             if(totalPage > 1){
                 renderPagination(totalPage,Number(activePage),totalNum)
-            } else{
+            }else{
                 $('.pagination').html("")
             }
         }else{}
@@ -184,6 +197,7 @@ function dateChange(){
         })
         isReject = 1
         isRejectTemp = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -196,6 +210,7 @@ function dateChange(){
         })
         isReject = 2
         isRejectTemp = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -283,7 +298,7 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:emptyBox())
+    $('tbody.tbodys').html(str?str:emptyBox())
     bindEdit(data,activePage)
 }
 
@@ -527,4 +542,18 @@ $(document).on("click", function(){
     $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
-})
+})
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/quexianDetailHome.js

@@ -3,7 +3,9 @@ require("../css/quexianDetailHome.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate} = require('./utils.js')
+require('./../resource/jquery-ui/jquery-ui.min.js');
+require('./../resource/jquery-ui/jquery-ui.min.css');
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -35,6 +37,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
     }else{
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
@@ -43,8 +46,8 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
-    }
-    getTabData(1)//条目缺陷    
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
+    }   
     from = getUrlArgObjectNew("from",srcUrl)||""
     if(from == 1){
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="partDetail.html">病案首页合格率占比 / </a>缺陷详情`)
@@ -66,10 +69,12 @@ $(function(){
         })
     }
     $(".abnormalClear").click(function(){
+        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
         name = ""
         $(".patientNumInp").val("")
         getTabData(1)
     })
+    getTabData(1)//条目缺陷 
     // getMolist()
 })
 function getMolist(){
@@ -155,6 +160,14 @@ $("th[code]").on("click",function(e){
     // console.log(code)
 });
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
         current:activePage,
         type: isReject,
@@ -166,7 +179,9 @@ function getTabData(activePage){
         ascs:data_asc,
         descs:data_desc,
         ruleType:ruleType||null,
-        size: 15
+        size: 15,
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     post(api.entryCountGroupByEntryAndDeptPage,param).then(res =>{
         if(res.data.code == '0'){
@@ -194,8 +209,8 @@ function dateChange(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
-        isReject = 1
-        isRejectTemp = 1
+        isReject = isRejectTemp = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -206,8 +221,8 @@ function dateChange(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
-        isReject = 2
-        isRejectTemp = 2
+        isReject = isRejectTemp = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -539,4 +554,18 @@ $(document).on("click", function(){
     $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
-})
+})
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/singleVeto.js

@@ -3,7 +3,7 @@ require("../css/tiaomu.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,focusMenuItem} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,focusMenuItem,setDatePicker,getPickerDate} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -45,7 +45,6 @@ $(function(){
     if(from == 2){
         $(".partTitle a").attr("href","deptConsole.html").html("控制台(科室) / ")
     }
-    getTabData(1)//条目缺陷
     $(".partTitle a").click(function(){
         //初始菜单选中
         $(".managerContainer").remove()
@@ -58,6 +57,7 @@ $(function(){
     })
     $(".abnormalClear").click(function(){
         // window.location.reload()
+        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
         $(".selectModuleType").html("全部")
         $(".selectReject").html("全部")
         $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -78,6 +78,7 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
     }else{
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
@@ -86,7 +87,9 @@ $(function(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
     }
+    getTabData(1)//条目缺陷
 })
 bindDeptSelect()
 //科室选择
@@ -135,6 +138,14 @@ function getDeptList(){
     $(".tiaomu .filterDropList").html(str)
 }
 function getTabData(activePage){
+    const dateStatrt = getPickerDate($("#datepicker"),1)
+    const dateEnd = getPickerDate($("#datepicker2"),2)
+    const start = new Date(dateStatrt).getTime()
+    const end = new Date(dateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
     const param = {
         current:activePage,
         type: isReject,
@@ -143,7 +154,9 @@ function getTabData(activePage){
         isReject:isSingleReject, //是否单项否决
         name: name, //条目名
         deptName: deptId, //科室名
-        size: 15
+        size: 15,
+        "startDate":dateStatrt,
+        "endDate":dateEnd
     }
     post(from == 1?api.entryGroupByEntryInnerPage:api.entryGroupByEntryAndDeptInnerPage,param).then(res =>{
         if(res.data.code == '0'){
@@ -171,8 +184,8 @@ function dateChange(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
-        isRejectTemp = 1
-        isReject = 1
+        isRejectTemp = isReject = 1
+        setDatePicker($("#datepicker"),$("#datepicker2"),1)
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -183,8 +196,8 @@ function dateChange(){
             color:'#00A1FF',
             backgroundColor:'#fff'
         })
-        isRejectTemp = 2
-        isReject = 2
+        isRejectTemp =  isReject = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -268,7 +281,7 @@ function renderTab(data,activePage){
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td class="textCenter">${item.casesName||'-'}</td>
                 <td>${item.name||'-'}</td>
-                <td  class="textCenter">${item.score||'-'}</td>
+                <td  class="textCenter">${item.score+''||'-'}</td>
                 <td  class="textCenter">${item.isReject == '1'?'是':'否'}</td>
                 <td class="textCenter">${item.num+''||'-'}</td>
                 <td  class="textCenter">${item.percentStr||'-'}</td>
@@ -526,4 +539,20 @@ $(document).on("click", function(){
     $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
-})
+})
+
+
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/utils.js

@@ -2,7 +2,7 @@ const qs = require('qs');
 const $ = require("jquery");
 const axios = require("axios")
 var Utils = require('./rePromise');
-const baseUrl = "http://192.168.2.121:5858"
+const baseUrl = "http://192.168.2.236:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',
@@ -276,7 +276,7 @@ function focusMenuItem(code){
   ele.click();
 }
 function emptyBox(name){
-  let str = `<tr><td colspan="18" style="text-align: center;color: #aaa">
+  let str = `<tr><td colspan="19" style="text-align: center;color: #aaa">
   <img style="margin-top:50px;width:100px;" src="${require('../images/empty1.png')}" />
   <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">${name||'暂无数据~'}</p>
   </td></tr>`
@@ -296,6 +296,84 @@ function setTitleTxt(dom,from){
     $(dom?dom:".partTitle").find("a").remove()
   }
 }
+
+//mode=1:本月，mode=2:本年 startDateDefault：mode不等于1和2开始日期，endDateDefault：mode不等于1和2结束日期
+function setDatePicker(picker1,picker2,mode,startDateDefault,endDateDefault){
+  $.datepicker.regional['zh-CN'] = {
+    clearText: '清除',
+    clearStatus: '清除已选e799bee5baa6e59b9ee7ad9431333361303131日期',
+    closeText: '关闭',
+    closeStatus: '不改变当前选择',
+    prevText: '<上月',
+    prevStatus: '显示上月',
+    prevBigText: '<<',
+    prevBigStatus: '显示上一年',
+    nextText: '下月>',
+    nextStatus: '显示下月',
+    nextBigText: '>>',
+    nextBigStatus: '显示下一年',
+    currentText: '今天',
+    currentStatus: '显示本月',
+    monthNames: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    yearNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthStatus: '选择月份',
+    yearStatus: '选择年份',
+    weekHeader: '周',
+    weekStatus: '年内周次',
+    dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+    dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+    dayNamesMin: ['日','一','二','三','四','五','六'],
+    dayStatus: '设置 DD 为一周起始',
+    dateStatus: '选择 m月 d日, DD',
+    dateFormat: 'yy-mm-dd',
+    firstDay: 1,
+    initStatus: '请选择日期',
+    isRTL: false};
+    $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
+    let startDate = "", endDate=new Date()
+   
+    let year = new Date().getFullYear()
+    let month = new Date().getMonth() + 1
+    if(mode == '1'){
+        startDate = new Date(`${year}-${month}-01`)
+    }else if(mode == '2'){
+        startDate = new Date(`${year}-01-01`)
+    } else {
+        startDate = startDateDefault || new Date()
+        endDate = endDateDefault || new Date()
+    }
+    if(picker1){
+      picker1.datepicker({
+        yearRange: "2015:"+year,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", startDate);
+    }
+    if(picker2){
+      picker2.datepicker({
+        yearRange: "2015:"+year,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+      }).datepicker( "setDate",endDate); 
+    }
+    
+}
+
+  //mode=1获取开始时间，mode=1获取结束时间
+function getPickerDate(picker,mode){
+  if(!picker){
+    return
+  }
+  let date = picker.val().trim()
+  if(mode == 1){
+    return date.replace(/\//g,'-') + ' 00:00:00'
+  }else if(mode == 2){
+    return date.replace(/\//g,'-') + ' 23:59:59'
+  }
+}
 module.exports = {
   pageMap,
   post,
@@ -312,5 +390,7 @@ module.exports = {
   picEmptyData,
   setTitleTxt,
   downloadExportedData,
-  expJson
+  expJson,
+  setDatePicker,
+  getPickerDate
 };