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

fix: refs #7524 dynamic fetch #828

Merged
jorgep merged 3 commits from 7524-hotfix-dynamicFetch into master 2024-10-14 14:02:04 +00:00
Conversation 0 Commits 3 Files Changed 10 +23 -98
10 changed files with 23 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/common/VnSelect.vue
View File

@ -227,6 +227,8 @@ function nullishToTrue(value) {
} }
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val); const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
defineExpose({ opts: myOptions });
jsegarra commented 2024-10-14 13:57:14 +00:00
Review
Copy Link

Molaria que en la guia de estilos hubiese un apartado para defineExpose
https://vuejs.org/style-guide/rules-recommended
Lo dejamos asi

Molaria que en la guia de estilos hubiese un apartado para defineExpose https://vuejs.org/style-guide/rules-recommended Lo dejamos asi
</script> </script>
<template> <template>

15
src/pages/Department/Card/DepartmentBasicData.vue
View File

@ -1,9 +1,7 @@
<script setup> <script setup>
import { ref } from 'vue';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue';
import FormModel from 'components/FormModel.vue'; import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue'; import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
@ -11,17 +9,8 @@ import VnSelect from 'src/components/common/VnSelect.vue';
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
const workersOptions = ref([]);
const clientsOptions = ref([]);
</script> </script>
<template> <template>
<FetchData
url="Workers/search"
@on-fetch="(data) => (workersOptions = data)"
auto-load
/>
<FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
<FormModel <FormModel
:url="`Departments/${route.params.id}`" :url="`Departments/${route.params.id}`"
model="department" model="department"
@ -62,7 +51,7 @@ const clientsOptions = ref([]);
<VnSelect <VnSelect
:label="t('department.bossDepartment')" :label="t('department.bossDepartment')"
v-model="data.workerFk" v-model="data.workerFk"
:options="workersOptions" url="Workers/search"
option-value="id" option-value="id"
option-label="name" option-label="name"
hide-selected hide-selected
@ -72,7 +61,7 @@ const clientsOptions = ref([]);
<VnSelect <VnSelect
:label="t('department.selfConsumptionCustomer')" :label="t('department.selfConsumptionCustomer')"
v-model="data.clientFk" v-model="data.clientFk"
:options="clientsOptions" url="Clients"
option-value="id" option-value="id"
option-label="name" option-label="name"
hide-selected hide-selected

15
src/pages/InvoiceOut/InvoiceOutFilter.vue
View File

@ -15,25 +15,10 @@ const props = defineProps({
required: true, required: true,
jorgep commented 2024-10-14 10:12:13 +00:00
Outdated
Review
Copy Link

No se usa

No se usa
}, },
}); });
const workers = ref();
const workersCopy = ref();
const states = ref(); const states = ref();
function setWorkers(data) {
workers.value = data;
workersCopy.value = data;
}
</script> </script>
<template> <template>
<FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load /> <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
<FetchData
url="Workers/activeWithInheritedRole"
:filter="{ where: { role: 'salesPerson' } }"
@on-fetch="setWorkers"
auto-load
/>
<VnFilterPanel :data-key="props.dataKey" :search-button="true"> <VnFilterPanel :data-key="props.dataKey" :search-button="true">
<template #tags="{ tag, formatFn }"> <template #tags="{ tag, formatFn }">
<div class="q-gutter-x-xs"> <div class="q-gutter-x-xs">

1
src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
View File

@ -168,7 +168,6 @@ const downloadCSV = async () => {
} }
} }
" "
:limit="0"
:columns="columns" :columns="columns"
auto-load auto-load
:is-editable="false" :is-editable="false"

11
src/pages/Item/ItemTypeCreate.vue
View File

