阶段更新

app/Admin/Controllers/Article/IndexController.php

@@ -5,6 +5,7 @@ namespace App\Admin\Controllers\Article;
 use App\Admin\Selectable\CategorySelectAble;
 use App\Models\Article;
 use App\Models\Category;
+use App\Models\CategoryOld;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
@@ -24,6 +25,7 @@ class IndexController extends AdminController
                 $filter->equal('category_id', '所属分类')->select(Category::selectOptions(function ($model) {
                     return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
                 }, '所有分类'));
+
             });
 
             $filter->disableIdFilter();
@@ -32,6 +34,7 @@ class IndexController extends AdminController
         $grid->column('id', '#ID#');
         $grid->column('cover', '封面图片')->image('', 100);
         $grid->column('category.title', '所属分类');
+        $grid->column('category_old.title', '所属老分类');
         $grid->column('title', '文章标题');
         $states = [
             'on'  => ['value' => 1, 'text' => '打开', 'color' => 'primary'],
@@ -50,10 +53,11 @@ class IndexController extends AdminController
 
         $form->text('title', '文章标题')->rules('min:2');
         $form->text('remark', '子标题');
-        $form->select('category_id', '上级分类')
+        $form->select('category_id', '所属分类')
              ->options(Category::selectOptions(function ($model) {
                  return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
              }, '一级分类'));
+
         $form->textarea('description', '内容简介');
         $form->image('cover', '封面')
              ->move('images/' . date('Y/m/d'))