|
@@ -365,7 +365,7 @@ class custReportController extends Controller
|
365
|
365
|
//未上报数据销售
|
366
|
366
|
$noReportSaler = $this->noReportSaler();
|
367
|
367
|
$no_height = '100';
|
368
|
|
- if($no_num = count($noReportSaler)) $no_height += round($no_num * 36);
|
|
368
|
+ if($no_num = count($noReportSaler)) $no_height += round($no_num * 37);
|
369
|
369
|
return view('custreport/detaillist', ['result' =>$result,
|
370
|
370
|
'page' =>$page,
|
371
|
371
|
'count' =>$count,
|
|
@@ -752,7 +752,7 @@ class custReportController extends Controller
|
752
|
752
|
$salers = DB::table('admin')->whereIn('id', $ids)->lists('realname', 'id');
|
753
|
753
|
|
754
|
754
|
//查每日上报数据销售
|
755
|
|
- $result = DB::table('cust_day_detail')->select('admin_id', 'dtime')->where('dtime','<',$today)->where('is_del', 0)->orderBy('dtime', 'desc')->get();
|
|
755
|
+ $result = DB::table('cust_day_detail')->select('admin_id', 'dtime')->where('dtime','<',$today)->where('dtime','>=','2019-09-04')->where('is_del', 0)->orderBy('dtime', 'desc')->get();
|
756
|
756
|
$result = json_decode(json_encode($result), true);
|
757
|
757
|
|
758
|
758
|
$data = array();
|