Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r28348 -r28506 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 28348) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 28506) @@ -433,6 +433,11 @@ var filter = recycleRecordFilterManager.getFilter(); filter = encodeURI(encodeURI(filter)); $("#recyclingRecordTable").empty(); + if(sstsConfig.showORRoomColumnInHistoryRecyclingRecordList){ + $("#newOperationRoom").show(); + }else { + $("#newOperationRoom").hide(); + } $.ajax({ type:'post', url:WWWROOT + '/disinfectSystem/recyclingRecordAction!getRecyclingRecordList.do?page='+page + '&filter=' + filter, @@ -465,8 +470,13 @@ +'
'+departName +'
'+dateObjFormat(result.data[i].recyclingTime) +'
'+result.data[i].operator - +'
'+result.data[i].recyclingApplicationType - +'
'+dateObjFormat(result.data[i].applySubmintDateTime) + +'
'+result.data[i].recyclingApplicationType + +'
'; + + if(sstsConfig.showORRoomColumnInHistoryRecyclingRecordList){ + recyclingRecordStr+='
'+result.data[i].recyclingApplication.operationRoom + '
' + } + recyclingRecordStr+='
'+dateObjFormat(result.data[i].applySubmintDateTime) +'
'+ result.data[i].remark +'
'; var recyclingRecordElement = $(recyclingRecordStr); recyclingRecordElement.find("td:eq(0)").hide();//隐藏并且不占用空间,visibility:collapse;没有用，visibility:hidden;会占用空间 @@ -1177,7 +1187,7 @@ openSelect('选择科室','addDepart.jsp?isFilterApplication=true&showDisableOrgUnit=true'); } function selectOperationRoom(){ - openSelect('选择手术间','selectOperationRoom.jsp?p=p'); + openSelect('选择手术间','selectOperationRoom.jsp?isFilterApplication=true&filterRecyclingStatus=true'); } function setApplicationHeaderFilterStyle(){ @@ -1368,6 +1378,11 @@ setHeaderFilterStyle("recyclingDate"); }else{ resetHeaderFilterStyle("recyclingDate"); + } + if(recycleRecordFilterManager.newOperationRoomEnabled()){ + setHeaderFilterStyle("newOperationRoom"); + }else{ + resetHeaderFilterStyle("newOperationRoom"); } } @@ -1388,6 +1403,12 @@ updateHeaderStatus(); } } +function selectNewOperationRoom(operationRoom){ + if(recycleRecordFilterManager.selectNewOperationRoom(operationRoom)){ + firstPage(); //过滤后就进入到首页 + updateHeaderStatus(); + } +} function filterDepart(){ openSelect('选择科室','addDepart.jsp?p=p'); } @@ -1432,6 +1453,9 @@ function filterApplicationType(){ openSelect('选择申请单类型','selectApplicationType.jsp?p=p'); } +function filterOperationRooms(){ + openSelect('选择手术间','selectOperationRoom.jsp?filterRecyclingStatus=false'); +} function selectApplicationType(type){ if(recycleRecordFilterManager.selectApplicationType(type)){ firstPage(); //过滤后就进入到首页 @@ -1842,7 +1866,8 @@ 科室 回收时间 操作员 - 申请单类型 + 申请单类型 + 手术间 申请时间 备注 Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js =================================================================== diff -u -r28485 -r28506 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js (.../config.js) (revision 28485) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js (.../config.js) (revision 28506) @@ -187,5 +187,7 @@ //外来器械桌面图标 enableForeignTousseApplicationDesktopIcon:true, //允许回收还物单 - allowInsteadReturn:true + allowInsteadReturn:true, + //历史回收记录列表显示手术间列 + showORRoomColumnInHistoryRecyclingRecordList:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js =================================================================== diff -u -r19121 -r28506 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js (.../recycleRecordFilterManager.js) (revision 19121) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js (.../recycleRecordFilterManager.js) (revision 28506) @@ -20,6 +20,8 @@ var tousseInstanceBarcode = ''; //装配任务序列号 var packingSerialNum = ''; + //手术间 + var newOperationRoom = ''; this.selectSerialNum = function(serialNum){ packingSerialNum = CookieManager.getCookie('packingSerialNum'); @@ -29,6 +31,14 @@ } return false; } + this.selectNewOperationRoom = function(room){ + newOperationRoom = CookieManager.getCookie('newOperationRoom'); + if(room.length > 0 && newOperationRoom != room){ + CookieManager.setCookie('newOperationRoom',room); + return true; + } + return false; + } /** * 判断序列号的过滤是否启用。如果cookie中记录了序列号的过滤条件，则返回true,否则返回false */ @@ -59,6 +69,16 @@ } return false; } + /** + * 判断手术间的过滤是否启用。如果cookie中记录了手术间的过滤条件，则返回true,否则返回false + */ + this.newOperationRoomEnabled = function(){ + newOperationRoom = CookieManager.getCookie('newOperationRoom'); + if(newOperationRoom && newOperationRoom.length > 0){ + return true; + } + return false; + } //设置过滤的操作员，返回条件表示是否有修改 this.selectUser = function(name,fullName){ userName = CookieManager.getCookie('userName'); @@ -197,6 +217,10 @@ // filter += '"applicationType":'; // filter += '"' + applicationType + '"'; } + newOperationRoom = CookieManager.getCookie('newOperationRoom'); + if(newOperationRoom.length > 0){ + filter.operationRoom = newOperationRoom; + } recyclingDateRange = CookieManager.getCookie('recyclingDateRange'); if(recyclingDateRange.length > 0){ // if(filter.length > 1){ @@ -260,6 +284,11 @@ CookieManager.deleteCookie('idCardBarcode'); ret = true; } + newOperationRoom = CookieManager.getCookie('newOperationRoom'); + if(newOperationRoom.length > 0){ + CookieManager.deleteCookie('newOperationRoom'); + ret = true; + } tousseInstanceBarcode = CookieManager.getCookie('tousseInstanceBarcode'); if(tousseInstanceBarcode.length > 0){ CookieManager.deleteCookie('tousseInstanceBarcode'); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectOperationRoom.jsp =================================================================== diff -u -r18334 -r28506 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectOperationRoom.jsp (.../selectOperationRoom.jsp) (revision 18334) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectOperationRoom.jsp (.../selectOperationRoom.jsp) (revision 28506) @@ -94,16 +94,29 @@ $("#spellingCode").on("change paste keyup", function() { searchTousse(""); }); +//是否过滤申请单 +var isFilterApplication = false; +if('${param.isFilterApplication}' == "true"){ + isFilterApplication = true; +} +//true表示查询待回收列表；false表示查询历史回收列表 +var filterRecyclingStatus = '${param.filterRecyclingStatus}'; //动态加载JS和CSS document.write(''); function closeLayer(){ var index = parent.LAYER.getFrameIndex(); parent.LAYER.close(index); } - function addDepart(operationRoom){ - window.parent.setOperationRoom(operationRoom); + function addDepart(operationRoom){ + //待回收列表弹出窗 + if(isFilterApplication){ + window.parent.setOperationRoom(operationRoom); + closeLayer(); + }else{ + window.parent.selectNewOperationRoom(operationRoom); closeLayer(); + } } /** @@ -113,7 +126,7 @@ var inputObj = document.getElementById('spellingCode'); var inputValue = inputObj.value; inputObj.value = inputValue + sign; - RecyclingRecordTableManager.searchOperationRoom(inputObj.value,function(result){ + RecyclingRecordTableManager.searchOperationRoom(inputObj.value,filterRecyclingStatus,function(result){ if(result != null && result.length > 0){ var userArray = JSON.parse(result); var htmlResultCode = "