修改后台打卡记录筛选

app/Http/Controllers/Admin/CustomClockinRecord.php

@@ -40,6 +40,7 @@ class CustomClockinRecord extends Auth{
 		$cityId					= request('city_id',0);
 		$status					= request('status');
 		$startTime				= request('start_time','');
+		$endTime				= request('end_time','');
 		// 编码转ID
 		$uid					= $Custom->codeToId($code);
 		// 查询条件
@@ -51,7 +52,7 @@ class CustomClockinRecord extends Auth{
 		if( $cityId )			$map[] = ['custom.city_id','=',$cityId];
 		if( $activeName )		$map[] = ['score_clockin_active.name','=',$activeName];
 		if( $startTime )		$map[] = ['custom_clockin_record.insert_time','>=',Carbon::createFromFormat('Y-m-d',$startTime)->startOfDay()->getTimestamp()];
-		if( $startTime )		$map[] = ['custom_clockin_record.nsert_time','<=',Carbon::createFromFormat('Y-m-d',$startTime)->endOfDay()->getTimestamp()];
+		if( $endTime )		    $map[] = ['custom_clockin_record.insert_time','<=',Carbon::createFromFormat('Y-m-d',$endTime)->endOfDay()->getTimestamp()];
 		if( !is_null($status) )	$map[] = ['custom_clockin_record.status','=',$status];
 		// 查询数据
 		$list					= $Model->query()

resources/views/admin/custom_clockin_record/index.blade.php

@@ -13,7 +13,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	<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="phone" value="{{request('phone','')}}" placeholder="请输入联系方式查询" />
 	</div>
-	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-2" style="margin-right: 2px;">
+	<div class="form-group col col-lg-1 col-md-2 col-sm-2 col-xs-2" style="margin-right: 2px;">
 	<select name="city_id" class="form-control selectpicker" data-max-options="20" data-live-search="true" data-live-search-placeholder="搜索城市" data-none-results-text="未搜索到 {0}" title="选择城市">
 			@foreach ($cityList as $group)
 			<optgroup label="{{$group['name']}}">
@@ -27,6 +27,9 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	<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="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/custom_clockin_record/index')}}" class="btn btn-sm btn-default" >重置</a>
 	@if( check_auth('admin/custom_clockin_record/down_excel') )

resources/views/admin/score_clockin_active/index.blade.php

@@ -42,7 +42,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						@foreach ($list as $a)
 						<tr>
 							<th>{{$a['id']}}</th>
-							<td>{{$a['name']}}</td>
+							<td style="white-space:pre">{{$a['name']}}</td>
 							<td>{{$a['city_ids']}}</td>
 							<td>{{$a['tag_scope']}}</td>
 							<td>{{date('Y/m/d H:i:s',$a['start_time'])}}</td>