Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r28882 -r29240
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 28882)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 29240)
@@ -859,6 +859,36 @@
 	}
 }
 
+/*
+*ZJJSRM-30勾选是否整炉后，器械包条码和器械包名称设置为禁止输入状态
+*/
+function updateDisaplay(isCheck){
+	if(isCheck){
+		Ext.getCmp('tempBarcode').disable();
+		Ext.getCmp('tousseName').disable();
+		Ext.getCmp('addExtractCheckTousseBtnC').setVisible(false);
+		disabledExtractCheckTousse();
+		if(!isUndefinedOrNullOrEmpty(qualityMonitoringSterilizationID) && parseInt(qualityMonitoringSterilizationID) !== 0){
+			Ext.Ajax.request({
+				url : WWWROOT + '/disinfectSystem/qualityMonitoringInstanceAction!getGoodsAmountBySterilizationRecord.do',
+				params : {sterilizationRecordId : qualityMonitoringSterilizationID},
+				success : function(response,options){
+					var result = Ext.decode(response.responseText);
+					if(result.success){
+						Ext.getCmp('tousseAmount').setValue(result.data.goodsAmount || 0);
+						Ext.getCmp('tousseName').setValue(result.data.tousseName);
+					}
+				}
+			})
+		}
+	}else {
+		Ext.getCmp('tempBarcode').enable();
+		Ext.getCmp('tousseName').enable();
+		Ext.getCmp('addExtractCheckTousseBtnC').setVisible(true);
+		enableExtractCheckTousse();
+	}
+}
+
 /**
  * 将“重新回收”和“重新装配”及“是否整炉”设置为未选中状态.
  */
@@ -1422,23 +1452,29 @@
 		}
 	}
 }
-/* function hideExtractCheckTousse(){
+
+//禁用器械包条码和器械包名称
+function disabledExtractCheckTousse(){
 	if(tousseItemCount > 0){
 		for(var i=1;i<tousseItemCount+1;i++){
-			if(Ext.getCmp('tousseBarcodeC'+i+"_"+2)){
-				Ext.getCmp('tousseBarcodeC'+i+"_"+2).setVisible(false);
-				Ext.getCmp('tousseBarcodeC'+i+"_"+4).setVisible(false);
-				Ext.getCmp('tousseBarcodeC'+i+"_"+1).setVisible(false);
-				Ext.getCmp('tousseBarcodeC'+i+"_"+3).setVisible(false);
-				Ext.getCmp('tousseBarcodeC'+i+"_"+6).setVisible(false);  
-				if(Ext.getCmp('addExtractCheckTousseBtnC'+i)){//隐藏添加按钮
-					Ext.getCmp('addExtractCheckTousseBtnC'+i).setVisible(false); 
-				}
-			}
+			Ext.getCmp('tempBarcode'+i+"_"+1).disable();
+			Ext.getCmp('tempBarcode'+i+"_"+3).disable();
+			Ext.getCmp('tempBarcode'+i+"_"+6).disable();
 		}
 	}
-} */
+}
 
+//启用器械包条码和器械包名称
+function enableExtractCheckTousse(){
+	if(tousseItemCount > 0){
+		for(var i=1;i<tousseItemCount+1;i++){
+			Ext.getCmp('tempBarcode'+i+"_"+1).enable();
+			Ext.getCmp('tempBarcode'+i+"_"+3).enable(); 
+			Ext.getCmp('tempBarcode'+i+"_"+6).enable();
+		}
+	}
+}
+
 //隐藏器械包信息块材料
 function hideExtractCheckMaterialWrapper(){
 	if(tousseAndMaterialWrapperCount > 0){
@@ -1914,6 +1950,7 @@
 				xtype:'button',
 				tooltip : '添加抽检器械包',
 				iconCls : 'btn_ext_add',
+				id:'addButton',
 				handler : function(field,e){
 					widthSetTousse = true;
 					var rememberNum2 = rememberNum;
@@ -4479,6 +4516,7 @@
 								Ext.getCmp('isAllTousseOfSterile').setValue('否');
 							}
 							updateControlStatus();
+							updateDisaplay(checked);
 						}
 					}
 				}]