wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev

This commit is contained in:
Jorge Penadés 2024-05-07 16:19:13 +02:00
parent 1d9616c25e 0e7c2c7118
commit 392d1892ba
2 changed files with 1 additions and 11 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">

5
src/pages/Worker/Card/WorkerCard.vue
View File

@ -1,15 +1,12 @@
<script setup> <script setup>
import VnCard from 'components/common/VnCard.vue'; import VnCard from 'components/common/VnCard.vue';
import WorkerDescriptor from './WorkerDescriptor.vue'; import WorkerDescriptor from './WorkerDescriptor.vue';
const filter = { where: {} };
</script> </script>
<template> <template>
<VnCard <VnCard
data-key="Worker" data-key="Worker"
custom-url="Workers/Summary" base-url="Workers"
:descriptor="WorkerDescriptor" :descriptor="WorkerDescriptor"
:filter="filter"
searchbar-data-key="WorkerList" searchbar-data-key="WorkerList"
searchbar-url="Workers/filter" searchbar-url="Workers/filter"
searchbar-label="Search worker" searchbar-label="Search worker"