公共询价UI简单调整及新增公共询价后页面跳转更新

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

@@ -4900,7 +4900,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                             toaster.pop('success', '提示', data.success);
                             $timeout(function () {
                                 $rootScope.active = 'done';
-                                window.location.hash = "#/purc/inquiry_unapply";
+                                window.location.hash = "#/baseInfo/inquiryList";
                             }, 500);
                         }
                         if (data.error) {
@@ -5597,22 +5597,26 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 转客户询价
         $scope.transtoInquiry = function (inquiryItem) {
-            var modalInstance = $modal.open({
-                templateUrl: 'static/tpl/index/baseInfo/modal/quotation_modal.html',
-                controller: 'QuoteCtrl',
-                size: 'lg',
-                resolve: {
-                    inquiryItem: function () {
-                        return inquiryItem
+            if ($scope.currentEn.uu == inquiryItem.inquiry.enUU) {
+                toaster.pop('warning', '不能对自己企业报价');
+            } else {
+                var modalInstance = $modal.open({
+                    templateUrl: 'static/tpl/index/baseInfo/modal/quotation_modal.html',
+                    controller: 'QuoteCtrl',
+                    size: 'lg',
+                    resolve: {
+                        inquiryItem: function () {
+                            return inquiryItem
+                        }
                     }
-                }
-            });
+                });
 
-            modalInstance.result.then(function (data) {
-                $scope.tableParams.reload();
-            }, function () {
+                modalInstance.result.then(function (data) {
+                    $scope.tableParams.reload();
+                }, function () {
 
-            });
+                });
+            }
         }
 
         // 跳转到我的报价列表

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

@@ -303,9 +303,7 @@ margin-left: 55px;
 	<div class="pub-com_head">
 		<span>公共询价</span>
 		<div class="p-right">
-			<a ui-sref="purc.inquiry_unapply" title="待提交"><img src="static/img/icon/wait.png"/>待发布</a>
 			<a ui-sref="purc.pubinquiry_new" title="新增公共询价单"><img src="static/img/icon/add.png"/>新增</a>
-			<!--<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>-->
 		</div>
 	</div>
 	<div class="menu condition block">