@ -15,7 +15,6 @@ const router = useRouter();
const newItemTypeForm = reactive({}); const newItemTypeForm = reactive({});
const workersOptions = ref([]);
const categoriesOptions = ref([]); const categoriesOptions = ref([]);
const temperaturesOptions = ref([]); const temperaturesOptions = ref([]);
@ -25,12 +24,6 @@ const redirectToItemTypeBasicData = (_, { id }) => {
</script> </script>
<template> <template>
<FetchData
url="Workers"
@on-fetch="(data) => (workersOptions = data)"
:filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
auto-load
/>
<FetchData <FetchData
url="ItemCategories" url="ItemCategories"
@on-fetch="(data) => (categoriesOptions = data)" @on-fetch="(data) => (categoriesOptions = data)"
@ -61,7 +54,9 @@ const redirectToItemTypeBasicData = (_, { id }) => {
<VnSelect <VnSelect
v-model="data.workerFk" v-model="data.workerFk"
:label="t('itemType.shared.worker')" :label="t('itemType.shared.worker')"
:options="workersOptions" url="Workers"
sort-by="firstName ASC"
jorgep marked this conversation as resolved
jsegarra commented 2024-10-14 10:25:54 +00:00
Review
Copy Link

aquí has puesto firstName ASC, pero en otro archivo de la PR has dejado firstName. Concretamente en ItemTypeBasicData

aquí has puesto firstName ASC, pero en otro archivo de la PR has dejado firstName. Concretamente en ItemTypeBasicData
:fields="['id', 'firstName']"
option-value="id" option-value="id"
option-label="firstName" option-label="firstName"
hide-selected hide-selected

11
src/pages/ItemType/Card/ItemTypeBasicData.vue
View File

@ -12,17 +12,10 @@ import VnSelect from 'src/components/common/VnSelect.vue';
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
const workersOptions = ref([]);
const categoriesOptions = ref([]); const categoriesOptions = ref([]);
const temperaturesOptions = ref([]); const temperaturesOptions = ref([]);
</script> </script>
<template> <template>
<FetchData
url="Workers"
@on-fetch="(data) => (workersOptions = data)"
:filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
auto-load
/>
<FetchData <FetchData
url="ItemCategories" url="ItemCategories"
@on-fetch="(data) => (categoriesOptions = data)" @on-fetch="(data) => (categoriesOptions = data)"
@ -50,7 +43,9 @@ const temperaturesOptions = ref([]);
<VnSelect <VnSelect
v-model="data.workerFk" v-model="data.workerFk"
:label="t('shared.worker')" :label="t('shared.worker')"
:options="workersOptions" url="Workers"
sort-by="firstName ASC"
:fields="['id', 'firstName']"
option-value="id" option-value="id"
option-label="firstName" option-label="firstName"
hide-selected hide-selected

13
src/pages/Order/Card/OrderCreateDialog.vue
View File

@ -126,12 +126,6 @@ onMounted(async () => {
</script> </script>
<template> <template>
<FetchData
url="addresses"
@on-fetch="(data) => (clientOptions = data)"
:filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
auto-load
/>
<FormModelPopup <FormModelPopup
url-create="Orders/new" url-create="Orders/new"
:title="t('Create Order')" :title="t('Create Order')"
@ -165,13 +159,16 @@ onMounted(async () => {
</template> </template>
</VnSelect> </VnSelect>
<VnSelect <VnSelect
ref="addressRef"
:label="t('order.form.addressFk')" :label="t('order.form.addressFk')"
v-model="data.addressId" v-model="data.addressId"
:options="addressList" url="addresses"
:fields="['id', 'nickname', 'defaultAddressFk', 'street', 'city']"
sort-by="id"
option-value="id" option-value="id"
option-label="street" option-label="street"
hide-selected hide-selected
:disable="!addressList?.length" :disable="!$refs.addressRef?.length"
> >
<template #option="scope"> <template #option="scope">
<QItem v-bind="scope.itemProps"> <QItem v-bind="scope.itemProps">

12
src/pages/Order/Card/OrderFilter.vue
View File

@ -17,10 +17,6 @@ const props = defineProps({
const agencyFilter = { fields: ['id', 'name'] }; const agencyFilter = { fields: ['id', 'name'] };
const agencyList = ref(null); const agencyList = ref(null);
const salesPersonFilter = {
fields: ['id', 'nickname'],
};
const salesPersonList = ref(null);
const sourceList = ref([]); const sourceList = ref([]);
</script> </script>
@ -32,14 +28,6 @@ const sourceList = ref([]);
auto-load auto-load
@on-fetch="(data) => (agencyList = data)" @on-fetch="(data) => (agencyList = data)"
/> />
<FetchData
url="Workers/search"
:filter="salesPersonFilter"
sort-by="nickname ASC"
@on-fetch="(data) => (salesPersonList = data)"
:params="{ departmentCodes: ['VT'] }"
auto-load
/>
<FetchData <FetchData
url="Orders/getSourceValues" url="Orders/getSourceValues"
:filter="{ fields: ['value'] }" :filter="{ fields: ['value'] }"

15
src/pages/Shelving/Card/ShelvingFilter.vue
View File

@ -1,7 +1,5 @@
<script setup> <script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'components/ui/VnFilterPanel.vue'; import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
@ -14,22 +12,9 @@ const props = defineProps({
}); });
const emit = defineEmits(['search']); const emit = defineEmits(['search']);
const workers = ref();
function setWorkers(data) {
workers.value = data;
}
</script> </script>
<template> <template>
<FetchData
url="Workers/activeWithInheritedRole"
:filter="{ where: { role: 'salesPerson' } }"
sort-by="firstName ASC"
@on-fetch="setWorkers"
auto-load
/>
<VnFilterPanel <VnFilterPanel
:data-key="props.dataKey" :data-key="props.dataKey"
:search-button="true" :search-button="true"

26
src/pages/Ticket/TicketFilter.vue
View File

@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue'; 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 VnSelect from 'src/components/common/VnSelect.vue';
const { t } = useI18n(); const { t } = useI18n();
const props = defineProps({ const props = defineProps({
@ -15,7 +16,6 @@ const props = defineProps({
}, },
}); });
const workers = ref([]);
const provinces = ref([]); const provinces = ref([]);
const states = ref([]); const states = ref([]);
const agencies = ref([]); const agencies = ref([]);
@ -27,12 +27,6 @@ const warehouses = ref([]);
<FetchData url="States" @on-fetch="(data) => (states = data)" auto-load /> <FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
<FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load /> <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load /> <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
<FetchData
url="Workers/activeWithInheritedRole"
:filter="{ where: { role: 'salesPerson' } }"
@on-fetch="(data) => (workers = data)"
auto-load
/>
<VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table"> <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
<template #tags="{ tag, formatFn }"> <template #tags="{ tag, formatFn }">
<div class="q-gutter-x-xs"> <div class="q-gutter-x-xs">
@ -66,23 +60,19 @@ const warehouses = ref([]);
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem> <QItem>
<QItemSection v-if="!workers"> <QItemSection>
<QSkeleton type="QInput" class="full-width" /> <VnSelect
jsegarra commented 2024-10-14 10:29:10 +00:00
Review
Copy Link

Tenemos varias veces repetido este VnSelect, no?
Creo que al menos he visto 2 en esta PR, como de correcto seria hacer un componente aparte como si se hizo en salix, vn-worker-autocompletE?

Tenemos varias veces repetido este VnSelect, no? Creo que al menos he visto 2 en esta PR, como de correcto seria hacer un componente aparte como si se hizo en salix, vn-worker-autocompletE?
jorgep commented 2024-10-14 10:46:50 +00:00
Review
Copy Link

Lo veo bien, pero creo que mejor tarea, porque también está worker/search .

Lo veo bien, pero creo que mejor tarea, porque también está worker/search .
</QItemSection>
<QItemSection v-if="workers">
<QSelect
:label="t('Salesperson')" :label="t('Salesperson')"
v-model="params.salesPersonFk" v-model="params.salesPersonFk"
:options="workers" url="Workers/activeWithInheritedRole"
:where="{ role: 'salesPerson' }"
option-value="id" option-value="id"
option-label="name" option-label="firstName"
emit-value :use-like="false"
map-options sort-by="firstName ASC"
use-input
dense dense
outlined outlined
rounded rounded
:input-debounce="0"
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>