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

refs #6993 fixed QTable behaviour
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Jon Elias 2024-03-15 12:45:15 +01:00
parent 667359ed92
commit ff5e09d315
19 changed files with 16 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -30,4 +30,8 @@ yarn-error.log*
# Cypress directories and files
/tests/cypress/videos
/tests/cypress/screenshots
/tests/cypress/screenshots
#File's changes differences
quasar.patch
quasar.patch:Zone.Identifier

2
src/boot/defaults/qTable.js
View File

@ -1,5 +1,5 @@
import { QTable } from 'quasar';
import setDefault from './setDefault';
setDefault(QTable, 'pagination', { rowsPerPage: 25 });
setDefault(QTable, 'pagination', { rowsPerPage: 0 });
setDefault(QTable, 'hidePagination', true);

1
src/components/common/VnDmsList.vue
View File

@ -218,7 +218,6 @@ function parseDms(data) {
/>
<QTable
:columns="columns"
:pagination="{ rowsPerPage: 0 }"
:rows="rows"
class="full-width q-mt-md"
hide-bottom

2
src/pages/Claim/Card/ClaimAction.vue
View File

@ -291,8 +291,6 @@ async function importToNewRefundTicket() {
selection="multiple"
v-model:selected="selectedRows"
:grid="$q.screen.lt.md"
:pagination="{ rowsPerPage: 0 }"
:hide-bottom="true"
>
<template #body-cell-ticket="{ value }">
<QTd align="center">

2
src/pages/Claim/Card/ClaimDevelopment.vue
View File

@ -150,10 +150,8 @@ const columns = computed(() => [
<QTable
:columns="columns"
:rows="rows"
:pagination="{ rowsPerPage: 0 }"
row-key="$index"
selection="multiple"
hide-pagination
v-model:selected="selected"
:grid="$q.screen.lt.md"
table-header-class="text-left"

2
src/pages/Claim/Card/ClaimLines.vue
View File

@ -201,11 +201,9 @@ function showImportDialog() {
:columns="columns"
:rows="rows"
:dense="$q.screen.lt.md"
:pagination="{ rowsPerPage: 0 }"
row-key="id"
selection="multiple"
v-model:selected="selected"
hide-pagination
:grid="$q.screen.lt.md"
>
<template #body-cell-claimed="{ row, value }">

1
src/pages/Claim/Card/ClaimLinesImport.vue
View File

@ -121,7 +121,6 @@ function cancel() {
class="my-sticky-header-table"
:columns="columns"
:rows="claimableSales"
:pagination="{ rowsPerPage: 10 }"
row-key="saleFk"
selection="multiple"
v-model:selected="selected"

16
src/pages/Claim/Card/ClaimSummary.vue
View File

@ -242,13 +242,7 @@ function openDialog(dmsId) {
{{ t('claim.summary.details') }}
<QIcon name="open_in_new" />
</a>
<QTable
:columns="detailsColumns"
:rows="salesClaimed"
flat
dense
:rows-per-page-options="[0]"
>
<QTable :columns="detailsColumns" :rows="salesClaimed" flat dense>
<template #header="props">
<QTr :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" />
</a>
<QTable
:columns="developmentColumns"
:rows="developments"
flat
dense
:rows-per-page-options="[0]"
>
<QTable :columns="developmentColumns" :rows="developments" flat dense>
<template #header="props">
<QTr :props="props">
<QTh v-for="col in props.cols" :key="col.name" :props="props">

1
src/pages/Customer/Card/CustomerBalance.vue
View File

@ -198,7 +198,6 @@ const updateCompanyId = (id) => {
<QTable
:columns="columns"
:pagination="{ rowsPerPage: 12 }"
:rows="rows"
class="full-width q-mt-md"
row-key="id"

8
src/pages/Customer/Card/CustomerCredits.vue
View File

@ -97,13 +97,7 @@ const toCustomerCreditCreate = () => {
<template>
<QPage class="column items-center q-pa-md">
<QTable
:columns="columns"
:pagination="{ rowsPerPage: 12 }"
:rows="rows"
class="full-width q-mt-md"
row-key="id"
>
<QTable :columns="columns" :rows="rows" class="full-width q-mt-md" row-key="id">
<template #body-cell="props">
<QTd :props="props">
<QTr :props="props" class="cursor-pointer">

1
src/pages/Customer/Card/CustomerGreuges.vue
View File

@ -140,7 +140,6 @@ const toCustomerGreugeCreate = () => {
<QTable
:columns="columns"
:pagination="{ rowsPerPage: 12 }"
:rows="rows"
class="full-width q-mt-md"
row-key="id"

1
src/pages/Customer/Card/CustomerRecoveries.vue
View File

@ -97,7 +97,6 @@ const toCustomerRecoverieCreate = () => {
<QPage class="column items-center q-pa-md">
<QTable
:columns="columns"
:pagination="{ rowsPerPage: 12 }"
:rows="rows"
class="full-width q-mt-md"
row-key="id"

1
src/pages/Customer/ExtendedList/CustomerExtendedList.vue
View File

@ -510,7 +510,6 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
<QPage class="column items-center q-pa-md">
<QTable
:columns="columns"
:pagination="{ rowsPerPage: 12 }"
:rows="rows"
class="full-width q-mt-md"
row-key="id"

8
src/pages/InvoiceIn/Card/InvoiceInSummary.vue
View File

@ -323,12 +323,7 @@ function getLink(param) {
{{ t('invoiceIn.card.vat') }}
<QIcon name="open_in_new" />
</a>
<QTable
:columns="vatColumns"
:rows="invoiceIn.invoiceInTax"
flat
>
<QTable :columns="vatColumns" :rows="invoiceIn.invoiceInTax" flat>
<template #header="props">
<QTr :props="props" class="bg">
<QTh v-for="col in props.cols" :key="col.name" :props="props">
@ -361,7 +356,6 @@ function getLink(param) {
:columns="dueDayColumns"
:rows="invoiceIn.invoiceInDueDay"
flat
>
<template #header="props">
<QTr :props="props" class="bg">

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

@ -232,7 +232,6 @@ const selectWorkerId = (id) => {
:columns="columns"
:rows="rows"
row-key="clientId"
:pagination="{ rowsPerPage: 0 }"
class="full-width q-mt-md"
>
<template #body-cell="props">

14
src/pages/Route/RouteList.vue
View File

@ -16,7 +16,7 @@ import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
import RouteSummary from 'pages/Route/Card/RouteSummary.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';
const stateStore = useStateStore();
@ -144,8 +144,8 @@ const cloneRoutes = () => {
};
const showRouteReport = () => {
const ids = selectedRows.value.map(row => row?.id)
const idString = ids.join(',')
const ids = selectedRows.value.map((row) => row?.id);
const idString = ids.join(',');
let url;
if (selectedRows.value.length <= 1) {
@ -153,12 +153,12 @@ const showRouteReport = () => {
} else {
const params = new URLSearchParams({
access_token: session.getToken(),
id: idString
})
id: idString,
});
url = `api/Routes/downloadZip?${params.toString()}`;
}
window.open(url, '_blank');
}
};
const markAsServed = () => {
selectedRows.value.forEach((row) => {
@ -263,7 +263,6 @@ const markAsServed = () => {
data-key="RouteList"
url="Routes/filter"
:order="['created DESC', 'id DESC']"
:limit="20"
auto-load
>
<template #body="{ rows }">
@ -275,7 +274,6 @@ const markAsServed = () => {
flat
row-key="id"
selection="multiple"
:pagination="{ sortBy: 'ID', descending: true }"
>
<template #body-cell-worker="props">
<QTd :props="props">

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

@ -151,7 +151,6 @@ onMounted(async () => {
:rows="rows"
row-key="id"
hide-header
:pagination="{ rowsPerPage: 0 }"
class="full-width q-mt-md"
:no-data-label="t('No results')"
>

1
src/pages/Travel/Card/TravelSummary.vue
View File

@ -290,7 +290,6 @@ async function setTravelData(travelData) {
<QTable
:rows="entriesTableRows"
:columns="entriesTableColumns"
row-key="id"
class="full-width q-mt-md"
>

1
src/pages/Travel/Card/TravelThermographs.vue
View File

@ -145,7 +145,6 @@ const removeThermograph = async (id) => {
:rows="rows"
:columns="TableColumns"
:no-data-label="t('No results')"
:rows-per-page-options="[0]"
row-key="id"
class="full-width q-mt-md"
>