Merge branch 'dev' into 8441-createVehicleInvoiceInSection
gitea/salix-front/pipeline/pr-dev This commit is unstable
Details
gitea/salix-front/pipeline/pr-dev This commit is unstable
Details
This commit is contained in:
commit
78df8c877d
|
@ -34,7 +34,7 @@ import VnTableFilter from './VnTableFilter.vue';
|
||||||
import { getColAlign } from 'src/composables/getColAlign';
|
import { getColAlign } from 'src/composables/getColAlign';
|
||||||
import RightMenu from '../common/RightMenu.vue';
|
import RightMenu from '../common/RightMenu.vue';
|
||||||
import VnScroll from '../common/VnScroll.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 arrayData = useArrayData(useAttrs()['data-key']);
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -644,21 +644,15 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
};
|
};
|
||||||
return () => {};
|
return () => {};
|
||||||
});
|
});
|
||||||
const handleMultiCheck = (value) => {
|
const handleHeaderSelection = (evt, data) => {
|
||||||
if (value) {
|
if (evt === 'selected' && data) {
|
||||||
selected.value = tableRef.value.rows;
|
selected.value = tableRef.value.rows;
|
||||||
} else {
|
} else if (evt === 'selectAll') {
|
||||||
selected.value = [];
|
|
||||||
}
|
|
||||||
emit('update:selected', selected.value);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleSelectedAll = (data) => {
|
|
||||||
if (data) {
|
|
||||||
selected.value = data;
|
selected.value = data;
|
||||||
} else {
|
} else {
|
||||||
selected.value = [];
|
selected.value = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
emit('update:selected', selected.value);
|
emit('update:selected', selected.value);
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
@ -724,14 +718,14 @@ const handleSelectedAll = (data) => {
|
||||||
:data-cy
|
:data-cy
|
||||||
>
|
>
|
||||||
<template #header-selection>
|
<template #header-selection>
|
||||||
<VnMultiCheck
|
<VnCheckboxMenu
|
||||||
:searchUrl="searchUrl"
|
:searchUrl="searchUrl"
|
||||||
:expand="$props.multiCheck.expand"
|
:expand="$props.multiCheck.expand"
|
||||||
v-model="selectAll"
|
v-model="selectAll"
|
||||||
:url="$attrs['url']"
|
:url="$attrs['url']"
|
||||||
@update:selected="handleMultiCheck"
|
@update:selected="handleHeaderSelection('selected', $event)"
|
||||||
@select:all="handleSelectedAll"
|
@select:all="handleHeaderSelection('selectAll', $event)"
|
||||||
></VnMultiCheck>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #top-left v-if="!$props.withoutHeader">
|
<template #top-left v-if="!$props.withoutHeader">
|
||||||
|
|
|
@ -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>
|
|
@ -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>
|
|
|
@ -161,7 +161,7 @@ const arrayData = useArrayData(arrayDataKey, {
|
||||||
searchUrl: false,
|
searchUrl: false,
|
||||||
mapKey: $attrs['map-key'],
|
mapKey: $attrs['map-key'],
|
||||||
});
|
});
|
||||||
|
const isMenuOpened = ref(false);
|
||||||
const computedSortBy = computed(() => {
|
const computedSortBy = computed(() => {
|
||||||
return $props.sortBy || $props.optionLabel + ' ASC';
|
return $props.sortBy || $props.optionLabel + ' ASC';
|
||||||
});
|
});
|
||||||
|
@ -186,7 +186,9 @@ onMounted(() => {
|
||||||
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
|
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() {
|
function findKeyInOptions() {
|
||||||
if (!$props.options) return;
|
if (!$props.options) return;
|
||||||
return filter($props.modelValue, $props.options)?.length;
|
return filter($props.modelValue, $props.options)?.length;
|
||||||
|
@ -369,6 +371,8 @@ function getCaption(opt) {
|
||||||
:input-debounce="useURL ? '300' : '0'"
|
:input-debounce="useURL ? '300' : '0'"
|
||||||
:loading="someIsLoading"
|
:loading="someIsLoading"
|
||||||
@virtual-scroll="onScroll"
|
@virtual-scroll="onScroll"
|
||||||
|
@popup-hide="isMenuOpened = false"
|
||||||
|
@popup-show="isMenuOpened = true"
|
||||||
@keydown="handleKeyDown"
|
@keydown="handleKeyDown"
|
||||||
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
|
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
|
||||||
:data-url="url"
|
:data-url="url"
|
||||||
|
|
|
@ -19,7 +19,7 @@ export function useArrayData(key, userOptions) {
|
||||||
let canceller = null;
|
let canceller = null;
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
setOptions();
|
setOptions(userOptions ?? {});
|
||||||
reset(['skip']);
|
reset(['skip']);
|
||||||
|
|
||||||
const query = route.query;
|
const query = route.query;
|
||||||
|
@ -39,9 +39,10 @@ export function useArrayData(key, userOptions) {
|
||||||
setCurrentFilter();
|
setCurrentFilter();
|
||||||
});
|
});
|
||||||
|
|
||||||
if (key && userOptions) setOptions();
|
if (userOptions) setOptions(userOptions);
|
||||||
|
|
||||||
function setOptions(params = userOptions) {
|
function setOptions(params) {
|
||||||
|
if (!params) return;
|
||||||
const allowedOptions = [
|
const allowedOptions = [
|
||||||
'url',
|
'url',
|
||||||
'filter',
|
'filter',
|
||||||
|
|
|
@ -89,7 +89,6 @@ const columns = computed(() => [
|
||||||
<CustomerNotificationsCampaignConsumption
|
<CustomerNotificationsCampaignConsumption
|
||||||
:selected-rows="selected.length > 0"
|
:selected-rows="selected.length > 0"
|
||||||
:clients="selected"
|
:clients="selected"
|
||||||
:promise="refreshData"
|
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</VnSubToolbar>
|
</VnSubToolbar>
|
||||||
|
|
|
@ -142,13 +142,13 @@ onMounted(async () => {
|
||||||
valentinesDay: Valentine's Day
|
valentinesDay: Valentine's Day
|
||||||
mothersDay: Mother's Day
|
mothersDay: Mother's Day
|
||||||
allSaints: All Saints' Day
|
allSaints: All Saints' Day
|
||||||
Campaign consumption: Campaign consumption ({rows})
|
Campaign consumption: Campaign consumption - {rows} records
|
||||||
es:
|
es:
|
||||||
params:
|
params:
|
||||||
valentinesDay: Día de San Valentín
|
valentinesDay: Día de San Valentín
|
||||||
mothersDay: Día de la Madre
|
mothersDay: Día de la Madre
|
||||||
allSaints: Día de Todos los Santos
|
allSaints: Día de Todos los Santos
|
||||||
Campaign consumption: Consumo campaña ({rows})
|
Campaign consumption: Consumo campaña - {rows} registros
|
||||||
Campaign: Campaña
|
Campaign: Campaña
|
||||||
From: Desde
|
From: Desde
|
||||||
To: Hasta
|
To: Hasta
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useRoute, useRouter } from 'vue-router';
|
import { useRoute, useRouter } from 'vue-router';
|
||||||
|
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
|
|
||||||
|
import { usePrintService } from 'composables/usePrintService';
|
||||||
import { downloadFile } from 'src/composables/downloadFile';
|
import { downloadFile } from 'src/composables/downloadFile';
|
||||||
|
|
||||||
import CustomerFileManagementDelete from 'src/pages/Customer/components/CustomerFileManagementDelete.vue';
|
import CustomerFileManagementDelete from 'src/pages/Customer/components/CustomerFileManagementDelete.vue';
|
||||||
|
@ -12,7 +12,7 @@ const { t } = useI18n();
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
const { openReport } = usePrintService();
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
id: {
|
id: {
|
||||||
type: Number,
|
type: Number,
|
||||||
|
@ -24,7 +24,7 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const setDownloadFile = () => downloadFile($props.id);
|
const setDownloadFile = () => openReport(`dms/${$props.id}/downloadFile`, {}, '_blank');
|
||||||
|
|
||||||
const toCustomerFileManagementEdit = () => {
|
const toCustomerFileManagementEdit = () => {
|
||||||
router.push({
|
router.push({
|
||||||
|
|
|
@ -40,13 +40,11 @@ const dateRanges = computed(() => {
|
||||||
return { from, to };
|
return { from, to };
|
||||||
});
|
});
|
||||||
|
|
||||||
const reportParams = computed(() => {
|
const reportParams = computed(() => ({
|
||||||
return {
|
|
||||||
recipientId: Number(route.params.id),
|
recipientId: Number(route.params.id),
|
||||||
to: dateRange(dateRanges.value.to)[1],
|
from: dateRange(dateRanges.value.from)[0].toISOString(),
|
||||||
from: dateRange(dateRanges.value.from)[1],
|
to: dateRange(dateRanges.value.to)[1].toISOString(),
|
||||||
};
|
}));
|
||||||
});
|
|
||||||
|
|
||||||
async function getSupplierConsumptionData() {
|
async function getSupplierConsumptionData() {
|
||||||
await arrayData.fetch({ append: false });
|
await arrayData.fetch({ append: false });
|
||||||
|
|
|
@ -294,7 +294,7 @@ async function getZone(options) {
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('ticketList.warehouse')"
|
:label="t('basicData.warehouse')"
|
||||||
v-model="warehouseId"
|
v-model="warehouseId"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="name"
|
option-label="name"
|
||||||
|
@ -302,7 +302,7 @@ async function getZone(options) {
|
||||||
hide-selected
|
hide-selected
|
||||||
map-options
|
map-options
|
||||||
:required="true"
|
:required="true"
|
||||||
:rules="validate('ticketList.warehouse')"
|
:rules="validate('basicData.warehouse')"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md no-wrap">
|
<VnRow class="row q-gutter-md q-mb-md no-wrap">
|
||||||
|
|
|
@ -137,8 +137,6 @@ const setUserParams = (params) => {
|
||||||
($event) => onCategoryChange($event, searchFn)
|
($event) => onCategoryChange($event, searchFn)
|
||||||
"
|
"
|
||||||
:options="categoriesOptions"
|
:options="categoriesOptions"
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
hide-selected
|
hide-selected
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
|
@ -152,10 +150,7 @@ const setUserParams = (params) => {
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('negative.type')"
|
:label="t('negative.type')"
|
||||||
v-model="params.typeFk"
|
v-model="params.typeFk"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:options="itemTypesOptions"
|
:options="itemTypesOptions"
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
hide-selected
|
hide-selected
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
|
|
|
@ -121,7 +121,7 @@ const ticketColumns = computed(() => [
|
||||||
format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
|
format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'right',
|
||||||
label: t('advanceTickets.import'),
|
label: t('advanceTickets.import'),
|
||||||
name: 'totalWithVat',
|
name: 'totalWithVat',
|
||||||
hidden: true,
|
hidden: true,
|
||||||
|
@ -172,6 +172,15 @@ const ticketColumns = computed(() => [
|
||||||
headerClass: 'horizontal-separator',
|
headerClass: 'horizontal-separator',
|
||||||
name: 'futureLiters',
|
name: 'futureLiters',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: t('advanceTickets.preparation'),
|
||||||
|
name: 'futurePreparation',
|
||||||
|
field: 'futurePreparation',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
headerClass: 'horizontal-separator',
|
||||||
|
columnFilter: false,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('advanceTickets.futureZone'),
|
label: t('advanceTickets.futureZone'),
|
||||||
|
@ -196,15 +205,17 @@ const ticketColumns = computed(() => [
|
||||||
label: t('advanceTickets.notMovableLines'),
|
label: t('advanceTickets.notMovableLines'),
|
||||||
headerClass: 'horizontal-separator',
|
headerClass: 'horizontal-separator',
|
||||||
name: 'notMovableLines',
|
name: 'notMovableLines',
|
||||||
|
class: 'shrink',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('advanceTickets.futureLines'),
|
label: t('advanceTickets.futureLines'),
|
||||||
headerClass: 'horizontal-separator',
|
headerClass: 'horizontal-separator',
|
||||||
name: 'futureLines',
|
name: 'futureLines',
|
||||||
|
class: 'shrink',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'right',
|
||||||
label: t('advanceTickets.futureImport'),
|
label: t('advanceTickets.futureImport'),
|
||||||
name: 'futureTotalWithVat',
|
name: 'futureTotalWithVat',
|
||||||
hidden: true,
|
hidden: true,
|
||||||
|
@ -399,8 +410,10 @@ watch(
|
||||||
destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
|
destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
|
||||||
originElRef.value.classList.add('text-uppercase', 'color-vn-label');
|
originElRef.value.classList.add('text-uppercase', 'color-vn-label');
|
||||||
|
|
||||||
destinationElRef.value.setAttribute('colspan', '10');
|
originElRef.value.classList.add('advance-icon');
|
||||||
originElRef.value.setAttribute('colspan', '10');
|
|
||||||
|
destinationElRef.value.setAttribute('colspan', '9');
|
||||||
|
originElRef.value.setAttribute('colspan', '11');
|
||||||
|
|
||||||
destinationElRef.value.textContent = `${t(
|
destinationElRef.value.textContent = `${t(
|
||||||
'advanceTickets.destination',
|
'advanceTickets.destination',
|
||||||
|
|
|
@ -68,7 +68,7 @@ onMounted(async () => await getItemPackingTypes());
|
||||||
<span>{{ formatFn(tag.value) }}</span>
|
<span>{{ formatFn(tag.value) }}</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #body="{ params, searchFn }">
|
<template #body="{ params }">
|
||||||
<QItem class="q-my-sm">
|
<QItem class="q-my-sm">
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<VnInputDate
|
<VnInputDate
|
||||||
|
@ -96,12 +96,10 @@ onMounted(async () => await getItemPackingTypes());
|
||||||
option-value="code"
|
option-value="code"
|
||||||
option-label="description"
|
option-label="description"
|
||||||
:info="t('iptInfo')"
|
:info="t('iptInfo')"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
:use-like="false"
|
:use-like="false"
|
||||||
>
|
/>
|
||||||
</VnSelect>
|
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
|
@ -113,12 +111,10 @@ onMounted(async () => await getItemPackingTypes());
|
||||||
option-value="code"
|
option-value="code"
|
||||||
option-label="description"
|
option-label="description"
|
||||||
:info="t('iptInfo')"
|
:info="t('iptInfo')"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
:use-like="false"
|
:use-like="false"
|
||||||
>
|
/>
|
||||||
</VnSelect>
|
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
|
@ -137,7 +133,6 @@ onMounted(async () => await getItemPackingTypes());
|
||||||
:label="t('params.isFullMovable')"
|
:label="t('params.isFullMovable')"
|
||||||
v-model="params.isFullMovable"
|
v-model="params.isFullMovable"
|
||||||
toggle-indeterminate
|
toggle-indeterminate
|
||||||
@update:model-value="searchFn()"
|
|
||||||
dense
|
dense
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
|
@ -160,13 +155,9 @@ onMounted(async () => await getItemPackingTypes());
|
||||||
:label="t('params.warehouseFk')"
|
:label="t('params.warehouseFk')"
|
||||||
v-model="params.warehouseFk"
|
v-model="params.warehouseFk"
|
||||||
:options="warehousesOptions"
|
:options="warehousesOptions"
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
@update:model-value="searchFn()"
|
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
>
|
/>
|
||||||
</VnSelect>
|
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
|
@ -175,7 +166,6 @@ onMounted(async () => await getItemPackingTypes());
|
||||||
toggle-indeterminate
|
toggle-indeterminate
|
||||||
:label="t('params.onlyWithDestination')"
|
:label="t('params.onlyWithDestination')"
|
||||||
v-model="params.onlyWithDestination"
|
v-model="params.onlyWithDestination"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
dense
|
dense
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
|
|
|
@ -60,7 +60,7 @@ const groupedStates = ref([]);
|
||||||
<span>{{ formatFn(tag.value) }}</span>
|
<span>{{ formatFn(tag.value) }}</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #body="{ params, searchFn }">
|
<template #body="{ params }">
|
||||||
<QItem>
|
<QItem>
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<VnInput v-model="params.clientFk" :label="t('Customer ID')" filled />
|
<VnInput v-model="params.clientFk" :label="t('Customer ID')" filled />
|
||||||
|
@ -108,10 +108,7 @@ const groupedStates = ref([]);
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('State')"
|
:label="t('State')"
|
||||||
v-model="params.stateFk"
|
v-model="params.stateFk"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:options="states"
|
:options="states"
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
emit-value
|
emit-value
|
||||||
map-options
|
map-options
|
||||||
use-input
|
use-input
|
||||||
|
@ -128,7 +125,6 @@ const groupedStates = ref([]);
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('params.groupedStates')"
|
:label="t('params.groupedStates')"
|
||||||
v-model="params.groupedStates"
|
v-model="params.groupedStates"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:options="groupedStates"
|
:options="groupedStates"
|
||||||
option-label="code"
|
option-label="code"
|
||||||
emit-value
|
emit-value
|
||||||
|
@ -163,7 +159,6 @@ const groupedStates = ref([]);
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
v-model="params.myTeam"
|
v-model="params.myTeam"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:label="t('My team')"
|
:label="t('My team')"
|
||||||
toggle-indeterminate
|
toggle-indeterminate
|
||||||
/>
|
/>
|
||||||
|
@ -171,7 +166,6 @@ const groupedStates = ref([]);
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
v-model="params.pending"
|
v-model="params.pending"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:label="t('Pending')"
|
:label="t('Pending')"
|
||||||
toggle-indeterminate
|
toggle-indeterminate
|
||||||
/>
|
/>
|
||||||
|
@ -181,7 +175,6 @@ const groupedStates = ref([]);
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
v-model="params.hasInvoice"
|
v-model="params.hasInvoice"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:label="t('Invoiced')"
|
:label="t('Invoiced')"
|
||||||
toggle-indeterminate
|
toggle-indeterminate
|
||||||
/>
|
/>
|
||||||
|
@ -189,7 +182,6 @@ const groupedStates = ref([]);
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
v-model="params.hasRoute"
|
v-model="params.hasRoute"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:label="t('Routed')"
|
:label="t('Routed')"
|
||||||
toggle-indeterminate
|
toggle-indeterminate
|
||||||
/>
|
/>
|
||||||
|
@ -203,10 +195,7 @@ const groupedStates = ref([]);
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Province')"
|
:label="t('Province')"
|
||||||
v-model="params.provinceFk"
|
v-model="params.provinceFk"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:options="provinces"
|
:options="provinces"
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
emit-value
|
emit-value
|
||||||
map-options
|
map-options
|
||||||
use-input
|
use-input
|
||||||
|
@ -223,7 +212,6 @@ const groupedStates = ref([]);
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Agency')"
|
:label="t('Agency')"
|
||||||
v-model="params.agencyModeFk"
|
v-model="params.agencyModeFk"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:options="agencies"
|
:options="agencies"
|
||||||
emit-value
|
emit-value
|
||||||
map-options
|
map-options
|
||||||
|
@ -241,10 +229,7 @@ const groupedStates = ref([]);
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Warehouse')"
|
:label="t('Warehouse')"
|
||||||
v-model="params.warehouseFk"
|
v-model="params.warehouseFk"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:options="warehouses"
|
:options="warehouses"
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
emit-value
|
emit-value
|
||||||
map-options
|
map-options
|
||||||
use-input
|
use-input
|
||||||
|
|
|
@ -85,6 +85,7 @@ const ticketColumns = computed(() => [
|
||||||
label: t('advanceTickets.liters'),
|
label: t('advanceTickets.liters'),
|
||||||
name: 'liters',
|
name: 'liters',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
class: 'shrink',
|
||||||
headerClass: 'horizontal-separator',
|
headerClass: 'horizontal-separator',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -177,7 +178,12 @@ watch(
|
||||||
if (!$el) return;
|
if (!$el) return;
|
||||||
const head = $el.querySelector('thead');
|
const head = $el.querySelector('thead');
|
||||||
const firstRow = $el.querySelector('thead > tr');
|
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');
|
const newRow = document.createElement('tr');
|
||||||
destinationElRef.value = document.createElement('th');
|
destinationElRef.value = document.createElement('th');
|
||||||
originElRef.value = document.createElement('th');
|
originElRef.value = document.createElement('th');
|
||||||
|
@ -185,9 +191,10 @@ watch(
|
||||||
newRow.classList.add('bg-header');
|
newRow.classList.add('bg-header');
|
||||||
destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
|
destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
|
||||||
originElRef.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');
|
destinationElRef.value.setAttribute('colspan', '9');
|
||||||
originElRef.value.setAttribute('colspan', '9');
|
originElRef.value.setAttribute('colspan', '7');
|
||||||
|
|
||||||
originElRef.value.textContent = `${t('advanceTickets.origin')}`;
|
originElRef.value.textContent = `${t('advanceTickets.origin')}`;
|
||||||
destinationElRef.value.textContent = `${t('advanceTickets.destination')}`;
|
destinationElRef.value.textContent = `${t('advanceTickets.destination')}`;
|
||||||
|
@ -371,4 +378,12 @@ watch(
|
||||||
:deep(.horizontal-bottom-separator) {
|
:deep(.horizontal-bottom-separator) {
|
||||||
border-bottom: 4px solid white !important;
|
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>
|
</style>
|
||||||
|
|
|
@ -70,7 +70,7 @@ onMounted(async () => {
|
||||||
<span>{{ formatFn(tag.value) }}</span>
|
<span>{{ formatFn(tag.value) }}</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #body="{ params, searchFn }">
|
<template #body="{ params }">
|
||||||
<QItem class="q-my-sm">
|
<QItem class="q-my-sm">
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<VnInputDate
|
<VnInputDate
|
||||||
|
@ -116,11 +116,9 @@ onMounted(async () => {
|
||||||
option-value="code"
|
option-value="code"
|
||||||
option-label="description"
|
option-label="description"
|
||||||
:info="t('iptInfo')"
|
:info="t('iptInfo')"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
>
|
/>
|
||||||
</VnSelect>
|
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
|
@ -132,11 +130,9 @@ onMounted(async () => {
|
||||||
option-value="code"
|
option-value="code"
|
||||||
option-label="description"
|
option-label="description"
|
||||||
:info="t('iptInfo')"
|
:info="t('iptInfo')"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
>
|
/>
|
||||||
</VnSelect>
|
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
|
@ -145,13 +141,9 @@ onMounted(async () => {
|
||||||
:label="t('params.state')"
|
:label="t('params.state')"
|
||||||
v-model="params.state"
|
v-model="params.state"
|
||||||
:options="stateOptions"
|
:options="stateOptions"
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
@update:model-value="searchFn()"
|
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
>
|
/>
|
||||||
</VnSelect>
|
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
|
@ -160,13 +152,9 @@ onMounted(async () => {
|
||||||
:label="t('params.futureState')"
|
:label="t('params.futureState')"
|
||||||
v-model="params.futureState"
|
v-model="params.futureState"
|
||||||
:options="stateOptions"
|
:options="stateOptions"
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
@update:model-value="searchFn()"
|
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
>
|
/>
|
||||||
</VnSelect>
|
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
|
||||||
|
@ -176,7 +164,6 @@ onMounted(async () => {
|
||||||
:label="t('params.problems')"
|
:label="t('params.problems')"
|
||||||
v-model="params.problems"
|
v-model="params.problems"
|
||||||
:toggle-indeterminate="false"
|
:toggle-indeterminate="false"
|
||||||
@update:model-value="searchFn()"
|
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
@ -186,13 +173,9 @@ onMounted(async () => {
|
||||||
:label="t('params.warehouseFk')"
|
:label="t('params.warehouseFk')"
|
||||||
v-model="params.warehouseFk"
|
v-model="params.warehouseFk"
|
||||||
:options="warehousesOptions"
|
:options="warehousesOptions"
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
@update:model-value="searchFn()"
|
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
>
|
/>
|
||||||
</VnSelect>
|
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -120,6 +120,7 @@ basicData:
|
||||||
difference: Difference
|
difference: Difference
|
||||||
total: Total
|
total: Total
|
||||||
price: Price
|
price: Price
|
||||||
|
warehouse: Warehouse
|
||||||
newPrice: New price
|
newPrice: New price
|
||||||
chargeDifference: Charge difference to
|
chargeDifference: Charge difference to
|
||||||
withoutNegatives: Create without negatives
|
withoutNegatives: Create without negatives
|
||||||
|
|
|
@ -47,6 +47,7 @@ basicData:
|
||||||
difference: Diferencia
|
difference: Diferencia
|
||||||
total: Total
|
total: Total
|
||||||
price: Precio
|
price: Precio
|
||||||
|
warehouse: Almacén
|
||||||
newPrice: Nuevo precio
|
newPrice: Nuevo precio
|
||||||
chargeDifference: Cargar diferencia a
|
chargeDifference: Cargar diferencia a
|
||||||
withoutNegatives: Crear sin negativos
|
withoutNegatives: Crear sin negativos
|
||||||
|
|
|
@ -280,7 +280,7 @@ const fetchWeekData = async () => {
|
||||||
week: selectedWeekNumber.value,
|
week: selectedWeekNumber.value,
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
const [{ data: mailData }, { data: countData }] = await Promise.allS([
|
const [{ data: mailData }, { data: countData }] = await Promise.all([
|
||||||
axios.get(`Workers/${route.params.id}/mail`, {
|
axios.get(`Workers/${route.params.id}/mail`, {
|
||||||
params: { filter: { where } },
|
params: { filter: { where } },
|
||||||
}),
|
}),
|
||||||
|
@ -292,8 +292,9 @@ const fetchWeekData = async () => {
|
||||||
state.value = mail?.state;
|
state.value = mail?.state;
|
||||||
reason.value = mail?.reason;
|
reason.value = mail?.reason;
|
||||||
canResend.value = !!countData.count;
|
canResend.value = !!countData.count;
|
||||||
} catch {
|
} catch (error) {
|
||||||
state.value = null;
|
state.value = null;
|
||||||
|
if (error?.status != 403) throw error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ describe('InvoiceOut list', () => {
|
||||||
cy.dataCy('InvoiceOutDownloadPdfBtn').click();
|
cy.dataCy('InvoiceOutDownloadPdfBtn').click();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should download all pdfs', () => {
|
it.skip('should download all pdfs', () => {
|
||||||
cy.get(columnCheckbox).click();
|
cy.get(columnCheckbox).click();
|
||||||
cy.dataCy('InvoiceOutDownloadPdfBtn').click();
|
cy.dataCy('InvoiceOutDownloadPdfBtn').click();
|
||||||
});
|
});
|
||||||
|
@ -31,7 +31,7 @@ describe('InvoiceOut list', () => {
|
||||||
it('should open the invoice descriptor from table icon', () => {
|
it('should open the invoice descriptor from table icon', () => {
|
||||||
cy.get(firstSummaryIcon).click();
|
cy.get(firstSummaryIcon).click();
|
||||||
cy.get('.cardSummary').should('be.visible');
|
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', () => {
|
it('should open the client descriptor', () => {
|
||||||
|
|
|
@ -76,8 +76,8 @@ describe('TicketList', () => {
|
||||||
});
|
});
|
||||||
}).as('ticket');
|
}).as('ticket');
|
||||||
|
|
||||||
cy.get('[data-cy="Warehouse_select"]').type('Warehouse One');
|
cy.selectOption('[data-cy="Warehouse_select"]', 'Warehouse Five');
|
||||||
cy.get('.q-menu .q-item').contains('Warehouse One').click();
|
cy.searchBtnFilterPanel();
|
||||||
cy.wait('@ticket').then((interception) => {
|
cy.wait('@ticket').then((interception) => {
|
||||||
const data = interception.response.body[0];
|
const data = interception.response.body[0];
|
||||||
expect(data.hasComponentLack).to.equal(1);
|
expect(data.hasComponentLack).to.equal(1);
|
||||||
|
|
Loading…
Reference in New Issue