diff --git a/fe-admin/src/components/pe/PeDetailTabs.tsx b/fe-admin/src/components/pe/PeDetailTabs.tsx
index 4af4413..c853b99 100644
--- a/fe-admin/src/components/pe/PeDetailTabs.tsx
+++ b/fe-admin/src/components/pe/PeDetailTabs.tsx
@@ -42,6 +42,19 @@ import type { Paged, Supplier } from '@/types/master'
 
 const fmtMoney = (v: number) => v.toLocaleString('vi-VN')
 
+// Session 20 turn 4 — input helpers cho NCC/Quote inline form.
+// VND format dùng convention VN dấu chấm ngàn (1.000.000). Strip non-digit
+// khi parse user input → number. Empty/0 → empty string để placeholder hiện.
+const parseVnd = (s: string): number => Number(s.replace(/[^\d]/g, '')) || 0
+const formatVndInput = (n: number): string => (n > 0 ? n.toLocaleString('vi-VN') : '')
+
+// Validation cơ bản FE — empty OK (optional fields). BE FluentValidation
+// chưa enforce, FE check để user nhập sai biết ngay.
+const PHONE_RE = /^0\d{9,10}$/  // VN: bắt đầu 0, 10-11 digits sau khi strip space/dash/dot
+const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+const isValidPhone = (s: string): boolean => !s || PHONE_RE.test(s.replace(/[\s\-.]/g, ''))
+const isValidEmail = (s: string): boolean => !s || EMAIL_RE.test(s)
+
 // Main detail content — flat render 3 section không tabs.
 // Tên giữ PeDetailTabs để không break callsite (rename gây churn).
 //
@@ -1062,6 +1075,10 @@ function AddSupplierDialog({ evaluationId, onClose }: { evaluationId: string; on
     paymentTermText: '',
     note: '',
   })
