Merge remote-tracking branch 'origin/version1.3.5_zxc' into test

src/css/common.less

@@ -17,6 +17,7 @@ input:disabled {
     margin: 0;
     padding: 20px 25px;
     border:10px @disColor solid;
+    box-sizing: border-box;
 }
 
 th[code]{

src/css/single.less

@@ -1,6 +1,6 @@
 @import './reset.less';
 
-.tiaomu{
+.singleVeto{
     width: 100%;
     height: 100%;
     overflow-y: auto;

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/itemDefectDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/itemDefectDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,setDatePicker} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -192,9 +192,9 @@ $(".abnormalClear").on("click", function(e){
     //默认日期为近一个月
     setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     if(from == 2){
-        $('.selectDept ').html('全部') 
-    }else{
         $('.selectDept ').html(deptName) 
+    }else{
+        $('.selectDept ').html('全部')
     }
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)

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/singleVeto.js

@@ -161,7 +161,7 @@ function getTabData(activePage){
     }
     startDateParam=dateStatrt
     endDateParam=dateEnd
-    let deptName = from == 2&&deptList.length > 0 ? deptList[0].deptName : '';
+    // let deptName = from == 2&&deptList.length > 0 ? deptList[0].deptName : '';                                                                                                                                                                                                                                                                                                                                   
     const param = {
         current:activePage,
         type: 0,

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){