Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r36568 -r36597
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 36568)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 36597)
@@ -92,46 +92,40 @@
 	//return "<a href=\"#\" onclick=\"callModifyFun('"+v+"',"+dataArrStr+");return false;\">" + v + "</a>";
 }
 
-function renderPackageStatusColor(v, p, record){//包状态
-	var packageStatus = record.data['packageStatus'];
-	var color = "";
-	var fontSizeColor = "";
-	if(packageStatus == '已终止'){
-		color = "red";
-	}else if(packageStatus == '待接收' || packageStatus == '部分接收'){
-		color = '#ffff00';//黄色
-	}else if(packageStatus == '已归还'){
-		color = '#7030a0';//紫色
-		fontSizeColor = '#fff';
+//NFYY-29：收费状态背景颜色
+function renderChargeStatusColor(v, p, record){
+	var chargeStatus = record.data['chargeStatus'];
+	var color = '';
+	if(chargeStatus == '待确认'){
+		color = '#FFFF00';//黄色
+	}else if(chargeStatus == '已确认'){
+		color = '#fff';//白色
 	}
-	return "<p style='background-color:"+color+";color:"+fontSizeColor+"'>" + v + "</p>";
+	return "<p style='background-color:"+color+";'>" + v + "</p>";
 }
 
-function renderRecyclingStatusColor(v, p, record){//回收状态
+//GDSZYY-229：回收状态背景颜色
+function renderRecyclingStatusColor(v, p, record){
 	var recyclingStatus = record.data['recyclingStatus'];
-	var packageStatus = record.data['packageStatus'];
 	var color = "";
 	var fontColor = "";
-	if(packageStatus == '已归还'){
-		if(recyclingStatus == '已提前归还'){
-			color = '#ffa500';//橙色
-		}else{
-			color = '#fff';//白色
-		}
-	}else {
-		if(recyclingStatus == '已终止'){
-			color = "red";
-			fontColor = '#fff';
-		}else if(recyclingStatus == '待回收'){
-			color = '#a52a2a';//棕色
-			fontColor = '#fff';
-		}else if(recyclingStatus == '二次回收' || recyclingStatus == '已提前归还'){
-			color = '#ffa500';//橙色
-		}
+	if(recyclingStatus == '已终止'){
+		color = "red";
+		fontColor = '#fff';
+	}else if(recyclingStatus == '待接收' || recyclingStatus == '部分接收'){
+		color = '#ffff00';//黄色
+	}else if(recyclingStatus == '已接收'){
+		color = '#fff';//白色
+	}else if(recyclingStatus == '待回收' || recyclingStatus == '部分回收'){
+		color = '#a52a2a';//棕色
+		fontColor = '#fff';
+	}else if(recyclingStatus == '二次回收'){
+		color = '#ffa500';//橙色
 	}
 	return "<p style='background-color:"+color+";color:"+fontColor+"'>" + v + "</p>";
 }
 
+//ZSYY-330：装配状态背景颜色
 function renderPackingStateColor(v, p, record){
 	var color = '';
 	var fontColor = '';
@@ -151,6 +145,7 @@
 	return "<p style=\"background-color:"+color+";color:"+fontColor+"\">" + v + "</p>";
 }
 
+//ZSYY-330：灭菌状态背景颜色
 function renderSterilizationStateColor(v, p, record){
 	var color = '';
 	var fontColor = '';
@@ -170,36 +165,19 @@
 	return "<p style=\"background-color:"+color+";color:"+fontColor+"\">" + v + "</p>";
 }
 
-function renderChargeStatusColor(v, p, record){
-	var chargeStatus = record.data['chargeStatus'];
-	var color = '';
-	if(chargeStatus == '待确认'){
-		color = '#FFFF00';//黄色
-	}else if(chargeStatus == '已确认'){
-		color = '#fff';//白色
-	}
-	return "<p style='background-color:"+color+";'>" + v + "</p>";
-}
-
-function renderDeliverStatusColor(v, p, record){//发货状态
+//GDSZYY-229：发货状态背景颜色
+function renderDeliverStatusColor(v, p, record){
 	var deliverStatus = record.data['deliverStatus'];
-	var packageStatus = record.data['packageStatus'];
-	var recyclingStatus = record.data['recyclingStatus'];
 	var color = "";
 	var fontColor = '';
-	if(recyclingStatus == '待回收'){
-		color = '#fff';//白色
-	}else {
-		if(deliverStatus == '已终止'){
-			color = "red";
-			fontColor = '#fff';
-		}else if(packageStatus == '已接收' && deliverStatus == '待发货'){
-			color = "#00b0f0";//蓝色
-			fontColor = '#fff';
-		}else if(packageStatus == '已接收' && (deliverStatus == '已发货' || deliverStatus == '部分发货')){
-			color = "#00b050";//绿色
-			fontColor = '#fff';
-		}
+	if(deliverStatus == '已终止'){
+		color = "red";
+		fontColor = '#fff';
+	}else if(deliverStatus == '待发货'){
+		color = "#fff";//白色
+	}else if(deliverStatus == '已发货'){
+		color = "#00b050";//绿色
+		fontColor = '#fff';
 	}
 	return "<p style=\"background-color:"+color+";color:"+fontColor+"\">" + v + "</p>";
 }