forked from verdnatura/salix-front
refs #6993 fixed QTable behaviour
This commit is contained in:
parent
667359ed92
commit
ff5e09d315
|
@ -30,4 +30,8 @@ yarn-error.log*
|
||||||
|
|
||||||
# Cypress directories and files
|
# Cypress directories and files
|
||||||
/tests/cypress/videos
|
/tests/cypress/videos
|
||||||
/tests/cypress/screenshots
|
/tests/cypress/screenshots
|
||||||
|
|
||||||
|
#File's changes differences
|
||||||
|
quasar.patch
|
||||||
|
quasar.patch:Zone.Identifier
|
|
@ -1,5 +1,5 @@
|
||||||
import { QTable } from 'quasar';
|
import { QTable } from 'quasar';
|
||||||
import setDefault from './setDefault';
|
import setDefault from './setDefault';
|
||||||
|
|
||||||
setDefault(QTable, 'pagination', { rowsPerPage: 25 });
|
setDefault(QTable, 'pagination', { rowsPerPage: 0 });
|
||||||
setDefault(QTable, 'hidePagination', true);
|
setDefault(QTable, 'hidePagination', true);
|
||||||
|
|
|
@ -218,7 +218,6 @@ function parseDms(data) {
|
||||||
/>
|
/>
|
||||||
<QTable
|
<QTable
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:pagination="{ rowsPerPage: 0 }"
|
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
class="full-width q-mt-md"
|
class="full-width q-mt-md"
|
||||||
hide-bottom
|
hide-bottom
|
||||||
|
|
|
@ -291,8 +291,6 @@ async function importToNewRefundTicket() {
|
||||||
selection="multiple"
|
selection="multiple"
|
||||||
v-model:selected="selectedRows"
|
v-model:selected="selectedRows"
|
||||||
:grid="$q.screen.lt.md"
|
:grid="$q.screen.lt.md"
|
||||||
:pagination="{ rowsPerPage: 0 }"
|
|
||||||
:hide-bottom="true"
|
|
||||||
>
|
>
|
||||||
<template #body-cell-ticket="{ value }">
|
<template #body-cell-ticket="{ value }">
|
||||||
<QTd align="center">
|
<QTd align="center">
|
||||||
|
|
|
@ -150,10 +150,8 @@ const columns = computed(() => [
|
||||||
<QTable
|
<QTable
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
:pagination="{ rowsPerPage: 0 }"
|
|
||||||
row-key="$index"
|
row-key="$index"
|
||||||
selection="multiple"
|
selection="multiple"
|
||||||
hide-pagination
|
|
||||||
v-model:selected="selected"
|
v-model:selected="selected"
|
||||||
:grid="$q.screen.lt.md"
|
:grid="$q.screen.lt.md"
|
||||||
table-header-class="text-left"
|
table-header-class="text-left"
|
||||||
|
|
|
@ -201,11 +201,9 @@ function showImportDialog() {
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
:dense="$q.screen.lt.md"
|
:dense="$q.screen.lt.md"
|
||||||
:pagination="{ rowsPerPage: 0 }"
|
|
||||||
row-key="id"
|
row-key="id"
|
||||||
selection="multiple"
|
selection="multiple"
|
||||||
v-model:selected="selected"
|
v-model:selected="selected"
|
||||||
hide-pagination
|
|
||||||
:grid="$q.screen.lt.md"
|
:grid="$q.screen.lt.md"
|
||||||
>
|
>
|
||||||
<template #body-cell-claimed="{ row, value }">
|
<template #body-cell-claimed="{ row, value }">
|
||||||
|
|
|
@ -121,7 +121,6 @@ function cancel() {
|
||||||
class="my-sticky-header-table"
|
class="my-sticky-header-table"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:rows="claimableSales"
|
:rows="claimableSales"
|
||||||
:pagination="{ rowsPerPage: 10 }"
|
|
||||||
row-key="saleFk"
|
row-key="saleFk"
|
||||||
selection="multiple"
|
selection="multiple"
|
||||||
v-model:selected="selected"
|
v-model:selected="selected"
|
||||||
|
|
|
@ -242,13 +242,7 @@ function openDialog(dmsId) {
|
||||||
{{ t('claim.summary.details') }}
|
{{ t('claim.summary.details') }}
|
||||||
<QIcon name="open_in_new" />
|
<QIcon name="open_in_new" />
|
||||||
</a>
|
</a>
|
||||||
<QTable
|
<QTable :columns="detailsColumns" :rows="salesClaimed" flat dense>
|
||||||
:columns="detailsColumns"
|
|
||||||
:rows="salesClaimed"
|
|
||||||
flat
|
|
||||||
dense
|
|
||||||
:rows-per-page-options="[0]"
|
|
||||||
>
|
|
||||||
<template #header="props">
|
<template #header="props">
|
||||||
<QTr :props="props">
|
<QTr :props="props">
|
||||||
<QTh v-for="col in props.cols" :key="col.name" :props="props">
|
<QTh v-for="col in props.cols" :key="col.name" :props="props">
|
||||||
|
@ -284,13 +278,7 @@ function openDialog(dmsId) {
|
||||||
<QIcon name="open_in_new" />
|
<QIcon name="open_in_new" />
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<QTable
|
<QTable :columns="developmentColumns" :rows="developments" flat dense>
|
||||||
:columns="developmentColumns"
|
|
||||||
:rows="developments"
|
|
||||||
flat
|
|
||||||
dense
|
|
||||||
:rows-per-page-options="[0]"
|
|
||||||
>
|
|
||||||
<template #header="props">
|
<template #header="props">
|
||||||
<QTr :props="props">
|
<QTr :props="props">
|
||||||
<QTh v-for="col in props.cols" :key="col.name" :props="props">
|
<QTh v-for="col in props.cols" :key="col.name" :props="props">
|
||||||
|
|
|
@ -198,7 +198,6 @@ const updateCompanyId = (id) => {
|
||||||
|
|
||||||
<QTable
|
<QTable
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:pagination="{ rowsPerPage: 12 }"
|
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
class="full-width q-mt-md"
|
class="full-width q-mt-md"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
|
|
|
@ -97,13 +97,7 @@ const toCustomerCreditCreate = () => {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<QPage class="column items-center q-pa-md">
|
<QPage class="column items-center q-pa-md">
|
||||||
<QTable
|
<QTable :columns="columns" :rows="rows" class="full-width q-mt-md" row-key="id">
|
||||||
:columns="columns"
|
|
||||||
:pagination="{ rowsPerPage: 12 }"
|
|
||||||
:rows="rows"
|
|
||||||
class="full-width q-mt-md"
|
|
||||||
row-key="id"
|
|
||||||
>
|
|
||||||
<template #body-cell="props">
|
<template #body-cell="props">
|
||||||
<QTd :props="props">
|
<QTd :props="props">
|
||||||
<QTr :props="props" class="cursor-pointer">
|
<QTr :props="props" class="cursor-pointer">
|
||||||
|
|
|
@ -140,7 +140,6 @@ const toCustomerGreugeCreate = () => {
|
||||||
|
|
||||||
<QTable
|
<QTable
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:pagination="{ rowsPerPage: 12 }"
|
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
class="full-width q-mt-md"
|
class="full-width q-mt-md"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
|
|
|
@ -97,7 +97,6 @@ const toCustomerRecoverieCreate = () => {
|
||||||
<QPage class="column items-center q-pa-md">
|
<QPage class="column items-center q-pa-md">
|
||||||
<QTable
|
<QTable
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:pagination="{ rowsPerPage: 12 }"
|
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
class="full-width q-mt-md"
|
class="full-width q-mt-md"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
|
|
|
@ -510,7 +510,6 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
|
||||||
<QPage class="column items-center q-pa-md">
|
<QPage class="column items-center q-pa-md">
|
||||||
<QTable
|
<QTable
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:pagination="{ rowsPerPage: 12 }"
|
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
class="full-width q-mt-md"
|
class="full-width q-mt-md"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
|
|
|
@ -323,12 +323,7 @@ function getLink(param) {
|
||||||
{{ t('invoiceIn.card.vat') }}
|
{{ t('invoiceIn.card.vat') }}
|
||||||
<QIcon name="open_in_new" />
|
<QIcon name="open_in_new" />
|
||||||
</a>
|
</a>
|
||||||
<QTable
|
<QTable :columns="vatColumns" :rows="invoiceIn.invoiceInTax" flat>
|
||||||
:columns="vatColumns"
|
|
||||||
:rows="invoiceIn.invoiceInTax"
|
|
||||||
flat
|
|
||||||
|
|
||||||
>
|
|
||||||
<template #header="props">
|
<template #header="props">
|
||||||
<QTr :props="props" class="bg">
|
<QTr :props="props" class="bg">
|
||||||
<QTh v-for="col in props.cols" :key="col.name" :props="props">
|
<QTh v-for="col in props.cols" :key="col.name" :props="props">
|
||||||
|
@ -361,7 +356,6 @@ function getLink(param) {
|
||||||
:columns="dueDayColumns"
|
:columns="dueDayColumns"
|
||||||
:rows="invoiceIn.invoiceInDueDay"
|
:rows="invoiceIn.invoiceInDueDay"
|
||||||
flat
|
flat
|
||||||
|
|
||||||
>
|
>
|
||||||
<template #header="props">
|
<template #header="props">
|
||||||
<QTr :props="props" class="bg">
|
<QTr :props="props" class="bg">
|
||||||
|
|
|
@ -232,7 +232,6 @@ const selectWorkerId = (id) => {
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
row-key="clientId"
|
row-key="clientId"
|
||||||
:pagination="{ rowsPerPage: 0 }"
|
|
||||||
class="full-width q-mt-md"
|
class="full-width q-mt-md"
|
||||||
>
|
>
|
||||||
<template #body-cell="props">
|
<template #body-cell="props">
|
||||||
|
|
|
@ -16,7 +16,7 @@ import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
|
||||||
import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
|
import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
|
||||||
import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
|
import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
|
||||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||||
import {useSession} from "composables/useSession";
|
import { useSession } from 'composables/useSession';
|
||||||
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||||
|
|
||||||
const stateStore = useStateStore();
|
const stateStore = useStateStore();
|
||||||
|
@ -144,8 +144,8 @@ const cloneRoutes = () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const showRouteReport = () => {
|
const showRouteReport = () => {
|
||||||
const ids = selectedRows.value.map(row => row?.id)
|
const ids = selectedRows.value.map((row) => row?.id);
|
||||||
const idString = ids.join(',')
|
const idString = ids.join(',');
|
||||||
let url;
|
let url;
|
||||||
|
|
||||||
if (selectedRows.value.length <= 1) {
|
if (selectedRows.value.length <= 1) {
|
||||||
|
@ -153,12 +153,12 @@ const showRouteReport = () => {
|
||||||
} else {
|
} else {
|
||||||
const params = new URLSearchParams({
|
const params = new URLSearchParams({
|
||||||
access_token: session.getToken(),
|
access_token: session.getToken(),
|
||||||
id: idString
|
id: idString,
|
||||||
})
|
});
|
||||||
url = `api/Routes/downloadZip?${params.toString()}`;
|
url = `api/Routes/downloadZip?${params.toString()}`;
|
||||||
}
|
}
|
||||||
window.open(url, '_blank');
|
window.open(url, '_blank');
|
||||||
}
|
};
|
||||||
|
|
||||||
const markAsServed = () => {
|
const markAsServed = () => {
|
||||||
selectedRows.value.forEach((row) => {
|
selectedRows.value.forEach((row) => {
|
||||||
|
@ -263,7 +263,6 @@ const markAsServed = () => {
|
||||||
data-key="RouteList"
|
data-key="RouteList"
|
||||||
url="Routes/filter"
|
url="Routes/filter"
|
||||||
:order="['created DESC', 'id DESC']"
|
:order="['created DESC', 'id DESC']"
|
||||||
:limit="20"
|
|
||||||
auto-load
|
auto-load
|
||||||
>
|
>
|
||||||
<template #body="{ rows }">
|
<template #body="{ rows }">
|
||||||
|
@ -275,7 +274,6 @@ const markAsServed = () => {
|
||||||
flat
|
flat
|
||||||
row-key="id"
|
row-key="id"
|
||||||
selection="multiple"
|
selection="multiple"
|
||||||
:pagination="{ sortBy: 'ID', descending: true }"
|
|
||||||
>
|
>
|
||||||
<template #body-cell-worker="props">
|
<template #body-cell-worker="props">
|
||||||
<QTd :props="props">
|
<QTd :props="props">
|
||||||
|
|
|
@ -151,7 +151,6 @@ onMounted(async () => {
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
hide-header
|
hide-header
|
||||||
:pagination="{ rowsPerPage: 0 }"
|
|
||||||
class="full-width q-mt-md"
|
class="full-width q-mt-md"
|
||||||
:no-data-label="t('No results')"
|
:no-data-label="t('No results')"
|
||||||
>
|
>
|
||||||
|
|
|
@ -290,7 +290,6 @@ async function setTravelData(travelData) {
|
||||||
<QTable
|
<QTable
|
||||||
:rows="entriesTableRows"
|
:rows="entriesTableRows"
|
||||||
:columns="entriesTableColumns"
|
:columns="entriesTableColumns"
|
||||||
|
|
||||||
row-key="id"
|
row-key="id"
|
||||||
class="full-width q-mt-md"
|
class="full-width q-mt-md"
|
||||||
>
|
>
|
||||||
|
|
|
@ -145,7 +145,6 @@ const removeThermograph = async (id) => {
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
:columns="TableColumns"
|
:columns="TableColumns"
|
||||||
:no-data-label="t('No results')"
|
:no-data-label="t('No results')"
|
||||||
:rows-per-page-options="[0]"
|
|
||||||
row-key="id"
|
row-key="id"
|
||||||
class="full-width q-mt-md"
|
class="full-width q-mt-md"
|
||||||
>
|
>
|
||||||
|
|
Loading…
Reference in New Issue