询价页面数据展示调整

src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -603,13 +603,13 @@ margin-left: 55px;
 			<td class="text-center br-l">
 				<div ng-show="!inquiryItem.$editing"
 					 ng-init="parseDate(inquiryItem)">
-					<div ng-show="inquiryItem.vendFromDate">
+					<div ng-show="inquiryItem.fromDate">
 						<span class="text-muted">从 </span><span
-							ng-bind="inquiryItem.vendFromDate | date:'yyyy-MM-dd'"></span> <span
+							ng-bind="inquiryItem.fromDate | date:'yyyy-MM-dd'"></span> <span
 							class="text-muted">到 </span><span
-							ng-bind="inquiryItem.vendToDate | date:'yyyy-MM-dd'"></span>
+							ng-bind="inquiryItem.toDate | date:'yyyy-MM-dd'"></span>
 					</div>
-					<div ng-show="!inquiryItem.vendFromDate">
+					<div ng-show="!inquiryItem.fromDate">
 						<span class="text-muted">-</span>
 					</div>
 				</div>

src/main/webapp/resources/tpl/index/sale/pubinquiry.html

@@ -417,14 +417,14 @@
 				<span ng-bind="inquiryItem.minPackQty ? inquiryItem.minPackQty : '-'"></span>
 			</td>
 			<td class="text-center">
-				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid != 1" class="block">
+				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid != 1 && inquiryItem.overdue != 1" class="block">
 					<span class="text-trans warning">已报价</span>
 					<div ng-if="inquiryItem.checked == 1" class="text-muted" style="padding-top: 50px;">客户正在<br>审批...</div>
 				</div>
 				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1 && inquiryItem.invalid != 1" class="block">
 					<span class="text-trans success">已采纳</span>
 				</div>
-				<div ng-if="inquiryItem.status == 201 && inquiryItem.invalid == 1" class="block">
+				<div ng-if="inquiryItem.status == 201 && (inquiryItem.invalid == 1 || inquiryItem.overdue == 1)" class="block">
 					<span class="text-trans text-light">已失效</span>
 				</div>
 				<div ng-if="inquiryItem.status == 314" class="block">