pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

Merge branch 'develop' into 1.x

release
vine_liutk 2022-02-24 10:12:24 +08:00
parent f43f28ee19 1f41063bd6
commit 555d7e1c9f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Admin/Controllers/DealerOrderController.php
View File

@ -114,9 +114,9 @@ class DealerOrderController extends AdminController
}); });
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
$filter->panel(); $filter->panel();
$filter->equal('user.phone')->width(3); $filter->like('user.phone')->width(3);
$filter->equal('consignor.phone')->width(3); $filter->like('consignor.phone')->width(3);
$filter->equal('sn')->width(3); $filter->like('sn')->width(3);
$filter->between('paied_time')->dateTime()->width(5); $filter->between('paied_time')->dateTime()->width(5);
$filter->between('created_at')->dateTime()->width(5); $filter->between('created_at')->dateTime()->width(5);
// $filter->equal('id'); // $filter->equal('id');

4
app/Admin/Controllers/OrderController.php
View File

@ -128,8 +128,8 @@ class OrderController extends AdminController
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
$filter->panel(); $filter->panel();
$filter->equal('sn')->width(3); $filter->like('sn')->width(3);
$filter->equal('user.phone')->width(3); $filter->like('user.phone')->width(3);
$filter->where('tags', function ($query) { $filter->where('tags', function ($query) {
$query->whereHas('tags', function ($q) { $query->whereHas('tags', function ($q) {
$q->whereIn('tags.id', $this->input); $q->whereIn('tags.id', $this->input);