vietreport-admin/solution-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CLAUDE] FE: HĐ move Lich su dieu chinh sang Panel 3 duoi Lich su duyet
All checks were successful
Deploy SOLUTION_ERP / build-deploy (push) Successful in 2m55s
Details

Browse Source 
User request: 'cho hop dong dua cac thong tin lich su dieu chinh sang
duoi lich su duyet nhen'.

ContractDetailContent (Panel 2): xoa section 'Lich su dieu chinh' (cot
3/10 grid 7/3) → Chi tiet HD gio full-width. Remove import History +
ContractChangelogsTab.

WorkflowHistoryPanel (Panel 3): them section Lich su dieu chinh duoi
Lich su duyet. Import History icon + ContractChangelogsTab. Reuse same
component, chi doi vi tri render.

Mirror fe-admin + fe-user.
This commit is contained in:
pqhuy1987
2026-04-24 13:06:18 +07:00
parent d1090843a2
commit 8cf1fe214a
4 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
fe-user/src/components/contracts/ContractDetailContent.tsx
View File

@ -4,13 +4,12 @@
// approval history live separately in WorkflowHistoryPanel (Panel 3).
import { useState, type FormEvent } from 'react'
import { useMutation, useQueryClient } from '@tanstack/react-query'
import { ArrowLeft, CheckCircle2, MessageSquare, XCircle, ListChecks, History } from 'lucide-react'
import { ArrowLeft, CheckCircle2, MessageSquare, XCircle, ListChecks } from 'lucide-react'
import { toast } from 'sonner'
import { PhaseBadge } from '@/components/PhaseBadge'
import { SlaTimer } from '@/components/SlaTimer'
import { ContractAttachmentsSection } from '@/components/ContractAttachmentsSection'
import { ContractDetailsTab } from '@/components/contracts/ContractDetailsTab'
import { ContractChangelogsTab } from '@/components/contracts/ContractChangelogsTab'
import { Button } from '@/components/ui/Button'
import { Select } from '@/components/ui/Select'
import { Textarea } from '@/components/ui/Textarea'
@ -174,23 +173,14 @@ export function ContractDetailContent({
<ContractAttachmentsSection contractId={c.id} attachments={c.attachments} />
{/* Chi tiết + Lịch sử điều chỉnh — 7/3 grid bên dưới */}
<div className="grid grid-cols-1 gap-4 lg:grid-cols-10">
<section className="rounded-lg border border-slate-200 bg-white p-5 lg:col-span-7">
<h2 className="mb-3 flex items-center gap-2 text-sm font-semibold text-slate-700">
<ListChecks className="h-4 w-4" />
Chi tiết ({ContractTypeLabel[c.type] ?? '—'})
</h2>
<ContractDetailsTab contract={c} />
</section>
<section className="rounded-lg border border-slate-200 bg-white p-5 lg:col-span-3">
<h2 className="mb-3 flex items-center gap-2 text-sm font-semibold text-slate-700">
<History className="h-4 w-4" />
Lịch sử điều chỉnh
</h2>
<ContractChangelogsTab contractId={c.id} />
</section>
</div>
{/* Chi tiết HĐ full-width — Lịch sử điều chỉnh đã move sang Panel 3 */}
<section className="rounded-lg border border-slate-200 bg-white p-5">
<h2 className="mb-3 flex items-center gap-2 text-sm font-semibold text-slate-700">
<ListChecks className="h-4 w-4" />
Chi tiết ({ContractTypeLabel[c.type] ?? '—'})
</h2>
<ContractDetailsTab contract={c} />
</section>
<Dialog
open={actionOpen}

16
fe-user/src/components/contracts/WorkflowHistoryPanel.tsx
View File

@ -1,9 +1,11 @@
// Panel 3 cho 3-panel layout — gom WorkflowSummaryCard (timeline policy) +
// approval history (ai/khi/quyết định gì) vào 1 stack. Dùng cho cả MyContracts
// 3-panel và ContractDetailPage fullpage.
import { ArrowRight, Clock } from 'lucide-react'
// approval history (ai/khi/quyết định gì) + ContractChangelogsTab (mọi thay
// đổi header/detail/comment/attachment/transition) vào 1 stack. Dùng cho cả
// MyContracts 3-panel và ContractDetailPage fullpage.
import { ArrowRight, Clock, History } from 'lucide-react'
import { PhaseBadge } from '@/components/PhaseBadge'
import { WorkflowSummaryCard } from '@/components/WorkflowSummaryCard'
import { ContractChangelogsTab } from '@/components/contracts/ContractChangelogsTab'
import type { ContractDetail } from '@/types/contracts'
const fmt = (s: string) => new Date(s).toLocaleString('vi-VN')
@ -41,6 +43,14 @@ export function WorkflowHistoryPanel({ contract: c }: { contract: ContractDetail
))}
</ol>
</section>
<section className="rounded-xl border border-slate-200 bg-white p-5 shadow-sm">
<h2 className="mb-3 flex items-center gap-2 text-sm font-semibold text-slate-700">
<History className="h-4 w-4" />
Lịch sử điều chỉnh
</h2>
<ContractChangelogsTab contractId={c.id} />
</section>
</div>
)
}