针对已转报价的给出提示，并增加链接到详情

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8507 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/PurcInquiryController.java

@@ -368,7 +368,7 @@ public class PurcInquiryController {
 	 * @return
 	 */
 	@RequestMapping(value = "/inquiryItem/{id}", method = RequestMethod.GET)
-	private PurcInquiryItemInfo getInquiryItemDetail(@PathVariable Long id) {
+	private ModelMap getInquiryItemDetail(@PathVariable Long id) {
 		return purcInquiryService.getInquiryItemDetail(id);
 	}
 

src/main/java/com/uas/platform/b2b/service/PurcInquiryService.java

@@ -8,7 +8,6 @@ import org.springframework.ui.ModelMap;
 
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.PurcInquiry;
-import com.uas.platform.b2b.model.PurcInquiryItemInfo;
 import com.uas.platform.b2b.temporary.model.InquiryDetailInfo;
 import com.uas.platform.b2b.temporary.model.PurcInquiryInfo;
 import com.uas.platform.b2b.temporary.model.VendorAndContact;
@@ -118,7 +117,7 @@ public interface PurcInquiryService {
 	 * @param id
 	 * @return
 	 */
-	public PurcInquiryItemInfo getInquiryItemDetail(Long id);
+	public ModelMap getInquiryItemDetail(Long id);
 
 	/**
 	 * 查询发出的询价单详情，方便对比采纳

src/main/java/com/uas/platform/b2b/service/impl/PurcInquiryServiceImpl.java

@@ -668,8 +668,21 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 	}
 
 	@Override
-	public PurcInquiryItemInfo getInquiryItemDetail(Long id) {
-		return purcInquiryItemInfoDao.findOne(id);
+	public ModelMap getInquiryItemDetail(Long id) {
+		ModelMap map = new ModelMap();
+		PurcInquiryItemInfo inquiryItem = purcInquiryItemInfoDao.findOne(id);
+		map.put("inquiryItem", inquiryItem);
+		PurcInquiryItem purcInquiryItem = purcInquiryItemDao.findOne(id);
+		PurcInquiry purcInquiry = purcInquiryItem.getInquiry();
+		PurchaseInquiry inquiry = purchaseInquiryDao.findBySourceIdAndSourceApp(purcInquiry.getId(), SOURCERAPP);
+		if (null != inquiry) {
+			PurchaseInquiryItem purcItem = purchaseInquiryItemDao
+					.findByVendUUAndSourceId(SystemSession.getUser().getEnterprise().getUu(), id);
+			if (purcItem != null) {
+				map.put("id", inquiry.getId());
+			}
+		}
+		return map;
 	}
 
 	@Override

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

@@ -3722,9 +3722,15 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	 */
 	app.controller('PublicInquiryListDetailCtrl', ['$scope', '$stateParams', 'PurchaseInquiry','$filter', 'toaster', 'BaseService', 'ngTableParams', 'AccountEnterprise', function($scope, $stateParams, PurchaseInquiry, $filter, toaster, BaseService, ngTableParams, AccountEnterprise) {
 		BaseService.scrollBackToTop();
+		$scope.currentHasBid = false;
 		var loadData = function() {
 			PurchaseInquiry.inquiryItemDetail({id: $stateParams.id}, function(data) {
-				$scope.inquiryItem = data;
+				$scope.inquiryItem = data.inquiryItem;
+				if(data.id) {
+					$scope.id = data.id;
+					console.log($scope.id);
+					$scope.currentHasBid = true;
+				}
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});

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

@@ -575,6 +575,12 @@ input[type="radio"], input[type="checkbox"] {
                     <div ng-show="!currentHasBid" class="col-xs-2 pull-right btn-publish">
                         <button class="btn" ng-click="transtoInquiry(inquiryItem.id)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || nowdate > inquiryItem.toDate" ng-hide="inquiryItem.overdue == 1" title="如果招标单已过期，将无法进入投标">我要报价</button>
                     </div>
+                    <div class="col-xs-2 pull-right btn-disabled" ng-show="currentHasBid">
+                        <button class="btn" ng-disabled="disabled">已转报价</button>
+                    </div>
+                    <div class="pull-right a-detail" ng-show="currentHasBid">
+                        <a ui-sref="sale.inquiry_detail({id:id})" target="_self" title="点击查看详情">>>查看详情</a>
+                    </div>
                 </div>
             </div>
         </div>