|
@@ -249,7 +249,12 @@ function getFilterData(){
|
|
//获取分配核查任务列表数据
|
|
//获取分配核查任务列表数据
|
|
function getTabData(activePage){
|
|
function getTabData(activePage){
|
|
const filterData = getFilterData();
|
|
const filterData = getFilterData();
|
|
- const dept = global_DeptMId||global_DeptId||global_DeptAllId;
|
|
|
|
|
|
+ let dept = '';
|
|
|
|
+ if(global_activeTabCode!='0'){ //除科室任务外,待分配任务列表科室参数只受筛选项影响
|
|
|
|
+ dept = global_DeptAllId;
|
|
|
|
+ }else{
|
|
|
|
+ dept = global_DeptMId||global_DeptId||global_DeptAllId;
|
|
|
|
+ }
|
|
const deptList=dept.trim()?[dept]:[];
|
|
const deptList=dept.trim()?[dept]:[];
|
|
const param = {
|
|
const param = {
|
|
current:activePage,
|
|
current:activePage,
|
|
@@ -530,7 +535,7 @@ function renderTaskTable(data) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- const titles = $(".taskTable .tabTitle th[valCode]");console.log(data)
|
|
|
|
|
|
+ const titles = $(".taskTable .tabTitle th[valCode]");
|
|
for (let i = 0; i < data.length; i++) {
|
|
for (let i = 0; i < data.length; i++) {
|
|
const item = data[i];
|
|
const item = data[i];
|
|
str += `<tr data-index=${i}>`;
|
|
str += `<tr data-index=${i}>`;
|