fix: resolve conflict

This commit is contained in:
riefive
2025-11-21 10:33:45 +07:00
139 changed files with 7690 additions and 498 deletions

No files matched your search

+3 -2
View File
@@ -1,8 +1,9 @@
// Handlers
import { genCrudHandler } from '~/handlers/_handler'
import type { DeviceOrder } from '~/models/device-order'
// Services
import { create, update, remove } from '~/services/device-order-item.service'
import { create, update, remove } from '~/services/device-order.service'
export const {
recId,
@@ -17,7 +18,7 @@ export const {
handleActionEdit,
handleActionRemove,
handleCancelForm,
} = genCrudHandler({
} = genCrudHandler<DeviceOrder>({
create,
update,
remove,
+24
View File
@@ -0,0 +1,24 @@
// Handlers
import { genCrudHandler } from '~/handlers/_handler'
// Services
import { create, update, remove } from '~/services/general-consent.service'
export const {
recId,
recAction,
recItem,
isReadonly,
isProcessing,
isFormEntryDialogOpen,
isRecordConfirmationOpen,
onResetState,
handleActionSave,
handleActionEdit,
handleActionRemove,
handleCancelForm,
} = genCrudHandler({
create,
update,
remove,
})
+21
View File
@@ -0,0 +1,21 @@
import { createCrudHandler } from '~/handlers/_handler'
import { create, update, remove } from '~/services/medicine-form.service'
export const {
recId,
recAction,
recItem,
isReadonly,
isProcessing,
isFormEntryDialogOpen,
isRecordConfirmationOpen,
onResetState,
handleActionSave,
handleActionEdit,
handleActionRemove,
handleCancelForm,
} = createCrudHandler({
post: create,
patch: update,
remove: remove,
})
+1 -1
View File
@@ -1,4 +1,4 @@
import { createCrudHandler, genCrudHandler } from '~/handlers/_handler'
import { genCrudHandler } from '~/handlers/_handler'
import { create, update, remove } from '~/services/prescription.service'
export const {
@@ -0,0 +1,24 @@
// Handlers
import { genCrudHandler } from '~/handlers/_handler'
// Services
import { create, update, remove } from '~/services/supporting-document.service'
export const {
recId,
recAction,
recItem,
isReadonly,
isProcessing,
isFormEntryDialogOpen,
isRecordConfirmationOpen,
onResetState,
handleActionSave,
handleActionEdit,
handleActionRemove,
handleCancelForm,
} = genCrudHandler({
create,
update,
remove,
})