公共询价和详情过期时间过滤条件更新

src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -627,7 +627,10 @@ input[type="radio"], input[type="checkbox"] {
         </tr>
         </tbody>
     </table>
-    <div class="footer">
-        <button class="btn" ng-click="transtoInquiry(inquiryItem)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || inquiryItem.remainingTime < 0 || inquiryItem.overdue == 1" ng-hide="inquiryItem.overdue == 1" title="如果询价单已过期，将无法进入报价">我要报价</button>
+    <div class="footer" ng-if="inquiryItem.endDate != null">
+        <button class="btn" ng-click="transtoInquiry(inquiryItem)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || inquiryItem.remainingTime < 0 || inquiryItem.overdue == 1 || !isOverDue(inquiryItem.endDate)" title="如果询价单已过期，将无法进入报价">我要报价</button>
+    </div>
+    <div class="footer" ng-if="inquiryItem.endDate == null">
+        <button class="btn" ng-click="transtoInquiry(inquiryItem)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || inquiryItem.remainingTime < 0 || inquiryItem.overdue == 1 || !isOverDue(inquiryItem.inquiry.endDate)" title="如果询价单已过期，将无法进入报价">我要报价</button>
     </div>
 </div>

src/main/webapp/resources/tpl/index/baseInfo/inquiry_list.html

@@ -395,7 +395,7 @@
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind-html="inquiryItem.inquiry.endDate| datespan" ng-if="inquiryItem.endDate == null"></td>
                                         <td>
                                             <a class="offer"ng-click="transtoInquiry(inquiryItem)" ng-if="inquiryItem.remainingTime > 0 && inquiryItem.quoted != 1 && inquiryItem.overdue != 1">我要报价</a>
-                                            <a class="offer" ng-if="(inquiryItem.remainingTime <= 0 && inquiryItem.quoted != 1) || inquiryItem.overdue == 1" ng-click="">已结束</a>
+                                            <a class="offer" ng-if="(inquiryItem.remainingTime <= 0 && inquiryItem.quoted != 1) || inquiryItem.overdue == 1 || !isOverDue(inquiryItem.inquiry.endDate)" ng-click="">已结束</a>
                                             <a class="offer" ng-if="inquiryItem.quoted == 1" ng-click="">已报价</a>
                                         </td>
                                     </tr>