[CLAUDE] Contract: UAT S174 tinh-gon UI KHKK + cot 2 tang KHKK o workspace PE (FE-only x2 app, 0-mig)

Anh chot qua 6 anh khoanh do + 4 cau tra loi. 7 chinh, mirror SHA256 identical 8/8 cap.

Man DANH SACH KHKK (KhkkListPage / KhkkListPanel)
- Giu DUY NHAT header trang "Ke hoach ky ket HD / Giai doan 2".
- Bo o loc "Tat ca nhom": may loc GIU NGUYEN (query + stage2Content), nhom nay den
  DUY NHAT tu URL ?group=n (8 leaf menu trai). Go luon prop onGroupChange (noUnusedLocals).
- Bo thanh "Cay toan trinh - N goi" qua prop MOI `hideHeader` opt-in tren PipelineTreePanel.
  6 host con lai (PE / GD3 / GD4 / Inbox) KHONG truyen => hinh cu nguyen ven.
  Nut "Hien/An cay" (mobile) song TRONG thanh vua an => hideHeader ep than cay `flex`,
  neu khong `<lg` mat trang cai cay.

Man CHI TIET KHKK (KhkkDetailPage / KhkkDetailContent)
- Go khoi "Quy trinh duyet" (so-do Buoc/Cap + HANH DONG + 2 lich su) — day la BAN SAO
  THU HAI, ban chinh o Panel-3 man danh sach. Anh: "bo het, no se hien thi o Menu duyet".
  KHAI HE QUA: `<lg` dieu huong thang vao trang nay => mobile hien khong con Gui duyet /
  Xoa phieu. Mo lai = boc `lg:hidden`.
- Section 5 "Y kien cap duyet" doi sang DUNG style Duyet NCC (PeDetailTabs.tsx:705-774):
  card `rounded-lg p-3` + h4 ten cap + chip trang thai + y kien text-sm + chan ngay
  border-t; thay o phang 1 dong text-[11px]. GIU o "Chua ky" (PE khong co) — vang o thi
  nguoi doc khong biet con thieu chu ky cua ai.

Man TAO KHKK (KhkkCreatePage)
- Doi sang khuon "Tao phieu Duyet NCC moi" (PeWorkspaceCreateView): 1 card + divide-y,
  thanh dau ke LUONG, thanh cuoi hint do liet ke DICH DANH truong con thieu thay vi chi
  lam xam nut. Nut "Luu nhap" -> "Tao ke hoach".
- Ve "tao xong sang chi tiet" VON DA DUNG tu S161 (onSuccess -> navigate /khkk/:id);
  dot nay KHONG dung luong do, chi doi hinh.

Man DUYET NCC — THAO TAC (PurchaseEvaluationWorkspacePage + PeKhkkSidePanel MOI)
- Them cot 3: 1 cot 2 TANG 50/50 — tren = PE da duyet CHUA lap KHKK gom theo DU AN,
  duoi = KHKK da tao. Ti le 50/50 bang `min-h-0 flex-1` ca hai tang.
- 0 ENDPOINT MOI: dung lai approved-pe-awaiting-plan + contract-signing-plans.
  "Chua co KHKK" = existingGroups RONG — tu K2/S164 BE KHONG con loc ho, loc o FE.
- GATE #85: ca 2 cua gac bang policy `KeHoachKyKet.Read` trong khi day la man PE =>
  gate bang DUNG key policy cua endpoint (KHONG OR key menu Khkk_*), thieu quyen thi
  NOI RA thay vi de cot trang (cot trang doc thanh "chua co gi").
- Cot chi moc tu `xl`; o `lg` bo cuc giu DUNG 2 panel nhu cu.

Con lai (chua lam, da khai voi anh): bam PE o tang tren moi mo /khkk/create chu chua
chon san dung phieu do — can them ?peId= vao man tao.

