8067,8066,7998,7950

src/js/allotCheckTask.js

@@ -539,7 +539,7 @@ function selectTaskTb(){
                 depts.push($(checks[i]).parent().attr("deptid"))
             });
             global_TaskCodes=codes;
-            global_TaskDept=codes;
+            global_TaskDept=depts;
         }
         console.log(global_TaskCodes)
 
@@ -701,7 +701,8 @@ function formatDeptChecker(list){
     rendeCheckerList();
     //院级任务时科室“全部”不遍历
     if(+global_activeTabCode===2){
-        global_DeptId='-1';
+        //已有科室筛选，则按科室筛选，无则全部，院级全部为-1
+        global_DeptId=global_DeptId.trim()?global_DeptId:'-1';
     }
     renderCheckerTable();
 }
@@ -792,8 +793,8 @@ function bindDeptSelect(){
 function bindAllDeptSelect(){
     $('.deptAllItem').on("mousedown",function(){
         const deptItemName = $(this).attr("data-name")
-        global_DeptId="";
-        global_DeptMId="";
+        //global_DeptId="";     //7950bug
+        //global_DeptMId="";
         global_DeptAllId = $(this).attr("data-id");
         $('.selectAllDept i').text(deptItemName)
         $('.selectAllDept').attr('title',deptItemName)