From a1408153bed638afc391c0300891c073f3f0d729 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 30 Dec 2021 20:55:00 +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

---
 app/Admin/Actions/Grid/DistributionPreIncomeLog.php       | 2 +-
 app/Admin/Renderable/DistributionPreIncomeSimpleTable.php | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Actions/Grid/DistributionPreIncomeLog.php b/app/Admin/Actions/Grid/DistributionPreIncomeLog.php
index 1b82a187..ddc48397 100644
--- a/app/Admin/Actions/Grid/DistributionPreIncomeLog.php
+++ b/app/Admin/Actions/Grid/DistributionPreIncomeLog.php
@@ -14,7 +14,7 @@ class DistributionPreIncomeLog extends LazyRenderable
         $id = $this->key;
         $builder = DistributionPreIncomeLogModel::where('pre_income_id', $id);
         $grid = Grid::make($builder, function (Grid $grid) {
-            $grid->column('remarks');
+            $grid->column('remarks', '备注');
             $grid->column('change_amount', '变动金额');
             $grid->column('change_sales_value', '变动消费值');
             $grid->column('change_revenue', '变动收益');
diff --git a/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php b/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php
index d2475129..655a5367 100644
--- a/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php
+++ b/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php
@@ -2,6 +2,7 @@
 
 namespace App\Admin\Renderable;
 
+use App\Admin\Actions\Grid\DistributionPreIncomeLog;
 use App\Models\DistributionPreIncome;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid\LazyRenderable;
@@ -20,7 +21,13 @@ class DistributionPreIncomeSimpleTable extends LazyRenderable
                 1=>'danger',
                 2=>'success',
             ]);
+            $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('created_at', '创建时间');
             // $grid->withBorder();
             $grid->model()->orderBy('created_at', 'desc');