Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r25272 -r25776
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 25272)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 25776)
@@ -23,6 +23,10 @@
 
 function cancelQualityMonitoring() {
 	closeQMWindow();
+	if(typeof(layers) != "undefined"){
+		var index = parent.layer.getFrameIndex(window.name);
+		parent.layer.close(index);
+	}
 }
 
 function closeQMWindow(){
@@ -437,10 +441,9 @@
 		var info = barcode + "@" + tousseInstanceId + "@" + tousseName + "@" + amount + "@" + isRecycle+ "@" + isRepacking+ "@" + 1 +";";
 		tousseInstanceInfo = info + tousseInstanceInfo;
 	}
-	
 	//3、提交
 	setQmSubmitResult(0);
-	Ext.getCmp('addQualityMonitoringForm').form.submit( {
+	Ext.getCmp('addQualityMonitoringForm').form.submit({
 		url : WWWROOT + '/disinfectSystem/qualityMonitoringInstanceAction!saveQualityMonitoringInstance.do',
 		params : {
 			tousseInstanceInfo : tousseInstanceInfo,								//器械包信息
@@ -474,6 +477,10 @@
 				}
 			}else{
 				closeQMWindow();
+				if(typeof(layers) != "undefined"){
+					var index = parent.layer.getFrameIndex(window.name);
+					parent.layer.close(index);
+				}
 				if(recycleQM == false){
 					if(typeof(grid) != 'undefined' && grid != null){
 						grid.getStore().reload();
@@ -718,6 +725,7 @@
 			// 如果已经打开了，再选择其他的监测项，不再添加材料数据
 			return ;
 		}
+	
 		for(var i = 0 ; i < materialCountRecords.length ; i++){
 			var materialName = materialCountRecords[i].data["name"];
 			var count = materialCountRecords[i].data['count'];
@@ -1467,14 +1475,21 @@
 		id : 'qualityMonitoringWin',
 		layout : 'fit',
 		title : '质量监测信息',
-		width : 700,
+		width : 730,
 		modal : true,
 		autoHeight : true,
 		border : false,
-		plain : true,
+	    plain : true,
+		draggable:false,
 		items : [ formPanel ]
 	});
 	qualityMonitoringWin.show();
+	qualityMonitoringWin.on("close",function(){
+        if(typeof(layers) != "undefined"){
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		}
+    });
 	if(id != null && id != ''){
 		Ext.getCmp('formName').addClass("fieldReadOnlyNoRemove");
 		Ext.getCmp('responsibilityPart').addClass("fieldReadOnlyNoRemove");
@@ -2211,11 +2226,12 @@
 		frame : true,
 		labelSeparator : '：',
 		bodyStyle : 'padding:5px 5px 0px 5px',
-		width : 600,
+		width : 630,
 		height : 500,
 		labelAlign : 'right',
 		buttonAlign : 'center',
-		autoScroll : true,
+		//autoScroll : true,
+		bodyStyle : 'overflow-x:hidden; overflow-y:scroll',
 		items : [{
 			id:'baseInfoPanel',
 			layout : 'column',