diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index 1c3e98b2..2e369797 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -122,6 +122,8 @@ class OrderController extends AdminController
                 // $actions->append(new CreateOrderPackage());
             });
 
+            $grid->setResource('orders');
+
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel();
                 $filter->equal('sn')->width(3);
diff --git a/app/Admin/Controllers/TagController.php b/app/Admin/Controllers/TagController.php
index 98fc3159..7b759bbc 100644
--- a/app/Admin/Controllers/TagController.php
+++ b/app/Admin/Controllers/TagController.php
@@ -49,6 +49,7 @@ class TagController extends AdminController
                 $actions->disableDelete(Admin::user()->cannot('dcat.admin.tags.destroy'));
             });
 
+            $grid->setResource('tags');
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel();
                 $filter->equal('type')->select([
@@ -86,13 +87,19 @@ class TagController extends AdminController
     protected function form()
     {
         return Form::make(new Tag(), function (Form $form) {
-            $type = Request::Input('type', 0);
-            $form->display('id');
-            $form->radio('type')->options([
+            $types = [
                 TagModel::TYPE_ORDER =>'订单',
                 TagModel::TYPE_PACKAGE=>'货运',
                 TagModel::TYPE_AFTER_SALE =>'售后',
-            ])->default($type)->required();
+            ];
+            $type = Request::Input('type', 0);
+            if ($types[$type]) {
+                $types = [
+                    $type=> $types[$type],
+                ];
+            }
+            $form->display('id');
+            $form->radio('type')->options($types)->default($type)->required();
             $form->text('name')->required();
 
             $form->display('created_at');
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index e2836900..b874d1e4 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -82,6 +82,7 @@ Route::group([
 
     $router->get('after-sales', 'AfterSaleController@index')->name('after_sales.index');
     $router->get('after-sales/{after_sale}', 'AfterSaleController@show')->name('after_sales.show');
+    $router->get('finance-after-sales', 'AfterSaleController@index')->name('after_sales.finance');
 
     $router->resource('users', 'UserController');
 
@@ -95,6 +96,8 @@ Route::group([
     $router->resource('orders', 'OrderController')->only([
         'index', 'show', 'edit', 'update',
     ]);
+    $router->get('pendding-orders', 'OrderController@index')->name('orders.pendding_orders');
+    $router->get('finished-orders', 'OrderController@index')->name('orders.finished_orders');
 
     $router->resource('order-packages', 'OrderPackageController')->only([
         'index', 'edit', 'update', 'destroy',
@@ -115,6 +118,9 @@ Route::group([
     $router->resource('tags', 'TagController')->only([
         'index', 'create', 'store', 'edit', 'update', 'destroy',
     ]);
+    $router->get('order-tags', 'TagController@index')->name('orders.tags');
+    $router->get('package-tags', 'TagController@index')->name('order_packages.tags');
+    $router->get('aftersale-tags', 'TagController@index')->name('after_sales.tags');
 
     $router->resource('settings', 'SettingController')->only([
         'index', 'create', 'store', 'edit', 'update', 'destroy',
diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php
index efd0b3f9..39814b9d 100644
--- a/database/seeders/AdminMenuSeeder.php
+++ b/database/seeders/AdminMenuSeeder.php
@@ -164,12 +164,17 @@ class AdminMenuSeeder extends Seeder
                     [
                         'title' => '待发货单',
                         'icon' => '',
-                        'uri' => 'orders?filter-order_status[]=1&filter-order_status[]=2',
+                        'uri' => 'pendding-orders?filter-order_status[]=1&filter-order_status[]=2',
+                    ],
+                    [
+                        'title' => '已完成单',
+                        'icon' => '',
+                        'uri' => 'finished-orders?filter-order_status[]=9',
                     ],
                     [
                         'title' =>'订单标签',
                         'icon' => '',
-                        'uri' => 'tags?type=1',
+                        'uri' => 'order-tags?type=1',
                     ],
                     [
                         'title' =>'调价范围权限',
@@ -191,7 +196,7 @@ class AdminMenuSeeder extends Seeder
                     [
                         'title' =>'货运标签',
                         'icon' => '',
-                        'uri' => 'tags?type=2',
+                        'uri' => 'package-tags?type=2',
                     ],
                 ],
             ],
@@ -208,7 +213,7 @@ class AdminMenuSeeder extends Seeder
                     [
                         'title' =>'售后标签',
                         'icon' => '',
-                        'uri' => 'tags?type=3',
+                        'uri' => 'aftersale-tags?type=3',
                     ],
                 ],
             ],
@@ -245,7 +250,7 @@ class AdminMenuSeeder extends Seeder
                     [
                         'title' => '售后打款',
                         'icon' => '',
-                        'uri' =>'after-sales?state=5',
+                        'uri' =>'finance-after-sales?state=5',
                     ],
                     [
                         'title' => '老配额分红',
diff --git a/resources/lang/zh_CN/order.php b/resources/lang/zh_CN/order.php
index 78aea1f1..ed1374ac 100644
--- a/resources/lang/zh_CN/order.php
+++ b/resources/lang/zh_CN/order.php
@@ -4,6 +4,8 @@ return [
     'labels' => [
         'Order' => '订单列表',
         'orders' => '订单列表',
+        'pendding-orders' => '订单列表',
+        'finished-orders' => '订单列表',
     ],
     'fields' => [
         'user_id' => '用户',
diff --git a/resources/lang/zh_CN/tag.php b/resources/lang/zh_CN/tag.php
index 417c09ca..7345d304 100644
--- a/resources/lang/zh_CN/tag.php
+++ b/resources/lang/zh_CN/tag.php
@@ -4,6 +4,9 @@ return [
     'labels' => [
         'Tag' => '标签管理',
         'tags' => '标签管理',
+        'order-tags' => '订单标签',
+        'aftersale-tags' => '售后标签',
+        'package-tags' => '货运标签',
     ],
     'fields' => [
         'type' => '标签分类',