diff --git a/src/components/admin/unit/vehicle/CreateVehicleModal.vue b/src/components/admin/unit/vehicle/CreateVehicleModal.vue index 8ce33c7..54fa73e 100644 --- a/src/components/admin/unit/vehicle/CreateVehicleModal.vue +++ b/src/components/admin/unit/vehicle/CreateVehicleModal.vue @@ -85,6 +85,8 @@ export default defineComponent({ let formData = e.target.elements; let createVehicle: CreateVehicleViewModel = { name: "", + location: "", + vehicleTypeId: "", }; this.status = "loading"; this.createVehicle(createVehicle) diff --git a/src/demodata/vehicle.ts b/src/demodata/vehicle.ts index 82f5f85..522648d 100644 --- a/src/demodata/vehicle.ts +++ b/src/demodata/vehicle.ts @@ -1,14 +1,19 @@ import type { VehicleViewModel } from "../viewmodels/admin/unit/vehicle/vehicle.models"; +import { vehicleTypeDemoData } from "./vehicleType"; export const vehicleDemoData: Array = [ { id: "kjhb", name: "HLF", - type: "HLF 20/10", + location: "Tor 1", + vehicleTypeId: "xyz", + vehicleType: vehicleTypeDemoData[0], }, { id: "kjhb", name: "LF", - type: "LF 8/6", + location: "Tor 2", + vehicleTypeId: "abc", + vehicleType: vehicleTypeDemoData[1], }, ]; diff --git a/src/demodata/vehicleType.ts b/src/demodata/vehicleType.ts index 81db560..bea1c59 100644 --- a/src/demodata/vehicleType.ts +++ b/src/demodata/vehicleType.ts @@ -3,7 +3,12 @@ import type { VehicleTypeViewModel } from "../viewmodels/admin/unit/vehicleType/ export const vehicleTypeDemoData: Array = [ { id: "xyz", - type: "HLF", + type: "HLF 20/10", description: "HLF", }, + { + id: "abc", + type: "LF 8/6", + description: "LF", + }, ]; diff --git a/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts b/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts index c3a6f81..596eba8 100644 --- a/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts +++ b/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts @@ -22,7 +22,7 @@ export interface UpdateInspectionPlanViewModel { id: string; title: string; inspectionInterval: `${number}-${"d" | "m" | "y"}` | `${number}/${number}` | `${number}/*`; - remindTime: `${number}-${"d" | "m" | "y"}` | `${number}/${number}` | `${number}/*`; + remindTime?: `${number}-${"d" | "m" | "y"}` | `${number}/${number}` | `${number}/*`; } export interface InspectionPointViewModel { diff --git a/src/viewmodels/admin/unit/vehicle/vehicle.models.ts b/src/viewmodels/admin/unit/vehicle/vehicle.models.ts index be8dae3..22001cd 100644 --- a/src/viewmodels/admin/unit/vehicle/vehicle.models.ts +++ b/src/viewmodels/admin/unit/vehicle/vehicle.models.ts @@ -1,8 +1,11 @@ +import type { VehicleTypeViewModel } from "../vehicleType/vehicleType.models"; + export interface VehicleViewModel { id: string; name: string; location: string; vehicleTypeId: string; + vehicleType: VehicleTypeViewModel; } export interface CreateVehicleViewModel { @@ -15,5 +18,4 @@ export interface UpdateVehicleViewModel { id: string; name: string; location: string; - vehicleTypeId: string; }