Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
===================================================================
diff -u -r18153 -r18159
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 18153)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 18159)
@@ -39,6 +39,13 @@
 	}
 
 	function closeLayer() {
+		if(typeof(LAYER) != 'undefined'){
+			var layerIndex = LAYER.getFrameIndex();
+			if(layerIndex){
+				LAYER.close(layerIndex);
+				return;
+			}
+		}
 		if(typeof parent.closeLayer == 'function'){
 			  //统一到父窗口
 			  parent.closeLayer();
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r18153 -r18159
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 18153)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 18159)
@@ -1822,6 +1822,7 @@
 var layerIndex;
 function closeLayer(){
 	layer.close(layerIndex);
+	layerIndex = null;
 }
 
 //打开编辑数量页面
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setMaterialRecycleAmount.jsp
===================================================================
diff -u -r18153 -r18159
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setMaterialRecycleAmount.jsp	(.../setMaterialRecycleAmount.jsp)	(revision 18153)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setMaterialRecycleAmount.jsp	(.../setMaterialRecycleAmount.jsp)	(revision 18159)
@@ -35,6 +35,13 @@
 	}
 
 	function closeLayer() {
+		if(typeof(LAYER) != 'undefined'){
+			var layerIndex = LAYER.getFrameIndex();
+			if(layerIndex){
+				LAYER.close(layerIndex);
+				return;
+			}
+		}
 		if(typeof parent.closeLayer == 'function'){
 			  //统一到父窗口
 			  parent.closeLayer();
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
===================================================================
diff -u -r18153 -r18159
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp	(.../disinfectionTousseItems.jsp)	(revision 18153)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp	(.../disinfectionTousseItems.jsp)	(revision 18159)
@@ -32,6 +32,13 @@
 }
 
 function closeLayer(){
+	if(typeof(LAYER) != 'undefined'){
+		var layerIndex = LAYER.getFrameIndex();
+		if(layerIndex){
+			LAYER.close(layerIndex);
+			return;
+		}
+	}
 	if(typeof parent.closeLayer == 'function'){
 		  //统一到父窗口
 		  parent.closeLayer();
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
===================================================================
diff -u -r18153 -r18159
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 18153)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 18159)
@@ -63,6 +63,14 @@
 	}
 
 	function closeLayer() {
+		if(typeof(LAYER) != 'undefined'){
+			var layerIndex = LAYER.getFrameIndex();
+			if(layerIndex){
+				LAYER.close(layerIndex);
+				return;
+			}
+		}
+		
 		if(typeof parent.closeLayer == 'function'){
 			  //统一到父窗口
 			  parent.closeLayer();