Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28153 -r28320 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28153) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28320) @@ -5466,4 +5466,17 @@ } $("#materials"+row).val(dataJson); return true; -} \ No newline at end of file +} + +function cleanIsRecyclingFun(){ + if(window.opener){ + window.opener.isRecyclingWindow = null; + } +} + +function cleanIsRecycling(){ + if(window.opener){ + window.opener.isRecyclingWindow = 1; + } + window.onunload = cleanIsRecyclingFun; +} Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js =================================================================== diff -u -r18422 -r28320 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js (.../urgentGoodsHintView.js) (revision 18422) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js (.../urgentGoodsHintView.js) (revision 28320) @@ -6,6 +6,11 @@ * @param departmentCode 用户的当前科室编码 */ function runUrgentGoodsWarning(userName, departmentCode) { + var isRecycling = isRecyclingWindow; + if(isRecycling != null && isRecycling == 1){//代表是回收,并且是回收记录页面，就不执行加急 + return; + } + Ext4.Ajax.request({ url : WWWROOT + '/disinfectSystem/urgentGoodsWarningAction!getAllUrgentGoodsOfWarning.do', params : {userName : userName, departmentCode : departmentCode}, Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r28047 -r28320 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 28047) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 28320) @@ -722,14 +722,15 @@ $("#card_box").tabs("select",subtitle); } } - +var isRecyclingWindow = null; function addTab(itemId, subtitle, url){ if(typeof itemId == "undefined" || itemId == "") return; //var selected = (typeof(selected) == "undefined") ? true : selected; //触摸屏直接跳转 if(itemId == 'recyclingRecordTouchScreen'){ var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980'; recyclingWindow = openFullSizeWindowWithName(url,null,"recyclingWindow"); + isRecyclingWindow = recyclingWindow; return; }; addTabJquery(itemId, subtitle, url); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r28153 -r28320 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 28153) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 28320) @@ -265,7 +265,7 @@ - +