Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r17692 -r17799
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 17692)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 17799)
@@ -480,8 +480,8 @@
 				if(result.data.scope == "器械包"){
 					top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
 					top.Ext.getCmp('tousseInfoFieldSet').setVisible(true);
-					top.Ext.getCmp('material').setVisible(false);   
-					top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(false);
+					top.Ext.getCmp('materialId').setVisible(false);   
+//					top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(false);
 					top.Ext.getCmp('amount').setVisible(true);   
 					top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(true);
 					hideExtractCheckMaterial();
@@ -509,8 +509,8 @@
 					top.Ext.getCmp('repacking').setVisible(false);   
 					top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(false);
 					showAllTousseOfSterileCheckBox(false);
-					top.Ext.getCmp('material').setVisible(true);   
-					top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('materialId').setVisible(true);   
+//					top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
 					top.Ext.getCmp('amount').setVisible(true);   
 					top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(true);
 					//showExtractCheckMaterial();
@@ -526,8 +526,8 @@
 				}else if(result.data.scope == "材料和器械包"){
 					top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
 					top.Ext.getCmp('tousseInfoFieldSet').setVisible(true);
-					top.Ext.getCmp('material').setVisible(true);   
-					top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('materialId').setVisible(true);   
+//					top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
 					top.Ext.getCmp('amount').setVisible(true);   
 					top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(true);
 					top.Ext.getCmp('tempBarcode').setVisible(true);   
@@ -545,8 +545,8 @@
 				}else if(result.data.scope == "无"){
 					top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
 					top.Ext.getCmp('tousseInfoFieldSet').setVisible(true);
-					top.Ext.getCmp('material').setVisible(true);   
-					top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('materialId').setVisible(true);   
+//					top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
 					top.Ext.getCmp('amount').setVisible(true);   
 					top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(true);
 					top.Ext.getCmp('tempBarcode').setVisible(true);   
@@ -1524,26 +1524,32 @@
 					},
 					anchor : '95%'
 				},{
-					xtype : 'combo',
-					id : 'material',
-					name : 'material',
-					fieldLabel : '抽检器械',
-					queryParam : 'spell',
-					minChars : 0,
-					valueField : 'id',
-					displayField : 'name',
-					store : materialDefinitionStore,
-					forceSelection : true,
-					lazyInit : true,
-					triggerAction : 'all',
-					hideTrigger : true,
-					typeAhead : false,
-					anchor : '95%',
-					listeners : {
-						select : function(combo, record, index) {
-							combo.setValue(record.data.name);
+					layout : 'form',
+					id : 'materialId',
+					columnWidth : 1,
+					labelWidth : 90,
+					items : [{
+						xtype : 'combo',
+						id : 'material',
+						name : 'material',
+						fieldLabel : '抽检器械',
+						queryParam : 'spell',
+						minChars : 0,
+						valueField : 'id',
+						displayField : 'name',
+						store : materialDefinitionStore,
+						forceSelection : true,
+						lazyInit : true,
+						triggerAction : 'all',
+						hideTrigger : true,
+						typeAhead : false,
+						anchor : '95%',
+						listeners : {
+							select : function(combo, record, index) {
+								combo.setValue(record.data.name);
+							}
 						}
-					}
+					}]
 				},{
 					layout : 'form',
 					hidden : !(qualityMonitoringWRRecordID > 0 && (sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),
@@ -1870,8 +1876,9 @@
 						top.Ext.getCmp('allTousseOfSterile').setVisible(false);
 						top.Ext.getCmp('allTousseOfSterile').getEl().up('.x-form-item').setDisplayed(false);
 					}else if("器械包" == result.data.scope){
-						top.Ext.getCmp('material').setVisible(false);   
-						top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(false);
+//						top.Ext.getCmp('materialId').setVisible(false);   
+//						top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(false);
+						top.Ext.getCmp('materialId').setVisible(false);
 						top.Ext.getCmp('amount').setVisible(true);   
 						top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(true);
 					}