merge

app/Filters/ReimbursementFilter.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use EloquentFilter\ModelFilter;
-
-class ReimbursementFilter extends ModelFilter
-{
-}

app/Models/Reimbursement.php

@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Enums\CheckStatus;
-use App\Filters\ReimbursementFilter;
 use App\Traits\HasCheckable;
 use App\Traits\HasDateTimeFormatter;
 use EloquentFilter\Filterable;
@@ -24,21 +23,26 @@ class Reimbursement extends Model
         'photos',
     ];
 
+    public function modelFilter()
+    {
+        return \App\Admin\Filters\ReimbursementFilter::class;
+    }
+
     public function employee(): BelongsTo
     {
         return $this->belongsTo(Employee::class);
     }
 
+    public function scopeSort($q)
+    {
+        return $q->orderBy('created_at', 'desc');
+    }
+
     public function type(): BelongsTo
     {
         return $this->belongsTo(Keyword::class, 'reimbursement_type_id', 'key');
     }
 
-    public function modelFilter(): string
-    {
-        return ReimbursementFilter::class;
-    }
-
     public function canUpdate(): bool
     {
         return in_array($this->workflow?->check_status, [CheckStatus::None, CheckStatus::Fail, CheckStatus::Cancel]);

database/seeders/AdminPermissionSeeder.php

@@ -41,7 +41,7 @@ class AdminPermissionSeeder extends Seeder
                 'uri' => '/store',
                 'children' => [
                     'stores' => [
-                        'name' => '全部门店',
+                        'name' => '门店管理',
                         'icon' => '',
                         'uri' => '/store/stores',
                         'resource' => true,

routes/api.php

@@ -15,6 +15,9 @@ use Illuminate\Support\Facades\Route;
 Route::post('/auth/login', [AccessTokenController::class, 'store']);
 Route::delete('/auth/logout', [AccessTokenController::class, 'destroy']);
 
+// 数据字典
+Route::get('keyword', [\App\Http\Controllers\Api\KeywordController::class, 'index']);
+
 Route::group([
     'middleware' => ['auth:api'],
 ], function () {
@@ -51,6 +54,9 @@ Route::group([
     // 员工管理
     Route::group(['middleware' => ['user_role:admin,store']], function () {
         Route::post('hr/employee/{id}/leave', [\App\Http\Controllers\Api\Hr\EmployeeController::class, 'leave']);
-        Route::resource('hr/employee', \App\Http\Controllers\Api\Hr\EmployeeController::class);
+        Route::apiResource('hr/employee', \App\Http\Controllers\Api\Hr\EmployeeController::class);
     });
+
+    // 报销管理
+    Route::apiResource('reimbursements', \App\Http\Controllers\Api\ReimbursementController::class);
 });