From a69c3cc8e31cf51f1457a7337689164bae8f095e Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Sun, 28 Apr 2024 22:51:13 +0800
Subject: [PATCH] em

---
 app/Enums/CheckStatus.php                        | 16 ++++++++++++++++
 .../Controllers/Api/ReimbursementController.php  |  2 +-
 app/Http/Resources/WorkflowLogResource.php       |  1 +
 database/factories/EmployeeFactory.php           |  1 -
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/Enums/CheckStatus.php b/app/Enums/CheckStatus.php
index 25d1725..af8413c 100644
--- a/app/Enums/CheckStatus.php
+++ b/app/Enums/CheckStatus.php
@@ -54,4 +54,20 @@ enum CheckStatus: int
     {
         return data_get(self::options(), $this->value);
     }
+
+    public function options2()
+    {
+        return [
+            self::None->value => '待提审',
+            self::Processing->value => '待审核',
+            self::Success->value => '已通过',
+            self::Fail->value => '已拒绝',
+            self::Cancel->value => '已取消',
+        ];
+    }
+
+    public function text2()
+    {
+        return data_get(self::options2(), $this->value);
+    }
 }
diff --git a/app/Http/Controllers/Api/ReimbursementController.php b/app/Http/Controllers/Api/ReimbursementController.php
index 06c3e60..fd85bef 100644
--- a/app/Http/Controllers/Api/ReimbursementController.php
+++ b/app/Http/Controllers/Api/ReimbursementController.php
@@ -36,7 +36,7 @@ class ReimbursementController extends Controller
         $validated = $request->validate(
             rules: [
                 'reimbursement_type_id' => ['bail', 'required', Rule::exists(Keyword::class, 'key')],
-                'expense' => ['bail', 'required', 'numeric', 'min:0'],
+                'expense' => ['bail', 'required', 'min:0', 'decimal:0,2'],
                 'reason' => ['bail', 'required', 'max:255'],
                 'photos' => ['bail', 'required', 'array'],
             ],
diff --git a/app/Http/Resources/WorkflowLogResource.php b/app/Http/Resources/WorkflowLogResource.php
index 48827fd..9d7998b 100644
--- a/app/Http/Resources/WorkflowLogResource.php
+++ b/app/Http/Resources/WorkflowLogResource.php
@@ -24,6 +24,7 @@ class WorkflowLogResource extends JsonResource
             'check_name' => $this->check_name,
             'check_user_id' => $this->check_user_id,
             'checked_at' => $this->checked_at?->timestamp,
+            'checked_format' => $this->checked_at?->format('Y-m-d H:i:s'),
             'remarks' => $this->remarks,
             'check_status' => $this->check_status,
             'check_status_text' => $this->check_status->text(),
diff --git a/database/factories/EmployeeFactory.php b/database/factories/EmployeeFactory.php
index e9b6081..7e02687 100644
--- a/database/factories/EmployeeFactory.php
+++ b/database/factories/EmployeeFactory.php
@@ -26,7 +26,6 @@ class EmployeeFactory extends Factory
 
         $adminUser = AdminUser::create([
             'username' => $phone,
-            // 123456
             'password' => AdminUser::where('id', 1)->value('password'),
             'name' => $name,
         ]);