Commit 079ef47a by LiuJunYi

订单导出增加标题

parent 937f467e
...@@ -77,6 +77,7 @@ class Order extends AuthBase ...@@ -77,6 +77,7 @@ class Order extends AuthBase
$start_time = input('get.start_time'); $start_time = input('get.start_time');
$end_time = input('get.end_time'); $end_time = input('get.end_time');
$type = input('get.type'); $type = input('get.type');
$title = input('get.title');
$condition = []; $condition = [];
if ($status != '-1') { if ($status != '-1') {
$condition['status'] = $status; $condition['status'] = $status;
...@@ -84,6 +85,9 @@ class Order extends AuthBase ...@@ -84,6 +85,9 @@ class Order extends AuthBase
if ($type) { if ($type) {
$condition['type'] = $type; $condition['type'] = $type;
} }
if($title){
$condition['title'] = ['like','%'.$title.'%'];
}
if ($start_time && $end_time) { if ($start_time && $end_time) {
$condition['created_at'] = ['between', [$start_time . ' 00:00:00', $end_time . ' 00:00:00']]; $condition['created_at'] = ['between', [$start_time . ' 00:00:00', $end_time . ' 00:00:00']];
} else { } else {
......
...@@ -10,22 +10,30 @@ ...@@ -10,22 +10,30 @@
<form class="form-inline pull-left" method="GET" id="order-search" <form class="form-inline pull-left" method="GET" id="order-search"
action="<?php echo url('@admin/order/index')?>"> action="<?php echo url('@admin/order/index')?>">
<div class="form-group margin-right"> <div class="form-group margin-right">
<input class="form-control" type="text" name="title" value="{:input('title')}" placeholder="活动名称"/> <input class="form-control" id="title" type="text" name="title" value="{:input('title')}"
placeholder="活动名称"/>
</div> </div>
<div class="form-group margin-right"> <div class="form-group margin-right">
<select name="status" class="form-control" id="status"> <select name="status" class="form-control" id="status">
<option value="-1" {if condition="$status=='-1'" }selected{/if}>全部订单状态</option> <option value="-1" {if condition="$status=='-1'" }selected{
<option value="0" {if condition="$status=='0'" }selected{/if}>未付款</option> /if}>全部订单状态</option>
<option value="1" {if condition="$status=='1'" }selected{/if}>进行中</option> <option value="0" {if condition="$status=='0'" }selected{
<option value="2" {if condition="$status=='2'" }selected{/if}>待评价</option> /if}>未付款</option>
<option value="3" {if condition="$status=='3'" }selected{/if}>已完成</option> <option value="1" {if condition="$status=='1'" }selected{
/if}>进行中</option>
<option value="2" {if condition="$status=='2'" }selected{
/if}>待评价</option>
<option value="3" {if condition="$status=='3'" }selected{
/if}>已完成</option>
</select> </select>
</div> </div>
<div class="form-group margin-right"> <div class="form-group margin-right">
<select name="type" class="form-control" id="type"> <select name="type" class="form-control" id="type">
<option value="">全部订单类型</option> <option value="">全部订单类型</option>
<option value="1" {if condition="input('type')=='1'" }selected{/if}>活动报名订单</option> <option value="1" {if condition="input('type')=='1'" }selected{
<option value="2" {if condition="input('type')=='2'" }selected{/if}>购买会员卡订单</option> /if}>活动报名订单</option>
<option value="2" {if condition="input('type')=='2'" }selected{
/if}>购买会员卡订单</option>
</select> </select>
</div> </div>
<div class="form-group margin-right"> <div class="form-group margin-right">
...@@ -184,7 +192,8 @@ ...@@ -184,7 +192,8 @@
var type = $("#type").val(); var type = $("#type").val();
var start_time = $("#start_time").val(); var start_time = $("#start_time").val();
var end_time = $("#end_time").val(); var end_time = $("#end_time").val();
window.location.href = "{:url('admin/order/orderOutput')}" + '?status=' + status + '&type=' + type + '&start_time=' + start_time + '&end_time=' + end_time; var title = $("#title").val();
window.location.href = "{:url('admin/order/orderOutput')}" + '?status=' + status + '&type=' + type + '&start_time=' + start_time + '&end_time=' + end_time + '&title=' + title;
$(this).removeAttr('disabled'); $(this).removeAttr('disabled');
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment