Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js =================================================================== diff -u -r36104 -r36793 --- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js (.../storageLocationLookView.js) (revision 36104) +++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js (.../storageLocationLookView.js) (revision 36793) @@ -101,13 +101,13 @@ } //验证器械包预警期、失效期 -function getValidAndWarningStatus(record,p){ +function getValidAndWarningStatus(record,v){ var validUntil = record.data.validUntil; var warningUntil = record.data.warningUntil; //由客户端时间改为和服务器时间进行比较 - var b = compareDate(myDateFormat(warningUntil,p,record),serverDate);//预警期 - var f = compareDate(myDateFormat(validUntil,p,record),serverDate);//失效期 + var b = compareDate(myDateFormat(warningUntil,v,record),serverDate);//预警期 + var f = compareDate(myDateFormat(validUntil,v,record),serverDate);//失效期 if(!f){ return 2;//失效 } @@ -123,7 +123,7 @@ } var color = '' var fontColor = '' - var status = getValidAndWarningStatus(record,p); + var status = getValidAndWarningStatus(record,v); if(status == 1){ color = "yellow"; fontColor = '#000';