Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
This commit is contained in:
commit
063ac0cb7b
|
|
@ -49,7 +49,7 @@ function formatNumber(number) {
|
|||
<VnPaginate
|
||||
:data-key="$props.url"
|
||||
:url="$props.url"
|
||||
:filter="filter"
|
||||
:user-filter="filter"
|
||||
order="smsFk DESC"
|
||||
:offset="100"
|
||||
:limit="5"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ const killSession = async ({ userId, created }) => {
|
|||
<VnPaginate
|
||||
:data-key="urlPath"
|
||||
ref="paginateRef"
|
||||
:filter="filter"
|
||||
:user-filter="filter"
|
||||
:url="urlPath"
|
||||
order="created DESC"
|
||||
auto-load
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ const fetchAliases = () => paginateRef.value.fetch();
|
|||
<VnPaginate
|
||||
ref="paginateRef"
|
||||
data-key="AliasUsers"
|
||||
:filter="filter"
|
||||
:user-filter="filter"
|
||||
:url="urlPath"
|
||||
:limit="0"
|
||||
auto-load
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ onMounted(async () => await getAccountData(false));
|
|||
<VnPaginate
|
||||
ref="paginateRef"
|
||||
data-key="AccountMailAliases"
|
||||
:filter="filter"
|
||||
:user-filter="filter"
|
||||
:url="urlPath"
|
||||
auto-load
|
||||
>
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ const redirectToRoleSummary = (id) =>
|
|||
<VnPaginate
|
||||
ref="paginateRef"
|
||||
:data-key="dataKey"
|
||||
:filter="filter"
|
||||
:user-filter="filter"
|
||||
:url="urlPath"
|
||||
:limit="0"
|
||||
auto-load
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ const redirectToRoleSummary = (id) =>
|
|||
<VnPaginate
|
||||
ref="paginateRef"
|
||||
data-key="InheritedRoles"
|
||||
:filter="filter"
|
||||
:user-filter="filter"
|
||||
:url="urlPath"
|
||||
:limit="0"
|
||||
auto-load
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ const redirectToRoleSummary = (id) =>
|
|||
<VnPaginate
|
||||
ref="paginateRef"
|
||||
data-key="SubRoles"
|
||||
:filter="filter"
|
||||
:user-filter="filter"
|
||||
:url="urlPath"
|
||||
auto-load
|
||||
>
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ const toCustomerAddressEdit = (addressId) => {
|
|||
data-key="CustomerAddresses"
|
||||
order="id DESC"
|
||||
ref="vnPaginateRef"
|
||||
:filter="addressFilter"
|
||||
:user-filter="addressFilter"
|
||||
:url="`Clients/${route.params.id}/addresses`"
|
||||
/>
|
||||
<div class="full-width flex justify-center">
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ const updateData = () => {
|
|||
<div class="full-width flex justify-center">
|
||||
<QCard class="card-width q-pa-lg">
|
||||
<VnPaginate
|
||||
:filter="filter"
|
||||
:user-filter="filter"
|
||||
@on-fetch="fetch"
|
||||
auto-load
|
||||
data-key="CustomerCreditContracts"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ const routeId = route.params.id;
|
|||
<VnPaginate
|
||||
data-key="AgencyModes"
|
||||
:url="`AgencyModes`"
|
||||
:filter="{ where: { agencyFk: routeId } }"
|
||||
:user-filter="{ where: { agencyFk: routeId } }"
|
||||
order="name"
|
||||
auto-load
|
||||
>
|
||||
|
|
@ -47,7 +47,7 @@ const routeId = route.params.id;
|
|||
</QPage>
|
||||
</template>
|
||||
<i18n>
|
||||
es:
|
||||
es:
|
||||
isOwn: Tiene propietario
|
||||
isAnyVolumeAllowed: Permite cualquier volumen
|
||||
Search agency: Buscar agencia
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ async function deleteWorCenter(id) {
|
|||
ref="paginate"
|
||||
data-key="AgencyWorkCenters"
|
||||
url="AgencyWorkCenters"
|
||||
:filter="{ where: { agencyFk: routeId } }"
|
||||
:user-filter="{ where: { agencyFk: routeId } }"
|
||||
order="id"
|
||||
auto-load
|
||||
>
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@ const openSmsDialog = async () => {
|
|||
:key="refreshKey"
|
||||
data-key="RouteTicketList"
|
||||
url="Routes/getTickets"
|
||||
:filter="{ id: route.params.id }"
|
||||
:user-filter="{ id: route.params.id }"
|
||||
:limit="0"
|
||||
:order="['priority ASC']"
|
||||
auto-load
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ const redirectToUpdateView = (addressData) => {
|
|||
<VnPaginate
|
||||
data-key="SupplierAddress"
|
||||
:url="`Suppliers/${route.params.id}/addresses`"
|
||||
:filter="addressesFilter"
|
||||
:user-filter="addressesFilter"
|
||||
auto-load
|
||||
>
|
||||
<template #body="{ rows }">
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
|
|||
<VnPaginate
|
||||
ref="paginateRef"
|
||||
data-key="TicketTracking"
|
||||
:filter="paginateFilter"
|
||||
:user-filter="paginateFilter"
|
||||
url="TicketTrackings"
|
||||
auto-load
|
||||
order="created DESC"
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ const removeThermograph = async (id) => {
|
|||
ref="thermographPaginateRef"
|
||||
data-key="TravelThermographs"
|
||||
url="TravelThermographs"
|
||||
:filter="thermographFilter"
|
||||
:user-filter="thermographFilter"
|
||||
auto-load
|
||||
>
|
||||
<template #body="{ rows }">
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ watch(
|
|||
data-key="wagonTypeTray"
|
||||
url="WagonTypeTrays"
|
||||
order="id DESC"
|
||||
:filter="filter"
|
||||
:user-filter="filter"
|
||||
auto-load
|
||||
ref="vnPaginateRef"
|
||||
v-bind="$attrs"
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ function reloadData() {
|
|||
ref="paginate"
|
||||
data-key="WorkerPda"
|
||||
url="DeviceProductionUsers"
|
||||
:filter="{ where: { userFk: routeId } }"
|
||||
:user-filter="{ where: { userFk: routeId } }"
|
||||
order="id"
|
||||
search-url="pda"
|
||||
auto-load
|
||||
|
|
|
|||
|
|
@ -1,33 +1,16 @@
|
|||
<script setup>
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { ref } from 'vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import FormModel from 'src/components/FormModel.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import { QCheckbox } from 'quasar';
|
||||
import VnInputTime from 'src/components/common/VnInputTime.vue';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const agencyFilter = {
|
||||
fields: ['id', 'name'],
|
||||
order: 'name ASC',
|
||||
limit: 30,
|
||||
};
|
||||
const agencyOptions = ref([]);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
:filter="agencyFilter"
|
||||
@on-fetch="(data) => (agencyOptions = data)"
|
||||
auto-load
|
||||
url="AgencyModes/isActive"
|
||||
/>
|
||||
|
||||
<FormModel auto-load model="Zone">
|
||||
<FormModel :url="`Zones/${$route.params.id}`" auto-load model="zone">
|
||||
<template #form="{ data, validate }">
|
||||
<VnRow>
|
||||
<VnInput
|
||||
|
|
@ -40,16 +23,16 @@ const agencyOptions = ref([]);
|
|||
|
||||
<VnRow>
|
||||
<VnSelect
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
v-model="data.agencyModeFk"
|
||||
:rules="validate('zone.agencyModeFk')"
|
||||
:options="agencyOptions"
|
||||
url="AgencyModes/isActive"
|
||||
:fields="['id', 'name']"
|
||||
:label="t('Agency')"
|
||||
emit-value
|
||||
map-options
|
||||
use-input
|
||||
hide-bottom-space
|
||||
sort-by="name"
|
||||
/>
|
||||
<VnInput
|
||||
class="mw-10"
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
|
|||
<VnPaginate
|
||||
ref="paginateRef"
|
||||
data-key="ZoneWarehouses"
|
||||
:filter="{ include: 'warehouse' }"
|
||||
:user-filter="{ include: 'warehouse' }"
|
||||
:url="urlPath"
|
||||
auto-load
|
||||
>
|
||||
|
|
|
|||
Loading…
Reference in New Issue