Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r27263 -r27266 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27263) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27266) @@ -3587,6 +3587,10 @@ var returnValue = endCase.returnValue || ''; + if(returnValue == ''){ + return; + } + var paramStr = JSON.stringify(canTerminateTousseItemIds); $.ajax({ type:'get', Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r27263 -r27266 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27263) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27266) @@ -317,7 +317,7 @@
-
自送人 
+
自送人
@@ -326,20 +326,20 @@ -
回收人 
-
清点人  
-
回收时间  
-
科   室 
-
类  型   
-
申请时间  
+
回收人
+
清点人
+
回收时间
+
+
+
申请时间
-
备   注:
-
   沟通人  
+
备注:
+
沟通人
Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r27263 -r27266 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 27263) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 27266) @@ -348,6 +348,8 @@ height = parseInt(height,10); var url = ''; + var tab1GroupMgr = new Ext.WindowGroup(); + tab1GroupMgr.zseed=999999; if(typeof varArgIn == 'object'){ var html = ''; @@ -371,6 +373,7 @@ isTopContainer : true, modal : true, resizable : false, + manager: tab1GroupMgr, items:[{ xtype:"panel", id:"index",