Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r26337 -r26370
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 26337)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 26370)
@@ -31,6 +31,7 @@
 var onErrorDamageBtnClick = null;
 var curSelMaterialName = null;
 var curSelMaterialId = null;
+
 //判断是否ie和ie7
 var isIE6OrIE7 = top.Ext4.isIE6 || top.Ext4.isIE7;
 var appDepartJsonStore = new Ext4.data.Store({
@@ -700,7 +701,10 @@
 	{name : 'customSplitBasketAmount'},
 	{name : 'serialNumber'},
 	{name : 'cleaned'},
-	{name : 'note'}
+	{name : 'note'},
+	{name : 'urgentLevelObj'},
+	{name : 'colorCode'},
+	{name : "urgentLevelName"}
 ]});
 
 function buildColumnTreeColumns(treeId){
@@ -781,24 +785,52 @@
 			align:'center',
 		    sortable: true,
 		    dataIndex: 'urgentAmount',
+			hidden:!sstsConfig.enableUrgentFunction,
 		    renderer: function(v,p,record,rowIndex, columnIndex, store,view){
 		    	if(v > 0){
-		    		/*if(record.get("leaf")){
-		    			return  null ;
-		    		}else{
-		    			return "<p style=\"background-color:#FF9797\">" + v + "</p>";
-		    		}*/
-		    		return "<p style=\"background-color:#FF9797\">" + v + "</p>";
+					var urgentAmountColor = "";
+					if(sstsConfig.enableUrgentFunction){
+						if(record.get("leaf")){//子级
+							var colorCode = record.get("urgentLevelObj").colorCode;
+							if(colorCode != ""){//有加急的
+								urgentAmountColor = "<p style=\"background-color:"+colorCode+"\">" + v + "</p>";
+							}
+						}else{//父级
+							var parentColor = record.get("colorCode");
+							urgentAmountColor = "<p style=\"background-color:"+parentColor+"\">" +v + "</p>";
+						}
+					}
+		    		return urgentAmountColor;
 		    	}else{
 		    		return null;
 		    	}
 		    }
 		},{
-			header: '加急等级',
+			header: '加急级别',
 			width: 60,
 			align: 'center',
 			sortable: true,
-			dataIndex: 'urgentLevel'
+			hidden:!sstsConfig.enableUrgentFunction,
+			dataIndex: 'urgentLevel',
+			renderer: function(v,p,record,rowIndex, columnIndex, store,view){
+				if(sstsConfig.enableUrgentFunction){
+					var urgentLevel = "";
+					if(record.get("leaf")){
+						var colorCode = record.get("urgentLevelObj").colorCode;
+						var name = record.get("urgentLevelObj").name;
+						if(colorCode != ""){
+							urgentLevel = "<p style=\"background-color:"+colorCode+"\">" +name + "</p>";
+						}
+					}else{
+						var parentColor = record.get("colorCode");
+						var urgentLevelName = record.get("urgentLevelName");
+						urgentLevel = "<p style=\"background-color:"+parentColor+"\">" + urgentLevelName + "</p>";
+					}
+					return urgentLevel;
+				}else{
+					return null;
+				}
+			}
 		},{
 			header: '清洗篮筐',
 			width : 110,
@@ -2392,7 +2424,7 @@
 		taskStatus,department,tousseType, packageType, packageSize,
 		sterilingMethod,recyclingTime,isTraceable,isPrint,isReview,errors,
 		damages,replenishMaterils,taskType,supplierName,haveIDCard,urgentAmount,idCardBarcode,
-		allowModifyPackageType,errorRemark,damageRemark,urgentLevel,serialNum,recyclingItemRemark,cleaned,note){
+		allowModifyPackageType,errorRemark,damageRemark,urgentLevel,serialNum,recyclingItemRemark,cleaned,note,urgentLevelObj,colorCode,urgentLevelName){
 	var leaf = false;
 	if(taskId != ''){
 		leaf = true;
@@ -2434,7 +2466,10 @@
 		serialNumber:serialNum,
 		recyclingItemRemark:recyclingItemRemark,
 		cleaned: cleaned,
-		note: note
+		note: note,
+		urgentLevelObj:urgentLevelObj,
+		colorCode:colorCode,
+		urgentLevelName:urgentLevelName
 	});
 	if(!leaf){
 		node.set("checked" ,false);
@@ -3961,6 +3996,7 @@
 									showResult('该篮筐在'+taskGroup+'内无装配任务！' , null , sstsConfig.messagePauseTimeOnPackingPage);
 								}
 	                        	var speakBasket = new SpeakBasket();
+								
 	                        	for(var n = 0;n < nLength; n++){
 	                        		var taskVO = taskList[n];
 									var td_id = taskVO.tousseID;
@@ -3997,7 +4033,7 @@
 										parentNode = addTaskNode('',td_id,'',videoNames,tousseName,0,'','','',
 												'','',tousseType, packageType, "",
 												sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount,
-												taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'','',taskVO.cleaned,taskVO.note);
+												taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'','',taskVO.cleaned,taskVO.note,'',taskVO.colorCode,taskVO.urgentLevelName);
 										newParentNode = true;
 									}else{
 										var uamountStr = parentNode.get('urgentAmount');
@@ -4070,7 +4106,7 @@
 											var childNode =	addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
 													taskStatus,department,tousseType, packageType,packageSize,sterilingMethod,dateTime,isTraceable,isPrint,isReview,
 													errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount,task.idCardBarcode,
-													task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber,task.recyclingItemRemark,task.cleaned,task.note);
+													task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber,task.recyclingItemRemark,task.cleaned,task.note,task.urgentLevelObj,task.colorCode,task.urgentLevelName);
 											parentNode.appendChild(childNode);
 											var pNewAmount = parentNode.get('amount') + amount;
 											parentNode.set('amount',pNewAmount);