Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r27718 -r27723
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 27718)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 27723)
@@ -28,7 +28,11 @@
 var addExtractClick;//抽检器械后面添加按钮的显示与隐藏
 var addTousseClick;//器械包条码后面添加按钮的显示与隐藏
 var positionlabelWFlag = false; //控制样式
-var labelWidthLeft = 135;
+var labelWidthLeft = 135;
+if(Ext.getCmp("tousseInfoFieldSet")){
+	var getWidth = Ext.getCmp("tousseInfoFieldSet").items.items[0].el.dom.clientWidth;
+}
+
 function cancelQualityMonitoring() {
 	closeQMWindow();
 }
@@ -694,7 +698,7 @@
 					Ext.getCmp('sterilizationRecordInfo').setVisible(true);
 					// 如果监测范围为灭菌炉记录，隐藏器械包信息
 					Ext.getCmp('tousseInfoFieldSet').setVisible(false);
-					Ext.getCmp('addBtnAll').setVisible(false);
+					Ext.getCmp('addBtnAll').setVisible(true);
 					//Ext.getCmp('addExtractCheckTousse').setVisible(false);
 					//Ext.getCmp('addExtractCheckMaterial').setVisible(false);
 					hideExtractCheckMaterial();
@@ -739,8 +743,8 @@
 					hideFirstTousse();
 					showFirstMaterial();
 //					Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
-					Ext.getCmp('recycleC').setVisible(true);   
-					Ext.getCmp('repackingC').setVisible(true);
+					Ext.getCmp('recycleC').setVisible(false);   
+					Ext.getCmp('repackingC').setVisible(false);
 					showAllTousseOfSterileCheckBox(true);
 					Ext.getCmp('addBtnAll').setVisible(true);
 					//Ext.getCmp('addExtractCheckTousse').setVisible(false);
@@ -1562,8 +1566,7 @@
  */
 function addExtractCheckTousse(tousseName,tousseBarcode,tousseInstanceId,tAmount,orderNumber,isRecycle,isRePacking,isWrapper,isTousseAndMaterial,amount,tosseAndMaterialId,isLoad){
 	tousseItemCount++;
-	var tosseAndMaterial = Ext.getCmp('tosseAndMaterial');
-	
+	var tosseAndMaterial = Ext.getCmp('tosseAndMaterial');	
 	var items1 = new Array();
 	var items2 = new Array();
 	var items3 = new Array();
@@ -1719,9 +1722,14 @@
 
 	var columnW = 0.4;
 	var labelW = 90;
-	if(widthSetTousse == true){
-		columnW = 0.44;
-		labelW = 123;
+	if(widthSetTousse == true){
+		if(recycleQM == true){
+			columnW = 0.439;
+			labelW = 129;
+		}else{
+			columnW = 0.44;
+			labelW = 123;  
+		}
 	}else if(widthSetTousse == false ){
 		if(addTousseClick == true){
 			columnW = 0.4;
@@ -1733,7 +1741,10 @@
 	}else if(isLoad == true){
 		columnW = 0.4;
 		labelW = 90;
-	}
+	}/* else if(recycleQM == true){
+		columnW = 0.44;
+		labelW = 123;
+	} */
 	
 	items4 = {
 			layout : 'form',
@@ -1849,7 +1860,7 @@
 						layout : 'column',
 						columnWidth : .5,
 						labelWidth : 90,
-						width:820,
+						width:recycleQM ? getWidth : "",
 						id:'setLayout'+tousseAndMaterialWrapperCount+'_TP'
 					}]
 				});
@@ -2059,9 +2070,9 @@
 					addExtractClick = true;
 					addExtractCheckMaterial("","",1,"","",true,"","","","","","");
 					addExtractClick =  false;
-				}else if(result.data.scope == "灭菌炉记录"){
+				}/* else if(result.data.scope == "灭菌炉记录"){
 					showResultQM('监测项为灭菌炉记录不能添加器械和器械包!');
-				}else if(result.data.scope == "材料和器械包"){
+				} */else if(result.data.scope == "材料和器械包"){
 					widthSet = "";
 					addTousseClick = true;	
 					addExtractClick = true;
@@ -2075,7 +2086,7 @@
 							layout : 'column',
 							columnWidth : .5,
 							labelWidth : 90,
-							width:820,
+							width:recycleQM ? getWidth : "",
 							id:'setLayout'+tousseAndMaterialWrapperCount+'_TMP' 
 						}]
 					});
