From 95fdec8a06e5f62b3b3ebc4f84922439a34174c8 Mon Sep 17 00:00:00 2001
From: sky121113 <sky121113@gmail.com>
Date: Wed, 4 Feb 2026 13:20:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(procurement):=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E6=8E=A1=E8=B3=BC=E5=96=AE=E8=88=87=E9=80=B2=E8=B2=A8=E5=96=AE?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A8=99=E7=B1=A4=E3=80=81=E7=8B=80=E6=85=8B?=
 =?UTF-8?q?=E8=88=87=E6=93=8D=E4=BD=9C=E7=B4=80=E9=8C=84=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Core/Controllers/RoleController.php       |  6 +++---
 .../ActivityLog/ActivityDetailDialog.tsx      | 20 +++++++++++++++++--
 resources/js/Pages/PurchaseOrder/Create.tsx   |  4 ++--
 resources/js/Pages/PurchaseOrder/Show.tsx     |  2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/Modules/Core/Controllers/RoleController.php b/app/Modules/Core/Controllers/RoleController.php
index 1d53d32..ae7a9e4 100644
--- a/app/Modules/Core/Controllers/RoleController.php
+++ b/app/Modules/Core/Controllers/RoleController.php
@@ -187,13 +187,13 @@ class RoleController extends Controller
             'vendors' => '廠商資料管理',
             'purchase_orders' => '採購單管理',
             'goods_receipts' => '進貨單管理',
-            'production_orders' => '生產工單管理',
             'recipes' => '配方管理',
+            'production_orders' => '生產工單管理',
+            'utility_fees' => '公共事業費管理',
+            'accounting' => '會計報表',
             'users' => '使用者管理',
             'roles' => '角色與權限',
             'system' => '系統管理',
-            'utility_fees' => '公共事業費管理',
-            'accounting' => '會計報表',
         ];
 
         $result = [];
diff --git a/resources/js/Components/ActivityLog/ActivityDetailDialog.tsx b/resources/js/Components/ActivityLog/ActivityDetailDialog.tsx
index c0059e5..afd73bf 100644
--- a/resources/js/Components/ActivityLog/ActivityDetailDialog.tsx
+++ b/resources/js/Components/ActivityLog/ActivityDetailDialog.tsx
@@ -97,6 +97,7 @@ const fieldLabels: Record<string, string> = {
     source_purchase_order_id: '來源採購單',
     quality_status: '品質狀態',
     quality_remark: '品質備註',
+    purchase_order_id: '來源採購單',
     // 採購單欄位
     po_number: '採購單號',
     vendor_id: '廠商',
@@ -105,6 +106,7 @@ const fieldLabels: Record<string, string> = {
     user_id: '建單人員',
     total_amount: '小計',
     expected_delivery_date: '預計到貨日',
+    order_date: '下單日期',
     status: '狀態',
     tax_amount: '稅額',
     grand_total: '總計',
@@ -141,6 +143,8 @@ const statusMap: Record<string, string> = {
     received: '已收貨',
     cancelled: '已取消',
     completed: '已完成',
+    closed: '已結案',
+    partial: '部分收貨',
     // 生產工單狀態
     planned: '已計畫',
     in_progress: '生產中',
@@ -154,6 +158,13 @@ const qualityStatusMap: Record<string, string> = {
     rejected: '瑕疵/拒收',
 };
 
+// 入庫類型翻譯對照表
+const typeMap: Record<string, string> = {
+    standard: '採購進貨',
+    miscellaneous: '雜項入庫',
+    other: '其他入庫',
+};
+
 export default function ActivityDetailDialog({ open, onOpenChange, activity }: Props) {
     if (!activity) return null;
 
@@ -166,7 +177,7 @@ export default function ActivityDetailDialog({ open, onOpenChange, activity }: P
 
     // 自訂欄位排序順序
     const sortOrder = [
-        'po_number', 'vendor_name', 'warehouse_name', 'expected_delivery_date', 'status', 'remark',
+        'po_number', 'vendor_name', 'warehouse_name', 'order_date', 'expected_delivery_date', 'status', 'remark',
         'invoice_number', 'invoice_date', 'invoice_amount',
         'total_amount', 'tax_amount', 'grand_total' // 確保金額的特定順序
     ];
@@ -234,8 +245,13 @@ export default function ActivityDetailDialog({ open, onOpenChange, activity }: P
             return qualityStatusMap[value];
         }
 
+        // 處理入庫類型
+        if (key === 'type' && typeof value === 'string' && typeMap[value]) {
+            return typeMap[value];
+        }
+
         // 處理日期欄位 (YYYY-MM-DD)
-        if ((key === 'expected_delivery_date' || key === 'invoice_date' || key === 'arrival_date' || key === 'expiry_date') && typeof value === 'string') {
+        if ((key === 'order_date' || key === 'expected_delivery_date' || key === 'invoice_date' || key === 'arrival_date' || key === 'expiry_date') && typeof value === 'string') {
             // 僅取日期部分 (YYYY-MM-DD)
             return value.split('T')[0].split(' ')[0];
         }
diff --git a/resources/js/Pages/PurchaseOrder/Create.tsx b/resources/js/Pages/PurchaseOrder/Create.tsx
index 7b79e38..45506bf 100644
--- a/resources/js/Pages/PurchaseOrder/Create.tsx
+++ b/resources/js/Pages/PurchaseOrder/Create.tsx
@@ -90,7 +90,7 @@ export default function CreatePurchaseOrder({
         }
 
         if (!orderDate) {
-            toast.error("請選擇採購日期");
+            toast.error("請選擇下單日期");
             return;
         }
 
@@ -247,7 +247,7 @@ export default function CreatePurchaseOrder({
                             <div className="grid grid-cols-1 md:grid-cols-2 gap-8">
                                 <div className="space-y-3">
                                     <label className="text-sm font-bold text-gray-700">
-                                        採購日期 <span className="text-red-500">*</span>
+                                        下單日期 <span className="text-red-500">*</span>
                                     </label>
                                     <Input
                                         type="date"
diff --git a/resources/js/Pages/PurchaseOrder/Show.tsx b/resources/js/Pages/PurchaseOrder/Show.tsx
index fa6c60b..4d1782c 100644
--- a/resources/js/Pages/PurchaseOrder/Show.tsx
+++ b/resources/js/Pages/PurchaseOrder/Show.tsx
@@ -89,7 +89,7 @@ export default function ViewPurchaseOrderPage({ order }: Props) {
                                     <span className="font-medium text-gray-900">{formatDateTime(order.createdAt)}</span>
                                 </div>
                                 <div>
-                                    <span className="text-sm text-gray-500 block mb-1">採購日期</span>
+                                    <span className="text-sm text-gray-500 block mb-1">下單日期</span>
                                     <span className="font-medium text-gray-900">{order.orderDate || "-"}</span>
                                 </div>
                                 <div>