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

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

@@ -139,12 +139,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			throw new IllegalOperatorException("回复的数量合计超过了订单数量");
 		purchaseOrderReplyDao.save(reply);
 		purchaseOrderItemDao.updateByReply(reply.getDelivery(), reply.getRemark(), item.getId());
+		PurchaseOrder order = item.getOrder();
 		// 订单主记录状态
-		List<PurchaseOrderItem> notReply = purchaseOrderItemDao.findByOrderIdAndStatus(item.getOrder().getId(),
-				(short) Status.NOT_REPLY.value());
-		PurchaseOrder order = purchaseOrderDao.findOne(item.getOrder().getId());
-		order.setStatus((short) (notReply.size() > 0 ? Status.NOT_REPLY.value() : Status.REPLIED.value()));
-		purchaseOrderDao.save(order);
+		updateOrderStatus(order.getId());
 		// 将回复信息推送给采购企业采购员（或管理员）
 		if (order.getUserUU() != null) {
 			// Android
@@ -156,6 +153,16 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		}
 	}
 
+	/**
+	 * 修改客户采购单的回复状态
+	 */
+	private void updateOrderStatus(long orderId) {
+		List<PurchaseOrderItem> notReply = purchaseOrderItemDao.findByOrderIdAndStatus(orderId, (short) Status.NOT_REPLY.value());
+		PurchaseOrder order = purchaseOrderDao.findOne(orderId);
+		order.setStatus((short) (notReply.size() > 0 ? Status.NOT_REPLY.value() : Status.REPLIED.value()));
+		purchaseOrderDao.save(order);
+	}
+
 	@Override
 	public PurchaseOrderAll findByCode(String code) {
 		List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao.findByVendUUAndCode(SystemSession.getUser().getEnterprise().getUu(),
@@ -264,6 +271,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			if (orderItem != null) {
 				orderItem.setEndStatus((short) Status.DOWNLOADED.value());
 				purchaseOrderItemDao.save(orderItem);
+				// 明细结案情况下，明细状态为已回复（即不再处理），此时同时修改主记录状态
+				updateOrderStatus(orderItem.getOrder().getId());
 			}
 		}
 	}

src/main/webapp/resources/css/index.css

