Merge remote-tracking branch 'origin/test' into version1.3.3

# Conflicts:
#	src/html/qcScore.html

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

@@ -33,6 +33,6 @@ 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

@@ -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/partDetailControl.less

@@ -115,16 +115,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,7 +102,8 @@ table{
     position: relative;
 }
 .overAuto{
-    overflow: auto;
+    display: table;
+    padding-right: 20px;
 }
 .toggle-item{
     display: none;
@@ -107,7 +112,7 @@ table{
     position: absolute;
     left: 1008px;
     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,7 +100,8 @@ table{
     position: relative;
 }
 .overAuto{
-    overflow: auto;
+    display: table;
+    padding-right: 20px;
 }
 .toggle-item{
     display: none;
@@ -105,7 +110,7 @@ table{
     position: absolute;
     left: 1008px;
     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,7 +105,8 @@ table{
     position: relative;
 }
 .overAuto{
-    overflow: auto;
+    display: table;
+    padding-right: 20px;
 }
 .toggle-item{
     display: none;
@@ -110,7 +115,7 @@ table{
     position: absolute;
     left: 1008px;
     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

@@ -164,6 +164,7 @@
     p{
       font-size:12px;
       color: @trdColor;
+      white-space: nowrap;
     }
   }
 }

src/html/qcList.html

@@ -117,7 +117,7 @@
 
             <div class="pagination"></div>
         </div>
-        
+
     </div>
 </body>
 

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}}
@@ -79,7 +81,6 @@
                              <td>${诊断名称}</td>
                              <td>${诊断编码}</td>
                              <td>${入院情况}</td>
-                             <td>${出院情况}</td>
                          </tr>
                          {{/if}}
                          {{/each}}
@@ -93,7 +94,9 @@
                      </table>
                  </td>
              </tr>
-             <tr><td colspan="2" class="table-tip">出院病情：1、"治愈"  2、"好转"  3、"未愈"  4、"死亡"  9、"其它"<br/>入院病情：1、"有" 2、"临床未确定" 3、"情况不明" 4、"无"</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/js/index.js

@@ -80,8 +80,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();
     });
@@ -90,7 +89,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"});
   });