Selaa lähdekoodia

Merge remote-tracking branch 'origin/test_yw' into yiwu_qcCheck0512

# Conflicts:
#	src/js/allotCheckTask.js
zhouna 4 vuotta sitten
vanhempi
commit
d5564f8e4e
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2 2
      src/js/allotCheckTask.js

+ 2 - 2
src/js/allotCheckTask.js

@@ -652,12 +652,12 @@ function bindCheckerSelect(){
         $('.selectChecker').attr('title',itemName)
         $('.selectChecker').attr('title',itemName)
         $(".checkerList").css("display", "none")
         $(".checkerList").css("display", "none")
         global_DeptAllId="";
         global_DeptAllId="";
+        const totalArr = global_DeptId?global_DeptCheckers[global_DeptId]:global_Checkers[+global_activeTabCode+4];
         if(!itemId.trim()){
         if(!itemId.trim()){
-            renderCheckerTable();
+            renderCheckerTable(totalArr);
             return
             return
         }
         }
         const dept=$(this).attr("data-dept");
         const dept=$(this).attr("data-dept");
-        const totalArr = global_DeptId?global_DeptCheckers[global_DeptId]:global_Checkers[+global_activeTabCode+4];
         const arr = (totalArr||[]).find((it)=>itemId===it.doctorId&&dept===it.deptId);
         const arr = (totalArr||[]).find((it)=>itemId===it.doctorId&&dept===it.deptId);
         renderCheckerTable(arr?[arr]:[]);
         renderCheckerTable(arr?[arr]:[]);
     })
     })