Selaa lähdekoodia

Revert "修改日期格式"

This reverts commit 2ced148ac1192a0a3902c9e0a604318bf8345b40.
zhangxc 5 vuotta sitten
vanhempi
commit
edb2c7520d

+ 2 - 2
src/js/console.js

@@ -1789,10 +1789,10 @@ function getStaticDate(flg){
         setCookieAction(behosDateStart,behosDateEnd)
     }
     if(behosDateStart){
-        behosDateStart = behosDateStart + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
     getBarData(dateType)
     getHomeData('firstLevelPercent')

+ 2 - 2
src/js/deptConsole.js

@@ -904,10 +904,10 @@ function getStaticDate(flg){
         setCookieAction(behosDateStart,behosDateEnd)
     }
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
     
     getBarData(dateType)

+ 4 - 4
src/js/itemDefectDetail.js

@@ -150,10 +150,10 @@ $(".filter").on("click", function(e){
         return
     }
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
     // console.log('deptNameTemp',deptNameTemp,deptName)
     name = nameTemp
@@ -213,10 +213,10 @@ $(".abnormalClear").on("click", function(e){
     behosDateStart = $("#datepicker").val().trim()
     behosDateEnd = $("#datepicker2").val().trim()
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
    
     getTabData(1)

+ 4 - 4
src/js/qcList.js

@@ -135,10 +135,10 @@ $(".filter").on("click", function(e){
         return
     }
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
 
     name = nameTemp
@@ -197,10 +197,10 @@ $(".abnormalClear").on("click", function(e){
     behosDateStart = $("#datepicker").val().trim()
     behosDateEnd = $("#datepicker2").val().trim()
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
    
     getTabData(1)

+ 4 - 4
src/js/qcListCopy.js

@@ -160,10 +160,10 @@ $(".filter").on("click", function(e){
         return
     }
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 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  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
    
     getTabData(1)

+ 4 - 4
src/js/qcListDept.js

@@ -137,10 +137,10 @@ $(".filter").on("click", function(e){
         return
     }
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
     name = nameTemp
     behospitalCode = behospitalCodeTemp
@@ -199,10 +199,10 @@ $(".abnormalClear").on("click", function(e){
     behosDateStart = $("#datepicker").val().trim()
     behosDateEnd = $("#datepicker2").val().trim()
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
     getTabData(1)
 })

+ 4 - 4
src/js/qcListDocteam.js

@@ -121,10 +121,10 @@ $(".filter").on("click", function(e){
         return
     }
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
     name = nameTemp
     behospitalCode = behospitalCodeTemp
@@ -179,10 +179,10 @@ $(".abnormalClear").on("click", function(e){
     behosDateStart = $("#datepicker").val().trim()
     behosDateEnd = $("#datepicker2").val().trim()
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
     getTabData(1)
 })

+ 4 - 4
src/js/qcListPerson.js

@@ -140,10 +140,10 @@ $(".filter").on("click", function(e){
         return
     }
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
     name = nameTemp
     behospitalCode = behospitalCodeTemp
@@ -200,10 +200,10 @@ $(".abnormalClear").on("click", function(e){
     behosDateStart = $("#datepicker").val().trim()
     behosDateEnd = $("#datepicker2").val().trim()
     if(behosDateStart){
-        behosDateStart = behosDateStart  + ' 00:00:00'
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
-        behosDateEnd = behosDateEnd  + ' 23:59:59'
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
     getTabData(1)
 })

+ 1 - 1
src/js/quexianDetailControlHome.js

@@ -49,7 +49,7 @@ $(function(){
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
     }else if(isReject == 3){
-        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam.replace(/-/g,'/')),new Date(endDateParam.replace(/-/g,'/')))
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
     }else{
         setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }

+ 2 - 2
src/js/utils.js

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