Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
===================================================================
diff -u -r30912 -r31128
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js	(.../qualityMonitoringDefinitionView.js)	(revision 30912)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js	(.../qualityMonitoringDefinitionView.js)	(revision 31128)
@@ -554,26 +554,45 @@
 }
 
 
-function showOrHideRecordInformation(value){	
+function showOrHideRecordInformation(value){
 	if(value == "回收清点"){
-		top.Ext.getCmp('recordRecycleInformation_id').show();
 		top.Ext.getCmp('recordRinseInformation_id').hide();
 		top.Ext.getCmp('recordSterilizatioInformation_id').hide();
 		top.Ext.getCmp('isInsertBasket').enable();
 		showSterNameAndFre();
+		if(entityName == '质量监测'){
+			top.Ext.getCmp('recordRecycleInformation_id').show();
+			top.Ext.getCmp('isInsertBasket_id').show();
+		}else {
+			top.Ext.getCmp('recordRecycleInformation_id').hide();
+			top.Ext.getCmp('isInsertBasket_id').hide();
+		}
 	}else if(value == "清洗消毒"){
-		top.Ext.getCmp('recordRinseInformation_id').show();
 		top.Ext.getCmp('recordRecycleInformation_id').hide();
 		top.Ext.getCmp('recordSterilizatioInformation_id').hide();
 		top.Ext.getCmp('isInsertBasket').enable();
 		showSterNameAndFre();
+		if(entityName == '质量监测'){
+			top.Ext.getCmp('recordRinseInformation_id').show();
+			top.Ext.getCmp('isInsertBasket_id').show();
+		}else {
+			top.Ext.getCmp('recordRinseInformation_id').hide();
+			top.Ext.getCmp('isInsertBasket_id').hide();
+		}
 	}else if(value == "灭菌管理"){
-		top.Ext.getCmp('recordSterilizatioInformation_id').show();
 		top.Ext.getCmp('recordRecycleInformation_id').hide();
 		top.Ext.getCmp('recordRinseInformation_id').hide();
 		top.Ext.getCmp('showSterNameAndFre_id').hide();
 		top.Ext.getCmp('isInsertBasket').disable();
-		hideSterNameAndFre();
+		if(entityName == '质量监测'){
+			hideSterNameAndFre();
+			top.Ext.getCmp('recordSterilizatioInformation_id').show();
+			top.Ext.getCmp('isInsertBasket_id').show();
+		}else {
+			showSterNameAndFre();
+			top.Ext.getCmp('recordSterilizatioInformation_id').hide();
+			top.Ext.getCmp('isInsertBasket_id').hide();
+		}
 	}else{
 		top.Ext.getCmp('recordRecycleInformation_id').hide();
 		top.Ext.getCmp('recordRinseInformation_id').hide();
@@ -719,6 +738,7 @@
 		},{
 			columnWidth : .5,
 			layout : 'form',
+			id:"isInsertBasket_id",
 			items:[{
 				xtype : 'combo',
 				fieldLabel : "物品入筐",
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
===================================================================
diff -u -r30831 -r31128
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 30831)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 31128)
@@ -118,7 +118,6 @@
 			id : 'configItemOptionSterFre',
 			name : 'configItemOptionSterFre',
 			allowBlank : true,
-			readOnly : true,
 			value : value,
 			anchor : '95%'
 		}]
@@ -138,7 +137,6 @@
 			id : 'configItemOptionSterName',
 			name : 'configItemOptionSterName',
 			allowBlank : true,
-			readOnly: true,
 			value : value,
 			anchor : '95%'
 		}]
@@ -2102,6 +2100,9 @@
 			success : function(response,options){
 				var result = Ext.decode(response.responseText);
 				if(result.success){
+					if(result.isTraceble == '否'){
+						showResult('该物品是不追溯的包，请检查炉号炉次是否正确！');
+					}
 					if(isQMView == true){
 						if(tempBarcode != null && tempBarcode != ''){
 							top.Ext.getCmp('tousseName2').setValue(result.tousseName + "(" + tempBarcode + ")");