verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 91 Releases Wiki Activity

Desarrollo de los submodulos basic data, notes y pbx #245

Merged
jsegarra merged 16 commits from :features/ms_submodulos_worker into dev 2024-04-08 06:19:29 +00:00
Conversation 2 Commits 16 Files Changed 9 +59 -83
1 changed files with 59 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 71b2f7c8dc - Show all commits

142
src/pages/Worker/Card/WorkerBasicData.vue
View File

@ -75,101 +75,77 @@ const maritalStatus = [
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput :label="t('Name')" clearable v-model="data.firstName" />
</div>
<div class="col">
<VnInput :label="t('Last name')" clearable v-model="data.lastName" />
</div>
<VnInput :label="t('Name')" clearable v-model="data.firstName" />
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-04-02 06:30:55 +00:00
Outdated
Review
Copy Link

Quitar <div class="col">

Quitar `<div class="col">`
wbuezas commented 2024-04-02 15:45:25 +00:00
Outdated
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
<VnInput :label="t('Last name')" clearable v-model="data.lastName" />
</VnRow>
jsegarra marked this conversation as resolved
alexm commented 2024-04-02 06:31:17 +00:00
Review
Copy Link

Quitar <div class="col">

Quitar `<div class="col">`
wbuezas commented 2024-04-02 15:45:21 +00:00
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput
v-model="data.phone"
:label="t('Business phone')"
clearable
/>
</div>
<div class="col">
<VnInput
v-model="data.mobileExtension"
:label="t('Mobile extension')"
clearable
/>
</div>
<VnInput v-model="data.phone" :label="t('Business phone')" clearable />
<VnInput
v-model="data.mobileExtension"
:label="t('Mobile extension')"
clearable
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-04-02 06:28:53 +00:00
Outdated
Review
Copy Link

Ya no hace falta usar <div class="col"> en los VnRow (por lo menos si teneis vuesta rama /dev actualizada)

Ya no hace falta usar `<div class="col">` en los `VnRow` (por lo menos si teneis vuesta rama /dev actualizada)
wbuezas commented 2024-04-02 15:45:16 +00:00
Outdated
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnSelectFilter
:label="t('Boss')"
:options="workersOptions"
hide-selected
option-label="nickname"
option-value="id"
v-model="data.bossFk"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>{{ scope.opt?.name }}</QItemLabel>
<QItemLabel caption>
{{ scope.opt?.nickname }},
{{ scope.opt?.code }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelectFilter>
</div>
<div class="col">
<VnSelectFilter
:label="t('Marital status')"
:options="maritalStatus"
hide-selected
option-label="name"
option-value="code"
v-model="data.maritalStatus"
/>
</div>
<VnSelectFilter
:label="t('Boss')"
:options="workersOptions"
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-04-02 06:31:24 +00:00
Outdated
Review
Copy Link

Quitar <div class="col">

Quitar `<div class="col">`
wbuezas commented 2024-04-02 15:45:08 +00:00
Outdated
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
hide-selected
option-label="nickname"
option-value="id"
v-model="data.bossFk"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>{{ scope.opt?.name }}</QItemLabel>
<QItemLabel caption>
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-04-02 06:31:33 +00:00
Outdated
Review
Copy Link

Quitar <div class="col">

Quitar `<div class="col">`
wbuezas commented 2024-04-02 15:45:05 +00:00
Outdated
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
{{ scope.opt?.nickname }},
{{ scope.opt?.code }}
</QItemLabel>
</QItemSection>
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-03-21 06:19:04 +00:00
Outdated
Review
Copy Link

El botón de restarurar no está funcionando o no está habilitado cuando modifico el formulario

El botón de restarurar no está funcionando o no está habilitado cuando modifico el formulario
cfonseca commented 2024-03-26 22:19:31 +00:00
Outdated
Review
Copy Link

Corregido: 1d37b91e09

Corregido: 1d37b91e09
</QItem>
</template>
</VnSelectFilter>
<VnSelectFilter
:label="t('Marital status')"
:options="maritalStatus"
hide-selected
option-label="name"
option-value="code"
v-model="data.maritalStatus"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnSelectFilter
:label="t('Origin country')"
:options="countriesOptions"
hide-selected
option-label="country"
option-value="id"
v-model="data.originCountryFk"
/>
</div>
<div class="col">
<VnSelectFilter
:label="t('Education level')"
:options="educationLevelsOptions"
hide-selected
option-label="name"
option-value="id"
v-model="data.educationLevelFk"
/>
</div>
<VnSelectFilter
:label="t('Origin country')"
:options="countriesOptions"
hide-selected
jsegarra marked this conversation as resolved Outdated
alexm commented 2024-04-02 06:31:43 +00:00
Outdated
Review
Copy Link

Quitar <div class="col">

Quitar `<div class="col">`
wbuezas commented 2024-04-02 15:44:22 +00:00
Outdated
Review
Copy Link

<div class="col"> removidos

Commit: 71b2f7c8dc

`<div class="col">` removidos Commit: https://gitea.verdnatura.es/hyervoni/salix-front-mindshore/commit/71b2f7c8dccccdaa017044f2c9cdcac4b199f656
option-label="country"
option-value="id"
v-model="data.originCountryFk"
/>
<VnSelectFilter
:label="t('Education level')"
:options="educationLevelsOptions"
hide-selected
option-label="name"
option-value="id"
v-model="data.educationLevelFk"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput v-model="data.SSN" :label="t('SSN')" clearable />
</div>
<div class="col">
<VnInput
v-model="data.locker"
type="number"
:label="t('Locker')"
clearable
/>
</div>
<VnInput v-model="data.SSN" :label="t('SSN')" clearable />
<VnInput
v-model="data.locker"
type="number"
:label="t('Locker')"
clearable
/>
</VnRow>
</template>
</FormModel>