From d250ae4e71180f85cb19b763e19291a7b6376bf9 Mon Sep 17 00:00:00 2001
From: pqhuy1987 <pqhuy1987@gmail.com>
Date: Fri, 8 May 2026 15:37:03 +0700
Subject: [PATCH] =?UTF-8?q?[CLAUDE]=20PE=20Inbox:=20nh=E1=BA=ADn=20filter?=
 =?UTF-8?q?=20approvalWorkflowId=20+=20show=20dropdown=20c=E1=BA=A3=202=20?=
 =?UTF-8?q?view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

User báo:
- Filter "Tất cả quy trình duyệt" hiện chỉ ở Danh sách → muốn ở cả 2
- Filter chọn quy trình → không thấy phiếu V2 trong Duyệt (Inbox)

BE — wire filter vào Inbox:
- GetMyPurchaseEvaluationInboxQuery +ApprovalWorkflowId? param
- Handler thêm filter `q.Where(x => x.e.ApprovalWorkflowId == awId)`
- PurchaseEvaluationsController.Inbox +approvalWorkflowId query param

FE (cả 2 app mirror):
- PurchaseEvaluationsListPage: bỏ điều kiện `!pendingMe` ở Select dropdown
  → hiển thị filter quy trình duyệt CẢ Duyệt + Danh sách
- Inbox API call: pass approvalWorkflowId từ URL param

Verify: BE 0 error · 2 FE builds OK.

Test luồng eoffice:
1. Vào "Duyệt NCC > Duyệt" → 2 dropdown filter hiện đầy đủ
2. Chọn 1 quy trình V2 từ dropdown → list filter chỉ phiếu pin quy trình đó
3. Vào "Duyệt NCC > Danh sách" → 2 dropdown vẫn show, filter cũng work
---
 .../pages/pe/PurchaseEvaluationsListPage.tsx  | 26 ++++++++++---------
 .../pages/pe/PurchaseEvaluationsListPage.tsx  | 26 ++++++++++---------
 .../PurchaseEvaluationsController.cs          |  6 +++--
 .../PurchaseEvaluationFeatures.cs             |  7 +++--
 4 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/fe-admin/src/pages/pe/PurchaseEvaluationsListPage.tsx b/fe-admin/src/pages/pe/PurchaseEvaluationsListPage.tsx
