Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js =================================================================== diff -u -r33484 -r33655 --- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js (.../config.js) (revision 33484) +++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js (.../config.js) (revision 33655) @@ -225,5 +225,9 @@ //启用外来器械包供应商统计报表 enableForeignTousseSupplierStatisticsReport:true, //在PDA预回收界面显示手术间和病人信息 - displayOfOperatingRoomAndPatientInformationOnThePrepareRecycleScreenInPDA:true + displayOfOperatingRoomAndPatientInformationOnThePrepareRecycleScreenInPDA:true, + //启用待回收列表的表格列自定义 + enableTableColumnCustomizationForTheWaitRecycleList :["科室","手术间","患者","住院号","物品清单","包数","申请人","最后修改时间"], + //启用历史回收记录列表的表格列自定义 + enableTableColumnCustomizationForTheHistoryRecyclingRecordList :["科室","手术间","患者","物品清单","包数","清点人","申请单号"] } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r33642 -r33655 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33642) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33655) @@ -127,7 +127,7 @@ return $(td).parent().find("td:eq(0)").find("input").val() } function onTableLoad(tableId) { - var isHistory = (tableId == '#recyclingRecordTable'); + var isHistory = (tableId == '#recyclingRecordTableBody'); var switchIndex = isHistory ? 4 : 3; var $tr = $(tableId).find("tr"); $tr.each(function () { @@ -160,12 +160,7 @@ function getRecyclingRecordList(page) { var filter = recycleRecordFilterManager.getFilter(); filter = encodeURI(encodeURI(filter)); - $("#recyclingRecordTable").empty(); - if (sstsConfig.showORRoomColumnInHistoryRecyclingRecordList) { - $("#newOperationRoom").show(); - } else { - $("#newOperationRoom").hide(); - } + $("#recyclingRecordTableBody").empty(); var pageSize = $('#pageSize').val(); $.ajax({ type: 'post', @@ -198,28 +193,68 @@ trColor = 'bgcolor="#ffa500"'; } - var recyclingRecordStr = ''; - //单独一个td来放隐藏的id - recyclingRecordStr += ''; - if (sstsConfig.enablePackingSerialNum) { - recyclingRecordStr += '

' + result.data[i].packingTaskSerialNumber + '

'; - } + if (sstsConfig.enableTableColumnCustomizationForTheHistoryRecyclingRecordList) { + var arr = sstsConfig.enableTableColumnCustomizationForTheHistoryRecyclingRecordList; + var tbodyHtml = ''; + tbodyHtml += ''; + if (sstsConfig.enablePackingSerialNum) { + tbodyHtml += '

' + result.data[i].packingTaskSerialNumber + '

'; + } + for (var k = 0; k < arr.length; k++) { + if (arr[k] == '科室') { + tbodyHtml += ''; + tbodyHtml += '

'; + tbodyHtml += '

'; + tbodyHtml += departName; + tbodyHtml += '

'; + } else if (arr[k] == '手术间') { + tbodyHtml += '' + result.data[i].operationRoom + ''; + } else if (arr[k] == '患者') { + tbodyHtml += '' + result.data[i].patient + ''; + } else if (arr[k] == '物品清单') { + tbodyHtml += '' + result.data[i].listOfItems + ''; + } else if (arr[k] == '包数') { + tbodyHtml += '' + result.data[i].sumAmount + ''; + } else if (arr[k] == '清点人') { + tbodyHtml += '' + result.data[i].operator + ''; + } else if (arr[k] == '类型') { + tbodyHtml += '' + result.data[i].recyclingApplicationType + ''; + } else if (arr[k] == '申请单号') { + tbodyHtml += '' + result.data[i].serialNumber + ''; + } else if (arr[k] == '回收时间') { + tbodyHtml += '' + dateObjFormat(result.data[i].recyclingTime) + ''; + } else if (arr[k] == '申请时间') { + tbodyHtml += '' + dateObjFormat(result.data[i].applySubmintDateTime) + ''; + } else if (arr[k] == '备注') { + tbodyHtml += '' + result.data[i].remark + ''; + } + } + tbodyHtml += ''; + var recyclingRecordElement = $(tbodyHtml); + recyclingRecordElement.find("td:eq(0)").hide();//隐藏并且不占用空间,visibility:collapse;没有用，visibility:hidden;会占用空间 + $("#recyclingRecordTableBody").append(recyclingRecordElement); + } else { + var recyclingRecordStr = ''; + //单独一个td来放隐藏的id + recyclingRecordStr += ''; + if (sstsConfig.enablePackingSerialNum) { + recyclingRecordStr += '

