diff --git a/app/handlers/unit.handler.ts b/app/handlers/unit.handler.ts index 49d1b175..b1240291 100644 --- a/app/handlers/unit.handler.ts +++ b/app/handlers/unit.handler.ts @@ -3,10 +3,7 @@ import { genCrudHandler } from '~/handlers/_handler' // Services -import { getList, create, update, remove } from '~/services/unit.service' - -// Types -import type { Unit } from "~/models/unit"; +import { create, update, remove } from '~/services/unit.service' export const { recId, @@ -26,16 +23,3 @@ export const { 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: Unit) => ({ - value: item.id, - label: item.name, - })) - } - return data; -} \ No newline at end of file diff --git a/app/handlers/uom.handler.ts b/app/handlers/uom.handler.ts index 241a4a62..c4532dc7 100644 --- a/app/handlers/uom.handler.ts +++ b/app/handlers/uom.handler.ts @@ -2,10 +2,7 @@ import { genCrudHandler } from '~/handlers/_handler' // Services -import { getList, create, update, remove } from '~/services/uom.service' - -// Types -import type { Uom } from '~/models/uom' +import { create, update, remove } from '~/services/uom.service' export const { recId, @@ -26,15 +23,4 @@ export const { 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 -} + diff --git a/app/services/unit.service.ts b/app/services/unit.service.ts index bdee834a..27c4bfbf 100644 --- a/app/services/unit.service.ts +++ b/app/services/unit.service.ts @@ -1,20 +1,41 @@ +// Base import * as base from './_crud-base' +// Types +import type { Unit } from "~/models/unit"; + const path = '/api/v1/unit' const name = 'unit' export function create(data: any) { return base.create(path, data, name) } + export function getList(params: any = null) { return base.getList(path, params, name) } + export function getDetail(id: number | string) { return base.getDetail(path, id, name) } + export function update(id: number | string, data: any) { return base.update(path, id, data, name) } + export function remove(id: number | string) { return base.remove(path, id, name) } + +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: Unit) => ({ + value: item.id, + label: item.name, + })) + } + return data +} \ No newline at end of file diff --git a/app/services/uom.service.ts b/app/services/uom.service.ts index 13b3647e..581c28f7 100644 --- a/app/services/uom.service.ts +++ b/app/services/uom.service.ts @@ -1,20 +1,41 @@ +// Base import * as base from './_crud-base' +// Types +import type { Uom } from '~/models/uom' + const path = '/api/v1/uom' const name = 'uom' export function create(data: any) { return base.create(path, data, name) } + export function getList(params: any = null) { return base.getList(path, params, name) } + export function getDetail(id: number | string) { return base.getDetail(path, id, name) } + export function update(id: number | string, data: any) { return base.update(path, id, data, name) } + export function remove(id: number | string) { return base.remove(path, id, name) -} \ No newline at end of file +} + +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 +}