index 57a9147..cbbaca0 100644
--- a/fe-admin/src/pages/pe/PurchaseEvaluationsListPage.tsx
+++ b/fe-admin/src/pages/pe/PurchaseEvaluationsListPage.tsx
@@ -55,7 +55,10 @@ export function PurchaseEvaluationsListPage() {
     queryFn: async () => {
       if (pendingMe) {
         const res = await api.get<PeListItem[]>('/purchase-evaluations/inbox', {
-          params: { type: typeFilter ?? undefined },
+          params: {
+            type: typeFilter ?? undefined,
+            approvalWorkflowId: approvalWorkflowId || undefined,
+          },
         })
         return { items: res.data, total: res.data.length, page: 1, pageSize: res.data.length }
       }
@@ -135,17 +138,16 @@ export function PurchaseEvaluationsListPage() {
                 className="pl-8"
               />
             </div>
-            {/* Mig 23 — 2 dropdown tách: Quy trình duyệt + Trạng thái */}
-            {!pendingMe && (
-              <Select value={approvalWorkflowId} onChange={e => setParam('awId', e.target.value)}>
-                <option value="">Tất cả quy trình duyệt</option>
-                {approvalWorkflows.data?.map(w => (
-                  <option key={w.id} value={w.id}>
-                    {w.code} v{String(w.version).padStart(2, '0')} — {w.name}
-                  </option>
-                ))}
-              </Select>
-            )}
+            {/* Mig 23 — 2 dropdown tách: Quy trình duyệt + Trạng thái.
+                Hiển thị cả 2 view (Duyệt + Danh sách) — user feedback. */}
+            <Select value={approvalWorkflowId} onChange={e => setParam('awId', e.target.value)}>
+              <option value="">Tất cả quy trình duyệt</option>
+              {approvalWorkflows.data?.map(w => (
+                <option key={w.id} value={w.id}>
+                  {w.code} v{String(w.version).padStart(2, '0')} — {w.name}
+                </option>
+              ))}
+            </Select>
             <Select value={phase} onChange={e => setParam('phase', e.target.value)}>
               <option value="">Tất cả trạng thái</option>
               {Object.values(PeDisplayStatus).map(s => {
diff --git a/fe-user/src/pages/pe/PurchaseEvaluationsListPage.tsx b/fe-user/src/pages/pe/PurchaseEvaluationsListPage.tsx
index 57a9147..cbbaca0 100644
--- a/fe-user/src/pages/pe/PurchaseEvaluationsListPage.tsx
+++ b/fe-user/src/pages/pe/PurchaseEvaluationsListPage.tsx
@@ -55,7 +55,10 @@ export function PurchaseEvaluationsListPage() {
     queryFn: async () => {
       if (pendingMe) {
         const res = await api.get<PeListItem[]>('/purchase-evaluations/inbox', {
-          params: { type: typeFilter ?? undefined },
+          params: {
+            type: typeFilter ?? undefined,
+            approvalWorkflowId: approvalWorkflowId || undefined,
+          },
         })
         return { items: res.data, total: res.data.length, page: 1, pageSize: res.data.length }
       }
@@ -135,17 +138,16 @@ export function PurchaseEvaluationsListPage() {
                 className="pl-8"
               />
             </div>
-            {/* Mig 23 — 2 dropdown tách: Quy trình duyệt + Trạng thái */}
-            {!pendingMe && (
-              <Select value={approvalWorkflowId} onChange={e => setParam('awId', e.target.value)}>
-                <option value="">Tất cả quy trình duyệt</option>
-                {approvalWorkflows.data?.map(w => (
-                  <option key={w.id} value={w.id}>
-                    {w.code} v{String(w.version).padStart(2, '0')} — {w.name}
-                  </option>
-                ))}
-              </Select>
-            )}
+            {/* Mig 23 — 2 dropdown tách: Quy trình duyệt + Trạng thái.
+                Hiển thị cả 2 view (Duyệt + Danh sách) — user feedback. */}
+            <Select value={approvalWorkflowId} onChange={e => setParam('awId', e.target.value)}>
+              <option value="">Tất cả quy trình duyệt</option>
+              {approvalWorkflows.data?.map(w => (
+                <option key={w.id} value={w.id}>
+                  {w.code} v{String(w.version).padStart(2, '0')} — {w.name}
+                </option>
+              ))}
+            </Select>
             <Select value={phase} onChange={e => setParam('phase', e.target.value)}>
               <option value="">Tất cả trạng thái</option>
               {Object.values(PeDisplayStatus).map(s => {
diff --git a/src/Backend/SolutionErp.Api/Controllers/PurchaseEvaluationsController.cs b/src/Backend/SolutionErp.Api/Controllers/PurchaseEvaluationsController.cs
index 9fefdc8..511d991 100644
--- a/src/Backend/SolutionErp.Api/Controllers/PurchaseEvaluationsController.cs
+++ b/src/Backend/SolutionErp.Api/Controllers/PurchaseEvaluationsController.cs
@@ -28,8 +28,10 @@ public class PurchaseEvaluationsController(IMediator mediator) : ControllerBase
 
     [HttpGet("inbox")]
     public async Task<ActionResult<List<PurchaseEvaluationListItemDto>>> Inbox(
-        [FromQuery] PurchaseEvaluationType? type = null, CancellationToken ct = default)
-        => Ok(await mediator.Send(new GetMyPurchaseEvaluationInboxQuery(type), ct));
+        [FromQuery] PurchaseEvaluationType? type = null,
+        [FromQuery] Guid? approvalWorkflowId = null,
+        CancellationToken ct = default)
+        => Ok(await mediator.Send(new GetMyPurchaseEvaluationInboxQuery(type, approvalWorkflowId), ct));
 
     [HttpGet("{id:guid}")]
     public async Task<ActionResult<PurchaseEvaluationDetailBundleDto>> Get(Guid id, CancellationToken ct)
diff --git a/src/Backend/SolutionErp.Application/PurchaseEvaluations/PurchaseEvaluationFeatures.cs b/src/Backend/SolutionErp.Application/PurchaseEvaluations/PurchaseEvaluationFeatures.cs
index f717a5a..e0f909c 100644
--- a/src/Backend/SolutionErp.Application/PurchaseEvaluations/PurchaseEvaluationFeatures.cs
+++ b/src/Backend/SolutionErp.Application/PurchaseEvaluations/PurchaseEvaluationFeatures.cs
@@ -333,8 +333,9 @@ public class ListPurchaseEvaluationsQueryHandler(
 
 // ========== INBOX ==========
 
-public record GetMyPurchaseEvaluationInboxQuery(PurchaseEvaluationType? Type = null)
-    : IRequest<List<PurchaseEvaluationListItemDto>>;
+public record GetMyPurchaseEvaluationInboxQuery(
+    PurchaseEvaluationType? Type = null,
+    Guid? ApprovalWorkflowId = null) : IRequest<List<PurchaseEvaluationListItemDto>>;
 
 public class GetMyPurchaseEvaluationInboxQueryHandler(
     IApplicationDbContext db,
@@ -374,6 +375,8 @@ public class GetMyPurchaseEvaluationInboxQueryHandler(
                 select new { e, p, s };
 
         if (request.Type is not null) q = q.Where(x => x.e.Type == request.Type);
+        if (request.ApprovalWorkflowId is not null)
+            q = q.Where(x => x.e.ApprovalWorkflowId == request.ApprovalWorkflowId);
 
         return await q
             .OrderBy(x => x.e.SlaDeadline ?? DateTime.MaxValue)