@@ -99,6 +99,16 @@ a {
 .form-control {
 	border-color: #e1e1e1;
 }
+
+.btn-info {
+	background-color: #56a022;
+	border-color: #56a022;
+}
+
+.btn-info:hover,.btn-info:focus,.btn-info.focus,.btn-info:active,.btn-info.active{
+  background-color: #4b8b1e;
+  border-color: #4b8b1e;
+}
 /*dropdown*/
 .dropdown>.dropdown-toggle {
 	border-style: solid;
@@ -901,9 +911,19 @@ a {
 	margin-left: 20px;
 	color: #eee
 }
-@media (max-width: 1100px) {
-  .body {
-    width: 100%;
+@media (min-width: 1100px) {
+  .right {
+  	width: 930px;
+  }
+}
+@media (min-width: 1024px) {
+  .right {
+  	width: 810px;
+  }
+}
+@media (min-width: 910px) {
+  .right {
+  	width: 760px;
   }
 }
 /*footer*/
@@ -1013,6 +1033,6 @@ a {
   padding-right: 5px;
 }
 /*data view*/
-.container-data {
+.condition {
 	padding: 15px;
 }

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

@@ -299,11 +299,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 	app.controller('SaleOrderCtrl', function($scope, $rootScope, $filter, PurcOrderItem, ngTableParams, 
 		toaster, ReportService, BaseService){
 		$rootScope.active = 'order';
+		$scope.active = 'all';
 		$scope.tableParams = new ngTableParams({
 			page : 1, // show first page
 			count : 5, // count per page
 			sorting: {
-                date: 'desc' 
+                date: 'desc'
             }
 		}, {
 			total : 0, 
@@ -378,6 +379,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 	});
 	app.controller('SaleChangeCtrl', function($scope, $rootScope, $filter, PurcChange, ngTableParams, toaster, BaseService){
 		$rootScope.active = 'change';
+		$scope.active = 'all';
 		$scope.tableParams = new ngTableParams({
 			page : 1, 
 			count : 5,
@@ -424,6 +426,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 	});
 	app.controller('SaleInquiryCtrl', function($scope, $rootScope, $filter, PurcInquiry, ngTableParams, toaster, BaseService){
 		$rootScope.active = 'inquiry';
+		$scope.active = 'all';
 		$scope.tableParams = new ngTableParams({
 			page : 1, 
 			count : 5,
@@ -527,6 +530,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 	});
 	app.controller('SaleNoticeCtrl', function($scope, $rootScope, $filter, PurcNotice, ngTableParams, toaster, BaseService){
 		$rootScope.active = 'notice';
+		$scope.active = 'all';
 		$scope.tableParams = new ngTableParams({
 			page : 1, 
 			count : 5,

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

@@ -1,8 +1,22 @@
-<div class="block container-data">
+<div class="block">
 	<div class="condition block">
-		<div class="btn-group">
-			<button type="button" class="btn btn-default">全部</button>
-			<button type="button" class="btn btn-default">待确认</button>
+		<div class="row">
+			<div class="col-xs-4">
+				<div class="btn-group btn-group-justified">
+					<div class="btn-group">
+						<button type="button" class="btn btn-default"
+							ng-class="{'btn-info':active=='all'}">全部</button>
+					</div>
+					<div class="btn-group">
+						<button type="button" class="btn btn-default"
+							ng-class="{'btn-info':active=='todo'}">待确认</button>
+					</div>
+				</div>
+				<div class="col-xs-8"></div>
+			</div>
 		</div>
 	</div>
+	<div class="block">
+		<div ng-include="'static/tpl/index/sale/table/change.html'"></div>
+	</div>
 </div>

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

@@ -1,9 +1,23 @@
-<div class="block container-data">
+<div class="block">
 	<div class="condition block">
-		<div class="btn-group">
-		  <button type="button" class="btn btn-default">全部</button>
-		  <button type="button" class="btn btn-default">待报价</button>
+		<div class="row">
+			<div class="col-xs-4">
+				<div class="btn-group btn-group-justified">
+					<div class="btn-group">
+						<button type="button" class="btn btn-default"
+							ng-class="{'btn-info':active=='all'}">全部</button>
+					</div>
+					<div class="btn-group">
+						<button type="button" class="btn btn-default"
+							ng-class="{'btn-info':active=='todo'}">待报价</button>
+					</div>
+				</div>
+				<div class="col-xs-8"></div>
+			</div>
 		</div>
+
+	</div>
+	<div class="block">
+		<div ng-include="'static/tpl/index/sale/table/inquiry.html'"></div>
 	</div>
-	
 </div>

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

@@ -1,10 +1,27 @@
-<div class="block container-data">
+<div class="block">
 	<div class="condition block">
-		<div class="btn-group">
-		  <button type="button" class="btn btn-default">全部</button>
-		  <button type="button" class="btn btn-default">待发货</button>
-		  <button type="button" class="btn btn-default">已结案</button>
+		<div class="row">
+			<div class="col-xs-4">
+				<div class="btn-group btn-group-justified">
+					<div class="btn-group">
+						<button type="button" class="btn btn-default"
+							ng-class="{'btn-info':active=='all'}">全部</button>
+					</div>
+					<div class="btn-group">
+						<button type="button" class="btn btn-default"
+							ng-class="{'btn-info':active=='todo'}">待发货</button>
+					</div>
+					<div class="btn-group">
+						<button type="button" class="btn btn-default"
+							ng-class="{'btn-info':active=='end'}">已结案</button>
+					</div>
+				</div>
+				<div class="col-xs-8"></div>
+			</div>
 		</div>
-	</div>
 
+	</div>
+	<div class="block">
+		<div ng-include="'static/tpl/index/sale/table/notice.html'"></div>
+	</div>
 </div>

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

@@ -1,9 +1,27 @@
-<div class="block container-data">
+<div class="block">
 	<div class="condition block">
-		<div class="btn-group">
-			<button type="button" class="btn btn-default">全部</button>
-			<button type="button" class="btn btn-default">待回复</button>
-			<button type="button" class="btn btn-default">已结案</button>
+		<div class="row">
+			<div class="col-xs-4">
+				<div class="btn-group btn-group-justified">
+					<div class="btn-group">
+						<button type="button" class="btn btn-default"
+							ng-class="{'btn-info':active=='all'}">全部</button>
+					</div>
+					<div class="btn-group">
+						<button type="button" class="btn btn-default"
+							ng-class="{'btn-info':active=='todo'}">待回复</button>
+					</div>
+					<div class="btn-group">
+						<button type="button" class="btn btn-default"
+							ng-class="{'btn-info':active=='end'}">已结案</button>
+					</div>
+				</div>
+				<div class="col-xs-8"></div>
+			</div>
 		</div>
+
+	</div>
+	<div class="block">
+		<div ng-include="'static/tpl/index/sale/table/order.html'"></div>
 	</div>
 </div>

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

@@ -1,4 +1,4 @@
-<div class="condition block">
+<div class="block">
 	<div class="state-wrap" ng-controller="TodoCtrl">
 		<ul class="list-unstyled list-inline">
 			<li class="first"><a href="#"><span>所有订单</span></a></li>