Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r29016 -r29018
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 29016)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 29018)
@@ -1027,6 +1027,12 @@
 	}
 	return null;
 }
+
+/**
+ * 使用物品明细行的加急列的图标点击(已经改为下面的加急急别下拉选择的方式了)
+ * @param barcode
+ * @deprecated
+ */
 function urgentBtnClick(barcode){
 	var tousseInstanceGrid = top.Ext.getCmp('tousseInstanceGrid');
 	var record = getTousseInstanceRecord(barcode,tousseInstanceGrid);
@@ -1042,13 +1048,60 @@
 	
 	tousseInstanceGrid.getView().refresh();
 }
+
+/**
+ * 使用物品明细行的加急列的加急级别选择
+ * @param barcode
+ * @param urgentLevelId
+ */
+function urgentLevelSelect(barcode,urgentLevelId){
+	var tousseInstanceGrid = top.Ext.getCmp('tousseInstanceGrid');
+	var record = getTousseInstanceRecord(barcode,tousseInstanceGrid);
+	
+	if(record == null){
+		return;
+	}
+	record.data.urgentLevelIdForUseRecord = urgentLevelId;
+	//tousseInstanceGrid.getView().refresh();
+}
+
 function actualUsedClick(barcode,value){
 	var tousseInstanceGrid = top.Ext.getCmp('tousseInstanceGrid');
 	var record = getTousseInstanceRecord(barcode,tousseInstanceGrid);
 	if(record != null){
 		record.data.actualUsed = value;	
 	}	
 }
+
+function addAndEditUseRecord(id, status,recyclingStatus){
+	//判断是否开启有加急级别功能,并且还未加载过
+	if(sstsConfig.enableUrgentFunction && !urgentLevelData.hasLoaded){
+		Ext.Ajax.request({
+			url : WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!getUrgentsForSelect.do',
+			success : function(response, options) {
+				var result = Ext.decode(response.responseText);
+				if(result.message){
+					showResult(result.message);
+				}
+				if(result.success){
+					urgentLevelData.hasLoaded = true;
+					urgentLevelData.data = result.data;
+					addAndEditUseRecordAfterUrgentLevelDataLoaded(id, status,recyclingStatus);
+				}else{
+					if(!result.message){
+						showResult("加载加急级别失败.");
+					}
+				}
+			},
+			failure : function(response, options) {
+				showResult("加载加急级别失败.");
+			}
+		});
+	}else{
+		addAndEditUseRecordAfterUrgentLevelDataLoaded(id, status,recyclingStatus);
+	}
+}
+
 /**
  * 如果点击添加按钮，则传过来的ID为空
  * 
@@ -1057,7 +1110,7 @@
  *            审核状态
  * @return
  */
-function addAndEditUseRecord(id, status,recyclingStatus) {
+function addAndEditUseRecordAfterUrgentLevelDataLoaded(id, status,recyclingStatus) {
 	currentUseRecordId = id;
 	useRecordOperationRoomAllowBlank = getBoolValueFromJs('sstsConfig.useRecordOperationRoomAllowBlank',true);
 	useItemsStore.removeAll();
@@ -1294,29 +1347,40 @@
      	{header : "name",dataIndex : 'tousseDefinitionName',hidden : true,menuDisabled : true},
      	{header : "名称",dataIndex : 'showTousseName',width : 150,menuDisabled : true,renderer : renderTousseInstanceNameForUrgent},
      	{header : "使用次数",dataIndex : 'idCardUseAmount',width : 50,hidden : sstsConfig.disableIdCard},
-     	{header : '加急',width : 30,hidden : (sstsConfig.enableUrgentFunction),
+     	{header : '加急',width : 60,hidden : (!sstsConfig.enableUrgentFunction),
      		renderer : function(v, p, record,rowIndex, colIndex) {
-     			var imgName = (record.data.isUrgentForUseRecord=='是')?'arrow_down':'arrow_top';
+     			/*var imgName = (record.data.isUrgentForUseRecord=='是')?'arrow_down':'arrow_top';
      			var str = "<center>";
      			//对于聚合包内的子包所在的行,不提供加急选择
      			if(!record.get("comboTousseInstanceId")){
      				str += "<img src=\"" + WWWROOT + "/images/web/"+imgName+".png\" onclick='getCurrentTab().urgentBtnClick(\""+record.data.barcode+"\")'>";
      			}
      			str += "</center>";
-     			return str;
+     			return str;*/
+     			
+     			//由图标按钮调整为下拉框
+     			if(!record.get("comboTousseInstanceId")){
+     				var useRecordBarcode = record.data.barcode;
+     				var selectElementId = "select_"+useRecordBarcode;
+     				var urgentLevelComboHtml = "<select id='"+ selectElementId +"' onchange='getCurrentTab().urgentLevelSelect(\""+record.data.barcode+"\",this.value)'>";
+     				urgentLevelComboHtml += "<option value=''>不加急</option>";
+     				
+     				//遍历所配置的所有启用的加急级别
+     				if(urgentLevelData.data && urgentLevelData.data.length > 0){
+     					var urgentLevelIdForUseRecord = record.data.urgentLevelIdForUseRecord;
+     					for(var i = 0;i < urgentLevelData.data.length;i++){
+     						var urgentLevelDataId = urgentLevelData.data[i]["id"];
+     						urgentLevelComboHtml += "<option value=\""+ urgentLevelDataId +"\" "+ (urgentLevelIdForUseRecord && urgentLevelIdForUseRecord == urgentLevelDataId ? "selected" : "") +">"+ urgentLevelData.data[i]["urgentLevel"] +"</option>";
+     					}
+     				}
+     				urgentLevelComboHtml += "</select>";
+     				return urgentLevelComboHtml;
+     			}
+     			//对于聚合包内的子包所在的行,只进行相关字段的显示,不提供加急选择
+     			return "";
      		},
      		menuDisabled : true
-     	},{
-			header : "加急级别",
-			dataIndex : 'urgentLevel',
-			width : 70,
-			hidden : sstsConfig.enableUrgentFunction
-		},{
-			header : "是否真正使用",
-			dataIndex : 'actualUsed',
-			width : 70,
-			menuDisabled : true,
-			hidden:!sstsConfig.enableActualUsed,
+     	},{header : "是否真正使用",dataIndex : 'actualUsed',width : 70,menuDisabled : true,hidden:!sstsConfig.enableActualUsed,
      		renderer: function(v, p, record,rowIndex, colIndex){
  			//对于聚合包内的子包所在的行,不提供选择
  			if(!record.get("comboTousseInstanceId")){
@@ -2257,8 +2321,33 @@
 					listeners : {
 						render : function(c) {
 							c.getEl().on('keypress', function(e) {
-								if (e.getKey() == 13) {//
-									loadScanGoods();
+								if (e.getKey() == 13) {
+									//判断是否开启有加急级别功能,并且还未加载过
+									if(sstsConfig.enableUrgentFunction && !urgentLevelData.hasLoaded){
+										Ext.Ajax.request({
+											url : WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!getUrgentsForSelect.do',
+											success : function(response, options) {
+												var result = Ext.decode(response.responseText);
+												if(result.message){
+													showResult(result.message);
+												}
+												if(result.success){
+													urgentLevelData.hasLoaded = true;
+													urgentLevelData.data = result.data;
+													loadScanGoods();
+												}else{
+													if(!result.message){
+														showResult("加载加急级别失败.");
+													}
+												}
+											},
+											failure : function(response, options) {
+												showResult("加载加急级别失败.");
+											}
+										});
+									}else{
+										loadScanGoods();
+									}
 								}
 							});
 						}