From 66208ac79663a0fa8a8baf96cc2f02c69a456ede Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 30 Dec 2021 19:42:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/AfterSaleController.php | 20 ++++++++++++++++++-
 app/Admin/Controllers/CouponController.php    |  2 +-
 app/Admin/Controllers/OrderController.php     | 15 ++++++++++++--
 .../Controllers/OrderPackageController.php    | 12 ++++++++++-
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/app/Admin/Controllers/AfterSaleController.php b/app/Admin/Controllers/AfterSaleController.php
index a2f94152..0c3a381c 100644
--- a/app/Admin/Controllers/AfterSaleController.php
+++ b/app/Admin/Controllers/AfterSaleController.php
@@ -16,9 +16,11 @@ use App\Models\Tag;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
+use Dcat\Admin\Grid\Column;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Show;
+use Illuminate\Support\Facades\Request;
 
 class AfterSaleController extends AdminController
 {
@@ -30,7 +32,13 @@ class AfterSaleController extends AdminController
     protected function grid()
     {
         $builder = AfterSale::with(['user', 'order', 'orderProduct', 'tags']);
+
         return Grid::make($builder, function (Grid $grid) {
+            $orderProductId = Request::query('order_product_id', 0);
+            if ($orderProductId) {
+                $grid->model()->where('order_product_id', $orderProductId);
+            }
+
             $grid->column('sn')->copyable();
             $grid->column('tags', '标签')->display(function ($tags) {
                 $array = [];
@@ -40,7 +48,17 @@ class AfterSaleController extends AdminController
                 return $array;
             })->label();
             $grid->column('user.phone')->copyable();
-            $grid->column('order.sn')->copyable();
+            $grid->column('order.sn')->if(function () {
+                return Admin::user()->can('dcat.admin.orders.show');
+            })
+            ->then(function (Column $column) {
+                $column->link(function ($value) {
+                    return admin_url('orders/'.$this->order_id);
+                });
+            })
+            ->else(function (Column $column) {
+                $column->copyable();
+            });
 
             $grid->column('orderProduct.name');
             $grid->column('num');
diff --git a/app/Admin/Controllers/CouponController.php b/app/Admin/Controllers/CouponController.php
index 2d4e257f..8cd45c2a 100644
--- a/app/Admin/Controllers/CouponController.php
+++ b/app/Admin/Controllers/CouponController.php
@@ -70,7 +70,7 @@ class CouponController extends AdminController
             /** 查询 **/
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel();
-                $filter->liek('name')->width(3);
+                $filter->like('name')->width(3);
             });
         });
     }
diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index 4f7adc2f..91d978e4 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -20,6 +20,7 @@ use App\Models\Tag;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
+use Dcat\Admin\Grid\Column;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Show;
@@ -38,7 +39,7 @@ class OrderController extends AdminController
         $builder = Order::with(['user', 'tags']);
 
         return Grid::make($builder, function (Grid $grid) {
-            $grid->column('id')->sortable();
+            // $grid->column('id')->sortable();
             $grid->column('sn')->copyable();
             $grid->column('tags', '标签')->display(function ($tags) {
                 $array = [];
@@ -100,6 +101,9 @@ class OrderController extends AdminController
                 if (Admin::user()->can('dcat.admin.orders.tags')) {
                     $actions->append(new OrderSetTag());
                 }
+                if (Admin::user()->can('dcat.admin.distribution_pre_incomes.index')) {
+                    $actions->append('<a href="'.admin_route('distribution_pre_incomes.index', ['order[sn]'=>$actions->row->sn]).'"><i class="fa fa-eye"></i> 预收益明细</a>');
+                }
                 // $actions->append(new CreateOrderPackage());
             });
 
@@ -235,7 +239,14 @@ class OrderController extends AdminController
                         0=>'success',
                         1=>'danger',
                         2=>'primary',
-                    ]);
+                    ])->if(function () {
+                        return in_array($this->after_sale_state, [1, 2]) && Admin::user()->can('dcat.admin.after_sales.index');
+                    })
+                    ->then(function (Column $column) {
+                        $column->link(function ($value) {
+                            return admin_url('after-sales?order_product_id='.$this->id);
+                        });
+                    });
                     $grid->disableActions();
                     $grid->disablePagination();
                     $grid->disableRefreshButton();
diff --git a/app/Admin/Controllers/OrderPackageController.php b/app/Admin/Controllers/OrderPackageController.php
index 68646aaf..d538341a 100644
--- a/app/Admin/Controllers/OrderPackageController.php
+++ b/app/Admin/Controllers/OrderPackageController.php
@@ -30,7 +30,17 @@ class OrderPackageController extends AdminController
         $builder = OrderPackage::with(['order', 'tags']);
         return Grid::make($builder, function (Grid $grid) {
             // $grid->column('id')->sortable();
-            $grid->column('order.sn')->copyable();
+            $grid->column('order.sn')->if(function () {
+                return Admin::user()->can('dcat.admin.orders.show');
+            })
+            ->then(function (Column $column) {
+                $column->link(function ($value) {
+                    return admin_url('orders/'.$this->order_id);
+                });
+            })
+            ->else(function (Column $column) {
+                $column->copyable();
+            });
             $grid->column('tags', '标签')->display(function ($tags) {
                 $array = [];
                 foreach ($this->tags as $key => $tag) {