Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r26370 -r26489
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 26370)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 26489)
@@ -703,8 +703,7 @@
 	{name : 'cleaned'},
 	{name : 'note'},
 	{name : 'urgentLevelObj'},
-	{name : 'colorCode'},
-	{name : "urgentLevelName"}
+	{name : 'colorCode'}
 ]});
 
 function buildColumnTreeColumns(treeId){
@@ -813,18 +812,18 @@
 			hidden:!sstsConfig.enableUrgentFunction,
 			dataIndex: 'urgentLevel',
 			renderer: function(v,p,record,rowIndex, columnIndex, store,view){
-				if(sstsConfig.enableUrgentFunction){
+				if(v != "" ){
 					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>";
+					if(sstsConfig.enableUrgentFunction){
+						if(record.get("leaf")){//子级
+							var colorCode = record.get("urgentLevelObj").colorCode;
+							if(colorCode != ""){
+								urgentLevel = "<p style=\"background-color:"+colorCode+"\">" +v + "</p>";
+							}
+						}else{//父级
+							var parentColor = record.get("colorCode");
+							urgentLevel = "<p style=\"background-color:"+parentColor+"\">" +v + "</p>";
 						}
-					}else{
-						var parentColor = record.get("colorCode");
-						var urgentLevelName = record.get("urgentLevelName");
-						urgentLevel = "<p style=\"background-color:"+parentColor+"\">" + urgentLevelName + "</p>";
 					}
 					return urgentLevel;
 				}else{
@@ -2424,7 +2423,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,urgentLevelObj,colorCode,urgentLevelName){
+		allowModifyPackageType,errorRemark,damageRemark,urgentLevel,serialNum,recyclingItemRemark,cleaned,note,urgentLevelObj,colorCode){
 	var leaf = false;
 	if(taskId != ''){
 		leaf = true;
@@ -2468,8 +2467,7 @@
 		cleaned: cleaned,
 		note: note,
 		urgentLevelObj:urgentLevelObj,
-		colorCode:colorCode,
-		urgentLevelName:urgentLevelName
+		colorCode:colorCode
 	});
 	if(!leaf){
 		node.set("checked" ,false);
@@ -4033,7 +4031,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.colorCode,taskVO.urgentLevelName);
+												taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'','',taskVO.cleaned,taskVO.note,taskVO.urgentLevelObj,taskVO.colorCode);
 										newParentNode = true;
 									}else{
 										var uamountStr = parentNode.get('urgentAmount');
@@ -4078,7 +4076,7 @@
 										var replenishMaterils = task.replenishMaterils;
 										var taskType = task.taskType;
 										var supplierName = task.supplierName;
-										var packageSize = task.packageSize;
+										var packageSize = task.packageSize;								
 										
 										if(task.tousseType == '外来器械包'){
 											haveForeignTousseNode = true;
@@ -4106,7 +4104,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.urgentLevelObj,task.colorCode,task.urgentLevelName);
+													task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber,task.recyclingItemRemark,task.cleaned,task.note,task.urgentLevelObj,task.colorCode);
 											parentNode.appendChild(childNode);
 											var pNewAmount = parentNode.get('amount') + amount;
 											parentNode.set('amount',pNewAmount);