' + result.data[i].packingTaskSerialNumber + '

'; + } - recyclingRecordStr += '' - + '

' + departName - + '

' + dateObjFormat(result.data[i].recyclingTime) - + '

' + result.data[i].operator - + '

' + result.data[i].recyclingApplicationType - + '

'; + recyclingRecordStr += '' + + '

' + departName + + '

' + dateObjFormat(result.data[i].recyclingTime) + + '

' + result.data[i].operator + + '

' + result.data[i].recyclingApplicationType + + '

'; - if (sstsConfig.showORRoomColumnInHistoryRecyclingRecordList) { - recyclingRecordStr += '

' + result.data[i].operationRoom + '

' + recyclingRecordStr += '

' + dateObjFormat(result.data[i].applySubmintDateTime) + + '

' + result.data[i].remark + '

'; + var recyclingRecordElement = $(recyclingRecordStr); + recyclingRecordElement.find("td:eq(0)").hide();//隐藏并且不占用空间,visibility:collapse;没有用，visibility:hidden;会占用空间 + $("#recyclingRecordTableBody").append(recyclingRecordElement); } - recyclingRecordStr += '

' + dateObjFormat(result.data[i].applySubmintDateTime) - + '

' + result.data[i].remark + '

'; - var recyclingRecordElement = $(recyclingRecordStr); - recyclingRecordElement.find("td:eq(0)").hide();//隐藏并且不占用空间,visibility:collapse;没有用，visibility:hidden;会占用空间 - $("#recyclingRecordTable").append(recyclingRecordElement); + idArray.push(result.data[i].id); if (sstsConfig.enableUrgentFunction) { if (result.data[i].includingUrgent) {//有背景色，白色图标加急等级 @@ -230,7 +265,7 @@ } updatePageInfoDetail(result, page); loadRecycleItem(idArray.toString(), "recycle"); - onTableLoad("#recyclingRecordTable"); + onTableLoad("#recyclingRecordTableBody"); hideMask(); //tableMouseEvent("recyclingRecordTable","recycle"); }, @@ -495,7 +530,7 @@ } var toolTipManager = new ToolTipManager(); function mouseenter(objTr, id, isHistory) { - if (!isTouchScreen) { + if (isTouchScreen == false || isTouchScreen == 'false') { toolTipManager.removeToolTip(); $(objTr).find("td").addClass("mouse_color"); toolTipManager.appendToolTip(id, isHistory); @@ -506,7 +541,7 @@ } } function mouseleave(objTr) { - if (!isTouchScreen) { + if (isTouchScreen == false || isTouchScreen == 'false') { $(objTr).find("td").removeClass("mouse_color"); toolTipManager.removeToolTip(); } @@ -639,14 +674,51 @@ if (msg[i].type == '外来器械包申请单' && msg[i].recyclingStatus == '待回收') { color = '#ffa500'; } - var awaitForRecycleElement = $('' - + '

' + defaultString(departName) - + '' + defaultString(dateObjFormat(msg[i].submitTime)) - + '' + defaultString(msg[i].applicant) - + '' + defaultString(msg[i].type) - + '' + defaultString(msg[i].operationRoom) - + '' + defaultString(msg[i].remark) + ' '); - $("#awaitForRecycleTable").append(awaitForRecycleElement); + + if (sstsConfig.enableTableColumnCustomizationForTheWaitRecycleList) { + var arr = sstsConfig.enableTableColumnCustomizationForTheWaitRecycleList; + var tbodyHtml = ''; + for (var k = 0; k < arr.length; k++) { + if (arr[k] == '科室') { + tbodyHtml += ''; + tbodyHtml += '

