Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r30281 -r30284
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 30281)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 30284)
@@ -28,8 +28,9 @@
 var addExtractClick;//抽检器械后面添加按钮的显示与隐藏
 var addTousseClick;//器械包条码后面添加按钮的显示与隐藏
 var labelWidthLeft = 135;
-var currentOrgUnitName1 = currentOrgUnitName || '';
-var currentOrgUnitCoding1 = currentOrgUnitCoding || '';
+var currentOrgUnitName = currentOrgUnitName || '';
+var currentOrgUnitCoding = currentOrgUnitCoding || '';
+var newTousseItems = []
 if(Ext.getCmp("tousseInfoFieldSet")){
 	var getWidth = Ext.getCmp("tousseInfoFieldSet").items.items[0].el.dom.clientWidth;
 }
@@ -1397,14 +1398,25 @@
 	if(Ext.getCmp('tousseDefRecycling').getValue() != ""){
 		Ext.getCmp('tousseDefRecycling').setValue("");
 	}
-	
-	if(Ext.getCmp('tousseDefinitionId').getValue() != ""){
-		Ext.getCmp('tousseDefinitionId').setValue("");
+	if(newTousseItems.length > 0){
+		Ext.getCmp('tousseDefinitionId').setValue(newTousseItems[0].tousseID);
+		Ext.getCmp('tousseName').setValue(newTousseItems[0].tousseName);
+		var responsibilityPart = Ext.getCmp('responsibilityPart').getValue();
+		if(responsibilityPart == '装配管理'){
+			Ext.getCmp('responsiblePerson').setValue(newTousseItems[0].data['packer']);
+			Ext.getCmp('tousseDefinitionId').setValue(newTousseItems[0].data['tousseDefinition.id']);
+			Ext.getCmp('tousseName').setValue(newTousseItems[0].data['tousseDefinition.name']);
+		}
+		newTousseItems = [];
+	}else {
+		if(Ext.getCmp('tousseDefinitionId').getValue() != ""){
+			Ext.getCmp('tousseDefinitionId').setValue("");
+		}
+		
+		if(Ext.getCmp('tousseName').getValue() != ""){
+			Ext.getCmp('tousseName').setValue("");
+		}
 	}
-	
-	if(Ext.getCmp('tousseName').getValue() != ""){
-		Ext.getCmp('tousseName').setValue("");
-	}
 		
 	//2、如果有炉号炉次，则需要设值
 	if(!isUndefinedOrNullOrEmpty(Ext.getCmp('configItemOptionSterName'))){
@@ -2634,23 +2646,7 @@
 		border : false,
 	    plain : true,
 		draggable:false,
-		items : [ formPanel ],
-		listeners:{
-			render:function(){
-				setTimeout(function(){
-					if(tousseItems && tousseItems.length > 0){
-						Ext.getCmp('tousseDefinitionId').setValue(tousseItems[0].tousseID);
-						Ext.getCmp('tousseName').setValue(tousseItems[0].tousseName);
-						var responsibilityPart = Ext.getCmp('responsibilityPart').getValue();
-						if(responsibilityPart == '装配管理'){
-							Ext.getCmp('responsiblePerson').setValue(tousseItems[0].data['packer']);
-							Ext.getCmp('tousseDefinitionId').setValue(tousseItems[0].data['tousseDefinition.id']);
-							Ext.getCmp('tousseName').setValue(tousseItems[0].data['tousseDefinition.name']);
-						}
-					}
-				}, 1000);
-			}
-		}
+		items : [ formPanel ]
 	});
 	qualityMonitoringWin.show();
 	if(id != null && id != ''){
@@ -2920,6 +2916,9 @@
 			}
 		});
 	}
+	if(tousseItems && tousseItems.length > 0){
+		newTousseItems = tousseItems;
+	}
 }
 
 function uploadWindowA(imageType,id){
@@ -4068,13 +4067,13 @@
 					id : "orgUnit",
 					disabled:true,
 					anchor : '95%',
-					value:currentOrgUnitName1
+					value:currentOrgUnitName
 				}]
 			},{
 				xtype:'hidden',
 				id:'orgUnitCoding',
 				name:'orgUnitCoding',
-				value:currentOrgUnitCoding1
+				value:currentOrgUnitCoding
 			},{
 				layout : 'form',
 				columnWidth : .5,