7863-devToTest_2434 #613

Merged
alexm merged 131 commits from 7863-devToTest_2434 into test 2024-08-13 06:58:13 +00:00
2 changed files with 8 additions and 12 deletions
Showing only changes of commit 017d5382bb - Show all commits

View File

@ -139,23 +139,19 @@ const maritalStatus = [
<VnRow> <VnRow>
<VnInput v-model="data.SSN" :label="t('SSN')" clearable /> <VnInput v-model="data.SSN" :label="t('SSN')" clearable />
<VnInput
v-model="data.locker"
type="number"
:label="t('Locker')"
clearable
/>
</VnRow>
<VnRow>
<VnInputDate :label="t('fiDueDate')" v-model="data.fiDueDate" /> <VnInputDate :label="t('fiDueDate')" v-model="data.fiDueDate" />
<VnInput v-model="data.sex" :label="t('sex')" clearable />
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnSelect
:label="t('sex')"
:options="['M', 'F']"
hide-selected
v-model="data.sex"
/>
<VnInputDate :label="t('seniority')" v-model="data.seniority" /> <VnInputDate :label="t('seniority')" v-model="data.seniority" />
<VnInput v-model="data.fi" :label="t('fi')" />
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnInput v-model="data.fi" :label="t('fi')" />
<VnInputDate :label="t('birth')" v-model="data.birth" /> <VnInputDate :label="t('birth')" v-model="data.birth" />
</VnRow> </VnRow>
<VnRow> <VnRow>

View File

@ -5,7 +5,7 @@ import WorkerFilter from '../WorkerFilter.vue';
</script> </script>
<template> <template>
<VnCard <VnCard
data-key="Workers" data-key="Worker"
base-url="Workers" base-url="Workers"
:descriptor="WorkerDescriptor" :descriptor="WorkerDescriptor"
:filter-panel="WorkerFilter" :filter-panel="WorkerFilter"