1

app/Admin/Controllers/TaskController.php

@@ -5,8 +5,13 @@ namespace App\Admin\Controllers;
 use App\Admin\Repositories\Task;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
+use Dcat\Admin\Layout\Column;
+use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Layout\Row;
+use Illuminate\Http\Request;
+
 
 class TaskController extends AdminController
 {
@@ -25,12 +30,13 @@ class TaskController extends AdminController
             $grid->column('year');
             $grid->column('refer');
             $grid->column('guide');
-            $grid->column('status');
+//            $grid->column('status');
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
 
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('id');
+//                $filter->equal('id');
+                $filter->like('name');
 
             });
         });
@@ -53,7 +59,7 @@ class TaskController extends AdminController
             $show->field('year');
             $show->field('refer');
             $show->field('guide');
-            $show->field('status');
+//            $show->field('status');
             $show->field('created_at');
             $show->field('updated_at');
         });
@@ -66,18 +72,50 @@ class TaskController extends AdminController
      */
     protected function form()
     {
-        return Form::make(new Task(), function (Form $form) {
+        $data = json_decode(file_get_contents(base_path('app/china_all_area.json')),true);
+        foreach ($data as $datum){
+            foreach ($datum as $k=>$d){
+                $arr[$k]=$d;
+            }
+        }
+//        dd(array_values($data));
+        return Form::make(new Task(), function (Form $form)use ($arr) {
             $form->display('id');
             $form->text('name');
-            $form->text('level');
-            $form->text('area');
-            $form->text('year');
-            $form->text('refer');
-            $form->text('guide');
-            $form->text('status');
+            $form->select('level')->options([1=>1,2=>2,3=>3,4=>4,5=>5]);
+            $form->multipleSelect('area','选择地区')->options($arr);
+//            $form->distpicker([
+//                'province_id' => '省',
+//            ],'地区');
+//            $form->timeRange('year','year','选择时间');
+
+            $form->multipleSelect('year','选择时间')->options(function (){
+                $year=(int)date('Y');
+                for ($i=$year;$i>1900;$i--){
+                    $years[$i]=$i;
+                }
+                return $years;
+            });
+            $form->text('refer','参考信源');
+            $form->editor('guide','收集指南');
+//            $form->text('status');
 
             $form->display('created_at');
             $form->display('updated_at');
         });
     }
+
+
+    /**
+     * 新增数据保存
+     * @return mixed|void
+     */
+    public function store()
+    {
+        $request = \request();
+
+       dd($request->input());
+    }
+
+
 }

app/Admin/routes.php

@@ -14,4 +14,6 @@ Route::group([
     $router->get('/dashboard', 'HomeController@index');
 
     $router->resource('tasks', 'TaskController');
+
+//    $router->get('/api/city', 'TaskController@city');
 });

composer.json

@@ -18,8 +18,9 @@
         "laravel/tinker": "^2.5",
         "mosiboom/dcat-iframe-tab": "^1.2",
         "orangehill/iseed": "^3.0",
-        "w7corp/easywechat": "~5.0",
-        "tymon/jwt-auth": "^1.0.2"
+        "super-eggs/dcat-distpicker": "^2.0",
+        "tymon/jwt-auth": "^1.0.2",
+        "w7corp/easywechat": "~5.0"
     },
     "require-dev": {
         "spatie/laravel-ignition": "^1.0",