找不到 参数验证

app/Admin/Controllers/AlreadyDoneTaskController.php

@@ -27,7 +27,7 @@ class AlreadyDoneTaskController extends AdminController
         return Grid::make(TasksReceive::with(['task', 'collects', 'user','approve']), function (Grid $grid){
             $user = Admin::user();
             $user->is_admin == 0 && $grid->model()->where('user_id', $user->id);
-            $grid->model()->where('status', '>', 0);
+            $grid->model()->where('status', '>', 0)->orderBy('updated_at','desc');
 //            dd(trans('admin.view'));//查看
 
             $grid->model()->orderBy('created_at','desc');

app/Admin/Controllers/NoDoneTaskController.php

@@ -177,10 +177,10 @@ class NoDoneTaskController extends AdminController
             $form->display('task.year', '时间');
             $form->display('task.refer', '参考信源');
 
-            $form->text('collects.value', '指标值')->required();
-            $form->text('collects.reality_refer', '实际信源')->required();
-            $form->select('collects.refer_level', '信源等级')->options([1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5])->required();
-            $form->editor('collects.net_img', '网页截图')->required();
+            $form->text('collects.value', '指标值')->rules('required',['required'=>'指标值不能为空']);
+            $form->text('collects.reality_refer', '实际信源')->rules('required',['required'=>'实际信源不能为空']);
+            $form->select('collects.refer_level', '信源等级')->options([1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5])->rules('required',['required'=>'信源等级不能为空']);
+            $form->editor('collects.net_img', '网页截图')->rules('required',['required'=>'网页截图不能为空']);
             $form->text('collects.remark', '备注信息')->placeholder('如果找不到请填写备注信息')->attribute(['id'=>'remark-zbd']);
 
 //            $form->button('<a style="color: white;" href=/notFind/' . $id . '?remark='.'>找不到<a>');

app/Admin/Controllers/TasksApproveController.php

@@ -6,6 +6,7 @@ use App\Admin\Extensions\Tools\NotPassAction;
 use App\Admin\Extensions\Tools\PassAction;
 use App\Admin\Repositories\TasksApprove;
 use App\Admin\Services\CityAreaService;
+use App\Models\Task;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Column;
@@ -13,6 +14,8 @@ use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Widgets\Card;
+use Dcat\Admin\Widgets\Table;
 
 class TasksApproveController extends AdminController
 {
@@ -20,10 +23,25 @@ class TasksApproveController extends AdminController
     protected $title = '未审核';
 
 
-    public function checkData($status)
+    public function checkData($page =1,$pageSize= 10)
     {
+        $data = Task::query()
+            ->whereHas('receives',function ($query){
+                $query->where('status', 1)->orderBy('created_at', 'desc');
+            })
+            ->with(['receives.collects'])->paginate($pageSize,'*','page',$page)->toArray();
+        dd($data);
+
+        foreach ($data['data'] as $key =>&$item){
+            if (!$item['receives']){
+                unset($data['data'][$key]);
+            }
+            if (count($item['receives']) >1){
+//                if ($item['receives'][0]['']){}
+            }
+        }
         $content = Content::make();
-        return $content->body(view('admin.check', ['id' => 1]));
+        return $content->body(view('admin.check', ['data' => $data['data'],'page'=>$page,'total'=>$data['total']]));
     }
 
     protected function getData22($status)
@@ -147,6 +165,14 @@ class TasksApproveController extends AdminController
             $grid->column('序号')->display(function () {
                 return $this->_index + 1;
             });
+//                ->expand(function ($model) {
+//                $comments = $model->comments()->take(10)->map(function ($comment) {
+//                    return $comment->only(['id', 'content', 'created_at']);
+//                });
+//                return new Table(['ID', '内容', '发布时间'],[['id'=>1,'content'=>'dsdsds','<a href="/">通过</a>'],['id'=>2,'content'=>'d2sdsds','created_at'=>'gg2ggg']]
+//                    ,['id'=>'asddddd']);
+//            });
+
             $grid->column('user.name', '用户');
 
 //            $grid->column('id')->sortable();
@@ -175,12 +201,17 @@ class TasksApproveController extends AdminController
             $grid->column('collects.refer_level', '信源等级');
 
 
-//            $grid->rows(function ($row){
-//                if($this->_index %2 == 0){
-//                    $row->style("background-color:#eee");
-//                }
-//            });
 
+//            $grid->column('content')->expand(function (Grid\Displayers\Expand $expand) {
+//                // 设置按钮名称
+//                $expand->button('详情');
+//
+//                // 返回显示的详情
+//                // 这里返回 content 字段内容，并用 Card 包裹起来
+//                $card = new Card(null, '');
+//
+//                return "<div style='padding:10px 10px 0'>$card</div>";
+//            });
 
 //            $grid->column('collects.net_img', '截图链接');
 

app/Admin/routes.php

@@ -33,6 +33,8 @@ Route::group([
 
 
     $router->resource('approves', 'TasksApproveController');
+//    $router->get('approves', 'TasksApproveController@checkData');
+
     $router->resource('alreadyApprove', 'AlreadyApproveController');
     $router->resource('orders', 'TasksOrderController');
     $router->resource('createOrder', 'CreateOrderController');

resources/views/admin/button.blade.php

@@ -9,7 +9,7 @@
                 完 成</button>
         </div>
         <div class="btn-group pull-right" style="right: 10%">
-            <button onclick="jump({{$id}})" class="btn btn-primary ">找不到</button>
+            <button onclick="jump({{$id}})" class="btn btn-primary">找不到</button>
         </div>