Verify: build 2 app PASS; mirror SHA256 8/8 cap KHOP; byte-level grep bundle xac nhan
chuoi moi co mat ca 2 app (khong tin dong "built" — bai gotcha #77).

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

fe-admin/src/components/khkk/KhkkDetailContent.tsx

@@ -21,7 +21,7 @@
 import { useState, type ReactNode } from 'react'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import {
-  ClipboardList, FileCheck, MessageSquare, Paperclip, Pencil, Plus, Save, Trash2, Upload, Users,
+  Check, ClipboardList, FileCheck, MessageSquare, Paperclip, Pencil, Plus, Save, Trash2, Upload, Users,
 } from 'lucide-react'
 import { toast } from 'sonner'
 import { PePipelineStrip } from '@/components/pe/PePipelineStrip'
@@ -589,61 +589,85 @@ export function KhkkDetailContent({
               Phiếu chưa pin quy trình duyệt — chưa có cấp nào để ghi ý kiến.
             </div>
           ) : (
-            <div className="space-y-4">
+            <div className="space-y-3">
               {steps.map((step) => {
                 const signedCount = step.levels.filter(lv =>
                   opinions.some(o => o.approvalWorkflowLevelId === lv.id)).length
                 return (
-                  <div key={step.id} className="rounded-lg border border-slate-200">
-                    <div className="flex flex-wrap items-center gap-2 border-b border-slate-100 bg-slate-50/70 px-3 py-2">
-                      <span className="text-xs font-semibold text-slate-800">Bước {step.order} — {step.name}</span>
+                  <div key={step.id} className="rounded-lg border border-slate-200 bg-slate-50/40">
+                    <div className="flex flex-wrap items-center gap-2 border-b border-slate-200 bg-slate-50/80 px-3 py-2">
+                      <span className="text-[12px] font-bold uppercase tracking-wide text-slate-700">
+                        Bước {step.order} — {step.name}
+                      </span>
                       {step.departmentName && (
-                        <span className="rounded border border-slate-300 bg-white px-1.5 py-0.5 text-[10px] font-medium text-slate-600">
+                        <span className="rounded bg-emerald-50 px-1.5 py-0.5 text-[10px] font-medium text-emerald-700">
                           {step.departmentName}
                         </span>
                       )}
-                      <span className="ml-auto text-[10px] text-slate-500">
+                      <span
+                        className="ml-auto text-[10px] text-slate-500"
+                        title={`Tổng ${step.levels.length} NV tham gia (mỗi cấp chỉ cần 1 NV ký — OR-of-N)`}
+                      >
                         {signedCount}/{step.levels.length} cấp đã duyệt · {step.levels.length} NV tham gia
                       </span>
                     </div>
-                    <div className="grid grid-cols-1 gap-2 p-3 md:grid-cols-2">
-                      {step.levels.length === 0 && (
-                        <p className="text-[11px] italic text-slate-400">Bước này chưa cấu hình cấp duyệt.</p>
-                      )}
-                      {step.levels.map((lv) => {
-                        const signed = opinions.find(o => o.approvalWorkflowLevelId === lv.id)
-                        return (
-                          <div
-                            key={lv.id}
-                            className={cn(
-                              'rounded-md border px-2.5 py-2 text-[11px]',
-                              signed ? 'border-emerald-200 bg-emerald-50/40' : 'border-dashed border-slate-200 bg-white',
-                            )}
-                          >
-                            <div className="flex flex-wrap items-center gap-x-1.5 text-slate-700">
-                              <span className="font-medium">{lv.name || `Cấp ${lv.order}`}</span>
-                              <span className="text-slate-400">·</span>
-                              <span>{lv.approverFullName ?? '(chưa cấu hình)'}</span>
-                              {signed && (
-                                <>
-                                  <span className="text-slate-400">·</span>
-                                  <span className="text-slate-500">{formatDateTime(signed.signedAt)}</span>
-                                  {signed.approverUserId && signed.approverUserId !== signed.signedByUserId && (
-                                    <span className="rounded bg-amber-100 px-1.5 py-0.5 text-[9px] font-semibold text-amber-800">
-                                      duyệt thay ({signed.signedByFullName})
+                    <div className="p-3">
+                      {step.levels.length === 0 ? (
+                        <div className="text-[12px] italic text-slate-400">— Bước này chưa cấu hình cấp duyệt.</div>
+                      ) : (
+                        <div className="grid grid-cols-1 gap-3 md:grid-cols-2">
+                          {step.levels.map((lv) => {
+                            const signed = opinions.find(o => o.approvalWorkflowLevelId === lv.id)
+                            return (
+                              <div
+                                key={lv.id}
+                                className={cn(
+                                  'rounded-lg border bg-white p-3',
+                                  signed ? 'border-emerald-200' : 'border-dashed border-slate-200',
+                                )}
+                              >
+                                <div className="mb-2 flex items-start justify-between gap-2">
+                                  <div className="min-w-0 flex-1">
+                                    <h4 className="text-[13px] font-semibold text-slate-700">
+                                      {lv.name || `Cấp ${lv.order}`} —{' '}
+                                      <span className="text-slate-900">{lv.approverFullName ?? '(chưa cấu hình)'}</span>
+                                    </h4>
+                                    {/* Không dùng `signed!` — thu hẹp bằng chính `signed &&` để
+                                        khỏi mượn null-forgiving trên dữ-liệu từ API (gotcha #80). */}
+                                    {signed && signed.approverUserId
+                                      && signed.approverUserId !== signed.signedByUserId && (
+                                      <div className="mt-1 inline-flex items-center gap-1 rounded bg-amber-50 px-1.5 py-0.5 text-[10px] font-medium text-amber-700">
+                                        ⚠ Admin <strong>{signed.signedByFullName}</strong> duyệt thay
+                                      </div>
+                                    )}
+                                  </div>
+                                  {signed ? (
+                                    <span className="inline-flex shrink-0 items-center gap-1 rounded-full bg-emerald-100 px-2 py-0.5 text-[10px] font-medium text-emerald-700">
+                                      <Check className="h-3 w-3" /> Đã duyệt
+                                    </span>
+                                  ) : (
+                                    <span className="inline-flex shrink-0 items-center rounded-full bg-slate-100 px-2 py-0.5 text-[10px] font-medium text-slate-500">
+                                      Chưa ký
                                     </span>
                                   )}
-                                </>
-                              )}
-                            </div>
-                            <div className="mt-0.5 whitespace-pre-wrap text-slate-600">
-                              {signed
-                                ? (signed.comment?.trim() || '(duyệt — không ý kiến)')
-                                : <span className="italic text-slate-300">Chưa ký</span>}
-                            </div>
-                          </div>
-                        )
-                      })}
+                                </div>
+                                {signed ? (
+                                  <>
+                                    <div className="whitespace-pre-wrap text-sm text-slate-800">
+                                      {signed.comment?.trim() || '(duyệt — không ý kiến)'}
+                                    </div>
+                                    <div className="mt-2 border-t border-slate-100 pt-1.5 text-[11px] text-slate-500">
+                                      {formatDateTime(signed.signedAt)}
+                                    </div>
+                                  </>
+                                ) : (
+                                  <div className="text-sm italic text-slate-400">Chưa có ý kiến duyệt.</div>
+                                )}
+                              </div>
+                            )
+                          })}
+                        </div>
+                      )}
                     </div>
                   </div>
                 )

fe-admin/src/components/khkk/KhkkListPanel.tsx

@@ -31,11 +31,9 @@ import { usePipelineStages } from '@/hooks/usePipelineStages'
 import { api } from '@/lib/api'
 import { cn } from '@/lib/cn'
 import {
-  KHKK_APPROVAL_GROUPS,
   KHKK_PHASE_BADGE,
   KHKK_PHASE_LABELS,
   KhkkPhase,
-  khkkGroupMenuLabel,
   type KhkkListItemDto,
   type KhkkPhaseValue,
   type PagedResult,
@@ -172,7 +170,6 @@ export function KhkkListPanel({
   phase,
   onPhaseChange,
   group,
-  onGroupChange,
   deletedView,
   page,
   onPageChange,
@@ -184,8 +181,10 @@ export function KhkkListPanel({
   onSearchChange: (v: string) => void
   phase: KhkkPhaseValue | null
   onPhaseChange: (v: KhkkPhaseValue | null) => void
+  // [S174 owner] CHỈ còn đọc — `Select` nhóm đã gỡ khỏi UI. Nhóm nay đến DUY NHẤT từ URL
+  // (`?group=n`, tức 8 leaf nhóm ở menu trái). Máy lọc giữ NGUYÊN (query + `stage2Content`);
+  // chỉ bỏ đường đổi nhóm bằng tay — vào từ leaf nhóm rồi thì ô đó là thừa.
   group: number | null
-  onGroupChange: (v: number | null) => void
   deletedView: boolean
   page: number
   onPageChange: (p: number) => void
@@ -265,28 +264,16 @@ export function KhkkListPanel({
             className="pl-8"
           />
         </div>
-        <div className="grid grid-cols-2 gap-2">
-          <Select
-            value={phase ?? ''}
-            aria-label="Lọc trạng thái"
-            onChange={e => onPhaseChange(e.target.value === '' ? null : (Number(e.target.value) as KhkkPhaseValue))}
-          >
-            <option value="">Tất cả trạng thái</option>
-            {(Object.keys(KHKK_PHASE_LABELS) as unknown as number[]).map(p => (
-              <option key={p} value={p}>{KHKK_PHASE_LABELS[Number(p) as KhkkPhaseValue]}</option>
-            ))}
-          </Select>
-          <Select
-            value={group ?? ''}
-            aria-label="Lọc nhóm duyệt"
-            onChange={e => onGroupChange(e.target.value === '' ? null : Number(e.target.value))}
-          >
-            <option value="">Tất cả nhóm</option>
-            {KHKK_APPROVAL_GROUPS.map(n => (
-              <option key={n} value={n}>{khkkGroupMenuLabel(n)}</option>
-            ))}
-          </Select>
-        </div>
+        <Select
+          value={phase ?? ''}
+          aria-label="Lọc trạng thái"
+          onChange={e => onPhaseChange(e.target.value === '' ? null : (Number(e.target.value) as KhkkPhaseValue))}
+        >
+          <option value="">Tất cả trạng thái</option>
+          {(Object.keys(KHKK_PHASE_LABELS) as unknown as number[]).map(p => (
+            <option key={p} value={p}>{KHKK_PHASE_LABELS[Number(p) as KhkkPhaseValue]}</option>
+          ))}
+        </Select>
         {flatMode && !deletedView && canPe && (
           <p className="text-[10px] italic text-slate-400">
             Đang lọc — danh sách lấy thẳng từ máy chủ (không giới hạn 200 phiếu của cây).
@@ -305,6 +292,7 @@ export function KhkkListPanel({
           <PipelineTreePanel
             currentStage={2}
             className="border-0 shadow-none"
+            hideHeader
             bodyMaxHClass="max-h-[28rem] lg:max-h-none"
             stage2Options={{ stage2Content, stage2Count, onOpenKhkk: onSelect }}
           />