Browse Source

新增单据分类功能

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1528 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
aof 10 years ago
parent
commit
bd2a56c6d9
1 changed files with 8 additions and 2 deletions
  1. 8 2
      src/main/webapp/resources/tpl/index/make/order.html

+ 8 - 2
src/main/webapp/resources/tpl/index/make/order.html

@@ -134,7 +134,7 @@
 					</div>
 					</div>
 				</div>
 				</div>
 			</div>
 			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-5">
 				<div class="search">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
 					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、用料、客户名称或单据流水号搜索" />
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、用料、客户名称或单据流水号搜索" />
@@ -147,6 +147,11 @@
 					</div>
 					</div>
 				</div>
 				</div>
 			</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
 			</div>
@@ -160,6 +165,7 @@
 				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 				  </button>
 				  </button>
 				  <ul class="dropdown-menu">
 				  <ul class="dropdown-menu">
+				  	<li><a ng-click="changeDateZone(-1)">不限</a></li>
 					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
 					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
 				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
 				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
 				    <li><a ng-click="changeDateZone()">半年前</a></li>
 				    <li><a ng-click="changeDateZone()">半年前</a></li>
@@ -223,7 +229,7 @@
 				</div> <!-- 分页 -->
 				</div> <!-- 分页 -->
 			</td>
 			</td>
 			<td class="text-center">
 			<td class="text-center">
-				<a href="sale/orders/xls?_state={{active}}&keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" 
+				<a href="make/orders/xls?keyword={{keywordXls}}" 
 					target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 					target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 			</td>
 			</td>
 		</tr>
 		</tr>