+  const phoneError = !isValidPhone(form.contactPhone) ? 'SĐT không hợp lệ (cần 10-11 số bắt đầu 0)' : ''
+  const emailError = !isValidEmail(form.contactEmail) ? 'Email không hợp lệ' : ''
+  const hasError = !!(phoneError || emailError)
+
   const mut = useMutation({
     mutationFn: async () => api.post(`/purchase-evaluations/${evaluationId}/suppliers`, form),
     onSuccess: () => { toast.success('Đã thêm NCC.'); qc.invalidateQueries({ queryKey: ['pe-detail', evaluationId] }); onClose() },
@@ -1075,7 +1092,7 @@ function AddSupplierDialog({ evaluationId, onClose }: { evaluationId: string; on
       title="Thêm NCC vào phiếu"
       footer={<>
         <Button variant="ghost" onClick={onClose}>Hủy</Button>
-        <Button onClick={() => mut.mutate()} disabled={!form.supplierId || mut.isPending}>Thêm</Button>
+        <Button onClick={() => mut.mutate()} disabled={!form.supplierId || hasError || mut.isPending}>Thêm</Button>
       </>}
     >
       <div className="space-y-3">
@@ -1092,8 +1109,29 @@ function AddSupplierDialog({ evaluationId, onClose }: { evaluationId: string; on
           <div><Label>Hiển thị</Label><Input value={form.displayName} onChange={e => setForm({ ...form, displayName: e.target.value })} placeholder="vd TGN-30 ngày" /></div>
           <div><Label>Điều khoản TT</Label><Input value={form.paymentTermText} onChange={e => setForm({ ...form, paymentTermText: e.target.value })} placeholder="vd 30 ngày, 300tr" /></div>
           <div><Label>Người liên hệ</Label><Input value={form.contactName} onChange={e => setForm({ ...form, contactName: e.target.value })} /></div>
-          <div><Label>Điện thoại</Label><Input value={form.contactPhone} onChange={e => setForm({ ...form, contactPhone: e.target.value })} /></div>
-          <div className="col-span-2"><Label>Email</Label><Input value={form.contactEmail} onChange={e => setForm({ ...form, contactEmail: e.target.value })} /></div>
+          <div>
+            <Label>Điện thoại</Label>
+            <Input
+              type="tel"
+              inputMode="tel"
+              value={form.contactPhone}
+              onChange={e => setForm({ ...form, contactPhone: e.target.value })}
+              placeholder="0987654321"
+              className={phoneError ? 'border-red-300' : undefined}
+            />
+            {phoneError && <p className="mt-0.5 text-[10px] text-red-600">{phoneError}</p>}
+          </div>
+          <div className="col-span-2">
+            <Label>Email</Label>
+            <Input
+              type="email"
+              value={form.contactEmail}
+              onChange={e => setForm({ ...form, contactEmail: e.target.value })}
+              placeholder="name@example.com"
+              className={emailError ? 'border-red-300' : undefined}
+            />
+            {emailError && <p className="mt-0.5 text-[10px] text-red-600">{emailError}</p>}
+          </div>
           <div className="col-span-2"><Label>Ghi chú</Label><Input value={form.note} onChange={e => setForm({ ...form, note: e.target.value })} placeholder="ĐÃ CHỐT SO SÁNH LẦN 1 / ĐÀM PHÁN THÊM..." /></div>
         </div>
       </div>
@@ -1112,6 +1150,10 @@ function EditSupplierDialog({ evaluationId, row, onClose }: { evaluationId: stri
     paymentTermText: row.paymentTermText ?? '',
     note: row.note ?? '',
   })
+  const phoneError = !isValidPhone(form.contactPhone) ? 'SĐT không hợp lệ (cần 10-11 số bắt đầu 0)' : ''
+  const emailError = !isValidEmail(form.contactEmail) ? 'Email không hợp lệ' : ''
+  const hasError = !!(phoneError || emailError)
+
   const mut = useMutation({
     mutationFn: async () => api.put(`/purchase-evaluations/${evaluationId}/suppliers/${row.id}`, form),
     onSuccess: () => { toast.success('Đã cập nhật.'); qc.invalidateQueries({ queryKey: ['pe-detail', evaluationId] }); onClose() },
@@ -1124,15 +1166,36 @@ function EditSupplierDialog({ evaluationId, row, onClose }: { evaluationId: stri
       title={`Sửa NCC — ${row.supplierName}`}
       footer={<>
         <Button variant="ghost" onClick={onClose}>Hủy</Button>
-        <Button onClick={() => mut.mutate()} disabled={mut.isPending}>Lưu</Button>
+        <Button onClick={() => mut.mutate()} disabled={hasError || mut.isPending}>Lưu</Button>
       </>}
     >
       <div className="grid grid-cols-2 gap-3">
         <div><Label>Hiển thị</Label><Input value={form.displayName} onChange={e => setForm({ ...form, displayName: e.target.value })} /></div>
         <div><Label>Điều khoản TT</Label><Input value={form.paymentTermText} onChange={e => setForm({ ...form, paymentTermText: e.target.value })} /></div>
         <div><Label>Liên hệ</Label><Input value={form.contactName} onChange={e => setForm({ ...form, contactName: e.target.value })} /></div>
-        <div><Label>Điện thoại</Label><Input value={form.contactPhone} onChange={e => setForm({ ...form, contactPhone: e.target.value })} /></div>
-        <div className="col-span-2"><Label>Email</Label><Input value={form.contactEmail} onChange={e => setForm({ ...form, contactEmail: e.target.value })} /></div>
+        <div>
+          <Label>Điện thoại</Label>
+          <Input
+            type="tel"
+            inputMode="tel"
+            value={form.contactPhone}
+            onChange={e => setForm({ ...form, contactPhone: e.target.value })}
+            placeholder="0987654321"
+            className={phoneError ? 'border-red-300' : undefined}
+          />
+          {phoneError && <p className="mt-0.5 text-[10px] text-red-600">{phoneError}</p>}
+        </div>
+        <div className="col-span-2">
+          <Label>Email</Label>
+          <Input
+            type="email"
+            value={form.contactEmail}
+            onChange={e => setForm({ ...form, contactEmail: e.target.value })}
+            placeholder="name@example.com"
+            className={emailError ? 'border-red-300' : undefined}
+          />
+          {emailError && <p className="mt-0.5 text-[10px] text-red-600">{emailError}</p>}
+        </div>
         <div className="col-span-2"><Label>Ghi chú</Label><Input value={form.note} onChange={e => setForm({ ...form, note: e.target.value })} /></div>
       </div>
     </Dialog>
@@ -1331,7 +1394,8 @@ function HangMucCard({
                 <thead className="bg-slate-50 text-slate-600">
                   <tr>
                     <th className="border-r border-slate-200 px-2 py-1.5 text-left">NCC</th>
-                    <th className="border-r border-slate-200 px-2 py-1.5 text-left">Liên hệ</th>
+                    <th className="border-r border-slate-200 px-2 py-1.5 text-left">SĐT</th>
+                    <th className="border-r border-slate-200 px-2 py-1.5 text-left">Email</th>
                     <th className="border-r border-slate-200 px-2 py-1.5 text-left">Điều khoản TT</th>
                     <th className="border-r border-slate-200 px-2 py-1.5 text-left">File báo giá</th>
                     <th className="border-r border-slate-200 px-2 py-1.5 text-right">Số tiền</th>
@@ -1355,11 +1419,13 @@ function HangMucCard({
                           {s.displayName && <div className="text-[10px] text-slate-500">{s.displayName}</div>}
                           {s.note && <div className="text-[10px] text-amber-600">{s.note}</div>}
                         </td>
+                        <td className="border-r border-slate-200 px-2 py-1.5 text-[11px] text-slate-600 font-mono">
+                          {s.contactPhone || <span className="text-slate-300">—</span>}
+                        </td>
                         <td className="border-r border-slate-200 px-2 py-1.5 text-[11px] text-slate-600">
-                          {s.contactName && <div>{s.contactName}</div>}
-                          {s.contactPhone && <div>{s.contactPhone}</div>}
-                          {s.contactEmail && <div className="truncate" title={s.contactEmail}>{s.contactEmail}</div>}
-                          {!s.contactName && !s.contactPhone && !s.contactEmail && <span className="text-slate-300">—</span>}
+                          {s.contactEmail
+                            ? <span className="truncate" title={s.contactEmail}>{s.contactEmail}</span>
+                            : <span className="text-slate-300">—</span>}
                         </td>
                         <td className="border-r border-slate-200 px-2 py-1.5 text-[11px]">
                           {s.paymentTermText ?? <span className="text-slate-300">—</span>}
@@ -1578,12 +1644,19 @@ function QuoteDialog({
         <p className="text-sm text-slate-500">Hạng mục: <strong>{itemName}</strong></p>
         <div>
           <Label>Số tiền</Label>
-          <Input
-            type="number"
-            value={form.thanhTien}
-            onChange={e => setForm({ thanhTien: Number(e.target.value) })}
-            autoFocus
-          />
+          <div className="relative">
+            <Input
+              type="text"
+              inputMode="numeric"
+              value={formatVndInput(form.thanhTien)}
+              onChange={e => setForm({ thanhTien: parseVnd(e.target.value) })}
+              placeholder="0"
+              autoFocus
+              className="pr-12 font-mono text-right"
+            />
+            <span className="pointer-events-none absolute inset-y-0 right-3 flex items-center text-[12px] font-medium text-slate-500">đ</span>
+          </div>
+          <p className="mt-1 text-[11px] text-slate-500">VND — nhập số, tự format dấu chấm ngàn (vd 1.000.000)</p>
         </div>
       </div>
     </Dialog>
diff --git a/fe-user/src/components/pe/PeDetailTabs.tsx b/fe-user/src/components/pe/PeDetailTabs.tsx
index 4af4413..c853b99 100644
--- a/fe-user/src/components/pe/PeDetailTabs.tsx
+++ b/fe-user/src/components/pe/PeDetailTabs.tsx
@@ -42,6 +42,19 @@ import type { Paged, Supplier } from '@/types/master'
 
 const fmtMoney = (v: number) => v.toLocaleString('vi-VN')
 
+// Session 20 turn 4 — input helpers cho NCC/Quote inline form.
+// VND format dùng convention VN dấu chấm ngàn (1.000.000). Strip non-digit
+// khi parse user input → number. Empty/0 → empty string để placeholder hiện.
+const parseVnd = (s: string): number => Number(s.replace(/[^\d]/g, '')) || 0
+const formatVndInput = (n: number): string => (n > 0 ? n.toLocaleString('vi-VN') : '')
+
+// Validation cơ bản FE — empty OK (optional fields). BE FluentValidation
+// chưa enforce, FE check để user nhập sai biết ngay.
+const PHONE_RE = /^0\d{9,10}$/  // VN: bắt đầu 0, 10-11 digits sau khi strip space/dash/dot
+const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+const isValidPhone = (s: string): boolean => !s || PHONE_RE.test(s.replace(/[\s\-.]/g, ''))
+const isValidEmail = (s: string): boolean => !s || EMAIL_RE.test(s)
+
 // Main detail content — flat render 3 section không tabs.
 // Tên giữ PeDetailTabs để không break callsite (rename gây churn).
 //
@@ -1062,6 +1075,10 @@ function AddSupplierDialog({ evaluationId, onClose }: { evaluationId: string; on
     paymentTermText: '',
     note: '',
   })
+  const phoneError = !isValidPhone(form.contactPhone) ? 'SĐT không hợp lệ (cần 10-11 số bắt đầu 0)' : ''
+  const emailError = !isValidEmail(form.contactEmail) ? 'Email không hợp lệ' : ''
+  const hasError = !!(phoneError || emailError)
+
   const mut = useMutation({
     mutationFn: async () => api.post(`/purchase-evaluations/${evaluationId}/suppliers`, form),
     onSuccess: () => { toast.success('Đã thêm NCC.'); qc.invalidateQueries({ queryKey: ['pe-detail', evaluationId] }); onClose() },
@@ -1075,7 +1092,7 @@ function AddSupplierDialog({ evaluationId, onClose }: { evaluationId: string; on
       title="Thêm NCC vào phiếu"
       footer={<>
         <Button variant="ghost" onClick={onClose}>Hủy</Button>
-        <Button onClick={() => mut.mutate()} disabled={!form.supplierId || mut.isPending}>Thêm</Button>
+        <Button onClick={() => mut.mutate()} disabled={!form.supplierId || hasError || mut.isPending}>Thêm</Button>
       </>}
     >
       <div className="space-y-3">
@@ -1092,8 +1109,29 @@ function AddSupplierDialog({ evaluationId, onClose }: { evaluationId: string; on
           <div><Label>Hiển thị</Label><Input value={form.displayName} onChange={e => setForm({ ...form, displayName: e.target.value })} placeholder="vd TGN-30 ngày" /></div>
           <div><Label>Điều khoản TT</Label><Input value={form.paymentTermText} onChange={e => setForm({ ...form, paymentTermText: e.target.value })} placeholder="vd 30 ngày, 300tr" /></div>
           <div><Label>Người liên hệ</Label><Input value={form.contactName} onChange={e => setForm({ ...form, contactName: e.target.value })} /></div>
-          <div><Label>Điện thoại</Label><Input value={form.contactPhone} onChange={e => setForm({ ...form, contactPhone: e.target.value })} /></div>
-          <div className="col-span-2"><Label>Email</Label><Input value={form.contactEmail} onChange={e => setForm({ ...form, contactEmail: e.target.value })} /></div>
+          <div>
+            <Label>Điện thoại</Label>
+            <Input
+              type="tel"
+              inputMode="tel"
+              value={form.contactPhone}
+              onChange={e => setForm({ ...form, contactPhone: e.target.value })}
+              placeholder="0987654321"
+              className={phoneError ? 'border-red-300' : undefined}
+            />
+            {phoneError && <p className="mt-0.5 text-[10px] text-red-600">{phoneError}</p>}
+          </div>
+          <div className="col-span-2">
+            <Label>Email</Label>
+            <Input
+              type="email"
+              value={form.contactEmail}
+              onChange={e => setForm({ ...form, contactEmail: e.target.value })}
+              placeholder="name@example.com"
+              className={emailError ? 'border-red-300' : undefined}
+            />
+            {emailError && <p className="mt-0.5 text-[10px] text-red-600">{emailError}</p>}
+          </div>
           <div className="col-span-2"><Label>Ghi chú</Label><Input value={form.note} onChange={e => setForm({ ...form, note: e.target.value })} placeholder="ĐÃ CHỐT SO SÁNH LẦN 1 / ĐÀM PHÁN THÊM..." /></div>
         </div>
       </div>
@@ -1112,6 +1150,10 @@ function EditSupplierDialog({ evaluationId, row, onClose }: { evaluationId: stri
     paymentTermText: row.paymentTermText ?? '',
     note: row.note ?? '',
   })
+  const phoneError = !isValidPhone(form.contactPhone) ? 'SĐT không hợp lệ (cần 10-11 số bắt đầu 0)' : ''
+  const emailError = !isValidEmail(form.contactEmail) ? 'Email không hợp lệ' : ''
+  const hasError = !!(phoneError || emailError)
+
   const mut = useMutation({
     mutationFn: async () => api.put(`/purchase-evaluations/${evaluationId}/suppliers/${row.id}`, form),
     onSuccess: () => { toast.success('Đã cập nhật.'); qc.invalidateQueries({ queryKey: ['pe-detail', evaluationId] }); onClose() },
@@ -1124,15 +1166,36 @@ function EditSupplierDialog({ evaluationId, row, onClose }: { evaluationId: stri
       title={`Sửa NCC — ${row.supplierName}`}
       footer={<>
         <Button variant="ghost" onClick={onClose}>Hủy</Button>
-        <Button onClick={() => mut.mutate()} disabled={mut.isPending}>Lưu</Button>
+        <Button onClick={() => mut.mutate()} disabled={hasError || mut.isPending}>Lưu</Button>
       </>}
     >
       <div className="grid grid-cols-2 gap-3">
         <div><Label>Hiển thị</Label><Input value={form.displayName} onChange={e => setForm({ ...form, displayName: e.target.value })} /></div>
         <div><Label>Điều khoản TT</Label><Input value={form.paymentTermText} onChange={e => setForm({ ...form, paymentTermText: e.target.value })} /></div>
         <div><Label>Liên hệ</Label><Input value={form.contactName} onChange={e => setForm({ ...form, contactName: e.target.value })} /></div>
-        <div><Label>Điện thoại</Label><Input value={form.contactPhone} onChange={e => setForm({ ...form, contactPhone: e.target.value })} /></div>
-        <div className="col-span-2"><Label>Email</Label><Input value={form.contactEmail} onChange={e => setForm({ ...form, contactEmail: e.target.value })} /></div>
+        <div>
+          <Label>Điện thoại</Label>
+          <Input
+            type="tel"
+            inputMode="tel"
+            value={form.contactPhone}
+            onChange={e => setForm({ ...form, contactPhone: e.target.value })}
+            placeholder="0987654321"
+            className={phoneError ? 'border-red-300' : undefined}
+          />
+          {phoneError && <p className="mt-0.5 text-[10px] text-red-600">{phoneError}</p>}
+        </div>
+        <div className="col-span-2">
+          <Label>Email</Label>
+          <Input
+            type="email"
+            value={form.contactEmail}
+            onChange={e => setForm({ ...form, contactEmail: e.target.value })}
+            placeholder="name@example.com"
+            className={emailError ? 'border-red-300' : undefined}
+          />
+          {emailError && <p className="mt-0.5 text-[10px] text-red-600">{emailError}</p>}
+        </div>
         <div className="col-span-2"><Label>Ghi chú</Label><Input value={form.note} onChange={e => setForm({ ...form, note: e.target.value })} /></div>
       </div>
     </Dialog>
@@ -1331,7 +1394,8 @@ function HangMucCard({
                 <thead className="bg-slate-50 text-slate-600">
                   <tr>
                     <th className="border-r border-slate-200 px-2 py-1.5 text-left">NCC</th>
-                    <th className="border-r border-slate-200 px-2 py-1.5 text-left">Liên hệ</th>
+                    <th className="border-r border-slate-200 px-2 py-1.5 text-left">SĐT</th>
+                    <th className="border-r border-slate-200 px-2 py-1.5 text-left">Email</th>
                     <th className="border-r border-slate-200 px-2 py-1.5 text-left">Điều khoản TT</th>
                     <th className="border-r border-slate-200 px-2 py-1.5 text-left">File báo giá</th>
                     <th className="border-r border-slate-200 px-2 py-1.5 text-right">Số tiền</th>
@@ -1355,11 +1419,13 @@ function HangMucCard({
                           {s.displayName && <div className="text-[10px] text-slate-500">{s.displayName}</div>}
                           {s.note && <div className="text-[10px] text-amber-600">{s.note}</div>}
                         </td>
+                        <td className="border-r border-slate-200 px-2 py-1.5 text-[11px] text-slate-600 font-mono">
+                          {s.contactPhone || <span className="text-slate-300">—</span>}
+                        </td>
                         <td className="border-r border-slate-200 px-2 py-1.5 text-[11px] text-slate-600">
-                          {s.contactName && <div>{s.contactName}</div>}
-                          {s.contactPhone && <div>{s.contactPhone}</div>}
-                          {s.contactEmail && <div className="truncate" title={s.contactEmail}>{s.contactEmail}</div>}
-                          {!s.contactName && !s.contactPhone && !s.contactEmail && <span className="text-slate-300">—</span>}
+                          {s.contactEmail
+                            ? <span className="truncate" title={s.contactEmail}>{s.contactEmail}</span>
+                            : <span className="text-slate-300">—</span>}
                         </td>
                         <td className="border-r border-slate-200 px-2 py-1.5 text-[11px]">
                           {s.paymentTermText ?? <span className="text-slate-300">—</span>}
@@ -1578,12 +1644,19 @@ function QuoteDialog({
         <p className="text-sm text-slate-500">Hạng mục: <strong>{itemName}</strong></p>
         <div>
           <Label>Số tiền</Label>
-          <Input
-            type="number"
-            value={form.thanhTien}
-            onChange={e => setForm({ thanhTien: Number(e.target.value) })}
-            autoFocus
-          />
+          <div className="relative">
+            <Input
+              type="text"
+              inputMode="numeric"
+              value={formatVndInput(form.thanhTien)}
+              onChange={e => setForm({ thanhTien: parseVnd(e.target.value) })}
+              placeholder="0"
+              autoFocus
+              className="pr-12 font-mono text-right"
+            />
+            <span className="pointer-events-none absolute inset-y-0 right-3 flex items-center text-[12px] font-medium text-slate-500">đ</span>
+          </div>
+          <p className="mt-1 text-[11px] text-slate-500">VND — nhập số, tự format dấu chấm ngàn (vd 1.000.000)</p>
         </div>
       </div>
     </Dialog>