把获取单据的搜索条件作封装

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

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

@@ -151,9 +151,38 @@
 					<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="输入商品、客户名称或单据流水号搜索" />
 						<div class="search-advance text-link" ng-class="{'active': searchAdvance}" dropdown-toggle>高级搜索</div>
-						<div class="dropdown-menu">
-						   <div class="block">
-						   </div>
+						<div id="searchContainer" class="dropdown-menu">
+							<div class="block">
+								<form action="" class="form-horizontal">
+									<div class="form-group">
+										<label for="" class="col-xs-3 text-right control-label">关键词：</label>
+										<div class="col-xs-6"><input type="text" class="form-control" /></div>
+									</div>
+									<div class="form-group">
+										<label for="" class="col-xs-3 text-right control-label">交货日期：</label>
+										<div class="col-xs-6"><input type="text" class="form-control" /></div>
+									</div>
+									<div class="form-group">
+										<label for="orderDate" class="col-xs-3 text-right control-label">订单日期：</label>
+										<div class="col-xs-6"><input id="orderDate" type="text" class="form-control" /></div>
+									</div>
+									<div class="form-group">
+										<label for="" class="col-xs-3 text-right control-label">单价：</label>
+										<div class="col-xs-6"><input type="text" class="form-control" /></div>
+									</div>
+									<div class="form-group">
+										<label for="" class="col-xs-3 text-right control-label">
+											金额：
+										</label>
+										<div class="col-xs-6"><input type="text" class="form-control" /></div>
+									</div>
+									<div class="form-group">
+										<div for="" class="col-xs-12 text-right">
+											<button class="btn btn-info btn-xs">确定</button> 
+										</div>
+									</div>
+								</form>
+							</div>
 						</div>
 						<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
 					</div>
@@ -170,29 +199,78 @@
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>单据日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <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(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>单据日期：</label>
+					<div class="btn-group btn-menu" dropdown
+						is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;"
+							class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<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(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
 							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
 							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" max-date="condition.dateTo"
+							ng-required="true" max-date="condition.dateTo" current-text="今天"
+							clear-text="清除" close-text="关闭"
+							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							ng-click="openDatePicker($event, condition, '$fromOpened')"
+							ng-change="onDateCondition()"> <span
+							class="input-group-btn">
+							<button type="button" class="btn btn-default"
+								ng-click="openDatePicker($event, condition, '$fromOpened')">
+								<i class="fa fa-calendar"></i>
+							</button>
+						</span>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
+						<input type="text" ng-model="condition.dateTo"
+							class="form-control" placeholder="点击选择截止日期" readonly="readonly"
+							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							ng-required="true" min-date="condition.dateFrom"
 							current-text="今天" clear-text="清除" close-text="关闭"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							ng-focus="openDatePicker($event, condition, '$toOpened')"
+							ng-change="onDateCondition()"> <span
+							class="input-group-btn">
+							<button type="button" class="btn btn-default"
+								ng-click="openDatePicker($event, condition, '$toOpened')">
+								<i class="fa fa-calendar"></i>
+							</button>
+						</span>
+					</div>
+				</div>
+				<!-- <div class="form-group ">
+					<label>交货日期：</label>
+					<div class="btn-group btn-menu" dropdown
+						is-open="condition.$deliveryZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;"
+							class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDeliveryZone(-1)">不限</a></li>
+							<li><a ng-click="changeDeliveryZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDeliveryZone(2)">两个月内</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
+						<input type="text" ng-model="condition.deliveryFrom"
+							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
+							datepicker-popup="yyyy-MM-dd" is-open="condition.$deliveryFromOpened"
+							ng-required="true" max-date="condition.dateTo" current-text="今天"
+							clear-text="清除" close-text="关闭"
+							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
 							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
+							ng-change="onDateCondition()"> <span
+							class="input-group-btn">
 							<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
@@ -207,15 +285,15 @@
 							current-text="今天" clear-text="清除" close-text="关闭"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
 							ng-focus="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
+							ng-change="onDateCondition()"> <span
+							class="input-group-btn">
 							<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
 					</div>
-			  </div>
+				</div> -->
 			</form>
 		</div>
 	</div>
@@ -254,7 +332,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/orders/xls?_state={{active}}&keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" 
+				<a href="sale/orders/xls?_state={{active}}&searchFilter={{searchFilterXls}}" 
 					target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 			</td>
 		</tr>