Merge branch 'scrollBar' into test

src/js/console.js

@@ -1746,11 +1746,11 @@ function dateConsole(dateType,flg){
         startDate = new Date(getCookie("behosDateStart"))
         endDate = new Date(getCookie("behosDateEnd"))
         ownSelectDate = 3
-        $(".monthYear .year").css({
-            "border-color":'#A5ADBF',
-            color:'#A5ADBF',
-            backgroundColor:'#203463'
-        })
+        // $(".monthYear .year").css({
+        //     "border-color":'#A5ADBF',
+        //     color:'#A5ADBF',
+        //     backgroundColor:'#203463'
+        // })
         $(".monthYear .mon").css({
             "border-color":'#A5ADBF',
             color:'#A5ADBF',

src/js/deptConsole.js

@@ -857,11 +857,11 @@ function dateConsole(dateType,flg){
         ownSelectDate = 3
         startDate = new Date(getCookie("behosDateStart"))
         endDate = new Date(getCookie("behosDateEnd"))
-        $(".monthYear .year").css({
-            "border-color":'#A5ADBF',
-            color:'#A5ADBF',
-            backgroundColor:'#203463'
-        })
+        // $(".monthYear .year").css({
+        //     "border-color":'#A5ADBF',
+        //     color:'#A5ADBF',
+        //     backgroundColor:'#203463'
+        // })
         $(".monthYear .mon").css({
             "border-color":'#A5ADBF',
             color:'#A5ADBF',

src/js/keyItemFlawControl.js

@@ -86,8 +86,8 @@ function getTabData(activePage){
     "asc":data_asc,     //升序
     "desc":data_desc,       //降序
     //"type": 0, //1-本月，2-本年,0-自定义时间（现在所有都是自定义时间，都会传开始日期和结束日期）
-    "startDate":dateStatrt,
-    "endDate":dateEnd
+    "startDate":dateStatrt.replace(/\//g,'-'),
+    "endDate":dateEnd.replace(/\//g,'-')
   }
   startDateParam = dateStatrt
   endDateParam = dateEnd

src/js/qcListCopy.js

@@ -118,8 +118,8 @@ function getTabData(activePage){
         behDeptName: deptName == "全部" ? "":deptName,
         ascs:data_asc,     //升序
         descs:data_desc,       //降序
-        startDate: behosDateStart, //出院日期--开始时间
-        endDate: behosDateEnd, //出院日期--结束时间
+        startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
+        endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
         casesEntryName: casesEntryName,
         casesEntryId:casesId,
         size: 15,
@@ -160,10 +160,10 @@ $(".filter").on("click", function(e){
         return
     }
     if(behosDateStart){
-        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+        behosDateStart = behosDateStart + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+        behosDateEnd = behosDateEnd + ' 23:59:59'
     }
 
     name = nameTemp
@@ -238,10 +238,10 @@ $(".abnormalClear").on("click", function(e){
     behosDateStart = $("#datepicker").val().trim()
     behosDateEnd = $("#datepicker2").val().trim()
     if(behosDateStart){
-        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+        behosDateStart = behosDateStart + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+        behosDateEnd = behosDateEnd + ' 23:59:59'
     }
    
     getTabData(1)
@@ -919,8 +919,8 @@ $(function($){
             behDeptName: deptName,
             ascs:data_asc,     //升序
             descs:data_desc,       //降序
-            startDate: behosDateStart, //出院日期--开始时间
-            endDate: behosDateEnd, //出院日期--结束时间
+            startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
+            endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
             casesEntryName: casesEntryName,
             casesEntryId:casesId,
             isReject: isSingleReject,

src/js/utils.js

@@ -380,9 +380,11 @@ function getPickerDate(picker,mode){
   }
   let date = picker.val()
   if(mode == 1){
-    return date.replace(/\//g,'-') + ' 00:00:00'
+    return date + ' 00:00:00'
+    // return date.replace(/\//g,'-') + ' 00:00:00'
   }else if(mode == 2){
-    return date.replace(/\//g,'-') + ' 23:59:59'
+    return date + ' 23:59:59'
+    // return date.replace(/\//g,'-') + ' 23:59:59'
   }
 }
 function isMac(){