Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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

@@ -545,11 +545,11 @@
 							</div>
 						</div>
 					</div>
-					<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check == 1">
+					<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check == 1 && inquiryItem.invalid != 1">
 						<span class="text-trans half">未报价</span>
 						<div class="text-muted" style="padding-top: 50px;">询价单已<br>被提交...</div>
 					</div>
-					<div ng-if="inquiryItem.overdue == 1" class="block">
+					<div ng-if="inquiryItem.overdue == 1 && inquiryItem.invalid != 1" class="block">
 						<span class="text-trans error">已过期</span>
 					</div>
 					<div ng-if="inquiryItem.invalid == 1" class="block">