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

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

@@ -2,7 +2,6 @@ package com.uas.platform.b2b.service.impl;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
@@ -26,8 +25,6 @@ public class SaleOrderServiceImpl implements SaleOrderService{
 		return saleOrderDao.findAll(new Specification<SaleOrder>() {
 
 			public Predicate toPredicate(Root<SaleOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				Path<String> status = root.get("status");
-				query.where(builder.equal(status, "已审核"));
 				return null;
 			}
 		}, pageInfo);

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

@@ -838,12 +838,19 @@ px
 
 .pane.addon {
 	height: 185px;
-	line-height: 175px;
 	text-align: center;
-	margin-bottom: 15px;
+	line-height: 1.4;
 	cursor: pointer;
 }
 
+.pane.addon .pane-body {
+	padding-top: 60px;
+}
+
+.pane.addon i,.pane.addon span {
+	display: block;
+}
+
 .notice .detail>li {
 	clear: both;
 	display: block;

src/main/webapp/resources/tpl/index/home/right.html

@@ -34,7 +34,7 @@
 				<li class="start">
 					<ul class="list-unstyled">
 						<li><a href="#">待报价(0)</a></li>
-						<li><a ui-sref="sale.order.reply"">待回复(6)</a></li>
+						<li><a ui-sref="sale.order.reply">待回复(6)</a></li>
 					</ul>
 				</li>
 				<li class="doing">

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

@@ -23,7 +23,7 @@
 				</li>
 				<li>
 					<div class="title">
-						<a href="#">待回复</a>
+						<a ui-sref="sale.order.reply">待回复</a>
 					</div>
 					<div class="count text-inverse">6</div>
 				</li>
@@ -90,10 +90,12 @@
 				<div class="pane-header">营销工具</div>
 				<div class="pane-body"></div>
 			</div>
-			<div class="pane addon text-default">
-				<div class="pane-body">添加销售模块</div>
+			<div class="pane addon">
+				<div class="pane-body">
+					<a class="text-default"><i class="fa fa-plus fa-3x"></i><span>添加销售模块</span></a>
+				</div>
 			</div>
-			
+
 		</div>
 	</div>
 	<!-- End -->

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

@@ -1,6 +1,6 @@
 <div class="left-nav left-home">
 	<div class="nav-home">
-		<a ui-sref="sale" class="text-default"><span
+		<a ui-sref="sale.home" class="text-default"><span
 			class="glyphicon glyphicon-home icon-left"></span>销售</a>
 	</div>
 </div>

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

@@ -26,4 +26,7 @@
 			<td data-title="'状态'" width="50">{{order.status}}</td>
 		</tr>
 	</table>
+	<script type="text/ng-template" id="ng-table/headers/checkbox.html">
+		<input type="checkbox" ng-model="checkboxes.checked" id="select_all" name="filter-checkbox" value="" />
+	</script>
 </div>