munawwirul_jamal/simrsx-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve list organization source

Browse Source
This commit is contained in:
riefive
2025-10-01 14:36:48 +07:00
parent 6b69e48bd6
commit 41405ae113
11 changed files with 106 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/components/app/installation/entry-form.vue
+16
View File
@@ -4,6 +4,7 @@ import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
// Types
import type { InstallationFormData } from '~/schemas/installation.schema.ts'
@@ -86,6 +87,21 @@ function onCancelForm() {
<Input id="name" v-model="name" v-bind="nameAttrs" :disabled="isLoading || isReadonly" />
</Field>
</Cell>
<Cell>
<Label height="compact">Encounter Class</Label>
<Field :errMessage="errors.encounterClass_code">
<Combobox
id="encounterClass_code"
v-model="encounterClassCode"
v-bind="encounterClassCodeAttrs"
:items="encounterClasses"
:disabled="isLoading || isReadonly"
placeholder="Pilih Encounter Class"
search-placeholder="Cari Encounter Class"
empty-message="Encounter tidak ditemukan"
/>
</Field>
</Cell>
</Block>
<div class="my-2 flex justify-end gap-2 py-2">
<Button type="button" variant="secondary" class="w-[120px]" @click="onCancelForm"> Kembali </Button>
app/components/app/specialist/entry-form.vue
+6 -15
View File
@@ -4,7 +4,7 @@ import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
// import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
// Types
import type { SpecialistFormData } from '~/schemas/specialist.schema.ts'
@@ -90,24 +90,15 @@ function onCancelForm() {
<Cell>
<Label height="compact">Unit</Label>
<Field :errMessage="errors.unit">
<!-- <Combobox
<Combobox
id="unit"
v-model="unit"
v-bind="unitAttrs"
:items="units"
:disabled="isLoading || isReadonly"
placeholder="Pilih Unit"
search-placeholder="Cari unit"
empty-message="Unit tidak ditemukan"
v-model="unit"
v-bind="unitAttrs"
:items="units"
:disabled="isLoading || isReadonly"
/> -->
<Select
id="unit"
icon-name="i-lucide-chevron-down"
placeholder="Pilih unit"
v-model="unit"
v-bind="unitAttrs"
:items="units"
:disabled="isLoading || isReadonly"
/>
</Field>
</Cell>
app/components/app/subspecialist/entry-form.vue
+7 -16
View File
@@ -4,7 +4,7 @@ import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
// import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
// Types
import type { SubspecialistFormData } from '~/schemas/subspecialist.schema.ts'
@@ -90,24 +90,15 @@ function onCancelForm() {
<Cell>
<Label height="compact">Spesialis</Label>
<Field :errMessage="errors.specialist">
<!-- <Combobox
id="specialis"
<Combobox
id="specialist"
v-model="specialist"
v-bind="specialistAttrs"
:items="specialists"
:disabled="isLoading || isReadonly"
placeholder="Pilih spesialis"
search-placeholder="Cari spesialis"
empty-message="Spesialis tidak ditemukan"
v-model="specialist"
v-bind="specialistAttrs"
:items="specialists"
:disabled="isLoading || isReadonly"
/> -->
<Select
id="specialist"
icon-name="i-lucide-chevron-down"
placeholder="Pilih spesialis"
v-model="specialist"
v-bind="specialistAttrs"
:items="specialists"
:disabled="isLoading || isReadonly"
/>
</Field>
</Cell>
app/components/app/unit/entry-form.vue
+20 -3
View File
@@ -4,6 +4,7 @@ import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
// Types
import type { UnitFormData } from '~/schemas/unit.schema.ts'
@@ -15,6 +16,7 @@ import { useForm } from 'vee-validate'
interface Props {
schema: z.ZodSchema<any>
installations: any[]
values: any
isLoading?: boolean
isReadonly?: boolean
@@ -33,13 +35,13 @@ const { defineField, errors, meta } = useForm({
initialValues: {
code: '',
name: '',
installation: '',
installation_id: 0,
} as Partial<UnitFormData>,
})
const [code, codeAttrs] = defineField('code')
const [name, nameAttrs] = defineField('name')
const [installation, installationAttrs] = defineField('installation')
const [installation, installationAttrs] = defineField('installation_id')
// Fill fields from props.values if provided
if (props.values) {
@@ -59,7 +61,7 @@ function onSubmitForm(values: any) {
const formData: UnitFormData = {
name: name.value || '',
code: code.value || '',
installation: installation.value || '',
installation_id: installation.value || '',
}
emit('submit', formData, resetForm)
}
@@ -85,6 +87,21 @@ function onCancelForm() {
<Input id="name" v-model="name" v-bind="nameAttrs" :disabled="isLoading || isReadonly" />
</Field>
</Cell>
<Cell>
<Label height="compact">Instalasi</Label>
<Field :errMessage="errors.installation">
<Combobox
id="installation"
v-model="installation"
v-bind="installationAttrs"
:items="installations"
:disabled="isLoading || isReadonly"
placeholder="Pilih Instalasi"
search-placeholder="Cari instalasi"
empty-message="Instalasi tidak ditemukan"
/>
</Field>
</Cell>
</Block>
<div class="my-2 flex justify-end gap-2 py-2">
<Button type="button" variant="secondary" class="w-[120px]" @click="onCancelForm"> Kembali </Button>
app/components/content/specialist/list.vue
+1 -11
View File
@@ -13,7 +13,6 @@ import { toast } from '~/components/pub/ui/toast'
// Types
import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
import { SpecialistSchema, type SpecialistFormData } from '~/schemas/specialist.schema'
import type { Unit } from '~/models/unit'
// Handlers
import {
@@ -29,12 +28,11 @@ import {
handleActionRemove,
handleCancelForm,
} from '~/handlers/specialist.handler'
import { units, getUnitList } from '~/handlers/_shared.handler'
// Services
import { getSpecialists, getSpecialistDetail } from '~/services/specialist.service'
import { getUnits } from '~/services/unit.service'
const units = ref<{ value: string; label: string }[]>([])
const title = ref('')
const {
@@ -93,14 +91,6 @@ const getCurrentSpecialistDetail = async (id: number | string) => {
}
}
const getUnitList = async () => {
const result = await getUnits()
if (result.success) {
const currentUnits = result.body?.data || []
units.value = currentUnits.map((item: Unit) => ({ value: item.id ? Number(item.id) : item.code, label: item.name }))
}
}
// Watch for row actions when recId or recAction changes
watch([recId, recAction], () => {
switch (recAction.value) {
app/components/content/subspecialist/list.vue
+1 -14
View File
@@ -13,7 +13,6 @@ import { toast } from '~/components/pub/ui/toast'
// Types
import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
import { SubspecialistSchema, type SubspecialistFormData } from '~/schemas/subspecialist.schema'
import type { Specialist } from '~/models/specialist'
// Handlers
import {
@@ -29,12 +28,11 @@ import {
handleActionRemove,
handleCancelForm,
} from '~/handlers/subspecialist.handler'
import { specialists, getSpecialistsList } from '~/handlers/_shared.handler'
// Services
import { getSubspecialists, getSubspecialistDetail } from '~/services/subspecialist.service'
import { getSpecialists } from '~/services/specialist.service'
const specialists = ref<{ value: string; label: string }[]>([])
const title = ref('')
const {
@@ -93,17 +91,6 @@ const getCurrentSubSpecialistDetail = async (id: number | string) => {
}
}
const getSpecialistsList = async () => {
const result = await getSpecialists()
if (result.success) {
const currentSpecialists = result.body?.data || []
specialists.value = currentSpecialists.map((item: Specialist) => ({
value: item.id ? Number(item.id) : item.code,
label: item.name,
}))
}
}
// Watch for row actions when recId or recAction changes
watch([recId, recAction], () => {
switch (recAction.value) {
app/components/content/unit/list.vue
+3
View File
@@ -28,6 +28,7 @@ import {
handleActionRemove,
handleCancelForm,
} from '~/handlers/unit.handler'
import { installations, getInstallationList } from '~/handlers/_shared.handler'
// Services
import { getUnits, getUnitDetail } from '~/services/unit.service'
@@ -110,6 +111,7 @@ watch([recId, recAction], () => {
})
onMounted(async () => {
await getInstallationList()
await getUnitList()
})
</script>
@@ -127,6 +129,7 @@ onMounted(async () => {
<Dialog v-model:open="isFormEntryDialogOpen" :title="!!recItem ? title : 'Tambah Unit'" size="lg" prevent-outside>
<AppUnitEntryForm
:schema="UnitSchema"
:installations="installations"
:values="recItem"
:is-loading="isProcessing"
:is-readonly="isReadonly"
app/handlers/_shared.handler.ts
+49 -10
View File
@@ -1,19 +1,28 @@
// types
import type { MedicineGroup } from '~/models/medicine-group'
import type { MedicineMethod } from '~/models/medicine-method'
import type { Installation } from "~/models/installation"
import type { Specialist } from '~/models/specialist'
import type { Uom } from '~/models/uom'
import type { Unit } from '~/models/unit'
// services
import { getMedicineGroups } from '~/services/medicine-group.service'
import { getMedicineMethods } from '~/services/medicine-method.service'
import { getUoms } from '~/services/uom.service'
import { getEncounters } from '~/services/encounter.service'
import { getInstallations } from '~/services/installation.service'
import { getSpecialists } from '~/services/specialist.service'
import { getUoms } from '~/services/uom.service'
import { getUnits } from '~/services/unit.service'
// variables
export const medicineGroups = ref<{ value: string; label: string }[]>([])
export const medicineMethods = ref<{ value: string; label: string }[]>([])
export const uoms = ref<{ value: string; label: string }[]>([])
export const encounterClasses = ref<{ value: string; label: string }[]>([])
export const installations = ref<{ value: string; label: string }[]>([])
export const specialists = ref<{ value: string; label: string }[]>([])
export const uoms = ref<{ value: string; label: string }[]>([])
export const units = ref<{ value: string; label: string }[]>([])
export const getMedicineGroupList = async () => {
const result = await getMedicineGroups()
@@ -37,14 +46,6 @@ export const getMedicineMethodList = async () => {
}
}
export const getUomList = async () => {
const result = await getUoms()
if (result.success) {
const currentUoms = result.body?.data || []
uoms.value = currentUoms.map((uom: Uom) => ({ value: uom.code || uom.erp_id, label: uom.name }))
}
}
export const getEncounterClassList = async () => {
const result = await getEncounters()
if (result.success) {
@@ -52,3 +53,41 @@ export const getEncounterClassList = async () => {
encounterClasses.value = currentValues.map((item: any) => ({ value: item.code || item.id, label: item.name }))
}
}
export const getInstallationList = async () => {
const result = await getInstallations()
if (result.success) {
const currentInstallations = result.body?.data || []
installations.value = currentInstallations.map((item: Installation) => ({
value: item.id ? Number(item.id) : item.code,
label: item.name,
}))
}
}
export const getSpecialistsList = async () => {
const result = await getSpecialists()
if (result.success) {
const currentSpecialists = result.body?.data || []
specialists.value = currentSpecialists.map((item: Specialist) => ({
value: item.id ? Number(item.id) : item.code,
label: item.name,
}))
}
}
export const getUnitList = async () => {
const result = await getUnits()
if (result.success) {
const currentUnits = result.body?.data || []
units.value = currentUnits.map((item: Unit) => ({ value: item.id ? Number(item.id) : item.code, label: item.name }))
}
}
export const getUomList = async () => {
const result = await getUoms()
if (result.success) {
const currentUoms = result.body?.data || []
uoms.value = currentUoms.map((uom: Uom) => ({ value: uom.code || uom.erp_id, label: uom.name }))
}
}
app/models/installation.ts
+1
View File
@@ -1,4 +1,5 @@
export interface Installation {
id?: number | null
code: string
name: string
encounterClass_code?: string | null
app/models/unit.ts
+1 -1
View File
@@ -2,5 +2,5 @@ export interface Unit {
id?: number
code: string
name: string
installation?: string | number
installation_id?: string | number
}
app/schemas/unit.schema.ts
+1
View File
@@ -4,6 +4,7 @@ import type { Unit } from '~/models/unit'
const UnitSchema = z.object({
code: z.string({ required_error: 'Kode harus diisi' }).min(1, 'Kode minimum 1 karakter'),
name: z.string({ required_error: 'Nama harus diisi' }).min(1, 'Nama minimum 1 karakter'),
installation_id: z.number().min(1, 'Instalasi harus diisi').nullable(),
})
type UnitFormData = z.infer<typeof UnitSchema> & Unit