Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r27723 -r27729
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 27723)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 27729)
@@ -27,7 +27,6 @@
 var widthSetTousse;//控制样式
 var addExtractClick;//抽检器械后面添加按钮的显示与隐藏
 var addTousseClick;//器械包条码后面添加按钮的显示与隐藏
-var positionlabelWFlag = false; //控制样式
 var labelWidthLeft = 135;
 if(Ext.getCmp("tousseInfoFieldSet")){
 	var getWidth = Ext.getCmp("tousseInfoFieldSet").items.items[0].el.dom.clientWidth;
@@ -1098,7 +1097,7 @@
 	
 	var columnW = 0.32;
 	var labelW = 91;
-	var positionlabelW = 116;
+	var positionlabelW = 123;
 	if(widthSet == true){
 		columnW = 0.36;
 		if(recycleQM == true){
@@ -2439,8 +2438,16 @@
 						Ext.getCmp('containerName').getEl().up('.x-form-item').setDisplayed(false); 
 					}
 					materialDefinitionStore.baseParams['spell'] = "";
-					materialDefinitionStore.reload();
+					materialDefinitionStore.reload();
 					
+					if(qualityMonitoringWRRecordID > 0 && (sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition){
+						Ext.getCmp('basketBarcodeC').setVisible(true); 
+						Ext.getCmp('positionC').setVisible(true);
+					}else{
+						Ext.getCmp('basketBarcodeC').setVisible(false);
+						Ext.getCmp('positionC').setVisible(false);
+					}
+					
 					if("材料" == result.data.scope){
 						hideFirstTousse();
 						showFirstMaterial();
@@ -2549,7 +2556,14 @@
 				showResultQM('系统加载出错，请稍候再试');
 			}
 		});
-	}else{
+	}else{
+		if(qualityMonitoringWRRecordID > 0 && (sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition){
+			Ext.getCmp('basketBarcodeC').setVisible(true); 
+			Ext.getCmp('positionC').setVisible(true);
+		}else{
+			Ext.getCmp('basketBarcodeC').setVisible(false);
+			Ext.getCmp('positionC').setVisible(false);
+		}
 		setStartDate(Ext, 'yyyy/MM/dd HH:mm', 'dateTime');  //（设置抽检时间，取服务器时间 cjr）
 		disableRecycleAndRepacking();
 		var resonPart = Ext.getCmp('responsibilityPart').getValue();
@@ -3285,8 +3299,7 @@
 			var position = qualityMonitoringGoodsList[i].position;
 			Ext.getCmp('material').setValue(mateialName);
 			Ext.getCmp('materialAmount').setValue(amount);
-			Ext.getCmp('position').setValue(position);
-			positionlabelWFlag = true;
+			Ext.getCmp('position').setValue(position);
 		}else{
 			var mateialName = qualityMonitoringGoodsList[i].material;
 			var amount = qualityMonitoringGoodsList[i].amount;
@@ -3369,8 +3382,7 @@
 			var position = qualityMonitoringGoodsList[i].position;
 			Ext.getCmp('material').setValue(mateialName);
 			Ext.getCmp('materialAmount').setValue(amount);
-			Ext.getCmp('position').setValue(position);
-			positionlabelWFlag = true;
+			Ext.getCmp('position').setValue(position);
 		}else {
 			var tousseName = qualityMonitoringGoodsList[i].tousseName;
 			var mateialName = qualityMonitoringGoodsList[i].material;
@@ -3507,7 +3519,12 @@
 	if(recycleQM == true){
 		
 		disableShowImageButton = true;
-	}
+	}
+	var labelWidthPosition = 123;
+	if(id != null && id != ''){
+		labelWidthPosition = 91;
+	}
+	
 	var varibaleContent1;
 	var varibaleContent2;
 	// 责任环节带出监测项
@@ -4378,7 +4395,7 @@
 					}]
 				},{
 					layout : 'form',
-					hidden : !(qualityMonitoringWRRecordID > 0 && (sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),
+					//hidden : !(qualityMonitoringWRRecordID > 0 && (sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),
 					id : 'basketBarcodeC',
 					columnWidth : .36,
 					labelWidth : 90,
@@ -4400,10 +4417,10 @@
 					}]
 				},{
 					layout : 'form',
-					hidden : !(qualityMonitoringWRRecordID > 0 && (sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),
+					//hidden : !(qualityMonitoringWRRecordID > 0 && (sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),
 					id : 'positionC',
-					columnWidth : .36,
-					labelWidth : positionlabelWFlag ? 92: 116,
+					columnWidth : .36,
+					labelWidth :labelWidthPosition,
 					items : [{
 						xtype : 'textfield',
 						name : 'position',