增加对公共询价（已发布）的查询

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

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

@@ -218,7 +218,19 @@ public class PurcInquiryController {
 	 */
 	@RequestMapping(value = "/unapply", method = RequestMethod.GET)
 	private Page<PurcInquiry> getUnapply(PageParams params) {
-		return purcInquiryService.getUnapply(params);
+		Page<PurcInquiry> inquiry = purcInquiryService.getUnapply(params);
+		return inquiry;
+	}
+
+	/**
+	 * 已发布
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/submit", method = RequestMethod.GET)
+	private Page<PurcInquiry> getSubmit(PageParams params) {
+		return purcInquiryService.getSubmit(params);
 	}
 
 	/**

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

@@ -126,4 +126,12 @@ public interface PurcInquiryService {
 	 */
 	public InquiryDetailInfo getInquiryDetail(Long id);
 
+	/**
+	 * 查询已发布（主要查看公共询价）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	public Page<PurcInquiry> getSubmit(PageParams params);
+
 }

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

@@ -349,7 +349,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 
 	@Override
 	public Page<PurcInquiry> getUnapply(PageParams params) {
-		final PageInfo pageInfo = new PageInfo();
+		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("enteryStatus", Status.UNAPPLY.value());
 		return inquiryDao.findAll(new Specification<PurcInquiry>() {
@@ -359,6 +359,18 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 		}, pageInfo);
 	}
 
+	@Override
+	public Page<PurcInquiry> getSubmit(PageParams params) {
+		final PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("enteryStatus", Status.ENABLED.value());
+		return inquiryDao.findAll(new Specification<PurcInquiry>() {
+			public Predicate toPredicate(Root<PurcInquiry> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
+			}
+		}, pageInfo);
+	}
+
 	@Override
 	public ModelMap refuseInquiry(Long id) {
 		ModelMap map = new ModelMap();

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

@@ -3161,14 +3161,34 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	// 平台询价单（未提交）
 	app.controller('UnapplyInquiryCtrl', ['$scope', 'PurchaseInquiry', 'ngTableParams', 'BaseService', 'toaster', function($scope, PurchaseInquiry, ngTableParams, BaseService, toaster) {
 		BaseService.scrollBackToTop();
-		$scope.status = 'InquiryUnSubmit';
+		$scope.active = 'done';
+		var getService = function() {
+			if($scope.active == 'todo') {
+				return PurchaseInquiry.getUnapply;
+			}
+			if($scope.active == 'done') {
+				return PurchaseInquiry.getSubmit;
+			}
+		}
+		
+		$scope.setActive = function(state) {
+			if($scope.active != state ) {
+				$scope.active = state;
+				if ($scope.tableParams.page() == 1) {
+					$scope.tableParams.reload();
+				} else {
+					$scope.tableParams.page(1);
+				}
+			}
+		}
+		
 		$scope.tableParams = new ngTableParams({
 			page : 1, 
 			count : 5,
 			sorting: {
-                'inquiry.date': 'desc',
-                'inquiry.enterprise.enName': 'asc',
-                'inquiry.code': 'asc'
+                'date': 'desc',
+                'enterprise.enName': 'asc',
+                'code': 'asc'
             }
 		}, {
 			total : 0, 
@@ -3180,7 +3200,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				if ($scope.active == 'overdue') {
 					$scope.active = 'end';
 				}
-				PurchaseInquiry.getUnapply(null, BaseService.parseParams(pageParams), function(page){
+				getService().call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElements);

src/main/webapp/resources/js/index/services/Purc.js

@@ -863,6 +863,10 @@ define([ 'ngResource'], function() {
                url: 'purc/inquiry/unapply',
                method: 'GET'
 			},
+			getSubmit: {
+	               url: 'purc/inquiry/submit',
+	               method: 'GET'
+				},
 			deleteById: {
 				url: 'purc/inquiry/deleteById/:id',
 				method: 'DELETE'

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

@@ -280,6 +280,20 @@
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
+<div class="row">
+	<div class="col-xs-10">
+		<div class="btn-group btn-group-sm btn-group-justified">
+			<div class="btn-group btn-group-sm">
+				<button type="button" class="btn btn-default btn-line"
+						ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">已发布</button>
+			</div>
+			<div class="btn-group btn-group-sm">
+				<button type="button" class="btn btn-default btn-line"
+						ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待发布</button>
+			</div>
+		</div>
+	</div>
+</div>
 <table class="inquiry-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
@@ -351,9 +365,9 @@
 				备注：<span ng-bind="::inquiry.remark"></span>
 			</td>
 			<td colspan="1" class="text-center">
-				<a ng-click="submit(inquiry.id)" ng-if="inquiry.isOpen==0">提交</a>
-				<a ng-click="publish(inquiry.id)" ng-if="inquiry.isOpen==1">发布</a>
-				<a ng-click="clearOrder(inquiry.id)">删除</a>
+				<a ng-click="submit(inquiry.id)" ng-if="inquiry.isOpen==0 && inquiry.enteryStatus != 313">提交</a>
+				<a ng-click="publish(inquiry.id)" ng-if="inquiry.isOpen==1 && inquiry.enteryStatus != 313">发布</a>
+				<a ng-click="clearOrder(inquiry.id)" ng-if="inquiry.enteryStatus != 313">删除</a>
 			</td>
 		</tr>
 		<tr class="inquiry-bd" ng-repeat="item in inquiry.inquiryItems track by item.id"
@@ -392,7 +406,7 @@
 				</div>
 			</td>-->
 			<td ng-bind="::item.enterprise.enName" colspan="2"></td>
-			<td class="text-center"><a ng-click="deleteById(item.id)">删除</a></td>
+			<td class="text-center"><a ng-click="deleteById(item.id)"  ng-if="inquiry.enteryStatus != 313">删除</a></td>
 		</tr>
 	</tbody>
 </table>