From c30426c077e804b1cde6120f5cc06e9a10b6e600 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 23 Oct 2020 17:17:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=93=E5=B1=95=E5=91=98=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/Salesman.php | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/Admin/Controllers/v3/Salesman.php b/app/Admin/Controllers/v3/Salesman.php
index 1a479cf..15f0dba 100644
--- a/app/Admin/Controllers/v3/Salesman.php
+++ b/app/Admin/Controllers/v3/Salesman.php
@@ -47,17 +47,12 @@ class Salesman extends AdminController
                 $name = request()->get('name') ?(request()->get('name')=='全部'?'总':request()->get('name')): '';
                 $option = request()->get('option') ?? 0;
                 $searchTime = request()->input('created_at');//搜索时间
-                if ($adu->isRole('lanzu_cs')){
-                    $grid->disableFilterButton();
+                if ($searchTime){
+                    $content = "<a href='salesman_export?option={$option}&name={$name}&created_at[start]={$searchTime['start']}&created_at[end]={$searchTime['end']}' class='btn btn-primary feather icon-download'> 导出 </a>";
                 }else{
-                    if ($searchTime){
-                        $content = "<a href='salesman_export?option={$option}&name={$name}&created_at[start]={$searchTime['start']}&created_at[end]={$searchTime['end']}' class='btn btn-primary feather icon-download'> 导出 </a>";
-                    }else{
-                        $content = "<a href='salesman_export?option={$option}&name={$name}' class='btn btn-primary feather icon-download'> 导出 </a>";
-                    }
-                    $grid->tools($content);
+                    $content = "<a href='salesman_export?option={$option}&name={$name}' class='btn btn-primary feather icon-download'> 导出 </a>";
                 }
-
+                $grid->tools($content);
                 $grid->paginate(10);
                 $grid->column('person_id', '懒ID');
                 $grid->column('nick_name', '拓展员')->display(function (){
@@ -86,15 +81,16 @@ class Salesman extends AdminController
                 $grid->disableEditButton();
                 $grid->disableDeleteButton();
                 $grid->disableViewButton();
-                $grid->filter(function (Grid\Filter $filter)use ($option) {
-                    $filter->equal('person_id','懒ID');
-                    $filter->equal('user_id','拓展员')->select(
-                        LanzuEmployees::where('status',1)->pluck('name','user_id')
-                    );
+                $grid->filter(function (Grid\Filter $filter)use ($option,$adu) {
+                    if (!$adu->isRole('lanzu_cs')){
+                        $filter->equal('person_id','懒ID');
+                        $filter->equal('user_id','拓展员')->select(
+                            LanzuEmployees::where('status',1)->pluck('name','user_id')
+                        );
+                    }
                     if ($option==0){
                         $filter->between('created_at','日期')->datetime();
                     }
-
                 });
             });
         }