Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
===================================================================
diff -u -r26289 -r26392
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 26289)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 26392)
@@ -355,6 +355,18 @@
 	function renderCallModifyFunction(v, p, record){
 		return "<a id='" + v + "' href=\"javascript:callModifyFunction();\" onclick=\"callModifyFunction();\">" + v + "</a>";
 	}
+	//加急--发货计划列表
+	function renderCallMainFunction(v, p, record){
+		if(sstsConfig.enableUrgentFunction && record.json.maxUrgentLevel && record.json.maxUrgentLevel.colorCode != undefined){
+			var colorClassName = getClassNameForColor(record.json.maxUrgentLevel.colorCode);
+			var result = "";
+			result += "<div class='underCell " + colorClassName + " invoice-urgentImgDiv'>";
+			result += "<img src='";
+			result += WWWROOT + "/images/web/urgent-white.png'";
+			result += " class='sL-urgentImgBasket' ></div>";
+			return result;
+		}
+	}
 	diposableGooodsStore.on('load', function(){
 		selectDisposableGoodsTypeOnLoad();
 		refreshList();
@@ -426,9 +438,9 @@
 	    bodyStyle : 'border:1px solid #afd7af',
 	    sm : row_selectModel,
 	    cm : new top.Ext.grid.ColumnModel([selectModel,
-            {header : "紧急度",width : 20,dataIndex : 'urgency', renderer : urgencyIconRender3},
-	         {header : "科室",width : 50,dataIndex : 'depart',menuDisabled:true,renderer : renderCallModifyFunction},
-	      	 {id:'remark',header : "备注",width : 130,dataIndex : 'remark',menuDisabled:true}
+            {header : "是否加急",width : 20,dataIndex : 'urgency', renderer : renderCallMainFunction},
+	        {header : "科室",width : 50,dataIndex : 'depart',menuDisabled:true,renderer : renderCallModifyFunction},
+	      	{id:'remark',header : "备注",width : 130,dataIndex : 'remark',menuDisabled:true}
 	    ]),
 	    autoExpandColumn : 'remark',
 	    frame : false,
@@ -437,16 +449,18 @@
 			//是否隔行换色
 			stripeRows: false,
 			getRowClass : function(record,rowIndex,rowParams,store){
+ 				var className = "";
 				//借物单高亮
 				var remark = record.get('remark');
 				if (remark.indexOf("借物单") != -1){
-					return 'BorrowList';
+					className += 'BorrowList';
 				}
 				if(sstsConfig.invoicePlanList_notice_auxiliaryInvoice_history){
 					if(record.data.sent){
-	            		return 'invoicePlanList_notice_auxiliaryInvoice_history';
+	            		className += 'invoicePlanList_notice_auxiliaryInvoice_history';
 	            	}
 				}
+				return className;
 			}
 		},
 	    loadMask:{msg:'正在加载，请稍候...'},
@@ -485,6 +499,14 @@
 	
 	var	view_recyclingapplicationCm = new Ext.grid.ColumnModel([
         {header : "申请的物品",id:'showTousseName',dataIndex : 'showTousseName',width : 180,menuDisabled: true},
+		{header : "最高紧急程度",dataIndex : 'heimu',width : 50, menuDisabled: true,
+			renderer : function(v, p, record){
+				//最高紧急
+				if(sstsConfig.enableUrgentFunction && record.json.maxUrgentLevel != undefined && record.json.maxUrgentLevel.colorCode != undefined){
+					return record.json.maxUrgentLevel.name;
+				}
+			}
+		},
         {header : "待发",dataIndex : 'count',width : 50, menuDisabled: true},
 		{header : '加急',id : 'urgentAmount',dataIndex : 'urgentAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount}
 	]);
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r26303 -r26392
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 26303)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 26392)
@@ -454,6 +454,7 @@
 var addGridItem = Ext.data.Record.create([
     {name : 'id'},
     {name : 'barcode'},
+	{name :	'urgentLevel'},
     {name : 'name'},
     {name : 'appRecord'},
     {name : 'tousseFixedBarcode'},
@@ -626,6 +627,7 @@
 		var newRecord = new addGridItem({
 			id : 0,
 			barcode : goods.barcode,
+			urgentLevel : goods.urgentLevel,
 			name : goods.name,
 			ttsName : goods.ttsName,
 			tousseFixedBarcode : goods.tousseFixedBarcode,
@@ -666,6 +668,7 @@
 	var newRecord = new addGridItem({
 		id : 0,
 		barcode : goods.barcode,
+		urgentLevel : goods.urgentLevel,
 		name : goods.name,
 		ttsName : goods.ttsName,
 		tousseFixedBarcode : goods.tousseFixedBarcode,
@@ -1420,6 +1423,7 @@
 			fields : [
 			  	    {name : 'id'},
 			  	    {name : 'barcode'},
+					{name : 'urgentLevel'},
 			  	    {name : 'name'},
 			  	    {name : 'ttsName'},
 			  	    {name : 'appRecord'},
@@ -1581,6 +1585,13 @@
 				}
 			})*/
 		},
+		{header : "最高紧急程度",dataIndex : 'heimu',width : 180,menuDisabled: true,
+			renderer : function(v, p, record){
+				if(sstsConfig.enableUrgentFunction && record.json.maxUrgentLevel && record.json.maxUrgentLevel.colorCode != undefined){
+					return record.json.maxUrgentLevel.name;
+				}
+			}
+		},
 		{header : '加急',id : 'urgentAmount',dataIndex : 'urgentAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount},
 		{header : '实发',id : 'tempAmount',dataIndex : 'tempAmount',width : 50,value : 0, menuDisabled: true,renderer:formatScannedAmount},
 		{header : '误差',id : 'errorAmount',dataIndex : 'errorAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount},
@@ -1618,7 +1629,22 @@
 	    {header : "批次/灭菌日期",dataIndex : 'batchNumber',width : 70,menuDisabled: true}
 	]);
 	var cm = new Ext.grid.ColumnModel([
-			{header : "条码",dataIndex : 'barcode',width : 65,menuDisabled: true},
+			{header : "条码",dataIndex : 'barcode',width : 95,menuDisabled: true,
+				renderer : function(v, p, record){
+					if(sstsConfig.enableUrgentFunction && record.data.urgentLevel != undefined && record.data.urgentLevel.colorCode != undefined){
+						var result = "";
+						result += "<div class='underCell invoice-urgentImgDiv'>";
+						result += "<img src='";
+						result += WWWROOT + "/images/web/urgent-red.png'";
+						result +=  " class='serialNumberHrefUrgImg' style='top:-3px;'/>";
+						result += v + "</div>";
+						return result;
+					}
+					else{
+						return v;
+					}
+				}
+			},
 			{header : "物品名称",dataIndex : 'showTousseName',width : 190,menuDisabled: true},
 			{header : "name",dataIndex : 'name',hidden : true,menuDisabled: true},
 			{header : "批次/灭菌日期",dataIndex : 'batchNumber',width : 125,menuDisabled: true},
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
===================================================================
diff -u -r26350 -r26392
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 26350)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 26392)
@@ -87,6 +87,7 @@
 		}
 		pageContext.setAttribute("allSterilisationStr", allSterilisationJSONArray.toString());
 	%>
+	<link rel="stylesheet" type="text/css" href="${ctx}/common/common.css"/>
 	<script type="text/javascript" src="${ctx}/js/common.js"></script>
 	<script type="text/javascript" src="${ctx}/js/Ext2CompUtil.js"></script>
 	<script type="text/javascript" src="${ctx}/js/json3.min.js"></script>