Leadfyy.co
/
lianjie_admin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

活动商品--添加快捷日期选择

master
liangyuyan 5 years ago
parent
cf54d8655e
commit
c0f6df7065
3 changed files with 130 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 113
      app/Admin/Actions/Grid/v3/DataReportOption.php
  2. 26
      app/Admin/Controllers/v3/GoodsActivityReportController.php
  3. 6
      app/Admin/Controllers/v3/OrderReportController.php

113
app/Admin/Actions/Grid/v3/DataReportOption.php
View File

@ -0,0 +1,113 @@
<?php
namespace App\Admin\Actions\Grid\v3;
use Dcat\Admin\Actions\Response;
use Dcat\Admin\Admin;
use Dcat\Admin\Tree\AbstractTool;
use Illuminate\Http\Request;
class DataReportOption extends AbstractTool
{
protected $url;
protected $option;
protected $title = '';
public function __construct($option = '', $url = '', $title = '')
{
$this->option = $option;
$this->url = $url;
$this->title = $title;
}
/**
* Handle the action request.
*
* @param Request $request
*
* @return Response
*/
public function handle(Request $request)
{
// $date = $this->getDataByOption($this->option);
// $startTime = $date['start'] ?? '';
// $endTime = $date['end'] ?? '';
return $this->response()
->success('查询中~');
// ->redirect('/'.$this->url.'?start_time='.$startTime.'&end_time='.$endTime);
}
/**
* @return string
*/
protected function html()
{
$date = $this->getDataByOption($this->option);
$startTime = $date['start'] ?? '';
$endTime = $date['end'] ?? '';
$url = 'admin/'.$this->url.'?start_time='.$startTime.'&end_time='.$endTime;
$this->defaultHtmlAttribute('href', url($url));
return <<<HTML
<a {$this->formatHtmlAttributes()}>{$this->title()}</a>
HTML;
}
public function getDataByOption($option)
{
$date = ['start','end'];
$today = date('Y-m-d');
switch($option){
case 'today':
$date['start'] = $today;
$date['end'] = $today;
break;
case 'yesterday':
$yesterday = date("Y-m-d",strtotime("-1 days",time()));
$date['start'] = $yesterday;
$date['end'] = $yesterday;
break;
case 'this_week':
$first=1;
//获取当前周的第几天 周日是 0 周一到周六是 1 - 6
$w=date('w',strtotime($today));
//获取本周开始日期，如果$w是0，则表示周日，减去 6 天
$week_start=date('Y-m-d',strtotime("$today -".($w ? $w - $first : 6).' days'));
//本周结束日期
$week_end=date('Y-m-d',strtotime("$week_start +6 days"));
$date['start'] = $week_start;
$date['end'] = $week_end;
break;
case 'last_week':
// 上周日
$lastSunday = date('Y-m-d', strtotime('-1 sunday', time()));
// 上周一
$lastMonday = date('Y-m-d', strtotime('-1 monday', strtotime($lastSunday)));
$date['start'] = $lastMonday;
$date['end'] = $lastSunday;
break;
case 'this_month':
$thisMonthStart = date('Y-m-01', strtotime($today));
$thisMonthEnd = date('Y-m-d', strtotime($today));
$date['start'] = $thisMonthStart;
$date['end'] = $thisMonthEnd;
break;
case 'last_month':
//上月初
$lastMonthStart = date('Y-m-d', strtotime('-1 month', strtotime(date('Y-m', time()) . '-01')));
// 上月底
$lastMonthEnd = date('Y-m-d', strtotime(date('Y-m', time()) . '-01') - 86400);
$date['start'] = $lastMonthStart;
$date['end'] = $lastMonthEnd;
break;
default:
break;
}
return $date;
}
}

26
app/Admin/Controllers/v3/GoodsActivityReportController.php
View File

@ -2,12 +2,8 @@
namespace App\Admin\Controllers\v3; namespace App\Admin\Controllers\v3;
use App\Admin\Actions\Grid\v3\OrderReportLastMonth;
use App\Admin\Actions\Grid\v3\OrderReportLastWeek;
use App\Admin\Actions\Grid\v3\OrderReportToday;
use App\Admin\Actions\Grid\v3\OrderReportYesterday;
use App\Admin\Actions\Grid\v3\DataReportOption;
use Dcat\Admin\Grid\Model as GridModel;
use App\Admin\Repositories\v3\GoodsActivityReport; use App\Admin\Repositories\v3\GoodsActivityReport;
use App\Admin\Widgets\Charts\OrderGoodsActivityColumnChart; use App\Admin\Widgets\Charts\OrderGoodsActivityColumnChart;
use Dcat\Admin\Grid; use Dcat\Admin\Grid;
@ -54,15 +50,21 @@ class GoodsActivityReportController extends AdminController
$grid->filter(function (Filter $filter) use($marketList,$storeList) { $grid->filter(function (Filter $filter) use($marketList,$storeList) {
// 更改为 panel 布局 // 更改为 panel 布局
$filter->panel(); $filter->panel();
$filter->equal('name','商品名称');
$filter->equal('market_id','市场')->select($marketList);
$filter->equal('store_id','店铺')->select($storeList);
$filter->equal('start_time','开始时间')->date();
$filter->equal('end_time','结束时间')->date();
$filter->equal('start_time','开始时间')->date()->width(2);
$filter->equal('end_time','结束时间')->date()->width(2);
$filter->equal('name','商品名称')->width(3);
$filter->equal('market_id','市场')->select($marketList)->width(2);
$filter->equal('store_id','店铺')->select($storeList)->width(3);
}); });
// $grid->tools([new OrderReportToday(), new OrderReportYesterday(), new OrderReportLastWeek(), new OrderReportLastMonth()]);
$grid->tools([
new DataReportOption('today','goods_activity_report','今日'),
new DataReportOption('yesterday','goods_activity_report','昨日'),
new DataReportOption('this_week','goods_activity_report','本周'),
new DataReportOption('last_week','goods_activity_report','上周'),
new DataReportOption('this_month','goods_activity_report','本月'),
new DataReportOption('last_month','goods_activity_report','上月')
]);
// 每页1条 // 每页1条
$grid->paginate(10); $grid->paginate(10);

6
app/Admin/Controllers/v3/OrderReportController.php
View File

@ -35,9 +35,9 @@ class OrderReportController extends AdminController
// 更改为 panel 布局 // 更改为 panel 布局
$filter->panel(); $filter->panel();
$filter->equal('market_id','市场')->select($marketList);
$filter->equal('start_time','开始时间')->date();
$filter->equal('end_time','结束时间')->date();
$filter->equal('market_id','市场')->select($marketList)->width(3);
$filter->equal('start_time','开始时间')->date()->width(2);
$filter->equal('end_time','结束时间')->date()->width(2);
}); });
$grid->tools([new OrderReportToday(), new OrderReportYesterday(), new OrderReportLastWeek(), new OrderReportLastMonth()]); $grid->tools([new OrderReportToday(), new OrderReportYesterday(), new OrderReportLastWeek(), new OrderReportLastMonth()]);

Write Preview
Loading…
Cancel
Save