Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r24079 -r24092
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 24079)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 24092)
@@ -1078,7 +1078,7 @@
 			type : 'array'
 		}
 	},
-	fields : [ 'id','typeName','typeNameAndPurpose' ],
+	fields : [ 'id','typeName','typeNameAndPurpose','sterilizationMode' ],
 	autoLoad : true
 });
 //灭菌炉
@@ -1515,9 +1515,26 @@
 		editable:false,
 		triggerAction : 'all',
 		typeAhead : false,
-		allowBlank : false
+		allowBlank : false,
+		listeners : {
+			select : function(combo,rec){
+				Ext4.getCmp('sterilingMode').setValue(rec[0].data["sterilizationMode"]);
+			}
+		}
 	},{
 		columnWidth :.5,
+		xtype : 'textfield',
+		fieldLabel : '灭菌方式',
+		hidden : sstsConfig.hideSterilingType,
+		id : 'sterilingMode',
+		name : 'sterilingMode',
+		componentCls:'formItemMgn',
+		readOnly : true,
+		labelWidth:90,
+		labelAlign:'right',
+		anchor : '90%'
+	},{
+		columnWidth :.5,
 		xtype : 'combo',
 		fieldLabel : '包装类型',
 		id : 'packageType',
@@ -1581,7 +1598,7 @@
     			 var reset = false;
     			 SterilizationRecordTableManager.getSterilisationAndMaxFrequencyMap(combo.value,0,function(map){
     				 var sterilizerTypeData = new Array();
-    				 sterilizerTypeData.push(new Array("0","无",""));
+    				 sterilizerTypeData.push(new Array("0","无","",""));
     				 var frequency = 1;
     				 if(map){
     					 if(map.sterilisationList){
@@ -1592,7 +1609,7 @@
     							 if(purpose != null && purpose != ''){
     								 sterilisationAndpurposeStr = map.sterilisationList[k].sterilisation + '(' + purpose + ')';
     							 }
-    							 sterilizerTypeData.push(new Array(map.sterilisationList[k].id, map.sterilisationList[k].sterilisation,sterilisationAndpurposeStr));
+    							 sterilizerTypeData.push(new Array(map.sterilisationList[k].id, map.sterilisationList[k].sterilisation,sterilisationAndpurposeStr, map.sterilisationList[k].sterilizationMode));
     							 if(sterilizerTypeObj == map.sterilisationList[k].sterilisation){
     								 reset = false;
     							 }
@@ -1608,6 +1625,7 @@
     				 Ext4.getCmp('frequency').setValue(frequency);
     				 if(reset){
     					 Ext4.getCmp("sterilingType").setValue("");
+    					 Ext4.getCmp("sterilingMode").setValue("");
     				 }
     			 });
     		 }
@@ -3239,6 +3257,7 @@
 	 }
 	 Ext4.getCmp('remark').setValue();
      Ext4.getCmp('sterilingType').setValue(null);
+     Ext4.getCmp("sterilingMode").setValue("");
      Ext4.getCmp('packageType').setValue(null);
      Ext4.getCmp('packageType').enable();
      lastSelectedTousseName = null;