7806_devToTest_2332 #578

Merged
alexm merged 138 commits from 7806_devToTest_2330 into test 2024-07-30 06:14:02 +00:00
1 changed files with 25 additions and 5 deletions
Showing only changes of commit 35fe28fff1 - Show all commits

View File

@ -7,13 +7,19 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import VnInputDate from 'components/common/VnInputDate.vue'; import VnInputDate from 'components/common/VnInputDate.vue';
import VnCurrency from 'src/components/common/VnCurrency.vue'; import VnCurrency from 'src/components/common/VnCurrency.vue';
import FetchData from 'components/FetchData.vue';
const { t } = useI18n(); const { t } = useI18n();
defineProps({ dataKey: { type: String, required: true } }); defineProps({ dataKey: { type: String, required: true } });
const suppliers = ref([]); const activities = ref([]);
</script> </script>
<template> <template>
<FetchData
url="SupplierActivities"
auto-load
@on-fetch="(data) => (activities = data)"
/>
<VnFilterPanel :data-key="dataKey" :search-button="true"> <VnFilterPanel :data-key="dataKey" :search-button="true">
<template #tags="{ tag, formatFn }"> <template #tags="{ tag, formatFn }">
<div class="q-gutter-x-xs"> <div class="q-gutter-x-xs">
@ -51,13 +57,11 @@ const suppliers = ref([]);
:label="t('params.supplierFk')" :label="t('params.supplierFk')"
option-value="id" option-value="id"
option-label="nickname" option-label="nickname"
:options="suppliers"
dense dense
outlined outlined
rounded rounded
:filter-options="['id', 'name']" :filter-options="['id', 'name']"
> />
</VnSelect>
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem> <QItem>
@ -94,7 +98,21 @@ const suppliers = ref([]);
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem class="q-mb-md"> <QItem>
<QItemSection>
<VnSelect
:label="t('params.supplierActivityFk')"
v-model="params.supplierActivityFk"
dense
outlined
rounded
option-value="code"
option-label="name"
:options="activities"
/>
</QItemSection>
</QItem>
<QItem c>
<QItemSection> <QItemSection>
<QCheckbox <QCheckbox
:label="t('params.isBooked')" :label="t('params.isBooked')"
@ -169,6 +187,7 @@ en:
to: To to: To
awbCode: AWB awbCode: AWB
correctingFk: Rectificative correctingFk: Rectificative
supplierActivityFk: Supplier activity
es: es:
params: params:
search: Id o nombre proveedor search: Id o nombre proveedor
@ -187,6 +206,7 @@ es:
dued: Vencida dued: Vencida
correctedFk: Rectificada correctedFk: Rectificada
correctingFk: Rectificativa correctingFk: Rectificativa
supplierActivityFk: Actividad proveedor
From: Desde From: Desde
To: Hasta To: Hasta
Amount: Importe Amount: Importe