Merge branch 'test' into byll

src/css/abnormal.less

@@ -113,16 +113,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .filterBox{
+    /*.filterBox{
         margin-bottom: 15px;
-    }
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         float: left;
         height: 40px;
         line-height: 40px;
-        margin: 0 20px 15px 0;
+        margin: 0 20px 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/assertType.less

@@ -115,16 +115,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .filterBox{
+    /*.filterBox{
         margin-bottom: 15px;
-    }
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         float: left;
         height: 40px;
         line-height: 40px;
-        margin: 0 20px 15px 0;
+        margin: 0 20px 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/common.less

@@ -15,7 +15,7 @@ input:disabled {
 .main-body-com{
     background: #fff;
     margin: 0;
-    padding: 20px 25px 0;
+    padding: 20px 25px;
     border:10px @disColor solid;
 }
 

src/css/dayDetail.less

@@ -113,16 +113,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .filterBox{
+    /*.filterBox{
         margin-bottom: 15px;
-    }
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         float: left;
         height: 40px;
         line-height: 40px;
-        margin: 0 20px 15px 0;
+        margin: 0 20px 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/deptScoreDetail.less

@@ -112,16 +112,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .filterBox{
+    /*.filterBox{
         margin-bottom: 15px;
-    }
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         float: left;
         height: 40px;
         line-height: 40px;
-        margin: 0 20px 15px 0;
+        margin: 0 20px 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/deptScoreDetailControl.less

@@ -115,16 +115,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .filterBox{
+    /*.filterBox{
         margin-bottom: 15px;
-    }
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         float: left;
         height: 40px;
         line-height: 40px;
-        margin: 0 20px 15px 0;
+        margin: 0 20px 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/index.less

@@ -236,9 +236,11 @@
       background: @themeColor;
       border-top: 1px @themeBorderClr solid;
       border-right: 1px rgba(74, 93, 142, 0.5) solid;
+      box-sizing: border-box;
       p{
         font-size:12px;
         color: @trdColor;
+        white-space: nowrap;
       }
     }
   }
@@ -248,6 +250,8 @@
     height: 100%;
     background: @themeColor;
     position: relative;
+    border-right: 1px @themeBorderClr solid;
+    box-sizing: border-box;
     .logo{
       height: 50px;
       line-height: 50px;

src/css/itemManager.less

@@ -25,15 +25,15 @@
         }
         
     }
-    .filterBox{
+    /*.filterBox{
         margin-bottom:20px;
-    }
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         height: 32px;
         line-height: 32px;
-        margin: 0 20px 10px 0;
+        margin: 0 20px 20px 0;
     }
     .filterDropList{
         position: absolute;

src/css/jiaji.less

@@ -116,16 +116,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .filterBox{
+    /*.filterBox{
         margin-bottom: 15px;
-    }
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         float: left;
         height: 40px;
         line-height: 40px;
-        margin: 0 20px 15px 0;
+        margin: 0 20px 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/partDetail.less

@@ -97,16 +97,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .filterBox{
+    /*.filterBox{
         margin-bottom: 15px;
-    }
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         float: left;
         height: 40px;
         line-height: 40px;
-        margin: 0 20px 15px 0;
+        margin: 0 20px 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/partDetailControl.less

@@ -97,16 +97,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .filterBox{
-        margin-bottom: 15px;
-    }
+    /*.filterBox{
+        margin-bottom: 10px;
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         float: left;
         height: 40px;
         line-height: 40px;
-        margin: 0 20px 15px 0;
+        margin: 0 20px 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/payDetail.less

@@ -116,16 +116,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .filterBox{
+    /*.filterBox{
         margin-bottom: 15px;
-    }
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         float: left;
         height: 40px;
         line-height: 40px;
-        margin: 0 20px 15px 0;
+        margin: 0 20px 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/qcList.less

@@ -3,19 +3,23 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background: @disColor;
+    background: #fff;
 }
 ul,li{
     list-style: none;
 }
 h2{
     .h2;
+    border-bottom: 10px @disColor solid;
     position: absolute;
 }
 .main-body{
     .main-body-com;
+    border: none;
+    border-left:10px @disColor solid;
     margin: 44px 0 0;
     min-width: 1090px;
+    min-height: calc(100% - 84px);
     // overflow: auto;
 }
 table{
@@ -98,13 +102,17 @@ table{
     position: relative;
 }
 .overAuto{
-    overflow: auto;
+    display: table;
+    padding-right: 20px;
+}
+.toggle-item{
+    display: none;
 }
 .filter-toggler{
     position: absolute;
     left: 960px;
     top: 8px;
-    color: #aaa;
+    color: #777;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcListDept.less

@@ -3,19 +3,23 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background: @disColor;
+    background: #fff;
 }
 ul,li{
     list-style: none;
 }
 h2{
     .h2;
+    border-bottom: 10px @disColor solid;
     position: absolute;
 }
 .main-body{
     .main-body-com;
+    border: none;
+    border-left:10px @disColor solid;
     margin: 44px 0 0;
     min-width: 1090px;
+    min-height: calc(100% - 84px);
     /*width: 100%;*/
 }
 table{
@@ -96,13 +100,17 @@ table{
     position: relative;
 }
 .overAuto{
-    overflow: auto;
+    display: table;
+    padding-right: 20px;
+}
+.toggle-item{
+    display: none;
 }
 .filter-toggler{
     position: absolute;
     left: 960px;
     top: 8px;
-    color: #aaa;
+    color: #777;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcListPerson.less

@@ -3,19 +3,23 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background: @disColor;
+    background: #fff;
 }
 ul,li{
     list-style: none;
 }
 h2{
     .h2;
+    border-bottom: 10px @disColor solid;
     position: absolute;
 }
 .main-body{
     .main-body-com;
+    border: none;
+    border-left:10px @disColor solid;
     margin: 44px 0 0;
     min-width: 1090px;
+    min-height: calc(100% - 84px);
     /*width: 100%;*/
 }
 table{
@@ -101,13 +105,17 @@ table{
     position: relative;
 }
 .overAuto{
-    overflow: auto;
+    display: table;
+    padding-right: 20px;
+}
+.toggle-item{
+    display: none;
 }
 .filter-toggler{
     position: absolute;
     left: 960px;
     top: 8px;
-    color: #aaa;
+    color: #777;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcScore.less

@@ -163,6 +163,7 @@
     p{
       font-size:12px;
       color: @trdColor;
+      white-space: nowrap;
     }
   }
 }
@@ -426,7 +427,7 @@
     }
   }
   .operation{
-    width:calc(22% - 11px);
+    width:calc(22% - 12px);
     height: 100%;
     margin-right: 10px;
     position: relative;

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">

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/qcList.html

@@ -35,7 +35,7 @@
                     <span class="export">导出</span>
                     <span class="filterclear abnormalClear filterclearT">重置</span>
                 </div>
-                <a href="javascript:void(0);" class="filter-toggler" id="filterToggler">收起筛选</a>
+                <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">展开筛选</a>
                 <div class="toggle-item clearfix">
                     <span class="filterItem doctorFilter">
                     <span>医生姓名：</span>
@@ -118,7 +118,7 @@
 
             <div class="pagination"></div>
         </div>
-        
+
     </div>
 </body>
 

src/html/qcListDept.html

@@ -35,7 +35,7 @@
                     <span class="export">导出</span>
                     <span class="filterclear abnormalClear filterclearT">重置</span>
                 </div>
-                <a href="javascript:void(0);" class="filter-toggler" id="filterToggler">收起筛选</a>
+                <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">展开筛选</a>
                 <div class="toggle-item clearfix">
                     <span class="filterItem typeFilter">
                         <span>医生姓名：</span>

src/html/qcListPerson.html

@@ -34,7 +34,7 @@
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear filterclearT">重置</span>
             </div>
-            <a href="javascript:void(0);" class="filter-toggler" id="filterToggler">收起筛选</a>
+            <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">展开筛选</a>
             <div class="toggle-item clearfix">
                 <span class="filterItem doctorFilter">
                     <span>医生：</span>

src/html/qcScore.html

@@ -52,6 +52,7 @@
                          <tr>
                              <th>出院诊断</th>
                              <th>疾病编码</th>
+                             <th>入院病情</th>
                              <th>出院病情</th>
                          </tr>
                          {{each(i,v) data}}
@@ -60,6 +61,7 @@
                              <td>${诊断名称}</td>
                              <td>${诊断编码}</td>
                              <td>${入院情况}</td>
+                             <td>${出院情况}</td>
                          </tr>
                          {{/if}}
                          {{/each}}
@@ -70,6 +72,7 @@
                          <tr>
                              <th>出院诊断</th>
                              <th>疾病编码</th>
+                             <th>入院病情</th>
                              <th>出院病情</th>
                          </tr>
                          {{each(i,v) data}}
@@ -78,6 +81,7 @@
                              <td>${诊断名称}</td>
                              <td>${诊断编码}</td>
                              <td>${入院情况}</td>
+                             <td>${出院情况}</td>
                          </tr>
                          {{/if}}
                          {{/each}}
@@ -86,12 +90,15 @@
                              <td></td>
                              <td></td>
                              <td></td>
+                             <td></td>
                          </tr>
                          {{/if}}
                      </table>
                  </td>
              </tr>
-             <tr><td colspan="2" class="table-tip">出院病情：1、"治愈"  2、"好转"  3、"未愈"  4、"死亡"  9、"其它"</td></tr>
+<!--
+             <tr><td colspan="2" class="table-tip">入院病情：1、"有" 2、"临床未确定" 3、"情况不明" 4、"无"<br/>出院病情：1、"治愈"  2、"好转"  3、"未愈"  4、"死亡"  9、"其它"</td></tr>
+-->
          </table>
          {{else}}
              <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/index.js

@@ -83,8 +83,7 @@ function initMenu(data,userInfo){
   });
 //收起菜单
   $(".slide-hide").click(function(){
-
-    $(".menu").animate({"width":"60px"},function(){
+    $(".menu,.copy-right").animate({"width":"60px"},function(){
       $(this).hide();
       $(".menu-mini").show();
     });
@@ -93,7 +92,7 @@ function initMenu(data,userInfo){
   //展开菜单
   $(".slide-show").click(function(){
     $(".menu-mini").hide();
-    $(".menu").show().animate({"width":"205px"},function(){
+    $(".menu,.copy-right").show().animate({"width":"205px"},function(){
     });
     $(".main").animate({"margin-left":"205px"});
   });

src/js/qcScore.js

@@ -36,7 +36,7 @@ function initMenu(data){
   });
 //收起菜单
   $(".slide-show").click(function(){
-    $(".sub-menu").animate({"width":"60px"},function(){
+    $(".sub-menu,.copy-right").animate({"width":"60px"},function(){
       $(this).hide();
       $(".menu-mini").show();
     });
@@ -45,7 +45,7 @@ function initMenu(data){
   //展开菜单
   $(".slide-hide").click(function(){
     $(".menu-mini").hide();
-    $(".sub-menu").show().animate({"width":"220px"},function(){
+    $(".sub-menu,.copy-right").show().animate({"width":"220px"},function(){
     });
     $(".tab-container").animate({"margin-left":"220px"});
   });