'; + tbodyHtml += '

'; + tbodyHtml += ''; + tbodyHtml += defaultString(departName); + tbodyHtml += ''; + } else if (arr[k] == '手术间') { + tbodyHtml += '' + defaultString(msg[i].operationRoom) + ''; + } else if (arr[k] == '患者') { + tbodyHtml += '' + defaultString(msg[i].patient) + ''; + } else if (arr[k] == '住院号') { + tbodyHtml += '' + defaultString(msg[i].hospitalNumber) + ''; + } else if (arr[k] == '物品清单') { + tbodyHtml += '' + defaultString(msg[i].listOfItems) + ''; + } else if (arr[k] == '包数') { + tbodyHtml += '' + defaultString(msg[i].sumAmount) + ''; + } else if (arr[k] == '申请人') { + tbodyHtml += '' + defaultString(msg[i].applicant) + ''; + } else if (arr[k] == '最后修改时间') { + tbodyHtml += '' + defaultString(dateObjFormat(msg[i].submitTime)) + ''; + } else if (arr[k] == '类型') { + tbodyHtml += '' + defaultString(msg[i].type) + ''; + } else if (arr[k] == '备注') { + tbodyHtml += '' + defaultString(msg[i].remark) + ''; + } + } + tbodyHtml += ''; + $("#awaitForRecycleTableBody").append(tbodyHtml); + } else { + var tbodyHtml = ''; + tbodyHtml += '

