[CLAUDE] PurchaseEvaluation: bo o "Ten ngan sach" o manual budget (UAT vong 4 - anh chot "cho ten ngan sach bo di nhe")
All checks were successful
Deploy SOLUTION_ERP / build-deploy (push) Successful in 4m23s

- PeDetailTabs Section 5 Dieu chinh ngan sach: bo input "Ten (khong bat buoc)"
  (user khong hieu "y nghia du phong la gi") - manual budget chi con So tien (VND).
  State manualName drop, payload budgetManualName: null. Ten cu phieu truoc van
  hien read-only, ve null khi Luu dieu chinh lan toi.
- PeHeaderForm: payload budgetManualName null + hasManual detect theo CA amount
  (phieu moi name=null sau khi bo o Ten -> van nhan dung manual mode).
- PeWorkspaceCreateView: khong doi (chua tung co o Ten, payload '' || null = null san).
- SHA256 mirror x2 app IDENTICAL, build tsc+vite x2 PASS.
This commit is contained in:
pqhuy1987
2026-06-11 18:22:26 +07:00
parent f21c55d04a
commit 69997da74f
4 changed files with 34 additions and 52 deletions

View File

@ -995,7 +995,9 @@ function BudgetAdjustSection({ ev, readOnly }: { ev: PeDetailBundle; readOnly: b
const [manualMode, setManualMode] = useState(initialManual) const [manualMode, setManualMode] = useState(initialManual)
const [budgetId, setBudgetId] = useState(ev.budgetId ?? '') const [budgetId, setBudgetId] = useState(ev.budgetId ?? '')
const [manualAmount, setManualAmount] = useState(ev.budgetManualAmount ?? 0) const [manualAmount, setManualAmount] = useState(ev.budgetManualAmount ?? 0)
const [manualName, setManualName] = useState(ev.budgetManualName ?? '') // S59 UAT vòng 4 (anh chốt "chỗ tên ngân sách bỏ đi"): bỏ ô "Tên (không bắt buộc)"
// — user không hiểu ý nghĩa; manual budget chỉ còn Số tiền. Tên cũ (phiếu trước)
// vẫn hiển thị read-only, sẽ về null khi Lưu điều chỉnh lần tới.
const eligibleBudgets = useQuery({ const eligibleBudgets = useQuery({
queryKey: ['eligible-budgets-adjust', ev.projectId], queryKey: ['eligible-budgets-adjust', ev.projectId],
@ -1008,7 +1010,7 @@ function BudgetAdjustSection({ ev, readOnly }: { ev: PeDetailBundle; readOnly: b
const adjustMut = useMutation({ const adjustMut = useMutation({
mutationFn: async () => { mutationFn: async () => {
const payload = manualMode const payload = manualMode
? { budgetId: null, budgetManualName: manualName || null, budgetManualAmount: manualAmount > 0 ? manualAmount : null } ? { budgetId: null, budgetManualName: null, budgetManualAmount: manualAmount > 0 ? manualAmount : null }
: { budgetId: budgetId || null, budgetManualName: null, budgetManualAmount: null } : { budgetId: budgetId || null, budgetManualName: null, budgetManualAmount: null }
await api.patch(`/purchase-evaluations/${ev.id}/budget-adjust`, payload) await api.patch(`/purchase-evaluations/${ev.id}/budget-adjust`, payload)
}, },
@ -1057,7 +1059,6 @@ function BudgetAdjustSection({ ev, readOnly }: { ev: PeDetailBundle; readOnly: b
setManualMode(initialManual) setManualMode(initialManual)
setBudgetId(ev.budgetId ?? '') setBudgetId(ev.budgetId ?? '')
setManualAmount(ev.budgetManualAmount ?? 0) setManualAmount(ev.budgetManualAmount ?? 0)
setManualName(ev.budgetManualName ?? '')
setEditing(true) setEditing(true)
}} }}
variant="ghost" variant="ghost"
@ -1099,17 +1100,7 @@ function BudgetAdjustSection({ ev, readOnly }: { ev: PeDetailBundle; readOnly: b
</Select> </Select>
</div> </div>
) : ( ) : (
<div className="grid gap-2 md:grid-cols-2"> <div className="max-w-xs">
<div>
<Label className="text-[11px]">Tên (không bắt buộc)</Label>
<Input
value={manualName}
onChange={e => setManualName(e.target.value)}
placeholder="vd Ngân sách dự phòng Q2/2026"
className="text-sm"
/>
</div>
<div>
<Label className="text-[11px]">Số tiền (VND)</Label> <Label className="text-[11px]">Số tiền (VND)</Label>
<div className="relative"> <div className="relative">
<Input <Input
@ -1123,7 +1114,6 @@ function BudgetAdjustSection({ ev, readOnly }: { ev: PeDetailBundle; readOnly: b
<span className="pointer-events-none absolute inset-y-0 right-3 flex items-center text-[12px] font-medium text-slate-500">đ</span> <span className="pointer-events-none absolute inset-y-0 right-3 flex items-center text-[12px] font-medium text-slate-500">đ</span>
</div> </div>
</div> </div>
</div>
)} )}
<div className="flex items-center justify-end gap-2"> <div className="flex items-center justify-end gap-2">
<Button <Button

View File

@ -101,7 +101,8 @@ export function PeHeaderForm({
useEffect(() => { useEffect(() => {
if (existing.data) { if (existing.data) {
const hasManual = existing.data.budgetManualName !== null // S59: manual-mode detect theo CẢ amount (phiếu mới name=null sau khi bỏ ô Tên).
const hasManual = existing.data.budgetManualAmount !== null || existing.data.budgetManualName !== null
|| existing.data.budgetManualAmount !== null || existing.data.budgetManualAmount !== null
setForm({ setForm({
type: existing.data.type, type: existing.data.type,
@ -124,7 +125,7 @@ export function PeHeaderForm({
const payloadBudgetFields = form.budgetManual const payloadBudgetFields = form.budgetManual
? { ? {
budgetId: null, budgetId: null,
budgetManualName: form.budgetManualName || null, budgetManualName: null, // S59 anh chốt bỏ "Tên ngân sách" — manual chỉ còn Số tiền
budgetManualAmount: form.budgetManualAmount > 0 ? form.budgetManualAmount : null, budgetManualAmount: form.budgetManualAmount > 0 ? form.budgetManualAmount : null,
} }
: { : {

View File

@ -995,7 +995,9 @@ function BudgetAdjustSection({ ev, readOnly }: { ev: PeDetailBundle; readOnly: b
const [manualMode, setManualMode] = useState(initialManual) const [manualMode, setManualMode] = useState(initialManual)
const [budgetId, setBudgetId] = useState(ev.budgetId ?? '') const [budgetId, setBudgetId] = useState(ev.budgetId ?? '')
const [manualAmount, setManualAmount] = useState(ev.budgetManualAmount ?? 0) const [manualAmount, setManualAmount] = useState(ev.budgetManualAmount ?? 0)
const [manualName, setManualName] = useState(ev.budgetManualName ?? '') // S59 UAT vòng 4 (anh chốt "chỗ tên ngân sách bỏ đi"): bỏ ô "Tên (không bắt buộc)"
// — user không hiểu ý nghĩa; manual budget chỉ còn Số tiền. Tên cũ (phiếu trước)
// vẫn hiển thị read-only, sẽ về null khi Lưu điều chỉnh lần tới.
const eligibleBudgets = useQuery({ const eligibleBudgets = useQuery({
queryKey: ['eligible-budgets-adjust', ev.projectId], queryKey: ['eligible-budgets-adjust', ev.projectId],
@ -1008,7 +1010,7 @@ function BudgetAdjustSection({ ev, readOnly }: { ev: PeDetailBundle; readOnly: b
const adjustMut = useMutation({ const adjustMut = useMutation({
mutationFn: async () => { mutationFn: async () => {
const payload = manualMode const payload = manualMode
? { budgetId: null, budgetManualName: manualName || null, budgetManualAmount: manualAmount > 0 ? manualAmount : null } ? { budgetId: null, budgetManualName: null, budgetManualAmount: manualAmount > 0 ? manualAmount : null }
: { budgetId: budgetId || null, budgetManualName: null, budgetManualAmount: null } : { budgetId: budgetId || null, budgetManualName: null, budgetManualAmount: null }
await api.patch(`/purchase-evaluations/${ev.id}/budget-adjust`, payload) await api.patch(`/purchase-evaluations/${ev.id}/budget-adjust`, payload)
}, },
@ -1057,7 +1059,6 @@ function BudgetAdjustSection({ ev, readOnly }: { ev: PeDetailBundle; readOnly: b
setManualMode(initialManual) setManualMode(initialManual)
setBudgetId(ev.budgetId ?? '') setBudgetId(ev.budgetId ?? '')
setManualAmount(ev.budgetManualAmount ?? 0) setManualAmount(ev.budgetManualAmount ?? 0)
setManualName(ev.budgetManualName ?? '')
setEditing(true) setEditing(true)
}} }}
variant="ghost" variant="ghost"
@ -1099,17 +1100,7 @@ function BudgetAdjustSection({ ev, readOnly }: { ev: PeDetailBundle; readOnly: b
</Select> </Select>
</div> </div>
) : ( ) : (
<div className="grid gap-2 md:grid-cols-2"> <div className="max-w-xs">
<div>
<Label className="text-[11px]">Tên (không bắt buộc)</Label>
<Input
value={manualName}
onChange={e => setManualName(e.target.value)}
placeholder="vd Ngân sách dự phòng Q2/2026"
className="text-sm"
/>
</div>
<div>
<Label className="text-[11px]">Số tiền (VND)</Label> <Label className="text-[11px]">Số tiền (VND)</Label>
<div className="relative"> <div className="relative">
<Input <Input
@ -1123,7 +1114,6 @@ function BudgetAdjustSection({ ev, readOnly }: { ev: PeDetailBundle; readOnly: b
<span className="pointer-events-none absolute inset-y-0 right-3 flex items-center text-[12px] font-medium text-slate-500">đ</span> <span className="pointer-events-none absolute inset-y-0 right-3 flex items-center text-[12px] font-medium text-slate-500">đ</span>
</div> </div>
</div> </div>
</div>
)} )}
<div className="flex items-center justify-end gap-2"> <div className="flex items-center justify-end gap-2">
<Button <Button

View File

@ -101,7 +101,8 @@ export function PeHeaderForm({
useEffect(() => { useEffect(() => {
if (existing.data) { if (existing.data) {
const hasManual = existing.data.budgetManualName !== null // S59: manual-mode detect theo CẢ amount (phiếu mới name=null sau khi bỏ ô Tên).
const hasManual = existing.data.budgetManualAmount !== null || existing.data.budgetManualName !== null
|| existing.data.budgetManualAmount !== null || existing.data.budgetManualAmount !== null
setForm({ setForm({
type: existing.data.type, type: existing.data.type,
@ -124,7 +125,7 @@ export function PeHeaderForm({
const payloadBudgetFields = form.budgetManual const payloadBudgetFields = form.budgetManual
? { ? {
budgetId: null, budgetId: null,
budgetManualName: form.budgetManualName || null, budgetManualName: null, // S59 anh chốt bỏ "Tên ngân sách" — manual chỉ còn Số tiền
budgetManualAmount: form.budgetManualAmount > 0 ? form.budgetManualAmount : null, budgetManualAmount: form.budgetManualAmount > 0 ? form.budgetManualAmount : null,
} }
: { : {