Merge remote-tracking branch 'origin/qc_zn' into test

# Conflicts:
#	src/css/itemManager.less
#	src/css/qcListDept.less
#	src/css/qcListPerson.less

src/css/itemManager.less

@@ -15,7 +15,7 @@
         .h2;
     }
     .main-body{
-        margin: 20px 40px;
+        margin: 10px 40px;
     }
     table{
         width: 100%;
@@ -26,9 +26,9 @@
            
         }
         th,td{
-            height: 40px;
+            height: 32px;
             box-sizing: border-box;
-            padding: 10px;
+            padding:0 10px;
             border:1px solid #E2E5EF;
             border-collapse: collapse;
         }
@@ -51,9 +51,8 @@
     .filterItem{
         position: relative;
         display: inline-block;
-        margin-right: 20px;
-        height: 40px;
-        line-height: 40px;
+        height: 32px;
+        line-height: 32px;
         margin: 0 20px 20px 0;
     }
     .filterDropList{
@@ -92,18 +91,17 @@
         display: inline-block;
         position: relative;
         width:140px;
-        padding: 0 10px;
-        height:40px;
+        height:32px;
         border-radius:4px;
         border: 1px solid #E2E5EF;
         box-sizing: border-box;
         cursor: pointer;
-        padding-right: 26px;
+        padding:0 26px 0 10px;
     }
     .arrow{
         position: absolute;
         width: 10px;
-        top: 16px;
+        top: 12px;
         right: 10px;
     }
     .moduleItemInp{
@@ -133,16 +131,20 @@
     .filter{
         display: inline-block;
         width:60px;
-        height:36px;
+        height:32px;
         background:@activeColor;
+        background:#5A8EEE;
         border-radius:4px;
         color: #fff;
         text-align: center;
-        line-height: 36px;
+        line-height: 32px;
         position: relative;
-        top: -1px;
+        top: 0px;
         cursor: pointer;
     }
+    .filterclear{
+        top:0px;
+    }
     .editItem{
        color: @activeColor;
        cursor: pointer;

src/css/moduleManager.less

@@ -6,10 +6,10 @@ h2{
     .h2;
 }
 .main-body{
-    margin: 20px 40px;
+    margin: 10px 40px;
 }
 .totalSumBox{
-    margin: 0 0 20px 0;
+    margin: 0 0 10px 0;
     text-align: right;
     padding: 0 20px 0 0;
     .totalSum{
@@ -26,7 +26,7 @@ table{
        
     }
     th,td{
-        height: 40px;
+        height: 32px;
         box-sizing: border-box;
         padding: 0 20px;
         border:1px solid #E2E5EF;

src/css/qcList.less

@@ -11,7 +11,7 @@ h2{
     .h2
 }
 .main-body{
-    margin: 20px 0;
+    margin: 10px 0;
     padding: 0 35px;
     min-width: 1090px;
     /*width: 100%;*/

src/css/qcListDept.less

@@ -1,5 +1,4 @@
-@import './reset.less';
-
+@import "./reset.less";
 .container{
     width: 100%;
     height: 100%;
@@ -9,20 +8,10 @@ ul,li{
     list-style: none;
 }
 h2{
-    width: 100%;
-    box-sizing: border-box;
-    background-color: #fff;
-    z-index: 20;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 15px;
-    border-bottom: 1px solid #E2E5EF;
-    font-size: 16px;
-    font-weight: bold   ;
-    letter-spacing: 1px;
+    .h2;
 }
 .main-body{
-    margin: 20px 0;
+    margin: 10px 0;
     padding: 0 35px;
     min-width: 1090px;
     /*width: 100%;*/
@@ -37,9 +26,8 @@ table{
        
     }
     th,td{
-        height: 40px;
         box-sizing: border-box;
-        padding: 10px;
+        padding:6px 10px;
         border:1px solid #E2E5EF;
         border-collapse: collapse;
     }
@@ -112,24 +100,24 @@ table{
     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 5px 0;
     span{
         display: inline-block;
-        line-height: 40px;
+        line-height: 32px;
         position: relative;
     }
     input{
         width:120px;
-        height:40px;
+        height:32px;
         border-radius:4px;
         border: 1px solid #E2E5EF;
         outline: none;
@@ -178,7 +166,7 @@ table{
     position: relative;
     width:120px;
     padding: 0 10px;
-    height:40px;
+    height:32px;
     border-radius:4px;
     border: 1px solid #E2E5EF;
     box-sizing: border-box;
@@ -191,12 +179,13 @@ table{
 .filter,.reset{
     display: inline-block;
     width:60px;
-    height:36px;
+    height:32px;
     background:@activeColor;
+    background:#5A8EEE;
     border-radius:4px;
     color: #fff;
     text-align: center;
-    line-height: 36px;
+    line-height: 32px;
     position: relative;
     top: 2px;
     cursor: pointer;
@@ -206,7 +195,7 @@ table{
 .arrow{
     position: absolute;
     width: 10px;
-    top: 16px;
+    top: 12px;
     right: 10px;
 }
 .iconCheck{
@@ -233,7 +222,7 @@ table{
     position: relative;
     display: inline-block;
     width: 120px;
-    height: 40px;
+    height: 32px;
     input{
         position: absolute;
     }
@@ -241,7 +230,7 @@ table{
 .iconCalen{
     position: absolute;
     width: 15px;
-    top: 12px;
+    top: 8px;
     right: 10px;
 }
 .textCenter{

src/css/qcListPerson.less

@@ -1,5 +1,4 @@
-@import './reset.less';
-
+@import "./reset.less";
 .container{
     width: 100%;
     height: 100%;
@@ -9,20 +8,10 @@ ul,li{
     list-style: none;
 }
 h2{
-    width: 100%;
-    box-sizing: border-box;
-    background-color: #fff;
-    z-index: 20;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 15px;
-    border-bottom: 1px solid #E2E5EF;
-    font-size: 16px;
-    font-weight: bold   ;
-    letter-spacing: 1px;
+    .h2;
 }
 .main-body{
-    margin: 20px 0;
+    margin: 10px 0;
     padding: 0 35px;
     min-width: 1090px;
     /*width: 100%;*/
@@ -37,9 +26,8 @@ table{
        
     }
     th,td{
-        height: 40px;
         box-sizing: border-box;
-        padding: 10px;
+        padding:6px 10px;
         border:1px solid #E2E5EF;
         border-collapse: collapse;
     }
@@ -112,24 +100,24 @@ table{
     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 5px 0;
     span{
         display: inline-block;
-        line-height: 40px;
+        line-height: 32px;
         position: relative;
     }
     input{
         width:120px;
-        height:40px;
+        height:32px;
         border-radius:4px;
         border: 1px solid #E2E5EF;
         outline: none;
@@ -177,7 +165,7 @@ table{
     position: relative;
     width:120px;
     padding: 0 10px;
-    height:40px;
+    height:32px;
     border-radius:4px;
     border: 1px solid #E2E5EF;
     box-sizing: border-box;
@@ -203,12 +191,13 @@ table{
 .filter,.reset{
     display: inline-block;
     width:60px;
-    height:36px;
+    height:32px;
     background:@activeColor;
+    background:#5A8EEE;
     border-radius:4px;
     color: #fff;
     text-align: center;
-    line-height: 36px;
+    line-height: 32px;
     position: relative;
     top: 2px;
     cursor: pointer;
@@ -218,7 +207,7 @@ table{
 .arrow{
     position: absolute;
     width: 10px;
-    top: 16px;
+    top: 12px;
     right: 10px;
 }
 .iconCheck{
@@ -253,7 +242,7 @@ table{
 .iconCalen{
     position: absolute;
     width: 15px;
-    top: 12px;
+    top: 8px;
     right: 10px;
 }
 .textCenter{

src/css/reset.less

@@ -399,15 +399,15 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
   .filterclear{
       display: inline-block;
       width:60px;
-      height:34px;
+      height:30px;
       background:#fff;
       border-radius:4px;
       color: #777;
       border: 1px solid #777;
       text-align: center;
-      line-height: 34px;
+      line-height: 30px;
       position: relative;
-      top: -1px;
+      top: 2px;
       cursor: pointer;
       margin-left: 5px;
   }

src/js/utils.js

@@ -169,7 +169,7 @@ $(".modal .close").click(function(){
 //计算容器高度
 function setBoxHeight(){
   const ht=window.innerHeight;
-  //$(".main-part").height((ht-60)+'px');
+  $(".content-box").height((ht-75)+'px');
   $(".content-ht").height((ht-126)+"px");
 }
 setBoxHeight();