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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Jorge Penadés 2024-05-07 16:36:34 +02:00
parent 014ec60e47 613492d04a
commit 7504e5d12c
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,13 +86,6 @@ const maritalStatus = [
:label="t('Mobile extension')" :label="t('Mobile extension')"
clearable clearable
/> />
<<<<<<< HEAD
<VnInput
v-model="data.client.phone"
:label="t('Personal phone')"
clearable
/>
======= >>>>>>> 095e62ebac4b6b88bc431f7c87455a0bb0989e80
</VnRow> </VnRow>
<VnRow class="row q-gutter-md q-mb-md"> <VnRow class="row q-gutter-md q-mb-md">