From 546423bdfb665a0b78ce9a15115fc309aecce274 Mon Sep 17 00:00:00 2001 From: riefive Date: Wed, 1 Oct 2025 15:24:54 +0700 Subject: [PATCH] fix: includes for unit --- app/components/app/unit/list-cfg.ts | 5 +++-- app/components/content/unit/list.vue | 2 +- app/handlers/_shared.handler.ts | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/components/app/unit/list-cfg.ts b/app/components/app/unit/list-cfg.ts index a6f5ffc7..1e3a46be 100644 --- a/app/components/app/unit/list-cfg.ts +++ b/app/components/app/unit/list-cfg.ts @@ -28,8 +28,9 @@ export const funcParsed: RecStrFuncUnknown = { const recX = rec as SmallDetailDto return `${recX.name}`.trim() }, - installation: (_rec: unknown): unknown => { - return '-' + installation: (rec: unknown): unknown => { + const recX = rec as SmallDetailDto + return recX.installation?.name || '-' }, } diff --git a/app/components/content/unit/list.vue b/app/components/content/unit/list.vue index 3d474cb7..69acc005 100644 --- a/app/components/content/unit/list.vue +++ b/app/components/content/unit/list.vue @@ -45,7 +45,7 @@ const { fetchData: getUnitList, } = usePaginatedList({ fetchFn: async (params: any) => { - const result = await getUnits({ search: params.search, page: params['page-number'] || 0 }) + const result = await getUnits({ search: params.search, page: params['page-number'] || 0, includes: 'installation' }) return { success: result.success || false, body: result.body || {} } }, entityName: 'unit', diff --git a/app/handlers/_shared.handler.ts b/app/handlers/_shared.handler.ts index 4d2179ed..e959e68d 100644 --- a/app/handlers/_shared.handler.ts +++ b/app/handlers/_shared.handler.ts @@ -50,7 +50,7 @@ export const getEncounterClassList = async () => { const result = await getEncounters() if (result.success) { const currentValues = result.body?.data || [] - encounterClasses.value = currentValues.map((item: any) => ({ value: item.code || item.id, label: item.name })) + encounterClasses.value = currentValues.map((item: any) => ({ value: item.class_code || item.id, label: item.class_code })) } }