updates

apps/dashboard/modules/purchase-orders/purchase-order-form.tsx

@@ -10,6 +10,7 @@ import {
     RhfTextField,
     RhfTextareaField,
     RhfAsyncSelectField,
+    RhfDateField,
 } from "@/shared/components/form"
 import { toast } from "sonner"
 import { useAuthApi } from "@/shared/useApi"
@@ -21,7 +22,8 @@ import {
     purchaseOrderFormSchema,
     type PurchaseOrderFormValues,
 } from "./purchase-order.schema"
-import { PURCHASE_ORDER_ROUTES, VENDOR_ROUTES, JOB_CARD_ROUTES, DEPARTMENT_ROUTES } from "@garage/api"
+import { VENDOR_ROUTES, JOB_CARD_ROUTES, DEPARTMENT_ROUTES } from "@garage/api"
+import { getFullName } from "@/shared/utils/getFullName"
 
 // ── Props ──
 
@@ -38,7 +40,7 @@ const DEFAULT_VALUES: PurchaseOrderFormValues = {
     job_card: null,
     department: null,
     title: "",
-    order_date: "",
+    order_date: new Date().toISOString().split("T")[0],
     delivery_date: "",
     notes: "",
 }
@@ -128,8 +130,8 @@ export function PurchaseOrderForm({ resourceId, initialData, onSuccess }: Purcha
                 <RhfTextField name="title" label="Title" placeholder="Enter purchase order title" required />
 
                 <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
-                    <RhfTextField name="order_date" label="Order Date" placeholder="YYYY-MM-DD" type="date" />
-                    <RhfTextField name="delivery_date" label="Delivery Date" placeholder="YYYY-MM-DD" type="date" />
+                    <RhfDateField name="order_date" label="Order Date" />
+                    <RhfDateField name="delivery_date" label="Delivery Date" />
                 </div>
 
                 <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
@@ -139,7 +141,7 @@ export function PurchaseOrderForm({ resourceId, initialData, onSuccess }: Purcha
                         placeholder="Select vendor"
                         queryKey={[VENDOR_ROUTES.INDEX]}
                         listFn={() => api.vendors.list()}
-                        mapOption={mapLookupOption}
+                        mapOption={(op: any) => ({ label: getFullName(op as any), value: String(op.id) })}
                         {...STORE_OBJECT}
                     />
                     <RhfAsyncSelectField
@@ -161,7 +163,7 @@ export function PurchaseOrderForm({ resourceId, initialData, onSuccess }: Purcha
                     listFn={() => api.jobCards.list()}
                     mapOption={(item: any) => ({
                         value: String(item.id),
-                        label: item.job_card_number || item.name || `#${item.id}`,
+                        label: item.title || `#${item.id}`,
                     })}
                     {...STORE_OBJECT}
                 />