Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r28606 -r28868
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 28606)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 28868)
@@ -22,6 +22,9 @@
 //grid数据的总数据量,非表格行数,而是右下角的总记录数
 var totalDataCount = 0;
 
+//服务器的日期(格式yyyy-MM-dd)
+var serverDate;
+
 function onAllChoosedOrNot(combo, record,index,nameOfFiled){
 	var choose = record.get(combo.checkField);
 	var fristRecord = combo.store.getAt(0);
@@ -249,13 +252,10 @@
 function getValidAndWarningStatus(record,p){
 	var validUntil = record.data.validUntil;
 	var warningUntil = record.data.warningUntil;
-	var date = new Date();
-	var currentDate = "";
-	currentDate = date.getFullYear()+"-";
-	currentDate += (date.getMonth()+1)+"-";
-	currentDate += date.getDate();
-	var b = compareDate(myDateFormat(warningUntil,p,record),currentDate);//预警期
-	var f = compareDate(myDateFormat(validUntil,p,record),currentDate);//失效期
+
+	//由客户端时间改为和服务器时间进行比较
+	var b = compareDate(myDateFormat(warningUntil,p,record),serverDate);//预警期
+	var f = compareDate(myDateFormat(validUntil,p,record),serverDate);//失效期
 	var color = "";
 	if(!f){
 		return 2;//失效
@@ -318,6 +318,15 @@
 	}
 }
 
+/**
+ * 冒似此函数没有被任何地方调用
+ * @param record
+ * @param index
+ * @param p
+ * @param ds
+ * @returns {Number}
+ * @deprecated
+ */
 function changeRowBackgroundColor(record,index,p,ds){
 	var validUntil = record.data.validUntil;
 	var warningUntil = record.data.warningUntil;
@@ -433,7 +442,17 @@
 		return v;
 }
 
-Ext.onReady(function() {
+//ext的初始函数
+Ext.onReady(function(){
+	//取到服务器时间后再初始化调用初始函数
+	getServerTime("yyyy-MM-dd",Ext,null,function(serverTime){
+		serverDate = serverTime;
+		readyFunction(serverTime);
+	});
+});
+
+//初始函数
+var readyFunction = function(serverTime) {
 	var columns = new Array();
 	columns.push(
 		{header : "器械包名称",width : 180,dataIndex : 'tousseDefinition.name',renderer : renderCallTousseInstanceInfoShowFun},
@@ -1433,7 +1452,7 @@
 			items : grid
 		}]
 	});
-});
+}
 
 //回收记录,装配记录视频
 function recyclingRecordVideo(beginTime,endTime,deviceId){