diff --git a/beike/Admin/Http/Controllers/OrderController.php b/beike/Admin/Http/Controllers/OrderController.php index 8fd3e4b9..8a885818 100644 --- a/beike/Admin/Http/Controllers/OrderController.php +++ b/beike/Admin/Http/Controllers/OrderController.php @@ -35,6 +35,22 @@ class OrderController extends Controller } + /** + * 导出订单列表 + * + * @param Request $request + * @return mixed + */ + public function export(Request $request) + { + $orders = OrderRepo::filterOrders($request->all()); + $data = [ + 'orders' => OrderList::collection($orders), + ]; + return view('admin::pages.orders.index', $data); + } + + /** * 查看单个订单 * diff --git a/beike/Admin/Repositories/PermissionRepo.php b/beike/Admin/Repositories/PermissionRepo.php index fe7d04d5..0ca0d2e9 100644 --- a/beike/Admin/Repositories/PermissionRepo.php +++ b/beike/Admin/Repositories/PermissionRepo.php @@ -72,7 +72,7 @@ class PermissionRepo */ private function getOrderPermissions(): array { - $routes = ['orders_index', 'orders_create', 'orders_show', 'orders_update', 'orders_delete', 'orders_update_status']; + $routes = ['orders_index', 'orders_export', 'orders_show', 'orders_update_status']; $items = $this->getPermissionList('order', $routes); return hook_filter('role.order_permissions', $items); } diff --git a/beike/Admin/Routes/admin.php b/beike/Admin/Routes/admin.php index 816c0445..64bdfdfa 100644 --- a/beike/Admin/Routes/admin.php +++ b/beike/Admin/Routes/admin.php @@ -111,6 +111,7 @@ Route::prefix($adminName) // 订单 Route::middleware('can:orders_index')->get('orders', [Controllers\OrderController::class, 'index'])->name('orders.index'); + Route::middleware('can:orders_export')->get('orders/export', [Controllers\OrderController::class, 'export'])->name('orders.export'); Route::middleware('can:orders_show')->get('orders/{order}', [Controllers\OrderController::class, 'show'])->name('orders.show'); Route::middleware('can:orders_update_status')->put('orders/{order}/status', [Controllers\OrderController::class, 'updateStatus'])->name('orders.update_status'); diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php index ec6b4b77..c971c0e3 100644 --- a/resources/beike/admin/views/pages/orders/index.blade.php +++ b/resources/beike/admin/views/pages/orders/index.blade.php @@ -86,7 +86,7 @@ el: '#app', data: { url: @json(admin_route('orders.index')), - exportUrl: @json(admin_route('orders.index')), + exportUrl: @json(admin_route('orders.export')), filter: { number: bk.getQueryString('number'), customer_name: bk.getQueryString('customer_name'), diff --git a/resources/lang/en/admin/order.php b/resources/lang/en/admin/order.php index f1906d26..b27582f6 100644 --- a/resources/lang/en/admin/order.php +++ b/resources/lang/en/admin/order.php @@ -11,16 +11,17 @@ return [ 'list' => 'Order List', + 'orders_index' => 'Index', + 'orders_create' => 'Create', + 'orders_show' => 'Detail', + 'orders_export' => 'Export', + 'orders_update' => 'Update', + 'orders_delete' => 'Delete', + 'orders_update_status' => 'Update Status', 'unpaid' => 'Unpaid', 'paid' => 'Paid', 'shipped' => 'Shipped', 'completed' => 'Completed', - - 'orders_create' => 'Create', - 'orders_show' => 'Detail', - 'orders_update' => 'Update', - 'orders_delete' => 'Delete', - 'orders_update_status' => 'Update Status', ]; diff --git a/resources/lang/zh_cn/admin/order.php b/resources/lang/zh_cn/admin/order.php index f7de106b..b2e9fab7 100644 --- a/resources/lang/zh_cn/admin/order.php +++ b/resources/lang/zh_cn/admin/order.php @@ -11,16 +11,17 @@ return [ 'list' => '订单列表', + 'orders_index' => '订单列表', + 'orders_create' => '创建订单', + 'orders_show' => '订单详情', + 'orders_export' => '导出订单', + 'orders_update' => '更新订单', + 'orders_delete' => '删除订单', + 'orders_update_status' => '更新状态', 'unpaid' => '待支付', 'paid' => '已支付', 'shipped' => '已发货', 'completed' => '已完成', - - 'orders_create' => '创建订单', - 'orders_show' => '订单详情', - 'orders_update' => '更新订单', - 'orders_delete' => '删除订单', - 'orders_update_status' => '更新状态', ];