' + defaultString(departName) + ''; + tbodyHtml += '' + defaultString(dateObjFormat(msg[i].submitTime)) + ''; + tbodyHtml += '' + defaultString(msg[i].applicant) + ''; + tbodyHtml += '' + defaultString(msg[i].type) + ''; + tbodyHtml += '' + defaultString(msg[i].operationRoom) + ''; + tbodyHtml += '' + defaultString(msg[i].remark) + ''; + tbodyHtml += ''; + $("#awaitForRecycleTableBody").append(tbodyHtml); + } idArray.push(msg[i].id); if (sstsConfig.enableUrgentFunction) { if (msg[i].urgentLevel != "" && msg[i].urgentLevel != undefined) {//有背景色，白色图标加急等级 @@ -658,7 +730,7 @@ } } loadRecycleItem(idArray.toString(), "apply"); - onTableLoad("#awaitForRecycleTable"); + onTableLoad("#awaitForRecycleTableBody"); //tableMouseEvent("awaitForRecycleTable","apply"); } @@ -709,7 +781,7 @@ }); } function refreshPage() { - $("#awaitForRecycleTable").empty(); + $("#awaitForRecycleTableBody").empty(); var id = $("#inputselect").val(); var appType = $("#appTypeSelect").val(); var applyTimeOrder = $("#applyTimeOrder").val(); @@ -921,7 +993,7 @@ } function filterApplication() { - $("#awaitForRecycleTable").empty(); + $("#awaitForRecycleTableBody").empty(); var id = $("#inputselect").val(); var txt = $("#item" + id).text(); var appType = $("#appTypeSelect").val(); @@ -1525,10 +1597,6 @@ $("#packingTaskSerialNum").hide(); } - if (sstsConfig.enablePackingSerialNum && sstsConfig.showORRoomColumnInHistoryRecyclingRecordList) { - $(".his_item .th td").css({ 'font-size': '20px' }) - } - $.divselect("#divselect", "#inputselect"); $.divselect("#divStatusSelect", "#inputStatusSelect"); $.divselect("#divDepartGroupSelect", "#inputDepartGroupSelect"); @@ -1603,6 +1671,116 @@ ratio = 1 } + if (sstsConfig.enableTableColumnCustomizationForTheWaitRecycleList) { + var arr = sstsConfig.enableTableColumnCustomizationForTheWaitRecycleList; + var width = 0; + var headerHtml = ''; + for (var i = 0; i < arr.length; i++) { + if (arr[i] == '科室') { + headerHtml += '科室'; + width += 130; + } else if (arr[i] == '手术间') { + headerHtml += '手术间'; + width += 121; + } else if (arr[i] == '患者') { + headerHtml += '患者'; + width += 100; + } else if (arr[i] == '住院号') { + headerHtml += '住院号'; + width += 100; + } else if (arr[i] == '物品清单') { + headerHtml += '物品清单'; + width += 200; + } else if (arr[i] == '包数') { + headerHtml += '包数'; + width += 100; + } else if (arr[i] == '申请人') { + headerHtml += '申请人'; + width += 94; + } else if (arr[i] == '最后修改时间') { + headerHtml += ''; + headerHtml += ''; + headerHtml += '最后修改时间'; + headerHtml += ''; + width += 180; + } else if (arr[i] == '类型') { + headerHtml += ''; + headerHtml += ''; + headerHtml += ''; + width += 200; + } else if (arr[i] == '备注') { + headerHtml += '备注'; + width += 176; + } + } + headerHtml += ''; + if (width > 930) { + document.getElementById('awaitForRecycleTableBody').style.width = width + 'px'; + document.getElementById('awaitForRecycleTableHead').style.width = width + 'px'; + } + document.getElementById('awaitForRecycleTableHead').innerHTML = headerHtml; + } + + if (sstsConfig.enableTableColumnCustomizationForTheHistoryRecyclingRecordList) { + var arr = sstsConfig.enableTableColumnCustomizationForTheHistoryRecyclingRecordList; + var width = 0; + var headerHtml = ''; + if (sstsConfig.enablePackingSerialNum) { + headerHtml += '序号'; + } + for (var i = 0; i < arr.length; i++) { + if (arr[i] == '科室') { + headerHtml += '科室'; + width += 130; + } else if (arr[i] == '手术间') { + headerHtml += '手术间'; + width += 121; + } else if (arr[i] == '患者') { + headerHtml += '患者'; + width += 100; + } else if (arr[i] == '物品清单') { + headerHtml += '物品清单'; + width += 200; + } else if (arr[i] == '包数') { + headerHtml += '包数'; + width += 100; + } else if (arr[i] == '清点人') { + headerHtml += '清点人'; + width += 94; + } else if (arr[i] == '类型') { + headerHtml += '申请单类型'; + width += 200; + } else if (arr[i] == '申请单号') { + headerHtml += '申请单号'; + width += 120; + } else if (arr[i] == '回收时间') { + headerHtml += '回收时间'; + width += 140; + } else if (arr[i] == '申请时间') { + headerHtml += '申请时间'; + width += 140; + } else if (arr[i] == '备注') { + headerHtml += '备注'; + width += 176; + } + } + headerHtml += ''; + if (width > 930) { + document.getElementById('recyclingRecordTableBody').style.width = width + 'px'; + document.getElementById('recyclingRecordTableHead').style.width = width + 'px'; + } + document.getElementById('recyclingRecordTableHead').innerHTML = headerHtml; + } + var screenWidth = ChangeRatio('width'); var screenHeight = ChangeRatio('height'); var htmlHeight = $('html').height(); @@ -1613,51 +1791,60 @@ $('.mbody_02').css({ 'height': (height + 30) + 'px', 'width': '1920px', 'zoom': 0.535 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 190) + 'px', 'top': '155px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 340) + 'px' }); + $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 310) + 'px', 'top': '70px' }); + $('#awaitForRecycleTable,#recyclingRecordTable').css({ 'height': (height - 310) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 360) + 'px' }); } else if (screenWidth > 1270 && screenWidth < 1300) { if (screenHeight < 730) { var height = body_height * ratio; $('.mbody_02').css({ 'height': (height - 60) + 'px', 'width': '1920px', 'zoom': 0.668 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 210) + 'px', 'top': '105px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 360) + 'px' }); + $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 310) + 'px' }); } else if (screenHeight > 730 && screenHeight < 780) { var height = body_height * ratio; $('.mbody_02').css({ 'height': height + 'px', 'width': '1920px', 'zoom': 0.668 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 170) + 'px', 'top': '118px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 320) + 'px' }); + $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 270) + 'px' }); } else if (screenHeight > 790 && screenHeight < 810) { var height = body_height * ratio; $('.mbody_02').css({ 'height': height + 'px', 'width': '1920px', 'zoom': 0.668 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 180) + 'px', 'top': '125px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 330) + 'px' }); + $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 285) + 'px', 'top': '55px' }); + $('#awaitForRecycleTable,#recyclingRecordTable').css({ 'height': (height - 285) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 335) + 'px' }); } else if (screenHeight > 820 && screenHeight < 1000) { var height = body_height * ratio; $('.mbody_02').css({ 'height': height + 'px', 'width': '1920px', 'zoom': 0.668 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 240) + 'px', 'top': '165px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 390) + 'px' }); + $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 350) + 'px', 'top': '60px' }); + $('#awaitForRecycleTable,#recyclingRecordTable').css({ 'height': (height - 350) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 408) + 'px' }); } else { var height = body_height * ratio; $('.mbody_02').css({ 'height': height + 'px', 'width': '1920px', 'zoom': 0.668 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 260) + 'px', 'top': '175px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 408) + 'px' }); + $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 378) + 'px', 'top': '70px' }); + $('#awaitForRecycleTable,#recyclingRecordTable').css({ 'height': (height - 378) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 428) + 'px' }); } } else if (screenWidth > 1350 && screenWidth < 1370) { var height = body_height * ratio; $('.mbody_02').css({ 'height': (height - 50) + 'px', 'width': '1920px', 'zoom': 0.715 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 200) + 'px', 'top': '107px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 350) + 'px' }); + $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 300) + 'px' }); } else if (screenWidth > 1390 && screenWidth < 1450) { var height = body_height * ratio; $('.mbody_02').css({ 'width': '1920px', 'height': height + 'px', 'zoom': 0.75 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 190) + 'px', 'top': '128px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 340) + 'px' }); + $('.wait_item .scroll,.his_item .scroll,#awaitForRecycleTable,#recyclingRecordTable').css({ 'height': (height - 290) + 'px' }); + $('#awaitForRecycleTableBody,#recyclingRecordTableBody').css({ 'height': (height - 340) + 'px' }); if (!isIE()) { $('#page').css({ 'height': '30px', 'top': '6px' }); } @@ -1666,7 +1853,7 @@ $('.mbody_02').css({ 'width': '1920px', 'height': (height - 40) + 'px', 'zoom': 0.8333 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 200) + 'px', 'top': '110px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 350) + 'px' }); + $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 300) + 'px' }); if (!isIE()) { $('#page').css({ 'height': '30px', 'top': '5px' }); } @@ -1675,7 +1862,7 @@ $('.mbody_02').css({ 'width': '1920px', 'height': (height - 30) + 'px', 'zoom': 1 / ratio }); $('.wait_item .sum,.his_item .page').css('bottom', '0px'); $('.wait_item,.his_item').css({ 'height': (height - 195) + 'px', 'top': '115px' }); - $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 340) + 'px' }); + $('.wait_item .scroll,.his_item .scroll').css({ 'height': (height - 290) + 'px' }); } scrollLoadData(50); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r33637 -r33655 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 33637) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 33655) @@ -267,6 +267,30 @@ width: 80px; height: 35px; } +.wait_item .scroll,.his_item .scroll { + top: 50px; + overflow-y: hidden !important; +} +#awaitForRecycleTableBody,#recyclingRecordTableBody { + overflow: auto; + top: 50px; + position: absolute; + height: 683px; + width: 100%; +} +.wait_item .th,.his_item .th { + top: -3px; + left: -7px; + width: 940px; +} +.wait_item .scroll .th td,.his_item .scroll .th td{ + border: 0; + height: 49px; +} +#awaitForRecycleTable,#recyclingRecordTable { + height: 733px; + width: 940px; +} @@ -354,35 +378,33 @@

清除过滤

添加

- -

- - - - - - - - - -

科室

- - 最后修改时间 -

申请人

- -

手术间

备注

+ + + + + + + + + + +