diff --git a/app/Admin/Controllers/LanzuCsInfoController.php b/app/Admin/Controllers/LanzuCsInfoController.php index 9002423..260580e 100644 --- a/app/Admin/Controllers/LanzuCsInfoController.php +++ b/app/Admin/Controllers/LanzuCsInfoController.php @@ -49,7 +49,7 @@ class LanzuCsInfoController extends AdminController }); $grid->disableViewButton(); $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); + $filter->like('name')->placeholder('请输入社区名称'); }); }); diff --git a/app/Admin/Controllers/LanzuCsWithdrawController.php b/app/Admin/Controllers/LanzuCsWithdrawController.php index 5b9dd1d..0010ce6 100644 --- a/app/Admin/Controllers/LanzuCsWithdrawController.php +++ b/app/Admin/Controllers/LanzuCsWithdrawController.php @@ -25,7 +25,7 @@ class LanzuCsWithdrawController extends AdminController */ protected function grid() { - return Grid::make(new LanzuCsWithdraw(), function (Grid $grid) { + return Grid::make(new LanzuCsWithdraw('csInfo'), function (Grid $grid) { $user = Admin::user(); if (!$user->isRole('lanzu_cs')) {//如果不是社区站点的角色登陆,则隐藏提现入口 $grid->disableCreateButton(); @@ -40,15 +40,13 @@ class LanzuCsWithdrawController extends AdminController $grid->disableViewButton(); $grid->disableDeleteButton(); $grid->id->sortable(); - $grid->cs_id('提现用户')->display(function () { - return LanzuCsInfo::where('id', $this->cs_id)->first()->name; - }); + $grid->column('csInfo.name','提现用户'); $grid->money; $grid->status('状态')->using([1 => '已同意', -1 => '已拒绝', 0 => '待审核'])->label([1 => 'success', -1 => 'danger', 0 => 'default']); $grid->is_pay('是否到账')->using(['否', '是']); $grid->created_at; $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); + $filter->like('csInfo.name','提现用户'); }); }); diff --git a/app/Models/LanzuCsInfo.php b/app/Models/LanzuCsInfo.php index 8201986..08090ea 100644 --- a/app/Models/LanzuCsInfo.php +++ b/app/Models/LanzuCsInfo.php @@ -30,7 +30,6 @@ class LanzuCsInfo extends Model foreach ($rows as $row){ $item[$row->admin_user_id] = $row->name; } - } return $item; } diff --git a/app/Models/LanzuCsWithdraw.php b/app/Models/LanzuCsWithdraw.php index 086eb9b..3fd6c6a 100644 --- a/app/Models/LanzuCsWithdraw.php +++ b/app/Models/LanzuCsWithdraw.php @@ -15,7 +15,7 @@ class LanzuCsWithdraw extends Model protected $dateFormat = 'U'; public function csInfo() { - return $this->hasOne("\App\Models\LanzuCsInfo",'id','cs_id'); + return $this->belongsTo("\App\Models\LanzuCsInfo",'cs_id','id'); }