|
|
@@ -147,7 +147,7 @@
|
|
|
</a>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="more" ng-class="{'open': condition.$open}">
|
|
|
+ <!-- <div class="more" ng-class="{'open': condition.$open}">
|
|
|
<form class="form-inline">
|
|
|
<div class="form-group ">
|
|
|
<label>日期：</label>
|
|
|
@@ -194,7 +194,56 @@
|
|
|
</div>
|
|
|
</form>
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </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(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"
|
|
|
+ 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-click="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>
|
|
|
+ </form>
|
|
|
+ </div>
|
|
|
<table class="order-table block" ng-table="tableParams">
|
|
|
<thead>
|
|
|
<tr class="header">
|
|
|
@@ -216,7 +265,7 @@
|
|
|
</div> <!-- 分页 -->
|
|
|
</td>
|
|
|
<td class="text-center">
|
|
|
- <a href="sale/sample/approval/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
|
|
|
+ <a href="sale/sample/approval/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr class="sep-row">
|
shenj