Explorar o código

删除根据回复状态分类,添加日期分类,Excel导出功能

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1551 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
aof %!s(int64=10) %!d(string=hai) anos
pai
achega
c4b0dbe8d6
Modificáronse 1 ficheiros con 6 adicións e 20 borrados
  1. 6 20
      src/main/webapp/resources/tpl/index/make/change.html

+ 6 - 20
src/main/webapp/resources/tpl/index/make/change.html

@@ -99,23 +99,7 @@
 </div>
 </div>
 <div class="condition block">
 <div class="condition block">
 		<div class="row">
 		<div class="row">
-			<div class="col-xs-4">
-				<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=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-					<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 class="col-xs-5">
+			<div class="col-xs-9">
 				<div class="search">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -154,7 +138,8 @@
 							ng-required="true"
 							ng-required="true"
 							current-text="今天" clear-text="清除" close-text="关闭"
 							current-text="今天" clear-text="清除" close-text="关闭"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							ng-focus="openDatePicker($event, condition, '$fromOpened')"
+							ng-change="onDateCondition()">
 						<span class="input-group-btn">
 						<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
 							<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$fromOpened')">
 								ng-click="openDatePicker($event, condition, '$fromOpened')">
@@ -169,7 +154,8 @@
 							ng-required="true"
 							ng-required="true"
 							current-text="今天" clear-text="清除" close-text="关闭"
 							current-text="今天" clear-text="清除" close-text="关闭"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')">
+							ng-focus="openDatePicker($event, condition, '$toOpened')"
+							ng-change="onDateCondition()">
 						<span class="input-group-btn">
 						<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
 							<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$toOpened')">
 								ng-click="openDatePicker($event, condition, '$toOpened')">
@@ -216,7 +202,7 @@
 				</div> <!-- 分页 -->
 				</div> <!-- 分页 -->
 			</td>
 			</td>
 			<td class="text-center">
 			<td class="text-center">
-				<a href="sale/changes/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="make/changes/xls?_state={{active}}&searchFilter={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 			</td>
 			</td>
 		</tr>
 		</tr>
 		<tr class="sep-row">
 		<tr class="sep-row">