新增采购询价跳转问题处理；客户公共询价页面提示优化

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

@@ -4881,10 +4881,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         $scope.loading = false;
                         if (data.success) {
                             toaster.pop('success', '提示', data.success);
-                            $timeout(function () {
-                                $rootScope.active = 'done';
-                                window.location.hash = "#/baseInfo/inquiryList";
-                            }, 500);
                         }
                         if (data.error) {
                             toaster.pop('error', '提示', data.error);
@@ -4937,7 +4933,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                             if (data.success) {
                                 toaster.pop('success', '提示', data.success);
                                 $timeout(function () {
-                                    window.location.hash = "#/purc/publicInquiry";
+                                    window.location.hash = "#/purc/purchaseinquiry";
                                 }, 500);
                             }
                             if (data.error) {
@@ -4966,9 +4962,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         $scope.loading = false;
                         if (data.success) {
                             toaster.pop('success', '提示', data.success);
-                            $timeout(function () {
-                                window.location.hash = "#/purc/publicInquiry";
-                            }, 500);
                         }
                         if (data.error) {
                             toaster.pop('error', '提示', data.error);

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

@@ -390,7 +390,7 @@
 				币别：<span ng-bind="::(isUser?'-':inquiryItem.currency)"></span>
 			</td>
 			<td>
-				税率：<span>17</span>%
+				税率：<span ng-bind="inquiryItem.taxrate || '-'"></span>%
 			</td>
 			<td class="text-right" colspan="2" class="order-sum">
 				<div ng-if="inquiryItem.replyable">
@@ -539,9 +539,10 @@
                 <a class="offer" ng-click="">已报价</a>
             </td>
             <td ng-if="inquiryItem.quoted != 1">
-                <a class="offer"ng-click="transtoInquiry(inquiryItem)" ng-if="inquiryItem.remainingTime > 0 && inquiryItem.overdue != 1 && currentEn.uu != inquiryItem.inquiry.enUU">报价</a>
-                <a style="color: #999" ng-if="currentEn.uu == inquiryItem.inquiry.enUU" ng-click="transtoInquiry(inquiryItem)">报价</a>
-                <a class="offer" ng-if="inquiryItem.remainingTime <= 0 || inquiryItem.overdue == 1 || !isOverDue(inquiryItem.inquiry.endDate)" ng-click="">已结束</a>
+                <a class="offer"ng-click="transtoInquiry(inquiryItem)" ng-if="inquiryItem.remainingTime > 0 && inquiryItem.overdue != 1 && currentEn.uu != inquiryItem.inquiry.enUU && isOverDue(inquiryItem.inquiry.endDate)">报价</a>
+                <a style="color: #999" ng-if="inquiryItem.remainingTime > 0 && inquiryItem.overdue != 1 && currentEn.uu == inquiryItem.inquiry.enUU && isOverDue(inquiryItem.inquiry.endDate)" ng-click="transtoInquiry(inquiryItem)">报价</a>
+                <a class="offer" ng-if="inquiryItem.remainingTime <= 0 " ng-click="">已过期</a>
+				<a ng-if="inquiryItem.remainingTime > 0 && (inquiryItem.overdue == 1 || !isOverDue(inquiryItem.inquiry.endDate))">停止报价</a>
             </td>
         </tr>
         </tbody>