Merge remote-tracking branch 'origin/master' into referMaster

src/js/console.js

@@ -1750,8 +1750,8 @@ function dateConsole(dateType){
     getEveryDeptLevel()
 }
 function getStaticDate(){
-    behosDateStart = $("#datepicker").val().trim()
-    behosDateEnd = $("#datepicker2").val().trim()
+    behosDateStart = $("#datepicker").val()
+    behosDateEnd = $("#datepicker2").val()
     const start = new Date(behosDateStart).getTime()
     const end = new Date(behosDateEnd).getTime()
     if(start > end){

src/js/mukuai.js

@@ -290,7 +290,8 @@ function renderTab(data,activePage){
     $(".goHomeDetail").click(function(){
         let model = $(this).attr("data-model")
         focusMenuItem("YH-KSZR-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=2&special=1&model="+model+"&shijian=3"+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
+        let deptName = deptId||(deptList.length>0?deptList[0].deptName:'')
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=2&deptName="+deptName+"&special=1&model="+model+"&shijian=3"+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
 }
 

src/js/qcList.js

@@ -628,7 +628,7 @@ function bindSelectCol(){
 }
 
 function closeColSet(){
-    pageSetCopy = pageSet
+    pageSetCopy = JSON.parse(JSON.stringify(pageSet))
     $("#mainBox .colSetBox", parent.document).remove()
 }
 function bindCloseColSet(){

src/js/qcListDept.js

@@ -624,7 +624,7 @@ function bindSelectCol(){
 }
 
 function closeColSet(){
-    pageSetCopy = pageSet
+    pageSetCopy = JSON.parse(JSON.stringify(pageSet))
     $("#mainBox .colSetBox", parent.document).remove()
 }
 function bindCloseColSet(){

src/js/qcListDocteam.js

@@ -549,7 +549,7 @@ function bindSelectCol(){
 }
 
 function closeColSet(){
-    pageSetCopy = pageSet
+    pageSetCopy = JSON.parse(JSON.stringify(pageSet))
     $("#mainBox .colSetBox", parent.document).remove()
 }
 function bindCloseColSet(){

src/js/qcListPerson.js

@@ -621,7 +621,7 @@ function bindSelectCol(){
 }
 
 function closeColSet(){
-    pageSetCopy = pageSet
+    pageSetCopy = JSON.parse(JSON.stringify(pageSet))
     $("#mainBox .colSetBox", parent.document).remove()
 }
 function bindCloseColSet(){

src/js/utils.js

@@ -370,7 +370,7 @@ function getPickerDate(picker,mode){
   if(!picker){
     return
   }
-  let date = picker.val().trim()
+  let date = picker.val()
   if(mode == 1){
     return date.replace(/\//g,'-') + ' 00:00:00'
   }else if(mode == 2){