Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r35033 -r35034
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 35033)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 35034)
@@ -2461,7 +2461,7 @@
 				if(top.Ext.getCmp('scope')){
 					scope = top.Ext.getCmp('scope').getValue();
 				}
-				if(scope == '器械包' || scope == '材料和器械包'){
+				if(scope == '器械包'){
 					for(var i=0;i<tousseItems.length;i++){
 						arr[i] = {
 							barcode:tousseItems[i].data.barcode,
@@ -2472,10 +2472,28 @@
 							isRecycle:'否',
 							isRePacking:'否',
 							isDiscard:'否',
+							scope:scope,
 							showInput:true
 						};
 					}
 					loadTousseMsg({},arr);
+				}else if(scope == '材料和器械包'){
+					for(var i=0;i<tousseItems.length;i++){
+						arr[i] = {
+							barcode:tousseItems[i].data.barcode,
+							tousseInstanceId:tousseItems[i].data.id,
+							tousseName:tousseItems[i].data.tousseDefinitionName,
+							amount:tousseItems[i].data.amount,
+							orderNumber:i,
+							isRecycle:'否',
+							isRePacking:'否',
+							isDiscard:'否',
+							scope:scope,
+							showInput:true
+						};
+					}
+					loadMateriaAndTousselMsg({},arr);
+					addExtractCheckMaterial("","",1,"","","",true,"","",true,"","",i);
 				}
 			}, 500);
 		}
@@ -3917,10 +3935,6 @@
 // 监测范围是器械包，加载器械包
 function loadTousseMsg(qualityMonitoringInstance, qualityMonitoringGoodsList){
 	setIsRecycleAndIsRepackingForWholeFurnace(qualityMonitoringInstance);
-	var scope;
-	if(top.Ext.getCmp('scope')){
-		scope = top.Ext.getCmp('scope').getValue();
-	}
 	if(qualityMonitoringGoodsList == null || qualityMonitoringGoodsList == '' || qualityMonitoringGoodsList.length == 0){
 		return ;
 	}
@@ -3973,6 +3987,7 @@
 			var isRePacking = qualityMonitoringGoodsList[i].isRepacking;
 			var isDiscard = qualityMonitoringGoodsList[i].isDiscard;
 			var showInput = qualityMonitoringGoodsList[i].showInput;
+			var scope = qualityMonitoringGoodsList[i].scope;
 			if(!showInput){
 				addExtractCheckTousse(tousseName,barcode,tousseInstanceId,amount,orderNumber,isRecycle,isRePacking,isDiscard,"","","","",true);
 			}else if(scope == '器械包' || scope == '材料和器械包'){
@@ -4127,7 +4142,13 @@
 				var isRecycle = qualityMonitoringGoodsList[i].isRecycle;
 				var isRePacking = qualityMonitoringGoodsList[i].isRepacking;
 				var isDiscard = qualityMonitoringGoodsList[i].isDiscard;
-				addExtractCheckTousse(tousseName,barcode,tousseInstanceId,amount,orderNumber,isRecycle,isRePacking,isDiscard,"","","","",true);
+				var showInput = qualityMonitoringGoodsList[i].showInput;
+				var scope = qualityMonitoringGoodsList[i].scope;
+				if(!showInput){
+					addExtractCheckTousse(tousseName,barcode,tousseInstanceId,amount,orderNumber,isRecycle,isRePacking,isDiscard,"","","","",true);
+				}else if(scope == '器械包' || scope == '材料和器械包'){
+					addExtractCheckTousse(tousseName,barcode,tousseInstanceId,amount,orderNumber,isRecycle,isRePacking,isDiscard,"","","","",true,showInput);
+				}
 			}else if(mateialName != null && mateialName != ''){
 				var amount = qualityMonitoringGoodsList[i].amount;
 				var orderNumber = qualityMonitoringGoodsList[i].orderNumber;