Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r27709 -r27772 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27709) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27772) @@ -4289,7 +4289,7 @@ layerIndex=layer.open({ type : 2, title : ['选择科室',true], - content : 'addDepart.jsp?resolution='+resolution+'&width='+width+'&height='+height, + content : 'addDepart.jsp?resolution='+resolution+'&width='+width+'&height='+height+"&showDisableOrgUnit=false", area : [ width + 'px' , height +heightExtra+ 'px'], border : [5, 0.3, '#fff', true], closeBtn : [2 , true], Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp =================================================================== diff -u -r27770 -r27772 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp (.../addDepart.jsp) (revision 27770) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp (.../addDepart.jsp) (revision 27772) @@ -22,6 +22,11 @@ if('${param.isFilterApplication}' == "true"){ isFilterApplication = true; } + //是否显示停用科室 + var showDisableOrgUnit = true; + if('${param.showDisableOrgUnit}' == "false"){ + showDisableOrgUnit = false; + }

@@ -174,7 +179,7 @@ if(sign != ""){ pages = 1; } - OrgUnitTableManager.searchOrgUnitBySpellOrWbCode(inputObj.value,pages,pageSize,true,function(result){ + OrgUnitTableManager.searchOrgUnitBySpellOrWbCode(inputObj.value,pages,pageSize,showDisableOrgUnit,function(result){ if(result != null){ var htmlResultCode = "

"; var orgUnitJsonArray = JSON.parse(result); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r27769 -r27772 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 27769) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 27772) @@ -1171,7 +1171,7 @@ } function selectApplyDepartment(){ - openSelect('选择科室','addDepart.jsp?isFilterApplication=true'); + openSelect('选择科室','addDepart.jsp?isFilterApplication=true&showDisableOrgUnit=true'); } function selectOperationRoom(){ openSelect('选择手术间','selectOperationRoom.jsp?p=p');