diff --git a/app/Admin/Controllers/DistributionPreIncomeController.php b/app/Admin/Controllers/DistributionPreIncomeController.php index ab692b36..856d772d 100644 --- a/app/Admin/Controllers/DistributionPreIncomeController.php +++ b/app/Admin/Controllers/DistributionPreIncomeController.php @@ -2,7 +2,7 @@ namespace App\Admin\Controllers; -use App\Admin\Actions\Grid\DistributionPreIncomeLog; +use App\Admin\Renderable\DistributionPreIncomeLogTable; use App\Admin\Repositories\DistributionPreIncome; use App\Models\DistributionPreIncome as DistributionPreIncomeModel; use App\Models\UserInfo; @@ -39,7 +39,7 @@ class DistributionPreIncomeController extends AdminController $grid->column('total_revenue'); $grid->column('logs', '收益详情')->display('详情')->modal(function ($modal) { $modal->title('收益详情'); - return DistributionPreIncomeLog::make(); + return DistributionPreIncomeLogTable::make(['id'=>$this->id]); }); $grid->column('status')->using(DistributionPreIncomeModel::$statusTexts)->dot([ 0=>'danger', diff --git a/app/Admin/Actions/Grid/DistributionPreIncomeLog.php b/app/Admin/Renderable/DistributionPreIncomeLogTable.php similarity index 87% rename from app/Admin/Actions/Grid/DistributionPreIncomeLog.php rename to app/Admin/Renderable/DistributionPreIncomeLogTable.php index ddc48397..1bd3944a 100644 --- a/app/Admin/Actions/Grid/DistributionPreIncomeLog.php +++ b/app/Admin/Renderable/DistributionPreIncomeLogTable.php @@ -1,12 +1,12 @@ disableActions(); $grid->disableCreateButton(); $grid->disablePagination(); - $grid->async(); + // $grid->async(); }); return $grid; diff --git a/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php b/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php index 655a5367..7fcb4bb7 100644 --- a/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php +++ b/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php @@ -2,7 +2,6 @@ namespace App\Admin\Renderable; -use App\Admin\Actions\Grid\DistributionPreIncomeLog; use App\Models\DistributionPreIncome; use Dcat\Admin\Grid; use Dcat\Admin\Grid\LazyRenderable; @@ -26,7 +25,7 @@ class DistributionPreIncomeSimpleTable extends LazyRenderable $grid->column('total_revenue', '收益'); $grid->column('logs', '收益详情')->display('详情')->modal(function ($modal) { $modal->title('收益详情'); - return DistributionPreIncomeLog::make(); + return DistributionPreIncomeLogTable::make(['id'=>$this->id]); }); $grid->column('created_at', '创建时间'); // $grid->withBorder();