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-09-30 15:13:11 +07:00
parent 7aeb99db89 001dffaacb
commit 15ca2085bd
10 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/components/app/division/entry-form-prev.vue
+1
View File
@@ -7,6 +7,7 @@ import Combobox from '~/components/pub/custom-ui/form/combobox.vue'
import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
import Field from '~/components/pub/custom-ui/form/field.vue'
import Label from '~/components/pub/custom-ui/form/label.vue'
import { Form } from '~/components/pub/ui/form'
interface DivisionFormData {
name: string
app/components/app/installation/entry-form.vue
+1
View File
@@ -5,6 +5,7 @@ import FieldGroup from '~/components/pub/custom-ui/form/field-group.vue'
import Field from '~/components/pub/custom-ui/form/field.vue'
import Label from '~/components/pub/custom-ui/form/label.vue'
import Select from '~/components/pub/custom-ui/form/select.vue'
import { Form } from '~/components/pub/ui/form'
interface InstallationFormData {
name: string
app/components/app/person-address/entry-form.vue
+1
View File
@@ -8,6 +8,7 @@ import Field from '~/components/pub/custom-ui/form/field.vue'
import Label from '~/components/pub/custom-ui/form/label.vue'
import { educationCodes, genderCodes, occupationCodes, religionCodes } from '~/lib/constants'
import { mapToComboboxOptList } from '~/lib/utils'
import { Form } from '~/components/pub/ui/form'
interface DivisionFormData {
name: string
app/components/app/person-contact/entry-form.vue
+1
View File
@@ -8,6 +8,7 @@ import Field from '~/components/pub/custom-ui/form/field.vue'
import Label from '~/components/pub/custom-ui/form/label.vue'
import { educationCodes, genderCodes, occupationCodes, religionCodes } from '~/lib/constants'
import { mapToComboboxOptList } from '~/lib/utils'
import { Form } from '~/components/pub/ui/form'
interface DivisionFormData {
name: string
app/components/app/person-relative/entry-form.vue
+1
View File
@@ -8,6 +8,7 @@ import Field from '~/components/pub/custom-ui/form/field.vue'
import Label from '~/components/pub/custom-ui/form/label.vue'
import { educationCodes, genderCodes, occupationCodes, religionCodes, relationshipCodes } from '~/lib/constants'
import { mapToComboboxOptList } from '~/lib/utils'
import { Form } from '~/components/pub/ui/form'
interface DivisionFormData {
name: string
app/components/app/person/entry-form.vue
+1
View File
@@ -8,6 +8,7 @@ import Field from '~/components/pub/custom-ui/form/field.vue'
import Label from '~/components/pub/custom-ui/form/label.vue'
import { educationCodes, genderCodes, occupationCodes, religionCodes } from '~/lib/constants'
import { mapToComboboxOptList } from '~/lib/utils'
import { Form } from '~/components/pub/ui/form'
interface DivisionFormData {
name: string
app/components/app/specialist-intern/entry-form.vue
+1
View File
@@ -8,6 +8,7 @@ import Field from '~/components/pub/custom-ui/form/field.vue'
import Label from '~/components/pub/custom-ui/form/label.vue'
import { educationCodes, genderCodes, occupationCodes, religionCodes, relationshipCodes } from '~/lib/constants'
import { mapToComboboxOptList } from '~/lib/utils'
import { Form } from '~/components/pub/ui/form'
interface DivisionFormData {
name: string