Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r35034 -r35035
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 35034)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 35035)
@@ -2477,23 +2477,31 @@
 						};
 					}
 					loadTousseMsg({},arr);
+					enableRecycleAndRepacking();
+					top.Ext.getCmp('disabledBarcode').enable();
 				}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
-						};
+					if(tousseItems.length > 0){
+						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+1),
+								isRecycle:'否',
+								isRePacking:'否',
+								isDiscard:'否',
+								scope:scope,
+								showInput:true
+							};
+						}
+						loadMateriaAndTousselMsg({},arr);
+						if(tousseItems.length > 1){
+							addExtractCheckMaterial("","",1,"","","",true,"","",true,"","",1);
+						}
+						enableRecycleAndRepacking();
+						top.Ext.getCmp('disabledBarcode').enable();
 					}
-					loadMateriaAndTousselMsg({},arr);
-					addExtractCheckMaterial("","",1,"","","",true,"","",true,"","",i);
 				}
 			}, 500);
 		}
@@ -4124,7 +4132,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{
 				top.Ext.getCmp('material').setValue(mateialName);
 				top.Ext.getCmp('materialAmount').setValue(amount);