diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue index 5c01d7216..34cdf88b8 100644 --- a/src/components/ui/VnRow.vue +++ b/src/components/ui/VnRow.vue @@ -9,6 +9,9 @@ > :deep(*) { flex: 1; } + &[wrap] { + flex-wrap: wrap; + } } @media screen and (max-width: 800px) { .vn-row { diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue index 5e2412437..5ded4be00 100644 --- a/src/components/ui/VnSubToolbar.vue +++ b/src/components/ui/VnSubToolbar.vue @@ -43,20 +43,9 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar()); - diff --git a/src/css/app.scss b/src/css/app.scss index 3efe92db4..c233b14f0 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -190,6 +190,10 @@ select:-webkit-autofill { font-size: medium; } +.q-toolbar { + background: var(--vn-section-color); +} + .q-card__actions { justify-content: center; } diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue index 82203fc2a..d131fea3e 100644 --- a/src/pages/Worker/Card/WorkerBasicData.vue +++ b/src/pages/Worker/Card/WorkerBasicData.vue @@ -12,9 +12,12 @@ import VnSelect from 'src/components/common/VnSelect.vue'; const route = useRoute(); const { t } = useI18n(); -const workersOptions = ref([]); -const countriesOptions = ref([]); -const educationLevelsOptions = ref([]); +const educationLevels = ref([]); +const countries = ref([]); +const maritalStatus = [ + { code: 'M', name: t('Married') }, + { code: 'S', name: t('Single') }, +]; const workerFilter = { include: [ @@ -29,44 +32,21 @@ const workerFilter = { { relation: 'department', scope: { include: { relation: 'department' } } }, ], }; -const workersFilter = { - fields: ['id', 'nickname'], - order: 'nickname ASC', - limit: 30, -}; -const countriesFilter = { - fields: ['id', 'name', 'code'], - order: 'name ASC', - limit: 30, -}; -const educationLevelsFilter = { fields: ['id', 'name'], order: 'name ASC', limit: 30 }; - -const maritalStatus = [ - { code: 'M', name: t('Married') }, - { code: 'S', name: t('Single') }, -]; + +es: + Create training course: Crear curso de formación + diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue index 0853791ef..765241341 100644 --- a/src/pages/Worker/WorkerFilter.vue +++ b/src/pages/Worker/WorkerFilter.vue @@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n'; import FetchData from 'components/FetchData.vue'; import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue'; import VnInput from 'src/components/common/VnInput.vue'; +import VnSelect from 'src/components/common/VnSelect.vue'; const { t } = useI18n(); const props = defineProps({ @@ -26,7 +27,7 @@ const departments = ref(); {{ formatFn(tag.value) }} -