Merge branch 'dev' into 7248-tablesObservation
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
334d39eeef
|
@ -27,6 +27,8 @@ 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;
|
||||
|
|
|
@ -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({
|
||||
|
|
|
@ -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 });
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -120,6 +120,7 @@ basicData:
|
|||
difference: Difference
|
||||
total: Total
|
||||
price: Price
|
||||
warehouse: Warehouse
|
||||
newPrice: New price
|
||||
chargeDifference: Charge difference to
|
||||
withoutNegatives: Create without negatives
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue