From bae0a222b8b7e79fc6cc2507ffaec53c406ee669 Mon Sep 17 00:00:00 2001 From: Andrian Roshandy Date: Mon, 1 Dec 2025 01:51:04 +0700 Subject: [PATCH] feat/micro-lab-order-50: adjust for antibiotic --- app/components/app/mcu-order-item/list.cfg.ts | 6 ++++-- app/components/app/mcu-order/micro-list.vue | 4 ++++ app/components/content/mcu-order/list.vue | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/components/app/mcu-order-item/list.cfg.ts b/app/components/app/mcu-order-item/list.cfg.ts index 1dee1bf9..28441165 100644 --- a/app/components/app/mcu-order-item/list.cfg.ts +++ b/app/components/app/mcu-order-item/list.cfg.ts @@ -1,16 +1,18 @@ import type { Config } from '~/components/pub/my-ui/data-table' export const config: Config = { - cols: [{}, {}], + cols: [{}, { width: 150 }, {}], headers: [ [ { label: 'Nama' }, + { label: 'Jadwal Pemeriksaan' }, + { label: 'Status' }, { label: 'Catatan' }, ], ], - keys: ['mcuSrc.name', 'mcuSrcCategory.name'], + keys: ['mcuSrc.name', 'examinationDate', 'status_code', 'note'], delKeyNames: [ { key: 'mcuSrc.name', label: 'Nama' }, diff --git a/app/components/app/mcu-order/micro-list.vue b/app/components/app/mcu-order/micro-list.vue index 4c749dc9..e63ad40b 100644 --- a/app/components/app/mcu-order/micro-list.vue +++ b/app/components/app/mcu-order/micro-list.vue @@ -4,10 +4,13 @@ import type { PaginationMeta } from '~/components/pub/my-ui/pagination/paginatio import Nav from '~/components/pub/my-ui/nav-footer/ca-ed-su.vue' import type { McuOrder } from '~/models/mcu-order'; +import AntibioticInUseList from '~/components/app/antibiotic-in-use/list.vue'; import McuOrderItems from '~/components/app/mcu-order-item/list.vue'; +import type { AntibioticInUse } from '~/models/antibiotic-in-use'; interface Props { data: McuOrder[] + antibioticInUses: AntibioticInUse[] paginationMeta: PaginationMeta } const props = defineProps() @@ -59,6 +62,7 @@ function navClick(type: 'cancel' | 'edit' | 'submit', data: McuOrder): void { /> + diff --git a/app/components/content/mcu-order/list.vue b/app/components/content/mcu-order/list.vue index 710a8951..6fcff867 100644 --- a/app/components/content/mcu-order/list.vue +++ b/app/components/content/mcu-order/list.vue @@ -54,7 +54,7 @@ const { page, 'scope-code': props.scopeCode, 'encounter-id': encounter_id, - includes: 'doctor,doctor-employee,doctor-employee-person', + includes: 'doctor,doctor-employee,doctor-employee-person,items,items-mcuSrc', }) return { success: result.success || false, body: result.body || {} } },