xun

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

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

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

@@ -402,8 +402,8 @@
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.enterprise.enName"><a></a></td>
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.endDate| date: 'yyyy-MM-dd'"></td>
                                         <td>
-                                            <a class="offer"ng-click="transtoInquiry(inquiryItem)" ng-if="isOverDue(inquiryItem.inquiry.endDate) && inquiryItem.quoted != 1">我要报价</a>
-                                            <a class="offer" ng-if="!isOverDue(inquiryItem.inquiry.endDate) && inquiryItem.quoted != 1" ng-click="">已结束</a>
+                                            <a class="offer"ng-click="transtoInquiry(inquiryItem)" ng-if="isOverDue(inquiryItem.inquiry.endDate) && inquiryItem.quoted != 1 && inquiryItem.overdue != 1">我要报价</a>
+                                            <a class="offer" ng-if="(!isOverDue(inquiryItem.inquiry.endDate) && inquiryItem.quoted != 1) || inquiryItem.overdue == 1" ng-click="">已结束</a>
                                             <a class="offer" ng-if="inquiryItem.quoted == 1" ng-click="">已报价</a>
                                         </td>
                                     </tr>