From 6e8d5bbe70611868e74d22de2cd2aef00677aeda Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Thu, 30 Dec 2021 20:53:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=B6=E7=9B=8A=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Actions/Grid/DistributionPreIncomeLog.php | 30 +++++++++++++++++++ .../DistributionPreIncomeController.php | 5 ++++ app/Models/DistributionPreIncomeLog.php | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 app/Admin/Actions/Grid/DistributionPreIncomeLog.php diff --git a/app/Admin/Actions/Grid/DistributionPreIncomeLog.php b/app/Admin/Actions/Grid/DistributionPreIncomeLog.php new file mode 100644 index 00000000..1b82a187 --- /dev/null +++ b/app/Admin/Actions/Grid/DistributionPreIncomeLog.php @@ -0,0 +1,30 @@ +key; + $builder = DistributionPreIncomeLogModel::where('pre_income_id', $id); + $grid = Grid::make($builder, function (Grid $grid) { + $grid->column('remarks'); + $grid->column('change_amount', '变动金额'); + $grid->column('change_sales_value', '变动消费值'); + $grid->column('change_revenue', '变动收益'); + $grid->column('created_at', '发生时间'); + $grid->disableActions(); + $grid->disableCreateButton(); + $grid->disablePagination(); + $grid->async(); + }); + + return $grid; + } +} diff --git a/app/Admin/Controllers/DistributionPreIncomeController.php b/app/Admin/Controllers/DistributionPreIncomeController.php index eed69efb..4a63ad61 100644 --- a/app/Admin/Controllers/DistributionPreIncomeController.php +++ b/app/Admin/Controllers/DistributionPreIncomeController.php @@ -2,6 +2,7 @@ namespace App\Admin\Controllers; +use App\Admin\Actions\Grid\DistributionPreIncomeLog; use App\Admin\Repositories\DistributionPreIncome; use App\Models\DistributionPreIncome as DistributionPreIncomeModel; use Dcat\Admin\Form; @@ -31,6 +32,10 @@ class DistributionPreIncomeController extends AdminController $grid->column('total_amount'); $grid->column('total_sales_value'); $grid->column('total_revenue'); + $grid->column('logs', '收益详情')->display('详情')->modal(function ($modal) { + $modal->title('收益详情'); + return DistributionPreIncomeLog::make(); + }); $grid->column('status')->using(DistributionPreIncomeModel::$statusTexts)->dot([ 0=>'danger', 1=>'danger', diff --git a/app/Models/DistributionPreIncomeLog.php b/app/Models/DistributionPreIncomeLog.php index 06d86ebc..0c3a5a6c 100644 --- a/app/Models/DistributionPreIncomeLog.php +++ b/app/Models/DistributionPreIncomeLog.php @@ -2,10 +2,12 @@ namespace App\Models; +use Dcat\Admin\Traits\HasDateTimeFormatter; use Illuminate\Database\Eloquent\Model; class DistributionPreIncomeLog extends Model { + use HasDateTimeFormatter; /** * @var array */