浏览代码

【Mod】增加时间搜索

liuxiangxin 3 月之前
父节点
当前提交
eee8ac99b7
共有 2 个文件被更改,包括 9 次插入2 次删除
  1. 5 1
      app/Http/Controllers/Admin/BookStock.php
  2. 4 1
      resources/views/admin/book_stock/index.blade.php

+ 5 - 1
app/Http/Controllers/Admin/BookStock.php

@@ -2,7 +2,7 @@
 
 use App\Http\Requests\Admin\BookStock as Request;
 use App\Models\BookStock as Model;
-
+use Illuminate\Support\Carbon;
 /**
  * BookStock管理
  *
@@ -26,12 +26,16 @@ class BookStock extends Auth{
 		$name					= request('name','');
 		$batchNo				= request('batch_no','');
 		$author					= request('author','');
+		$startTime				= request('start_time','');
+		$endTime				= request('end_time','');
 		// 查询条件
 		$map 					= [];
 		// 编码ID
 		if( $name )				$map[] = ['name','=',$name];
 		if( $batchNo )			$map[] = ['id','=',$Model->codeToId($batchNo)];
 		if( $author )			$map[] = ['author','=',$author];
+		if( $startTime )		$map[] = ['insert_time','>=',Carbon::createFromFormat('Y-m-d',$startTime)->startOfDay()->getTimestamp()];
+		if( $endTime )			$map[] = ['insert_time','<=',Carbon::createFromFormat('Y-m-d',$endTime)->endOfDay()->getTimestamp()];
 		// 查询数据
 		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(request('limit',config('page_num',10)))->appends(request()->all());
 		// 循环处理数据

+ 4 - 1
resources/views/admin/book_stock/index.blade.php

@@ -17,7 +17,10 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		<input type="text" class="form-control" name="author" value="{{request('author','')}}" placeholder="请输入作者查询" />
 	</div>
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-2" style="margin-right: 2px;">
-		<input type="text" class="form-control" name="name" value="{{request('name','')}}" placeholder="请输入book_stock名称查询" />
+		<input type="date" class="form-control" name="start_time" value="{{request('start_time','')}}" placeholder="请输入开始时间" />
+	</div>
+	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-2" style="margin-right: 2px;">
+		<input type="date" class="form-control" name="end_time" value="{{request('end_time','')}}" placeholder="请输入结束时间" />
 	</div>
 	<input type="submit" class="btn btn-sm btn-primary" value="查询"/>
 	<a href="{{url('admin/book_stock/index')}}" class="btn btn-sm btn-default" >重置</a>