Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r30584 -r31183
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 30584)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 31183)
@@ -645,11 +645,18 @@
 		data : [['全部'],['器械包申请单'],['一次性物品申请单'],['通用申请单']]
 	});
 	
-   var expensiveGoodsPaperTypeStore = new Ext.data.JsonStore({
+   	var expensiveGoodsPaperTypeStore = new Ext.data.JsonStore({
 		fields : [ 'name'],
 		url : WWWROOT + '/disinfectSystem/labelTemplateAction!getAllExpensiveGoodsPaperTypeStore.do'
 	});
 	
+	//加急等级数据源
+	var urgentStore = new Ext.data.JsonStore({
+		fields : ['id','name'],
+		root:'data',
+		url : WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!loadAllExceptDisabledUrgent.do',
+	});
+
 	var tabsItemArr = new Array();
 	var itemWidth = (document.body.offsetWidth>1400)?document.body.offsetWidth-60:1420;
 	tabsItemArr.push({
@@ -1064,6 +1071,36 @@
 				        	        	 allowBlank : false
 		             		  }]
 		             	  },{
+							layout:'form',
+						   	labelWidth : fontSize == 12 ? 180 : 210,
+						   	labelAlign:"right",
+							columnWidth: .25,
+							hidden:!(sstsConfig.enableTousseVoluntarilyUrgent && sstsConfig.enableUrgentFunction),
+							items:[{
+								xtype:'hidden',
+								name:'urgentLevelId',
+								id:'urgentLevelId'
+							},{
+								xtype : 'combo',
+								fieldLabel : '自动加急的加急级别',
+								id : 'urgentLevelName',
+								name : 'urgentLevelName',
+								valueField : 'name',
+								displayField : 'name',
+								anchor : '100%',
+								editable : false,
+								store : urgentStore,
+								forceSelection : true,
+								allowBlank : true,
+								triggerAction : 'all',
+								listeners:{
+									select : function (combo, record, index ){
+										var id = record.data.id;
+										Ext.getCmp('urgentLevelId').setValue(id);
+									}
+								}
+							}]
+						},{
 		             		  layout:'form',
 		             		  labelWidth : 180,
 		             		  columnWidth: .25,
@@ -3199,8 +3236,8 @@
             		var isDgConvertApplication = Ext.getCmp("isDgConvertApplication").getValue();
             		var saveImagePath = Ext.getCmp("saveImagePath").getValue();
             		var mergeTousseRuleForInvoiceBatchPrint = Ext.getCmp("mergeTousseRuleForInvoiceBatchPrint").getValue();
-            		var receiptor = Ext.getCmp("receiptor").getValue();
-            		
+					var receiptor = Ext.getCmp("receiptor").getValue();
+					var urgentLevelId = Ext.getCmp("urgentLevelId").getValue();
             		var myMask = new Ext.LoadMask(Ext.getBody(), {msg:"正在保存..."});
             		myMask.show();
             		
@@ -3233,7 +3270,8 @@
 	                    	autoMergeApplication : autoMergeApplication,//
 	                    	autoSignInvoice : autoSignInvoice,//
 	                    	bigPackageSterilizerType : bigPackageSterilizerType,//
-	                    	barcodePaperType : barcodePaperType,//
+							barcodePaperType : barcodePaperType,//
+							urgentLevelId:urgentLevelId,
 	                    	expensiveGoodsPaperType : expensiveGoodsPaperType,//
 	                    	basketLoadeTousseAmount : basketLoadeTousseAmount,//
 	                    	customTousseDefaultTaskGroup : customTousseDefaultTaskGroup,//
@@ -3540,6 +3578,11 @@
 			if(supplyRoomConfig.expensiveGoodsBillWarningTime!=null){
 				Ext.getCmp('expensiveGoodsBillWarningTime').setValue(supplyRoomConfig.expensiveGoodsBillWarningTime);
 			}
+			//ZSSXLRMYY-198:自动加急的加急级别
+			if(supplyRoomConfig.urgentLevel){
+				Ext.getCmp('urgentLevelName').setValue(supplyRoomConfig.urgentLevel.name);
+				Ext.getCmp('urgentLevelId').setValue(supplyRoomConfig.urgentLevel.id);
+			}
 			
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrint').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);