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

src/css/dayDetail.less

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

src/css/deptScoreDetail.less

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

src/css/deptScoreDetailControl.less

@@ -37,9 +37,9 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 0;
-        padding: 0 35px;
+        padding: 20px 35px 50px 35px;
         min-width: 1090px;
+        box-sizing: border-box;
         /*width: 100%;*/
     }
     table{

src/css/index.less

@@ -279,6 +279,8 @@
   .main{
     margin-left:@menuWt;
     height: 100%;
+    overflow-x: auto;
+    overflow-y: hidden;
     /*border: 10px solid #f5f5f5;*/
     iframe {
       width: 100%;

src/css/itemManager.less

@@ -16,6 +16,7 @@
     }
     .main-body{
         margin: 10px 40px;
+        padding-bottom: 50px;
     }
     table{
         width: 100%;

src/css/jiaji.less

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

src/css/moduleManager.less

@@ -7,6 +7,7 @@ h2{
 }
 .main-body{
     margin: 10px 40px;
+    padding-bottom: 40px;
 }
 .totalSumBox{
     margin: 0 0 10px 0;

src/css/mukuai.less

@@ -89,6 +89,7 @@
     }
     .main-body {
         margin: 20px 40px;
+        padding-bottom: 40px;
     }
     table{
         width: 100%;

src/css/partDetail.less

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

src/css/partDetailControl.less

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

src/css/payDetail.less

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

src/css/qcList.less

@@ -12,9 +12,9 @@ h2{
 }
 .main-body{
     margin: 10px 0;
-    padding: 0 35px;
     min-width: 1090px;
-    /*width: 100%;*/
+    padding: 0 35px 50px 35px;
+    overflow: auto;
 }
 table{
     width: 100%;

src/css/qcListDept.less

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

src/css/qcListPerson.less

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

src/css/quexianDetail.less

@@ -91,6 +91,7 @@
     }
     .main-body{
         margin: 20px 40px;
+        padding-bottom: 50px;
     }
     table{
         width: 100%;

src/css/quexianDetailControl.less

@@ -91,6 +91,7 @@
     }
     .main-body{
         margin: 20px 40px;
+        padding-bottom: 50px;
     }
     table{
         width: 100%;

src/css/quexianXQ.less

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

src/css/tiaomu.less

@@ -91,6 +91,7 @@
     }
     .main-body{
         margin: 20px 40px;
+        padding-bottom: 50px;
     }
     table{
         width: 100%;

src/html/qcList.html

@@ -60,7 +60,7 @@
                 <!-- <span class="reset">重置</span> -->
                 <span class="filterclear abnormalClear filterclearT">重置</span>
             </div>
-            <div>
+            <div class="overAuto">
                 <table>
                     <thead>
                     <tr>

src/js/index.js

@@ -11,9 +11,9 @@ $(function(){
   getOwnDept();
   //菜单展开收起
   sureChangeWord()
-  $(".main").css({
-    height:$(window).height()+'px'
-  })
+  // $(".main").css({
+  //   height:$(window).height()+'px'
+  // })
   $("body").on('focus',".modalAction input",function(){
     $(this).attr("type","password")
   })

src/js/itemManager.js

@@ -19,6 +19,7 @@ $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".abnormalClear").click(function(){
     window.location.reload()
 })
+
 //判断有无某一权限
 function hasData(data){
     let lis = JSON.parse(getCookie("codeLis"))||[]

src/js/jiaji.js

@@ -23,6 +23,7 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
 $(".abnormalClear").click(function(){
     window.location.reload()
 })
+
 $(".partTitle a").click(function(){
     //初始菜单选中
     $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");

src/js/tiaomu.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -38,9 +38,11 @@ bindDeptSelect()
 //科室选择
 function bindDeptSelect(){
     $(document).on("click",'.deptItem',function(){
+        console.log(isReject,'opopopo')
         const deptItemName = $(this).attr("data-name")
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId
+        deptId =deptItemId
         if(deptItemName.length > 10){
             $('.selectDept').html(deptItemName.substring(0,8)+'...')
         }else{