From 726b2c7cb9ce8ad0112edcfad7225034831e335e Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Thu, 29 Sep 2022 11:38:45 +0800 Subject: [PATCH] goods --- composer.json | 3 ++- src/Http/Admin/GoodsController.php | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 32515d2..b3aed20 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,8 @@ "require": { "php": ">=8.1.0", "peidikeji/dcat-admin": "*", - "tucker-eric/eloquentfilter": "^3.1" + "tucker-eric/eloquentfilter": "^3.1", + "dcat/easy-excel": "^1.1" }, "autoload": { "psr-4": { diff --git a/src/Http/Admin/GoodsController.php b/src/Http/Admin/GoodsController.php index 451e548..c0307ca 100644 --- a/src/Http/Admin/GoodsController.php +++ b/src/Http/Admin/GoodsController.php @@ -96,6 +96,8 @@ class GoodsController extends AdminController protected function grid() { return Grid::make(Goods::with(['category', 'brand', 'type', 'skus']), function (Grid $grid) { + $user = Admin::user(); + $grid->export(); $grid->model()->sort(); @@ -137,13 +139,11 @@ class GoodsController extends AdminController ->else() ->editable(); $grid->column('on_sale')->bool(); - $grid->column('is_recommend')->switch(); + $grid->column('is_recommend')->if(fn() => $user->can('dcat.admin.goods.edit'))->switch()->else()->bool(); $grid->column('sold_count'); $grid->createMode(Grid::CREATE_MODE_DEFAULT); - $user = Admin::user(); - $grid->showCreateButton($user->can('dcat.admin.goods.create')); $grid->actions(function (Actions $actions) use ($user) {