Index: ssts-web/src/main/webapp/common/selectOrgByExt.jsp =================================================================== diff -u -r29300 -r29308 --- ssts-web/src/main/webapp/common/selectOrgByExt.jsp (.../selectOrgByExt.jsp) (revision 29300) +++ ssts-web/src/main/webapp/common/selectOrgByExt.jsp (.../selectOrgByExt.jsp) (revision 29308) @@ -10,8 +10,6 @@ - - @@ -72,13 +70,15 @@ if(search !== ''){ codes = getQueryVariable('departCodes'); - departNames =getQueryVariable('departNames'); - orgUnitIds =getQueryVariable('orgUnitIds'); + departNames = getQueryVariable('departNames'); + orgUnitIds = getQueryVariable('orgUnitIds'); + searchSupplyRoom = getQueryVariable('searchSupplyRoom'); }else { codes = window.dialogArguments.departCodes; departNames = window.dialogArguments.departNames; orgUnitIds = window.dialogArguments.orgUnitIds; -} + searchSupplyRoom = window.dialogArguments.searchSupplyRoom; +} if(tabType != null && tabType.length > 0){ var tabArray = tabType.split(";"); @@ -102,4 +102,6 @@
+ + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/message/messageForm.js =================================================================== diff -u -r28276 -r29308 --- ssts-web/src/main/webapp/disinfectsystem/message/messageForm.js (.../messageForm.js) (revision 28276) +++ ssts-web/src/main/webapp/disinfectsystem/message/messageForm.js (.../messageForm.js) (revision 29308) @@ -18,7 +18,8 @@ sameLevel :'yes', range : 'all', departNames :departNames, - departCodes : codes + departCodes : codes, + searchSupplyRoom:true }; var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectOrgByExt.jsp?",param, "800", "450"); //org_3306;org_3219,口腔科;妇科 Index: ssts-web/src/main/webapp/js/org.js =================================================================== diff -u -r29300 -r29308 --- ssts-web/src/main/webapp/js/org.js (.../org.js) (revision 29300) +++ ssts-web/src/main/webapp/js/org.js (.../org.js) (revision 29308) @@ -44,7 +44,8 @@ autoLoad :true, baseParams :{ withoutBaseOrg:true, - showDisableOrgUnit : false + showDisableOrgUnit : false, + searchSupplyRoom:searchSupplyRoom || false }, reader : new Ext.data.JsonReader({ root : 'data'