更新

app/Admin/Actions/CovenantClosed.php

@@ -20,13 +20,13 @@ public function __construct($title = '', $cid = 0)
     {
     {
         $this->cid = $cid;
         $this->cid = $cid;
         parent::__construct($title);
         parent::__construct($title);
-        $this->title = $title;
+        //$this->title = $title;
     }
     }
 
 
     /**
     /**
      * @return string
      * @return string
      */
      */
-    protected $title = '<i class="feather icon-stop-circle"> 已结案 </i>';
+    protected $title = '<i class="feather icon-lock"> 已结案 </i>';
     /**
     /**
      * 按钮文本
      * 按钮文本
      *
      *
@@ -34,7 +34,7 @@ public function __construct($title = '', $cid = 0)
      */
      */
     public function title()
     public function title()
     {
     {
-        return '<i class="feather icon-stop-circle"></i> ' . $this->title . '';
+        return '<i class="feather icon-lock"></i> ' . $this->title;
     }
     }
     /**
     /**
      * Handle the action request.
      * Handle the action request.
@@ -61,7 +61,7 @@ public function render()
         return Modal::make()
         return Modal::make()
             ->lg()
             ->lg()
             ->title('已结案')
             ->title('已结案')
-            ->button("已结案")
+            ->button($this->title)
             ->body(CovenantClosedForm::make()->payload(['cid' => $this->cid]));
             ->body(CovenantClosedForm::make()->payload(['cid' => $this->cid]));
         //->button("<button class='btn btn-sm btn-primary'>$this->title</button>"); // 这个button就是对应上面的按钮
         //->button("<button class='btn btn-sm btn-primary'>$this->title</button>"); // 这个button就是对应上面的按钮
     }
     }

app/Admin/Actions/CovenantReturn.php

@@ -21,13 +21,13 @@ public function __construct($title = '', $cid = 0)
     {
     {
         $this->cid = $cid;
         $this->cid = $cid;
         parent::__construct($title);
         parent::__construct($title);
-        $this->title = $title;
+        //$this->title = $title;
     }
     }
 
 
     /**
     /**
      * @return string
      * @return string
      */
      */
