Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
392d1892ba
|
@ -86,13 +86,6 @@ const maritalStatus = [
|
|||
:label="t('Mobile extension')"
|
||||
clearable
|
||||
/>
|
||||
<<<<<<< HEAD
|
||||
<VnInput
|
||||
v-model="data.client.phone"
|
||||
:label="t('Personal phone')"
|
||||
clearable
|
||||
/>
|
||||
======= >>>>>>> 095e62ebac4b6b88bc431f7c87455a0bb0989e80
|
||||
</VnRow>
|
||||
|
||||
<VnRow class="row q-gutter-md q-mb-md">
|
||||
|
|
|
@ -1,15 +1,12 @@
|
|||
<script setup>
|
||||
import VnCard from 'components/common/VnCard.vue';
|
||||
import WorkerDescriptor from './WorkerDescriptor.vue';
|
||||
|
||||
const filter = { where: {} };
|
||||
</script>
|
||||
<template>
|
||||
<VnCard
|
||||
data-key="Worker"
|
||||
custom-url="Workers/Summary"
|
||||
base-url="Workers"
|
||||
:descriptor="WorkerDescriptor"
|
||||
:filter="filter"
|
||||
searchbar-data-key="WorkerList"
|
||||
searchbar-url="Workers/filter"
|
||||
searchbar-label="Search worker"
|
||||
|
|
Loading…
Reference in New Issue