Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
===================================================================
diff -u -r35468 -r35662
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 35468)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 35662)
@@ -122,7 +122,11 @@
 		+ rememberRecycleUser + "&departName=" + departName + "&departCoding=" + departCoding;
 }
 function cancel() {
-	location.href = WWWROOT + '/homepage/portalPage.jsp';
+	if(source == ''){
+		location.href = WWWROOT + '/homepage/portalPage.jsp';
+	}else {
+		window.close()
+	}
 }
 function getRecordId(td) {
 	return $(td).parent().find("td:eq(0)").find("input").val()