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

Merge branch 'dev' into 8441-createVehicleInvoiceInSection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details

This commit is contained in:
Jose Antonio Tubau 2025-04-30 12:05:43 +00:00
parent 8250660a32 bfb5c021bd
commit 78df8c877d
21 changed files with 201 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/VnTable/VnTable.vue
View File

@ -34,7 +34,7 @@ import VnTableFilter from './VnTableFilter.vue';
import { getColAlign } from 'src/composables/getColAlign';
import RightMenu from '../common/RightMenu.vue';
import VnScroll from '../common/VnScroll.vue';
import VnMultiCheck from '../common/VnMultiCheck.vue';
import VnCheckboxMenu from '../common/VnCheckboxMenu.vue';
const arrayData = useArrayData(useAttrs()['data-key']);
const $props = defineProps({
@ -644,21 +644,15 @@ const rowCtrlClickFunction = computed(() => {
};
return () => {};
});
const handleMultiCheck = (value) => {
if (value) {
const handleHeaderSelection = (evt, data) => {
if (evt === 'selected' && data) {
selected.value = tableRef.value.rows;
} else {
selected.value = [];
}
emit('update:selected', selected.value);
};
const handleSelectedAll = (data) => {
if (data) {
} else if (evt === 'selectAll') {
selected.value = data;
} else {
selected.value = [];
}
emit('update:selected', selected.value);
};
</script>
@ -724,14 +718,14 @@ const handleSelectedAll = (data) => {
:data-cy
>
<template #header-selection>
<VnMultiCheck
<VnCheckboxMenu
:searchUrl="searchUrl"
:expand="$props.multiCheck.expand"
v-model="selectAll"
:url="$attrs['url']"
@update:selected="handleMultiCheck"
@select:all="handleSelectedAll"
></VnMultiCheck>
@update:selected="handleHeaderSelection('selected', $event)"
@select:all="handleHeaderSelection('selectAll', $event)"
/>
</template>
<template #top-left v-if="!$props.withoutHeader">

115
src/components/common/VnCheckboxMenu.vue Normal file
View File

@ -0,0 +1,115 @@
<script setup>
import { ref } from 'vue';
import VnCheckbox from './VnCheckbox.vue';
import axios from 'axios';
import { toRaw } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
const route = useRoute();
const { t } = useI18n();
const model = defineModel({ type: [Boolean] });
const props = defineProps({
expand: {
type: Boolean,
default: false,
},
url: {
type: String,
required: true,
},
searchUrl: {
type: [String, Boolean],
default: 'table',
},
});
const value = ref(false);
const menuRef = ref(null);
const errorMessage = ref(null);
const rows = ref(0);
const onClick = async () => {
errorMessage.value = null;
if (value.value) {
const { filter } = JSON.parse(route.query[props.searchUrl]);
filter.limit = 0;
const params = {
params: { filter: JSON.stringify(filter) },
};
try {
const { data } = await axios.get(props.url, params);
rows.value = data;
} catch (error) {
const response = error.response;
if (response.data.error.name === 'UserError') {
errorMessage.value = t('tooManyResults');
} else {
errorMessage.value = response.data.error.message;
}
}
}
};
defineEmits(['update:selected', 'select:all']);
</script>
<template>
<div class="flex items-center no-wrap" style="display: flex">
<VnCheckbox v-model="value" @click="$emit('update:selected', value)" />
<QIcon
style="margin-left: -10px"
data-cy="btnMultiCheck"
v-if="value && $props.expand"
name="expand_more"
@click="onClick"
class="cursor-pointer"
color="primary"
size="xs"
>
<QMenu
fit
anchor="bottom start"
self="top left"
ref="menuRef"
data-cy="menuMultiCheck"
>
<QList separator>
<QItem
data-cy="selectAll"
v-ripple
clickable
@click="
$refs.menuRef.hide();
$emit('select:all', toRaw(rows));
"
>
<QItemSection>
<QItemLabel>
<span v-text="t('Select all')" />
</QItemLabel>
<QItemLabel overline caption>
<span
v-if="errorMessage"
class="text-negative"
v-text="errorMessage"
/>
<span
v-else
v-text="t('records', { rows: rows.length })"
/>
</QItemLabel>
</QItemSection>
</QItem>
<slot name="more-options"></slot>
</QList>
</QMenu>
</QIcon>
</div>
</template>
<i18n lang="yml">
en:
tooManyResults: Too many results. Please narrow down your search.
records: '{rows} records'
es:
Select all: Seleccionar todo
tooManyResults: Demasiados registros. Restringe la búsqueda.
records: '{rows} registros'
</i18n>

80
src/components/common/VnMultiCheck.vue
View File

@ -1,80 +0,0 @@
<script setup>
import { ref } from 'vue';
import VnCheckbox from './VnCheckbox.vue';
import axios from 'axios';
import { toRaw } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
const route = useRoute();
const { t } = useI18n();
const model = defineModel({ type: [Boolean] });
const props = defineProps({
expand: {
type: Boolean,
default: false,
},
url: {
type: String,
default: null,
required: true,
},
searchUrl: {
type: [String, Boolean],
default: 'table',
},
});
const value = ref(false);
const rows = ref(0);
const onClick = () => {
if (value.value) {
const { filter } = JSON.parse(route.query[props.searchUrl]);
filter.limit = 0;
const params = {
params: { filter: JSON.stringify(filter) },
};
axios
.get(props.url, params)
.then(({ data }) => {
rows.value = data;
})
.catch(console.error);
}
};
defineEmits(['update:selected', 'select:all']);
</script>
<template>
<div style="display: flex">
<VnCheckbox v-model="value" @click="$emit('update:selected', value)" />
<QBtn
v-if="value && $props.expand"
flat
dense
icon="expand_more"
@click="onClick"
>
<QMenu anchor="bottom right" self="top right">
<QList>
<QItem v-ripple clickable @click="$emit('select:all', toRaw(rows))">
{{ t('Select all', { rows: rows.length }) }}
</QItem>
<slot name="more-options"></slot>
</QList>
</QMenu>
</QBtn>
</div>
</template>
<i18n lang="yml">
en:
Select all: 'Select all ({rows})'
fr:
Select all: 'Sélectionner tout ({rows})'
es:
Select all: 'Seleccionar todo ({rows})'
de:
Select all: 'Alle auswählen ({rows})'
it:
Select all: 'Seleziona tutto ({rows})'
pt:
Select all: 'Selecionar tudo ({rows})'
</i18n>

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

@ -161,7 +161,7 @@ const arrayData = useArrayData(arrayDataKey, {
searchUrl: false,
mapKey: $attrs['map-key'],
});
const isMenuOpened = ref(false);
const computedSortBy = computed(() => {
return $props.sortBy || $props.optionLabel + ' ASC';
});
@ -186,7 +186,9 @@ onMounted(() => {
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
});
const someIsLoading = computed(() => isLoading.value || !!arrayData?.isLoading?.value);
const someIsLoading = computed(
() => (isLoading.value || !!arrayData?.isLoading?.value) && !isMenuOpened.value,
);
function findKeyInOptions() {
if (!$props.options) return;
return filter($props.modelValue, $props.options)?.length;
@ -369,6 +371,8 @@ function getCaption(opt) {
:input-debounce="useURL ? '300' : '0'"
:loading="someIsLoading"
@virtual-scroll="onScroll"
@popup-hide="isMenuOpened = false"
@popup-show="isMenuOpened = true"
@keydown="handleKeyDown"
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
:data-url="url"

7
src/composables/useArrayData.js
View File

@ -19,7 +19,7 @@ export function useArrayData(key, userOptions) {
let canceller = null;
onMounted(() => {
setOptions();
setOptions(userOptions ?? {});
reset(['skip']);
const query = route.query;
@ -39,9 +39,10 @@ export function useArrayData(key, userOptions) {
setCurrentFilter();
});
if (key && userOptions) setOptions();
if (userOptions) setOptions(userOptions);
function setOptions(params = userOptions) {
function setOptions(params) {
if (!params) return;
const allowedOptions = [
'url',
'filter',

1
src/pages/Customer/Notifications/CustomerNotifications.vue
View File

@ -89,7 +89,6 @@ const columns = computed(() => [
<CustomerNotificationsCampaignConsumption
:selected-rows="selected.length > 0"
:clients="selected"
:promise="refreshData"
/>
</template>
</VnSubToolbar>

4
src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
View File

@ -142,13 +142,13 @@ onMounted(async () => {
valentinesDay: Valentine's Day
mothersDay: Mother's Day
allSaints: All Saints' Day
Campaign consumption: Campaign consumption ({rows})
Campaign consumption: Campaign consumption - {rows} records
es:
params:
valentinesDay: Día de San Valentín
mothersDay: Día de la Madre
allSaints: Día de Todos los Santos
Campaign consumption: Consumo campaña ({rows})
Campaign consumption: Consumo campaña - {rows} registros
Campaign: Campaña
From: Desde
To: Hasta

6
src/pages/Customer/components/CustomerFileManagementActions.vue
View File

@ -1,9 +1,9 @@
<script setup>
import { useI18n } from 'vue-i18n';
import { useRoute, useRouter } from 'vue-router';
import { useQuasar } from 'quasar';
import { usePrintService } from 'composables/usePrintService';
import { downloadFile } from 'src/composables/downloadFile';
import CustomerFileManagementDelete from 'src/pages/Customer/components/CustomerFileManagementDelete.vue';
@ -12,7 +12,7 @@ const { t } = useI18n();
const quasar = useQuasar();
const route = useRoute();
const router = useRouter();
const { openReport } = usePrintService();
const $props = defineProps({
id: {
type: Number,
@ -24,7 +24,7 @@ const $props = defineProps({
},
});
const setDownloadFile = () => downloadFile($props.id);
const setDownloadFile = () => openReport(`dms/${$props.id}/downloadFile`, {}, '_blank');
const toCustomerFileManagementEdit = () => {
router.push({

12
src/pages/Supplier/Card/SupplierConsumption.vue
View File

@ -40,13 +40,11 @@ const dateRanges = computed(() => {
return { from, to };
});
const reportParams = computed(() => {
return {
recipientId: Number(route.params.id),
to: dateRange(dateRanges.value.to)[1],
from: dateRange(dateRanges.value.from)[1],
};
});
const reportParams = computed(() => ({
recipientId: Number(route.params.id),
from: dateRange(dateRanges.value.from)[0].toISOString(),
to: dateRange(dateRanges.value.to)[1].toISOString(),
}));
async function getSupplierConsumptionData() {
await arrayData.fetch({ append: false });

4
src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
View File

@ -294,7 +294,7 @@ async function getZone(options) {
</template>
</VnSelect>
<VnSelect
:label="t('ticketList.warehouse')"
:label="t('basicData.warehouse')"
v-model="warehouseId"
option-value="id"
option-label="name"
@ -302,7 +302,7 @@ async function getZone(options) {
hide-selected
map-options
:required="true"
:rules="validate('ticketList.warehouse')"
:rules="validate('basicData.warehouse')"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md no-wrap">

5
src/pages/Ticket/Negative/TicketLackFilter.vue
View File

@ -137,8 +137,6 @@ const setUserParams = (params) => {
($event) => onCategoryChange($event, searchFn)
"
:options="categoriesOptions"
option-value="id"
option-label="name"
hide-selected
dense
filled
@ -152,10 +150,7 @@ const setUserParams = (params) => {
<VnSelect
:label="t('negative.type')"
v-model="params.typeFk"
@update:model-value="searchFn()"
:options="itemTypesOptions"
option-value="id"
option-label="name"
hide-selected
dense
filled

21
src/pages/Ticket/TicketAdvance.vue
View File

@ -121,7 +121,7 @@ const ticketColumns = computed(() => [
format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
},
{
align: 'left',
align: 'right',
label: t('advanceTickets.import'),
name: 'totalWithVat',
hidden: true,
@ -172,6 +172,15 @@ const ticketColumns = computed(() => [
headerClass: 'horizontal-separator',
name: 'futureLiters',
},
{
label: t('advanceTickets.preparation'),
name: 'futurePreparation',
field: 'futurePreparation',
align: 'left',
sortable: true,
headerClass: 'horizontal-separator',
columnFilter: false,
},
{
align: 'left',
label: t('advanceTickets.futureZone'),
@ -196,15 +205,17 @@ const ticketColumns = computed(() => [
label: t('advanceTickets.notMovableLines'),
headerClass: 'horizontal-separator',
name: 'notMovableLines',
class: 'shrink',
},
{
align: 'left',
label: t('advanceTickets.futureLines'),
headerClass: 'horizontal-separator',
name: 'futureLines',
class: 'shrink',
},
{
align: 'left',
align: 'right',
label: t('advanceTickets.futureImport'),
name: 'futureTotalWithVat',
hidden: true,
@ -399,8 +410,10 @@ watch(
destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
originElRef.value.classList.add('text-uppercase', 'color-vn-label');
destinationElRef.value.setAttribute('colspan', '10');
originElRef.value.setAttribute('colspan', '10');
originElRef.value.classList.add('advance-icon');
destinationElRef.value.setAttribute('colspan', '9');
originElRef.value.setAttribute('colspan', '11');
destinationElRef.value.textContent = `${t(
'advanceTickets.destination',

18
src/pages/Ticket/TicketAdvanceFilter.vue
View File

@ -68,7 +68,7 @@ onMounted(async () => await getItemPackingTypes());
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
<template #body="{ params, searchFn }">
<template #body="{ params }">
<QItem class="q-my-sm">
<QItemSection>
<VnInputDate
@ -96,12 +96,10 @@ onMounted(async () => await getItemPackingTypes());
option-value="code"
option-label="description"
:info="t('iptInfo')"
@update:model-value="searchFn()"
dense
filled
:use-like="false"
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -113,12 +111,10 @@ onMounted(async () => await getItemPackingTypes());
option-value="code"
option-label="description"
:info="t('iptInfo')"
@update:model-value="searchFn()"
dense
filled
:use-like="false"
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -137,7 +133,6 @@ onMounted(async () => await getItemPackingTypes());
:label="t('params.isFullMovable')"
v-model="params.isFullMovable"
toggle-indeterminate
@update:model-value="searchFn()"
dense
/>
</QItemSection>
@ -160,13 +155,9 @@ onMounted(async () => await getItemPackingTypes());
:label="t('params.warehouseFk')"
v-model="params.warehouseFk"
:options="warehousesOptions"
option-value="id"
option-label="name"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -175,7 +166,6 @@ onMounted(async () => await getItemPackingTypes());
toggle-indeterminate
:label="t('params.onlyWithDestination')"
v-model="params.onlyWithDestination"
@update:model-value="searchFn()"
dense
/>
</QItemSection>

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

@ -60,7 +60,7 @@ const groupedStates = ref([]);
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
<template #body="{ params, searchFn }">
<template #body="{ params }">
<QItem>
<QItemSection>
<VnInput v-model="params.clientFk" :label="t('Customer ID')" filled />
@ -108,10 +108,7 @@ const groupedStates = ref([]);
<VnSelect
:label="t('State')"
v-model="params.stateFk"
@update:model-value="searchFn()"
:options="states"
option-value="id"
option-label="name"
emit-value
map-options
use-input
@ -128,7 +125,6 @@ const groupedStates = ref([]);
<VnSelect
:label="t('params.groupedStates')"
v-model="params.groupedStates"
@update:model-value="searchFn()"
:options="groupedStates"
option-label="code"
emit-value
@ -163,7 +159,6 @@ const groupedStates = ref([]);
<QItemSection>
<QCheckbox
v-model="params.myTeam"
@update:model-value="searchFn()"
:label="t('My team')"
toggle-indeterminate
/>
@ -171,7 +166,6 @@ const groupedStates = ref([]);
<QItemSection>
<QCheckbox
v-model="params.pending"
@update:model-value="searchFn()"
:label="t('Pending')"
toggle-indeterminate
/>
@ -181,7 +175,6 @@ const groupedStates = ref([]);
<QItemSection>
<QCheckbox
v-model="params.hasInvoice"
@update:model-value="searchFn()"
:label="t('Invoiced')"
toggle-indeterminate
/>
@ -189,7 +182,6 @@ const groupedStates = ref([]);
<QItemSection>
<QCheckbox
v-model="params.hasRoute"
@update:model-value="searchFn()"
:label="t('Routed')"
toggle-indeterminate
/>
@ -203,10 +195,7 @@ const groupedStates = ref([]);
<VnSelect
:label="t('Province')"
v-model="params.provinceFk"
@update:model-value="searchFn()"
:options="provinces"
option-value="id"
option-label="name"
emit-value
map-options
use-input
@ -223,7 +212,6 @@ const groupedStates = ref([]);
<VnSelect
:label="t('Agency')"
v-model="params.agencyModeFk"
@update:model-value="searchFn()"
:options="agencies"
emit-value
map-options
@ -241,10 +229,7 @@ const groupedStates = ref([]);
<VnSelect
:label="t('Warehouse')"
v-model="params.warehouseFk"
@update:model-value="searchFn()"
:options="warehouses"
option-value="id"
option-label="name"
emit-value
map-options
use-input

21
src/pages/Ticket/TicketFuture.vue
View File

@ -85,6 +85,7 @@ const ticketColumns = computed(() => [
label: t('advanceTickets.liters'),
name: 'liters',
align: 'left',
class: 'shrink',
headerClass: 'horizontal-separator',
},
{
@ -177,7 +178,12 @@ watch(
if (!$el) return;
const head = $el.querySelector('thead');
const firstRow = $el.querySelector('thead > tr');
const headSelectionCol = $el.querySelector(
'thead tr.bg-header th.q-table--col-auto-width',
);
if (headSelectionCol) {
headSelectionCol.classList.add('horizontal-separator');
}
const newRow = document.createElement('tr');
destinationElRef.value = document.createElement('th');
originElRef.value = document.createElement('th');
@ -185,9 +191,10 @@ watch(
newRow.classList.add('bg-header');
destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
originElRef.value.classList.add('text-uppercase', 'color-vn-label');
originElRef.value.classList.add('advance-icon');
destinationElRef.value.setAttribute('colspan', '7');
originElRef.value.setAttribute('colspan', '9');
destinationElRef.value.setAttribute('colspan', '9');
originElRef.value.setAttribute('colspan', '7');
originElRef.value.textContent = `${t('advanceTickets.origin')}`;
destinationElRef.value.textContent = `${t('advanceTickets.destination')}`;
@ -371,4 +378,12 @@ watch(
:deep(.horizontal-bottom-separator) {
border-bottom: 4px solid white !important;
}
:deep(th.advance-icon::after) {
content: '>>';
font-size: larger;
position: absolute;
text-align: center;
float: 0;
left: 0;
}
</style>

29
src/pages/Ticket/TicketFutureFilter.vue
View File

@ -70,7 +70,7 @@ onMounted(async () => {
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
<template #body="{ params, searchFn }">
<template #body="{ params }">
<QItem class="q-my-sm">
<QItemSection>
<VnInputDate
@ -116,11 +116,9 @@ onMounted(async () => {
option-value="code"
option-label="description"
:info="t('iptInfo')"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -132,11 +130,9 @@ onMounted(async () => {
option-value="code"
option-label="description"
:info="t('iptInfo')"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -145,13 +141,9 @@ onMounted(async () => {
:label="t('params.state')"
v-model="params.state"
:options="stateOptions"
option-value="id"
option-label="name"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -160,13 +152,9 @@ onMounted(async () => {
:label="t('params.futureState')"
v-model="params.futureState"
:options="stateOptions"
option-value="id"
option-label="name"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
@ -176,7 +164,6 @@ onMounted(async () => {
:label="t('params.problems')"
v-model="params.problems"
:toggle-indeterminate="false"
@update:model-value="searchFn()"
/>
</QItemSection>
</QItem>
@ -186,13 +173,9 @@ onMounted(async () => {
:label="t('params.warehouseFk')"
v-model="params.warehouseFk"
:options="warehousesOptions"
option-value="id"
option-label="name"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
</template>

1
src/pages/Ticket/locale/en.yml
View File

@ -120,6 +120,7 @@ basicData:
difference: Difference
total: Total
price: Price
warehouse: Warehouse
newPrice: New price
chargeDifference: Charge difference to
withoutNegatives: Create without negatives

1
src/pages/Ticket/locale/es.yml
View File

@ -47,6 +47,7 @@ basicData:
difference: Diferencia
total: Total
price: Precio
warehouse: Almacén
newPrice: Nuevo precio
chargeDifference: Cargar diferencia a
withoutNegatives: Crear sin negativos

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

@ -280,7 +280,7 @@ const fetchWeekData = async () => {
week: selectedWeekNumber.value,
};
try {
const [{ data: mailData }, { data: countData }] = await Promise.allS([
const [{ data: mailData }, { data: countData }] = await Promise.all([
axios.get(`Workers/${route.params.id}/mail`, {
params: { filter: { where } },
}),
@ -292,8 +292,9 @@ const fetchWeekData = async () => {
state.value = mail?.state;
reason.value = mail?.reason;
canResend.value = !!countData.count;
} catch {
} catch (error) {
state.value = null;
if (error?.status != 403) throw error;
}
};

4
test/cypress/integration/invoiceOut/invoiceOutList.spec.js
View File

@ -23,7 +23,7 @@ describe('InvoiceOut list', () => {
cy.dataCy('InvoiceOutDownloadPdfBtn').click();
});
it('should download all pdfs', () => {
it.skip('should download all pdfs', () => {
cy.get(columnCheckbox).click();
cy.dataCy('InvoiceOutDownloadPdfBtn').click();
});
@ -31,7 +31,7 @@ describe('InvoiceOut list', () => {
it('should open the invoice descriptor from table icon', () => {
cy.get(firstSummaryIcon).click();
cy.get('.cardSummary').should('be.visible');
cy.get('.summaryHeader > div').should('include.text', 'V10100001');
cy.get('.summaryHeader > div').should('include.text', 'A1111111');
});
it('should open the client descriptor', () => {

4
test/cypress/integration/ticket/ticketList.spec.js
View File

@ -76,8 +76,8 @@ describe('TicketList', () => {
});
}).as('ticket');
cy.get('[data-cy="Warehouse_select"]').type('Warehouse One');
cy.get('.q-menu .q-item').contains('Warehouse One').click();
cy.selectOption('[data-cy="Warehouse_select"]', 'Warehouse Five');
cy.searchBtnFilterPanel();
cy.wait('@ticket').then((interception) => {
const data = interception.response.body[0];
expect(data.hasComponentLack).to.equal(1);