@@ -2099,7 +2110,9 @@
 					Ext.getCmp('addQualityMonitoringForm').doLayout();
 					
 				}else if(result.data.scope == "无"){
-					addExtractCheckMaterial();
+					addExtractClick = true;
+					addExtractCheckMaterial("","",1,"","",true,"","","","","","");
+					addExtractClick =  false;
 				}
 				
 				if(result.data.items.length > 0){
@@ -2136,12 +2149,17 @@
 					        title:"监测项",
 					        layout:'column',
 					        autoHeight:true,
+							width:recycleQM ? getWidth : "",
 					        items:items
 						});
 					}
 				}
 				
-				Ext.getCmp('addQualityMonitoringForm').doLayout();
+				Ext.getCmp('addQualityMonitoringForm').doLayout();				
+				if(Ext.getCmp('itemsFieldSet'+"_"+tousseAndMaterialWrapperCount)){
+					Ext.getCmp('itemsFieldSet'+"_"+tousseAndMaterialWrapperCount).doLayout();
+				}
+				
 				if(Ext.getCmp('tousseInfoFieldSet')){
 					Ext.getCmp('tousseInfoFieldSet').doLayout();
 				}
@@ -2894,7 +2912,8 @@
 	
 	//获取第一块器械包写死的数据
 	var firstTousseBagsList = {};
-	if(Ext.getCmp("scope").getValue() != "材料"){
+	//if(Ext.getCmp("scope").getValue() != "材料" || Ext.getCmp("scope").getValue() != "无" || Ext.getCmp("scope").getValue() != "灭菌炉记录"){
+	if(Ext.getCmp("scope").getValue() == "材料和器械包" || Ext.getCmp("scope").getValue() == "器械包"){
 		var tousseName = Ext.getCmp('tousseName').getRawValue();
 		var barcode = Ext.getCmp('barcode').getValue();
 		var tousseInstanceId = Ext.getCmp('tousseInstanceId').getValue();
@@ -2915,7 +2934,7 @@
 	
 	
 	var getTousseArgument2;
-	if(Ext.getCmp("scope").getValue() == "材料和器械包" || Ext.getCmp("scope").getValue() == "材料"){
+	if(Ext.getCmp("scope").getValue() == "材料和器械包" || Ext.getCmp("scope").getValue() == "材料" || Ext.getCmp("scope").getValue() == "无"){
 		if(firstAddMaterial != undefined){//点击第一个抽检器械按钮增加在第一个下面的
 			for(var v = 0; v < firstAddMaterial.length; v++){				
 				if((firstAddMaterial[v].id).indexOf("basketBarcodeC") == -1){//除了篮筐条码
@@ -2950,10 +2969,17 @@
 		var getFirstConfigItemOptionArgument = setConfigItemOptionArgument(firstItemsFieldSet);
 		configItemOptionFirst = getFirstConfigItemOptionArgument[0];
 	}
-	tousseInstanceInfos.push({
-		"tousseBags":getTousseArgument2,
-		"configItemOption":configItemOptionFirst
-	});
+
+	if(Ext.getCmp("scope").getValue() == "灭菌炉记录"){//只有监测项传值，没有器械包和抽检器械
+		tousseInstanceInfos.push({
+			"configItemOption":configItemOptionFirst
+		});
+	}else{
+		tousseInstanceInfos.push({
+			"tousseBags":getTousseArgument2,
+			"configItemOption":configItemOptionFirst
+		});
+	}
 	
 	//获取增加的块
 	if(tousseAndMaterialWrapperCountNum > 0){//增加的块 这里的判断条件有问题
@@ -2993,7 +3019,7 @@
 					});
 				}
 				
-			}else if(Ext.getCmp("scope").getValue() == "材料"){
+			}else if(Ext.getCmp("scope").getValue() == "材料" || Ext.getCmp("scope").getValue() == "无"){
 				if(Ext.getCmp('tosseAndMaterial'+k+'_MP')){
 					var materialWrapper = Ext.getCmp('tosseAndMaterial'+k+'_MP').items.items;
 					var getMaterialArgument = setMaterialArgument(materialWrapper);		
@@ -3009,6 +3035,16 @@
 						"configItemOption":configItemOption
 					});
 				}
+			}else if(Ext.getCmp("scope").getValue() == "灭菌炉记录"){
+				//监测项
+				if(Ext.getCmp('itemsFieldSet_'+ k)){
+					var wrapperItemsFieldSet = Ext.getCmp('itemsFieldSet_'+ k).items.items;
+					var getConfigItemOptionArgument = setConfigItemOptionArgument(wrapperItemsFieldSet);
+					configItemOption = getConfigItemOptionArgument[0];
+				}
+				tousseInstanceInfos.push({
+					"configItemOption":configItemOption
+				});
 			}
 		}
 	}