Merge branch 'byll' into version1.3.3

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,159 @@ 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;
+    }
+    .iconCalen{
+        position: absolute;
+        width: 15px;
+        top: 10px !important;
+        right: 20px;
+    }
+}
+.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;
@@ -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/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

@@ -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/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/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" /><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" /><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/deptScoreDetailControl.html

@@ -21,7 +21,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
@@ -37,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" /></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></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

@@ -21,7 +21,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">

src/html/partDetail.html

@@ -34,6 +34,12 @@
                         
                     </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" /></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></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" /></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></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/qcList.html

@@ -59,16 +59,33 @@
                         <input class="doctorInp" type="text" placeholder="请输入医生姓名">
                     </span>
                     <span class="filterItem doctorFilter">
-                        <span>医生工号：</span>
-                        <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
-                    </span>
+                    <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>
             <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 +94,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 +104,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

@@ -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/qcListPerson.html

@@ -65,7 +65,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>
@@ -74,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>
@@ -82,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

@@ -89,6 +89,7 @@
                              <td></td>
                              <td></td>
                              <td></td>
+                             <td></td>
                          </tr>
                          {{/if}}
                      </table>

src/html/quexianDetailControl.html

@@ -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" /></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>

src/html/quexianDetailControlHome.html

@@ -41,6 +41,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" /></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>
+                </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
             </div>
@@ -52,7 +58,7 @@
                     <th class="moduleItemName textCenter">数量</th>
                     <th class="moduleScore" style="width: 80px;">缺陷占比</th>
                 </thead>
-                <tbody>
+                <tbody class="tbodys">
     
                 </tbody>
             </table>

src/html/singleVeto.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">

src/js/console.js

@@ -1,4 +1,5 @@
 const $ = require('jquery');
+
 require("../css/reset.less")
 require("../css/console.less")
 require("../images/logo.png")
@@ -7,8 +8,11 @@ require("../images/arrow_down.png")
 // 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 +25,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 +95,18 @@ $(function(){
             deptType="外科"
             getAverageScoreLis()
             $(this).parent().slideToggle().prev().find("span").html(str+"系统")
+        }else if(type == 7){//病案首页
+            lineType="合格率"
+            lineChartHome(lineType4,lineType1)
+            $(this).parent().slideToggle().prev().find("span").html(str)
+        }else if(type == 8){//病案首页
+            lineType = "完整率"
+            lineChartHome(lineType4,lineType2)
+            $(this).parent().slideToggle().prev().find("span").html(str)
+        }else if(type == 9){//病案首页
+            lineType = "完善率"
+            lineChartHome(lineType4,lineType3)
+            $(this).parent().slideToggle().prev().find("span").html(str)
         }
     })
     $(".part02").on("mouseenter",".bingli li.sec",function(){
@@ -100,7 +116,6 @@ $(function(){
       $(this).find(".explainNum").css("color","#A5ADBF")
     })
     getDetails()
-    getAverageScoreLis()
     getEveryDeptLevel()
 })
 function getDetails(){
@@ -130,9 +145,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){
@@ -182,9 +196,7 @@ function resizeBox(){
                 backgroundColor:'#203463'
             })
             dateType = 1
-            getBarData(1)
-            getAverageScoreLis()
-            getEveryDeptLevel()
+            dateConsole(1)
         })
         $(".monthYear .year").click(function(){
             $(this).css({
@@ -197,11 +209,11 @@ function resizeBox(){
                 backgroundColor:'#203463'
             })
             dateType = 2
-            getBarData(2)
-            getAverageScoreLis()
-            getEveryDeptLevel()
+            dateConsole(2)
         })
     }
+
+
 //控制台数
 function initConsole(result){
     let url = {
@@ -253,7 +265,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 +283,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){
@@ -357,25 +373,34 @@ function getBarData(type){
     // }
     if(hasData("FUNC000075")){
         post(api.homePageLevelLimit,{//病案首页
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
                 let result1 = data.data||[]
-                let dataX1=[],dataY1=[],dataY2=[],dataY3=[]
+                let dataX=[],dataY1=[],dataY2=[],dataY3=[]
                 for(let i = 0;i < result1.length;i++){
-                    dataX1.push(result1[i].deptName)
+                    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))
                 }
-                lineChartHome(dataX1,dataY1,dataY2,dataY3)
+                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 == "合格率")?lineType1:(lineType=="完整率"?lineType2:lineType3)
+                lineChartHome(dataX,datay)
             }
         })
     }
     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 +413,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 +426,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 +440,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 +475,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 +823,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 +838,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 +857,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 +921,7 @@ function lineChartHome(dataX,dataY1,dataY2,dataY3){
         yAxis: {
             type: 'value',
             min:0,
+            max:100,
             boundaryGap: [0.01, 0.01],axisLabel: {  
                 show: true,  
                 },  
@@ -915,23 +947,23 @@ function lineChartHome(dataX,dataY1,dataY2,dataY3){
         },
         series: [
             {
-                name: '合格率',
+                name: lineType,
                 type: 'line',
                 // stack: '总量',
-                data: dataY1
-            },
-            {
-                name: '完整率',
-                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); 
@@ -1660,4 +1692,102 @@ 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(){
+    getStaticDate()
+    getAverageScoreLis()
+    getBarData(dateType)
+    getEveryDeptLevel()
+})
+//日期联动
+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)
+    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
+    }
+    if(behosDateStart){
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+    }
+    if(behosDateEnd){
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+    }
+}
+$(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

@@ -21,9 +21,9 @@ $(function(){
         $(".circleBLis").css("display","block")
     }
     $(".partTitle p span").html(hospital)
-    setInterval(() => {
-        getTimeDetail()
-    }, 1000);
+    // setInterval(() => {
+    //     getTimeDetail()
+    // }, 1000);
     // resizeBox()
     initConsole()//质控列表
     getOwnDept()

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,11 @@ 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 +62,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 +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(){
@@ -99,6 +92,7 @@ function dateChange(){
         $(".dayDetail .deptListWrap").css("display","none")
         $(".dayDetail .dayFilter").css("display","block")
         statisticsType = 2
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
         getTabData(1)
     })
 }
@@ -116,12 +110,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 +492,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 +561,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({
@@ -244,3 +247,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/partDetail.js

@@ -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")
@@ -150,8 +150,8 @@ function dateChange(){
 }
 function getTabData(activePage){
     const param = {
-        "asc": "",
-        "desc": "",
+        "asc": data_asc,
+        "desc": data_desc,
         "deptName": deptId||"",
         "name": behospitalCode||"",
         "type": statisticsType||2, //1-本月，2-本年
@@ -431,14 +431,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/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/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
 };