Index: ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js
===================================================================
diff -u -r27655 -r29612
--- ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js	(.../toussePictures.js)	(revision 27655)
+++ ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js	(.../toussePictures.js)	(revision 29612)
@@ -25,7 +25,7 @@
 			var tousseDefinitionID = jsonObj.data.tousseDefinitionId;
 			var tousseName = escapeText(jsonObj.data.name);
 			if(tousseDefinitionID == "" || tousseName == ""){
-				showResult('请扫描正确的条码!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+				showResult('器械包名称不能为空!' , null , sstsConfig.messagePauseTimeOnPackingPage);
 				return;
 			}
 			window.open(WWWROOT + "/disinfectsystem/touchScreen/recycle/tousseImage.jsp" +
@@ -39,8 +39,12 @@
 	})
 }
 function escapeText(texts){
-	texts = texts.replace(/\#/g,"%23");
-	return texts;
+	if((texts || '') !== ''){
+		texts = texts.replace(/\#/g,"%23");
+		return texts;
+	}else {
+		return ''
+	}
 }
 var appDepartJsonStore2 = new Ext.data.JsonStore({
 	autoLoad:false,
@@ -72,15 +76,19 @@
 			handler : function() {
 				var tousseDefinitionID = tousseDefinitionIDQuery;
 				var toussepackingName = escapeText(toussepackingNameQuery);
+				if(tousseDefinitionID == "" || toussepackingName == ""){
+					showResult('器械包名称不能为空!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+					return;
+				}
 				var clientHeight = document.body.clientHeight;
-				window.open(WWWROOT + "/disinfectsystem/touchScreen/recycle/tousseImage.jsp" +
-					"?resolution=1980" +
-					"&tousseDefinitionID=" + tousseDefinitionID +
-					"&tousseName=" + encodeURIComponent(toussepackingName) +
-					"&parentPageName=toussePictures" +
-					"&clientHeight=" + clientHeight +
-					"&number=1&showToussePictures=true",
-					'tousseImages', '_self'); 
+					window.open(WWWROOT + "/disinfectsystem/touchScreen/recycle/tousseImage.jsp" +
+						"?resolution=1980" +
+						"&tousseDefinitionID=" + tousseDefinitionID +
+						"&tousseName=" + encodeURIComponent(toussepackingName) +
+						"&parentPageName=toussePictures" +
+						"&clientHeight=" + clientHeight +
+						"&number=1&showToussePictures=true",
+						'tousseImages', '_self'); 
 			}
 		},{
 			xtype : 'button',
@@ -91,32 +99,37 @@
 				var showModals = true;				
 				var dataAll = [];
 				var childIframe = window.frames["tousseImages"].document.getElementById("materialTable");
-				var childTr = childIframe.getElementsByTagName("tr");//所有tr
-				if(childTr.length > 0){				
-					for(var i = 0;i < childTr.length;i++){
-						var tds = childTr[i].getElementsByTagName("td");
-						for(var j = 0;j < tds.length;j++){
-							var checkInput = tds[j].getElementsByTagName("input");
-							for(var m = 0;m < checkInput.length;m++){
-								if(checkInput[m].checked){
-									var name = checkInput[m].value;
-									var amount =checkInput[m].getAttribute("amount");
-									var data = {
-										"name":name,
-										"count":amount
+				if(childIframe){
+					var childTr = childIframe.getElementsByTagName("tr");//所有tr
+					if(childTr.length > 0){				
+						for(var i = 0;i < childTr.length;i++){
+							var tds = childTr[i].getElementsByTagName("td");
+							for(var j = 0;j < tds.length;j++){
+								var checkInput = tds[j].getElementsByTagName("input");
+								for(var m = 0;m < checkInput.length;m++){
+									if(checkInput[m].checked){
+										var name = checkInput[m].value;
+										var amount =checkInput[m].getAttribute("amount");
+										var data = {
+											"name":name,
+											"count":amount
+										}
+										var datas = {
+											data:data
+										}
+										dataAll.push(datas);
 									}
-									var datas = {
-										data:data
-									}
-									dataAll.push(datas);
 								}
+								
 							}
-							
 						}
+						materialCountRecords = dataAll;
 					}
-					materialCountRecords = dataAll;
+					addQualityMonitoringByResponPart('清洗消毒');
+				}else {
+					showResult('器械包名称不能为空!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+					return;
 				}
-				addQualityMonitoringByResponPart('清洗消毒');
 			}
 		}],
 		items : [{
Index: ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp
===================================================================
diff -u -r29513 -r29612
--- ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp	(.../toussePictures.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp	(.../toussePictures.jsp)	(revision 29612)
@@ -51,6 +51,8 @@
 <title>仪器图谱</title>
 <script type="text/javascript">
 	var WWWROOT = '${ctx}';
+	var tousseName = '';
+	var depart = '';
 </script>
 </head>
 <body>