From 58c0dde377fb29a91e9e74735123229b6d40c035 Mon Sep 17 00:00:00 2001 From: riefive Date: Mon, 6 Oct 2025 10:14:51 +0700 Subject: [PATCH] fix: update handler for unit and uom --- app/handlers/_shared.handler.ts | 18 ------------- app/handlers/device.handler.ts | 3 +++ app/handlers/division-position.handler.ts | 13 ++++++---- app/handlers/division.handler.ts | 13 ++++++---- app/handlers/installation.handler.ts | 13 ++++++---- app/handlers/material.handler.ts | 13 ++++++---- app/handlers/uom.handler.ts | 31 ++++++++++++++++++----- 7 files changed, 60 insertions(+), 44 deletions(-) diff --git a/app/handlers/_shared.handler.ts b/app/handlers/_shared.handler.ts index f5196bac..0face19c 100644 --- a/app/handlers/_shared.handler.ts +++ b/app/handlers/_shared.handler.ts @@ -18,8 +18,6 @@ import { getEncounters } from '~/services/encounter.service' import { getDivisions } from '~/services/division.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 }[]>([]) @@ -110,22 +108,6 @@ export const getSpecialistsList = async () => { } } -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 })) - } -} - /** * Convert division response (with childrens) to TreeItem[] * @param divisions Array of division objects from API diff --git a/app/handlers/device.handler.ts b/app/handlers/device.handler.ts index 58030f6e..320c6ab7 100644 --- a/app/handlers/device.handler.ts +++ b/app/handlers/device.handler.ts @@ -1,4 +1,7 @@ +// Handlers import { genCrudHandler } from '~/handlers/_handler' + +// Services import { create, update, remove } from '~/services/device.service' export const { diff --git a/app/handlers/division-position.handler.ts b/app/handlers/division-position.handler.ts index 04e016c6..29ac912d 100644 --- a/app/handlers/division-position.handler.ts +++ b/app/handlers/division-position.handler.ts @@ -1,4 +1,7 @@ -import { createCrudHandler } from '~/handlers/_handler' +// Handlers +import { genCrudHandler } from '~/handlers/_handler' + +// Services import { create, update, remove } from '~/services/division-position.service' export const { @@ -14,8 +17,8 @@ export const { handleActionEdit, handleActionRemove, handleCancelForm, -} = createCrudHandler({ - post: create, - patch: update, - remove: remove, +} = genCrudHandler({ + create, + update, + remove, }) diff --git a/app/handlers/division.handler.ts b/app/handlers/division.handler.ts index 803ccbee..8c36c357 100644 --- a/app/handlers/division.handler.ts +++ b/app/handlers/division.handler.ts @@ -1,4 +1,7 @@ -import { createCrudHandler } from '~/handlers/_handler' +// Handlers +import { genCrudHandler } from '~/handlers/_handler' + +// Services import { create, update, remove } from '~/services/division.service' export const { @@ -14,8 +17,8 @@ export const { handleActionEdit, handleActionRemove, handleCancelForm, -} = createCrudHandler({ - post: create, - patch: update, - remove: remove, +} = genCrudHandler({ + create, + update, + remove, }) diff --git a/app/handlers/installation.handler.ts b/app/handlers/installation.handler.ts index 864738be..97898476 100644 --- a/app/handlers/installation.handler.ts +++ b/app/handlers/installation.handler.ts @@ -1,4 +1,7 @@ -import { createCrudHandler } from '~/handlers/_handler' +// Handlers +import { genCrudHandler } from '~/handlers/_handler' + +// Services import { create, update, remove } from '~/services/installation.service' export const { @@ -14,8 +17,8 @@ export const { handleActionEdit, handleActionRemove, handleCancelForm, -} = createCrudHandler({ - post: create, - patch: update, - remove: remove, +} = genCrudHandler({ + create, + update, + remove, }) diff --git a/app/handlers/material.handler.ts b/app/handlers/material.handler.ts index dd7dd4ff..28b6524c 100644 --- a/app/handlers/material.handler.ts +++ b/app/handlers/material.handler.ts @@ -1,4 +1,7 @@ -import { createCrudHandler } from '~/handlers/_handler' +// Handlers +import { genCrudHandler } from '~/handlers/_handler' + +// Services import { create, update, remove } from '~/services/material.service' export const { @@ -14,8 +17,8 @@ export const { handleActionEdit, handleActionRemove, handleCancelForm, -} = createCrudHandler({ - post: create, - patch: update, - remove: remove, +} = genCrudHandler({ + create, + update, + remove, }) diff --git a/app/handlers/uom.handler.ts b/app/handlers/uom.handler.ts index e4062fe1..241a4a62 100644 --- a/app/handlers/uom.handler.ts +++ b/app/handlers/uom.handler.ts @@ -1,5 +1,11 @@ -import { createCrudHandler } from '~/handlers/_handler' -import { create, update, remove } from '~/services/uom.service' +// Handlers +import { genCrudHandler } from '~/handlers/_handler' + +// Services +import { getList, create, update, remove } from '~/services/uom.service' + +// Types +import type { Uom } from '~/models/uom' export const { recId, @@ -14,8 +20,21 @@ export const { handleActionEdit, handleActionRemove, handleCancelForm, -} = createCrudHandler({ - post: create, - patch: update, - remove: remove, +} = genCrudHandler({ + create, + update, + remove, }) + +export async function getValueLabelList(params: any = null): Promise<{ value: string; label: string }[]> { + let data: { value: string; label: string }[] = [] + const result = await getList(params) + if (result.success) { + const resultData = result.body?.data || [] + data = resultData.map((item: Uom) => ({ + value: item.code || item.erp_id, + label: item.name, + })) + } + return data +}