2

app/Admin/Controllers/AlreadyApproveController.php

@@ -6,18 +6,10 @@ use App\Admin\Extensions\Tools\NotPassAction;
 use App\Admin\Extensions\Tools\PassAction;
 use App\Admin\Extensions\Tools\PassAction;
 use App\Admin\Repositories\TasksApprove;
 use App\Admin\Repositories\TasksApprove;
 use App\Admin\Services\CityAreaService;
 use App\Admin\Services\CityAreaService;
-use App\Models\Task;
-use Dcat\Admin\Actions\Action;
 use Dcat\Admin\Form;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Http\Controllers\Dashboard;
-use Dcat\Admin\Layout\Column;
-use Dcat\Admin\Layout\Content;
-use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Show;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
-use Dcat\Admin\Widgets\Tab;
-use SuperEggs\DcatDistpicker\DcatDistpickerHelper;
 
 
 class AlreadyApproveController extends AdminController
 class AlreadyApproveController extends AdminController
 {
 {

app/Admin/Controllers/AlreadyDoneTaskController.php

@@ -5,9 +5,6 @@ namespace App\Admin\Controllers;
 use App\Admin\Extensions\Tools\BackAction;
 use App\Admin\Extensions\Tools\BackAction;
 use App\Admin\Repositories\TasksReceive;
 use App\Admin\Repositories\TasksReceive;
 use App\Admin\Services\CityAreaService;
 use App\Admin\Services\CityAreaService;
-use App\Models\TasksApprove;
-use App\Models\TasksCollect;
-use Dcat\Admin\Actions\Action;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;

app/Admin/Controllers/CreateOrderController.php

@@ -3,19 +3,11 @@
 namespace App\Admin\Controllers;
 namespace App\Admin\Controllers;
 
 
 use App\Admin\Extensions\Tools\CreateSettlementOrder;
 use App\Admin\Extensions\Tools\CreateSettlementOrder;
-use App\Admin\Extensions\Tools\ReturnBack;
-use App\Admin\Extensions\Tools\UserConfirmOrder;
 use App\Admin\Repositories\TasksReceive;
 use App\Admin\Repositories\TasksReceive;
 use App\Admin\Services\CityAreaService;
 use App\Admin\Services\CityAreaService;
 use App\Models\AdminUser;
 use App\Models\AdminUser;
-use App\Models\TasksOrder;
-use Dcat\Admin\Admin;
-use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Layout\Content;
-use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
-use Dcat\Admin\Widgets\Tab;
 
 
 class CreateOrderController extends AdminController
 class CreateOrderController extends AdminController
 {
 {

app/Admin/Controllers/NoDoneTaskController.php

@@ -7,7 +7,6 @@ use App\Admin\Repositories\TasksReceive;
 use App\Admin\Services\CityAreaService;
 use App\Admin\Services\CityAreaService;
 use App\Models\TasksApprove;
 use App\Models\TasksApprove;
 use App\Models\TasksCollect;
 use App\Models\TasksCollect;
-use Dcat\Admin\Actions\Action;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;

app/Admin/Controllers/TaskController.php

@@ -3,7 +3,6 @@
 namespace App\Admin\Controllers;
 namespace App\Admin\Controllers;
 
 
 use App\Admin\Extensions\Tools\BatchReceiveAction;
 use App\Admin\Extensions\Tools\BatchReceiveAction;
-use App\Admin\Extensions\Tools\CreateSettlementOrder;
 use App\Admin\Extensions\Tools\ReceiveAction;
 use App\Admin\Extensions\Tools\ReceiveAction;
 use App\Admin\Repositories\Task;
 use App\Admin\Repositories\Task;
 use App\Admin\Services\CityAreaService;
 use App\Admin\Services\CityAreaService;
@@ -15,7 +14,6 @@ use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Show;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 
 
 
 
 class TaskController extends AdminController
 class TaskController extends AdminController

app/Admin/Controllers/TasksApproveController.php

@@ -6,18 +6,13 @@ use App\Admin\Extensions\Tools\NotPassAction;
 use App\Admin\Extensions\Tools\PassAction;
 use App\Admin\Extensions\Tools\PassAction;
 use App\Admin\Repositories\TasksApprove;
 use App\Admin\Repositories\TasksApprove;
 use App\Admin\Services\CityAreaService;
 use App\Admin\Services\CityAreaService;
-use App\Models\Task;
-use Dcat\Admin\Actions\Action;
 use Dcat\Admin\Form;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Http\Controllers\Dashboard;
 use Dcat\Admin\Layout\Column;
 use Dcat\Admin\Layout\Column;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Show;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
-use Dcat\Admin\Widgets\Tab;
-use SuperEggs\DcatDistpicker\DcatDistpickerHelper;
 
 
 class TasksApproveController extends AdminController
 class TasksApproveController extends AdminController
 {
 {
@@ -144,7 +139,8 @@ class TasksApproveController extends AdminController
 //        dd($taskIds);
 //        dd($taskIds);
 
 
 
 
-        return Grid::make(TasksApprove::with(['task', 'collects', 'user']), function (Grid $grid) {
+        $model =TasksApprove::with(['task', 'collects', 'user']);
+        return Grid::make($model, function (Grid $grid) {
             $grid->model()->where('status', 0)->orderBy('task_id', 'desc');
             $grid->model()->where('status', 0)->orderBy('task_id', 'desc');
 
 
             // 在 display 回调中使用
             // 在 display 回调中使用
@@ -166,7 +162,7 @@ class TasksApproveController extends AdminController
                     return $val;
                     return $val;
                 }
                 }
             });
             });
-            $grid->column('task.price', '单价');
+            $grid->column('task.price', '单价')->help('dsdds');
 
 
             $grid->column('collects.value', '指标值');
             $grid->column('collects.value', '指标值');
             $grid->column('collects.reality_refer', '实际信源')->display(function ($val) {
             $grid->column('collects.reality_refer', '实际信源')->display(function ($val) {
@@ -177,6 +173,14 @@ class TasksApproveController extends AdminController
                 }
                 }
             });
             });
             $grid->column('collects.refer_level', '信源等级');
             $grid->column('collects.refer_level', '信源等级');
+
+//            $grid->rows(function (Grid\Row $row){
+//                if($row->number %2 == 0){
+//                    $row->style("background-color:#eee");
+//                }
+//            });
+
+
 //            $grid->column('collects.net_img', '截图链接');
 //            $grid->column('collects.net_img', '截图链接');
 
 
 
 

app/Admin/Controllers/TasksOrderController.php

@@ -2,20 +2,15 @@
 
 
 namespace App\Admin\Controllers;
 namespace App\Admin\Controllers;
 
 
-use App\Admin\Extensions\Tools\CreateSettlementOrder;
 use App\Admin\Extensions\Tools\ReturnBack;
 use App\Admin\Extensions\Tools\ReturnBack;
 use App\Admin\Extensions\Tools\UserConfirmOrder;
 use App\Admin\Extensions\Tools\UserConfirmOrder;
-use App\Admin\Repositories\TasksReceive;
 use App\Admin\Services\CityAreaService;
 use App\Admin\Services\CityAreaService;
-use App\Models\AdminUser;
 use App\Models\TasksOrder;
 use App\Models\TasksOrder;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Content;
-use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
-use Dcat\Admin\Widgets\Tab;
 
 
 class TasksOrderController extends AdminController
 class TasksOrderController extends AdminController
 {
 {