-    protected $title = '<i class="feather icon-stop-circle"> 已退还 </i>';
+    protected $title = '<i class="feather icon-circle"> 已退还 </i>';
     /**
     /**
      * 按钮文本
      * 按钮文本
      *
      *
@@ -62,7 +62,7 @@ public function render()
         return Modal::make()
         return Modal::make()
             ->lg()
             ->lg()
             ->title('已退还')
             ->title('已退还')
-            ->button("已退还")
+            ->button($this->title)
             ->body(CovenantReturnForm::make()->payload(['cid' => $this->cid]));
             ->body(CovenantReturnForm::make()->payload(['cid' => $this->cid]));
         //->button("<button class='btn btn-sm btn-primary'>$this->title</button>"); // 这个button就是对应上面的按钮
         //->button("<button class='btn btn-sm btn-primary'>$this->title</button>"); // 这个button就是对应上面的按钮
     }
     }

app/Admin/Controllers/CovenantController.php

@@ -53,6 +53,10 @@ protected function grid()
 
 
             $grid->disableViewButton();
             $grid->disableViewButton();
             $grid->disableRowSelector();
             $grid->disableRowSelector();
+            //禁用增加按钮
+            if (!Admin::user()->can('hetong-add')) {
+                $grid->disableCreateButton();
+            }
 
 
             $grid->filter(function (Grid\Filter $filter) {
             $grid->filter(function (Grid\Filter $filter) {
                 // 更改为 panel 布局
                 // 更改为 panel 布局
@@ -87,11 +91,11 @@ protected function grid()
                 }
                 }
                 //已结案
                 //已结案
                 if (Admin::user()->can('hetong-closed') && $actions->row->is_closed == 0) {
                 if (Admin::user()->can('hetong-closed') && $actions->row->is_closed == 0) {
-                    $actions->append(new CovenantClosed('已结案', $actions->row->id));
+                    $actions->append(new CovenantClosed('', $actions->row->id));
                 }
                 }
                 // 已退还
                 // 已退还
                 if (Admin::user()->can('hetong-return') && $actions->row->is_return == 0) {
                 if (Admin::user()->can('hetong-return') && $actions->row->is_return == 0) {
-                    $actions->append(new CovenantReturn('已退还', $actions->row->id));
+                    $actions->append(new CovenantReturn('', $actions->row->id));
                 }
                 }
             });
             });
         });
         });

app/Admin/Controllers/LawyerCommissionController.php

@@ -8,6 +8,7 @@
 use Dcat\Admin\Form;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Show;
+use Dcat\Admin\Admin;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 use App\Models\CovenantReceivePayment as ModelCovenantReceivePayment;
 use App\Models\CovenantReceivePayment as ModelCovenantReceivePayment;
@@ -75,7 +76,9 @@ protected function grid()
 
 
             $grid->actions(function (Grid\Displayers\Actions $actions) {
             $grid->actions(function (Grid\Displayers\Actions $actions) {
                 //查看
                 //查看
-                $actions->append('<a href="/lawyer-commission-collect?no=' . $this->number . '" alt="查看" target="_blank">查看</a>');
+                if (Admin::user()->can('lawyer-commission-collect-view')) {
+                    $actions->append('<a href="/lawyer-commission-collect?no=' . $this->number . '" alt="查看" target="_blank"><i class="feather icon-eye"> 查看 </i></a>');
+                }
             });
             });
         });
         });
     }
     }

app/Admin/Controllers/LawyerController.php

@@ -9,6 +9,7 @@
 use Dcat\Admin\Form;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Show;
+use Dcat\Admin\Admin;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
@@ -44,6 +45,10 @@ protected function grid()
             // $grid->column('updated_at')->sortable();
             // $grid->column('updated_at')->sortable();
             $grid->disableViewButton();
             $grid->disableViewButton();
             $grid->disableRowSelector();
             $grid->disableRowSelector();
+            //禁用增加按钮
+            if (!Admin::user()->can('lawyer-add')) {
+                $grid->disableCreateButton();
+            }
 
 
             $grid->filter(function (Grid\Filter $filter) {
             $grid->filter(function (Grid\Filter $filter) {
                 // 更改为 panel 布局
                 // 更改为 panel 布局
@@ -54,6 +59,17 @@ protected function grid()
                 $filter->equal('settlement_period')->select(Lawyer::SETTLEMENT_PERIOD)->width(3);
                 $filter->equal('settlement_period')->select(Lawyer::SETTLEMENT_PERIOD)->width(3);
                 $filter->equal('settlement_method')->select(Lawyer::SETTLEMENT_METHOD)->width(3);
                 $filter->equal('settlement_method')->select(Lawyer::SETTLEMENT_METHOD)->width(3);
             });
             });
+
+            $grid->actions(function (Grid\Displayers\Actions $actions) {
+                //编辑
+                if (!Admin::user()->can('lawyer-edit')) {
+                    $actions->disableEdit();
+                }
+                //删除
+                if (!Admin::user()->can('lawyer-delete')) {
+                    $actions->disableDelete();
+                }
+            });
         });
         });
     }
     }
 
 

app/Admin/Controllers/LawyerCostController.php

@@ -82,12 +82,12 @@ protected function grid()
             $grid->actions(function (Grid\Displayers\Actions $actions) {
             $grid->actions(function (Grid\Displayers\Actions $actions) {
                 //成本汇总
                 //成本汇总
                 if (Admin::user()->can('lycost-collect')) {
                 if (Admin::user()->can('lycost-collect')) {
-                    $actions->append('<a href="/lycost-collect?no=' . $this->number . '" alt="成本汇总" target="_blank">成本汇总</a>');
+                    $actions->append('<a href="/lycost-collect?no=' . $this->number . '" alt="成本汇总" target="_blank"><i class="feather icon-book"> 成本汇总 </i></a>');
                 }
                 }
 
 
                 // 成本明细
                 // 成本明细
                 if (Admin::user()->can('lycost-list')) {
                 if (Admin::user()->can('lycost-list')) {
-                    $actions->append('<a href="/lycost-list?no=' . $this->number . '" alt="成本明细" target="_blank">成本明细</a>');
+                    $actions->append('<a href="/lycost-list?no=' . $this->number . '" alt="成本明细" target="_blank"><i class="feather icon-list"> 成本明细 </i></a>');
                 }
                 }
             });
             });
         });
         });

app/Admin/Controllers/LawyerCostListController.php

@@ -68,7 +68,7 @@ protected function grid()
                 $grid->disableEditButton();
                 $grid->disableEditButton();
             }
             }
             if (!Admin::user()->can('lawyer_cost_list_delete')) {
             if (!Admin::user()->can('lawyer_cost_list_delete')) {
-                $grid->disableEditButton();
+                $grid->disableDeleteButton();
             }
             }
 
 
             $grid->filter(function (Grid\Filter $filter) {
             $grid->filter(function (Grid\Filter $filter) {

app/Admin/Controllers/PrincipalController.php

@@ -44,6 +44,10 @@ protected function grid()
             // $grid->column('updated_at')->sortable();
             // $grid->column('updated_at')->sortable();
             $grid->disableViewButton();
             $grid->disableViewButton();
             $grid->disableRowSelector();
             $grid->disableRowSelector();
+            //禁用增加按钮
+            if (!Admin::user()->can('principal-add')) {
+                $grid->disableCreateButton();
+            }
 
 
             $grid->filter(function (Grid\Filter $filter) use ($ptype) {
             $grid->filter(function (Grid\Filter $filter) use ($ptype) {
                 // 更改为 panel 布局
                 // 更改为 panel 布局
@@ -54,6 +58,17 @@ protected function grid()
                 $filter->like('identity_card')->width(3);
                 $filter->like('identity_card')->width(3);
                 $filter->equal('wtype', '类型')->select([1 => '单位', 2 => '个人'])->width(3)->default(1);
                 $filter->equal('wtype', '类型')->select([1 => '单位', 2 => '个人'])->width(3)->default(1);
             });
             });
+
+            $grid->actions(function (Grid\Displayers\Actions $actions) {
+                //编辑
+                if (!Admin::user()->can('principal-edit')) {
+                    $actions->disableEdit();
+                }
+                //删除
+                if (!Admin::user()->can('principal-delete')) {
+                    $actions->disableDelete();
+                }
+            });
         });
         });
     }
     }
 
 

config/admin.php

@@ -242,7 +242,7 @@
         'bind_permission' => true,
         'bind_permission' => true,
 
 
         // Whether enable role bind to menu.
         // Whether enable role bind to menu.
-        'role_bind_menu' => true,
+        'role_bind_menu' => false,
 
 
         // Whether enable permission bind to menu.
         // Whether enable permission bind to menu.
         'permission_bind_menu' => true,
         'permission_bind_menu' => true,