From db48233f6c9d7c4652e4892af72529a9551040f3 Mon Sep 17 00:00:00 2001 From: riefive Date: Wed, 1 Oct 2025 15:17:31 +0700 Subject: [PATCH] fix: includes for medicine list --- app/components/app/medicine/list-cfg.ts | 6 +++--- app/components/content/medicine/list.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/components/app/medicine/list-cfg.ts b/app/components/app/medicine/list-cfg.ts index 3440e5f9..2c96958e 100644 --- a/app/components/app/medicine/list-cfg.ts +++ b/app/components/app/medicine/list-cfg.ts @@ -35,13 +35,13 @@ export const delKeyNames: KeyLabel[] = [ export const funcParsed: RecStrFuncUnknown = { group: (rec: unknown): unknown => { - return (rec as SmallDetailDto).medicineGroup_code || '-' + return (rec as SmallDetailDto).medicineGroup?.name || '-' }, method: (rec: unknown): unknown => { - return (rec as SmallDetailDto).medicineMethod_code || '-' + return (rec as SmallDetailDto).medicineMethod?.name || '-' }, unit: (rec: unknown): unknown => { - return (rec as SmallDetailDto).uom_code || '-' + return (rec as SmallDetailDto).uom?.name || '-' }, } diff --git a/app/components/content/medicine/list.vue b/app/components/content/medicine/list.vue index a690f781..e77ce620 100644 --- a/app/components/content/medicine/list.vue +++ b/app/components/content/medicine/list.vue @@ -55,7 +55,7 @@ const { fetchData: getMedicineList, } = usePaginatedList({ fetchFn: async (params: any) => { - const result = await getMedicines({ search: params.search, page: params['page-number'] || 0 }) + const result = await getMedicines({ search: params.search, page: params['page-number'] || 0, includes: 'medicineGroup,medicineMethod,uom' }) return { success: result.success || false, body: result.body || {} } }, entityName: 'medicine',