处理询价单页面时间显示错误的问题

src/main/webapp/resources/js/index/app.js

@@ -5052,7 +5052,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         if (data.success) {
                             toaster.pop('success', '提示', data.success);
                             $timeout(function () {
-                                window.location.hash = "#/purc/purchaseinquiry";
+                                window.location.hash = "#/baseInfo/inquiryList";
                             }, 500);
                         }
                         if (data.error) {

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

@@ -495,13 +495,11 @@ margin-left: 55px;
 			</td>
 			<td class="text-right" colspan="1" class="order-sum">
 				<div ng-if="inquiryItem.replyable">
-					<span class="text-inverse text-bold" ng-bind="::inquiryItem.inquiry.endDate | date:'yyyy-MM-dd'"></span>
+					<span class="text-inverse text-bold" ng-bind-html="::inquiryItem.inquiry.endDate | datespan"></span>
 				</div>
 			</td>
 			<td class="text-center">
 				<div class="operates">
-					<!-- <a ng-click="print(inquiryItem)" class="text-muted" title="打印"><i
-                        class="fa fa-print fa-lg"></i></a> -->
 				</div>
 			</td>
 		</tr>
@@ -568,31 +566,6 @@ margin-left: 55px;
 						<span ng-if="!isUser" ng-bind="reply.price | number:6"></span> <span
 							ng-show="reply.price == null || isUser" class="text-muted">-</span>
 					</div>
-					<!-- <div class="dropdown">
-						<a href="javascript:void(0);" class="dropdown-toggle text-default"
-						   ng-mouseover="getHistory(inquiryItem)">报价信息<i
-								class="fa fa-fw fa-angle-down"></i></a>
-						<div class="dropdown-menu pane" style="width: 270px;">
-							<div class="pane-body">
-								<ul class="list-unstyled list-menu">
-									<li ng-repeat="reply in inquiryItem.replies">
-										<div ng-class="{'text-inverse': $index==0}">
-											<div class="row row-sm"
-												 ng-repeat="reply in inquiryItem.replies">
-												<div class="col-xs-5">≥{{reply.lapQty}}</div>
-												<div class="col-xs-5">价格{{reply.price | number:6}}</div>
-											</div>
-										</div>
-										<div class="text-muted">{{reply.inquiry.date |
-											date:'yyyy-MM-dd'}}{{reply.inquiry.enterprise.enName}}
-										</div>
-									</li>
-								</ul>
-								<div ng-show="!inquiryItem.replies || inquiryItem.replies.length == 0"
-										class="text-center text-muted">暂无报价信息</div>
-							</div>
-						</div>
-					</div> -->
 				</div>
 				<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">
 					<div ng-repeat="reply in inquiryItem.replies">

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

@@ -299,9 +299,6 @@
 		<tr class="order-hd">
 			<td class="first" colspan="4">
 				<div class="order-main">
-						<!--<span> <input type="checkbox" class="selector"
-									  ng-model="inquiryItem.$selected">
-						</span> -->
 					<a href="javascript:void(0)" ng-if="!isUnread(inquiryItem.id)">
 						<i class="fa fa-circle-thin"></i>
 					</a>
@@ -326,8 +323,7 @@
 			</td>
 			<td class="text-right" colspan="1" class="order-sum">
 				<div ng-if="inquiryItem.replyable">
-					<span class="text-inverse text-bold" ng-bind="::inquiryItem.inquiry.endDate | timespan"></span>
-					<span class="text-muted">后截止报价</span>
+					<span class="text-inverse text-bold" ng-bind-html="inquiryItem.inquiry.endDate | datespan"></span>
 				</div>
 			</td>
 			<td class="text-center">
@@ -524,7 +520,7 @@
 					<span class="text-trans error">未采纳</span>
 				</div>
 				<div ng-if="inquiryItem.status == 200">
-					<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1">
+					<div ng-if="inquiryItem.overdue == 0 && inquiryItem.inquiry.check != 1">
 						<div ng-show="!inquiryItem.$editing">
 							<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; getToken()">报 价</a>
 						</div>
@@ -550,10 +546,14 @@
 						<span class="text-trans half">未报价</span>
 						<div class="text-muted" style="padding-top: 50px;">询价单已<br>被提交...</div>
 					</div>
-					<div ng-if="inquiryItem.inquiry.overdue == 1" class="block">
+					<div ng-if="inquiryItem.overdue == 1" class="block">
 						<span class="text-trans error">已过期</span>
 					</div>
 				</div>
+                <div ng-if="(inquiryItem.status == 201 && (inquiryItem.agreed != null) || inquiryItem.overdue == 1) && inquiryItem.inquiry.check != 1">
+                    <br><br>
+                    <a ui-sref="sale.quotation.new({inquiryItem:inquiryItem})">我要报价</a>
+                </div>
 			</td>
 		</tr>
 		</tbody>