From b0160dade631319220dba4d44ddb43be36932fea Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Fri, 18 Sep 2020 12:58:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ImsCjdcOrderMainController.php | 17 +++++++++-------- config/admin.php | 4 +++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index 5691890..2390ccb 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -69,19 +69,20 @@ class ImsCjdcOrderMainController extends AdminController $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) { $state = $actions->row->state; + $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '
详情
')); + if ($state == 2) { - $actions->append(new OrderStateHandle('
接单
', 3)); + $actions->append(new OrderStateHandle('
接单
', 3)); } elseif ($state == 311) { - $actions->append(new OrderStateHandle('
完成
', 4)); - $actions->append(new OrderPrint('
打印
')); + $actions->append(new OrderStateHandle('
完成
', 4)); + $actions->append(new OrderPrint('
打印
')); } elseif ($state == 3) { - $actions->append(new OrderPrint('
打印
')); - $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '
自送
')); + $actions->append(new OrderPrint('
打印
')); + $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '
自送
')); } elseif ($state == 8) { - $actions->append(new OrderStateHandle('
同意退款
', 9)); - $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '
拒绝退款
')); + $actions->append(new OrderStateHandle('
同意
', 9)); + $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '
拒绝
')); } - $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '
详情
')); }); diff --git a/config/admin.php b/config/admin.php index cb25c10..d653267 100644 --- a/config/admin.php +++ b/config/admin.php @@ -157,7 +157,9 @@ return [ | The global Grid action display class. |-------------------------------------------------------------------------- */ - 'grid_action_class' => Dcat\Admin\Grid\Displayers\DropdownActions::class, + //'grid_action_class' => Dcat\Admin\Grid\Displayers\DropdownActions::class, + 'grid_action_class' => Dcat\Admin\Grid\Displayers\Actions::class, + //'grid_action_class' => Dcat\Admin\Grid\Displayers\ContextMenuActions::class, ], /* From 5c28239d31d590a00fe06cd09d2a0c860be9e372 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Fri, 18 Sep 2020 14:17:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD,=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2=E5=92=8C=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/ImsCjdcOrderMainController.php | 2 ++ app/Admin/Repositories/ImsCjdcOrderMain.php | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index 2390ccb..bd3bdc8 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -91,6 +91,8 @@ class ImsCjdcOrderMainController extends AdminController if (!(Admin::user()->isRole('market_service'))){ $filter->equal('market_id','所属市场')->select(ImsCjdcMarket::getMarket()); } + $filter->between('created_at','下单时间')->datetime(); + $filter->between('money','订单金额'); }); $grid->disableViewButton(); diff --git a/app/Admin/Repositories/ImsCjdcOrderMain.php b/app/Admin/Repositories/ImsCjdcOrderMain.php index 220a7ad..eac9aed 100644 --- a/app/Admin/Repositories/ImsCjdcOrderMain.php +++ b/app/Admin/Repositories/ImsCjdcOrderMain.php @@ -17,6 +17,7 @@ class ImsCjdcOrderMain extends EloquentRepository public function get(Grid\Model $model) { + $builder = new \App\Models\ImsCjdcOrderMain(); $builder = $builder::leftJoin('lanzu_user','lanzu_user.id','lanzu_order_main.user_id') ->with('market') @@ -33,6 +34,12 @@ class ImsCjdcOrderMain extends EloquentRepository $value['arguments'][1] = $this->getGridColumns(); } elseif ($value['method'] == 'get') { $value['arguments'] = [$this->getGridColumns()]; + }elseif ($value['method']=='whereBetween'){ + if ($value['arguments'][0]=='created_at'){ + $value['arguments'][0] = 'lanzu_order_main.created_at'; + $value['arguments'][1][0] = strtotime($value['arguments'][1][0]); + $value['arguments'][1][1] = strtotime($value['arguments'][1][1]); + } } $query = call_user_func_array([$query, $value['method']], $value['arguments'] ?? []); });