@@ -24389,17 +24389,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
// 是否已过期
$scope.isOverDue = function (date) {
if (date) {
- var ndate = new Date();
- ndate.setHours(23, 59, 59 ,999);
- ndate.setDate(ndate.getDate());
- var timestamp = Date.parse(ndate);
+ var timestamp = new Date().getTime();
if (date > timestamp) {
- return true;
- } else {
return false;
+ } else {
+ return true;
}
} else {
+ return false;
@@ -325,10 +325,10 @@
<span ng-bind="remind.endDate | datespan" class="text-inverse text-bold"></span>
</td>
<td class="text-center">
- <div ng-if="!isOverDue(remind.endDate)" class="block">
+ <div ng-if="isOverDue(remind.endDate)" class="block">
<span>已结束</span>
</div>
- <div ng-if="isOverDue(remind.endDate)" class="block">
+ <div ng-if="!isOverDue(remind.endDate)" class="block">
<a ng-if="remind.status==100" ng-click="qute(remind)">报价</a>
<span ng-if="remind.status==101">已报价</span>
<span ng-if="remind.status==104">已采纳</span>