|
@@ -243,7 +243,7 @@ function getFilterData(){
|
|
|
function getTabData(activePage){
|
|
|
const filterData = getFilterData();
|
|
|
const dept = global_DeptMId||global_DeptId||global_DeptAllId;
|
|
|
- const deptList=dept?[dept]:[];
|
|
|
+ const deptList=dept.trim()?[dept]:[];
|
|
|
const param = {
|
|
|
current:activePage,
|
|
|
asc:data_asc, //升序
|
|
@@ -252,8 +252,7 @@ function getTabData(activePage){
|
|
|
jobType:global_activeTabCode, //0-科室任务 1-院级 2-质控科
|
|
|
...filterData,
|
|
|
deptList:deptList,
|
|
|
- behosDateEnd:undefined,
|
|
|
- behosDateStart:undefined
|
|
|
+ endTime:filterData.endTime+" 23:59:59"
|
|
|
};
|
|
|
$('.pagination').html("");
|
|
|
$('.patientTable .tbody').html(emptyBox('努力加载中...','',8))
|
|
@@ -368,7 +367,7 @@ function renderCheckerTable(d){
|
|
|
for(let i=0;i<titles.length;i++){
|
|
|
code=$(titles[i]).attr('valCode');
|
|
|
if(code==="jobNum"){
|
|
|
- str += `<td class="textCenter"><a class="job-num" data-index=${i} data-id="${item.doctorId}" data-name="${item.doctorName}">${ item[code]}<a></td>`
|
|
|
+ str += `<td class="textCenter"><a class="job-num" data-index=${i} data-dept=${item.deptId} data-id="${item.doctorId}" data-name="${item.doctorName}">${ item[code]}<a></td>`
|
|
|
}else{
|
|
|
str += `<td class="textCenter"><span data-index=${i}>${ item[code]}<span></td>`
|
|
|
}
|
|
@@ -439,7 +438,7 @@ function bindTaskNumEvent(){
|
|
|
global_CheckerId = $(this).attr("data-id");
|
|
|
global_CheckerName=$(this).attr("data-name");
|
|
|
$(".modal-container").show();
|
|
|
- getTasksList();
|
|
|
+ getTasksList($(this).attr("data-dept"));
|
|
|
})
|
|
|
}
|
|
|
//获取全部科室数据
|
|
@@ -467,8 +466,8 @@ function getCheckerList(){
|
|
|
}
|
|
|
|
|
|
//获取质控员任务列表
|
|
|
-function getTasksList(){
|
|
|
- post(ywCheckApi.getTaskByUserId,{checkId:global_CheckerId}).then(res =>{
|
|
|
+function getTasksList(deptId){
|
|
|
+ post(ywCheckApi.getTaskByUserId,{checkId:global_CheckerId,deptList:[deptId]}).then(res =>{
|
|
|
if(res.data.code == '0'){
|
|
|
const list = res.data.data||{};
|
|
|
renderTaskTable(list);
|
|
@@ -494,14 +493,14 @@ function renderTaskTable(data) {
|
|
|
code = $(titles[i]).attr('valCode');
|
|
|
str += `<td class="textCenter"><span data-index=${i}>${ item[code] || "-"}<span></td>`
|
|
|
}
|
|
|
- str+=`<td class="operaItem textCenter"><a class="delete" code="${item.behospitalCode}">移除</a></td><tr>`
|
|
|
+ str+=`<td class="operaItem textCenter"><a class="delete ${item.delFlag?'':'disable'}" code="${item.behospitalCode}">移除</a></td><tr>`
|
|
|
}
|
|
|
$('.taskTable .tbody').html(str);
|
|
|
bindDeleteEvent();
|
|
|
}
|
|
|
//移除任务事件
|
|
|
function bindDeleteEvent(){
|
|
|
- $(".taskTable .delete").unbind("click").click(function(e){
|
|
|
+ $(".taskTable .delete:not(.disable)").unbind("click").click(function(e){
|
|
|
global_TaskCodes=[$(this).attr("code")];
|
|
|
$(".del-pop").insertAfter($(this)).show();
|
|
|
});
|
|
@@ -596,11 +595,10 @@ function bindAllDeptSelect(){
|
|
|
const deptItemName = $(this).attr("data-name")
|
|
|
global_DeptId="";
|
|
|
global_DeptMId="";
|
|
|
- global_DeptAllId = $(this).attr("data-id")
|
|
|
+ global_DeptAllId = $(this).attr("data-id");
|
|
|
$('.selectAllDept i').text(deptItemName)
|
|
|
$('.selectAllDept').attr('title',deptItemName)
|
|
|
$(".deptAllList").css("display", "none")
|
|
|
- getTabData(1);
|
|
|
})
|
|
|
}
|
|
|
//质控员选择
|