Merge branch 'version1.3.4' into test

src/js/qcList.js

@@ -163,7 +163,7 @@ $(".abnormalClear").on("click", function(e){
     doctorNum=""; 
     doctorNameTemp=""; 
     doctorNumTemp=""; 
-    data_desc=[]; 
+    data_desc=["leave_hospital_date"]
     data_asc=[];
     $('.patientNumInp').val('')
     $('.patientNameInp').val('')
@@ -192,6 +192,7 @@ $(".abnormalClear").on("click", function(e){
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
     $("th[code]").removeClass("asc desc")
+    $(".leaveHospitalDate").addClass(" desc")
     behosDateStart = $("#datepicker").val().trim()
     behosDateEnd = $("#datepicker2").val().trim()
     if(behosDateStart){
@@ -394,7 +395,7 @@ function renderTabTitle(data){
         const item = data[i]
         if(item.status == 1){
             showNum++
-            str += `<th class="textCenter" code="${item.val.replace(/([A-Z])/g,function(match) {
+            str += `<th class="textCenter ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val.replace(/([A-Z])/g,function(match) {
                 return '_' + match.toLowerCase()    
             })}">${item.name}</th>`
         }

src/js/qcListDept.js

@@ -164,7 +164,7 @@ $(".abnormalClear").on("click", function(e){
     doctorNum=""; 
     doctorNameTemp=""; 
     doctorNumTemp=""; 
-    data_desc=[]; 
+    data_desc=["leave_hospital_date"]
     data_asc=[];
     $('.patientNumInp').val('')
     $('.patientNameInp').val('')
@@ -193,6 +193,7 @@ $(".abnormalClear").on("click", function(e){
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
     $("th[code]").removeClass("asc desc")
+    $(".leaveHospitalDate").addClass(" desc")
     behosDateStart = $("#datepicker").val().trim()
     behosDateEnd = $("#datepicker2").val().trim()
     if(behosDateStart){
@@ -412,7 +413,7 @@ function renderTabTitle(data){
         const item = data[i]
         if(item.status == 1){
             showNum++
-            str += `<th class="textCenter" code="${item.val.replace(/([A-Z])/g,function(match) {
+            str += `<th class="textCenter ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val.replace(/([A-Z])/g,function(match) {
                 return '_' + match.toLowerCase()    
             })}">${item.name}</th>`
         }

src/js/qcListPerson.js

@@ -167,7 +167,7 @@ $(".abnormalClear").on("click", function(e){
     doctorNum=""; 
     doctorNameTemp=""; 
     doctorNumTemp=""; 
-    data_desc=[]; 
+    data_desc=["leave_hospital_date"]
     data_asc=[];
     $('.patientNumInp').val('')
     $('.patientNameInp').val('')
@@ -196,6 +196,7 @@ $(".abnormalClear").on("click", function(e){
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
     $("th[code]").removeClass("asc desc")
+    $(".leaveHospitalDate").addClass(" desc")
     behosDateStart = $("#datepicker").val().trim()
     behosDateEnd = $("#datepicker2").val().trim()
     if(behosDateStart){
@@ -413,7 +414,7 @@ function renderTabTitle(data){
         const item = data[i]
         if(item.status == 1){
             showNum++
-            str += `<th class="textCenter" code="${item.val.replace(/([A-Z])/g,function(match) {
+            str += `<th class="textCenter  ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val.replace(/([A-Z])/g,function(match) {
                 return '_' + match.toLowerCase()    
             })}">${item.name}</th>`
         }