munawwirul_jamal/simrsx-fe
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve conflict

Browse Source
This commit is contained in:
riefive
2025-10-06 09:40:22 +07:00
parent 42a54bbb3b 19e00fa143
commit 51ddb9d8b5
227 changed files with 1859 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/components/content/medicine-method/list.vue
+4 -4
View File
@@ -1,8 +1,8 @@
<script setup lang="ts">
// Components
import Dialog from '~/components/pub/base/modal/dialog.vue'
import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
import Header from '~/components/pub/my-ui/nav-header/prep.vue'
import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
import AppMedicineMethodList from '~/components/app/medicine-method/list.vue'
import AppMedicineMethodEntryForm from '~/components/app/medicine-method/entry-form.vue'
@@ -11,7 +11,7 @@ import { usePaginatedList } from '~/composables/usePaginatedList'
import { toast } from '~/components/pub/ui/toast'
// Types
import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
import { BaseSchema, type BaseFormData } from '~/schemas/base.schema'
// Handlers