6464
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jon Elias 2024-05-15 09:05:29 +02:00
parent dcbf2eb837
commit b97f7e6b42
15 changed files with 87 additions and 25 deletions

View File

@ -139,6 +139,7 @@ const columns = computed(() => [
props: (prop) => ({ props: (prop) => ({
disable: true, disable: true,
'model-value': Boolean(prop.value), 'model-value': Boolean(prop.value),
class: 'disabled-checkbox',
}), }),
}, },
{ {

View File

@ -86,7 +86,9 @@ async function search() {
store.filter.skip = 0; store.filter.skip = 0;
store.skip = 0; store.skip = 0;
const { params: newParams } = await arrayData.addFilter({ params }); const { params: newParams } = await arrayData.addFilter({ params });
console.log('params: ', params);
userParams.value = newParams; userParams.value = newParams;
console.log('userParams: ', userParams);
if (!props.showAll && !Object.values(params).length) store.data = []; if (!props.showAll && !Object.values(params).length) store.data = [];

View File

@ -145,6 +145,15 @@ select:-webkit-autofill {
color: var(--vn-label-color); color: var(--vn-label-color);
} }
.disabled-checkbox {
& .q-checkbox__label {
color: var(--vn-text-color);
}
& .q-checkbox__inner {
color: var(--vn-label-color);
}
}
.q-chip, .q-chip,
.q-notification__message, .q-notification__message,
.q-notification__icon { .q-notification__icon {

View File

@ -183,10 +183,11 @@ const toCustomerAddressEdit = (addressId) => {
<QCheckbox <QCheckbox
:label="t('Is equalizated')" :label="t('Is equalizated')"
v-model="item.isEqualizated" v-model="item.isEqualizated"
class="q-mr-lg" class="q-mr-lg disabled-checkbox"
disable disable
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('Is logiflora allowed')" :label="t('Is logiflora allowed')"
v-model="item.isLogifloraAllowed" v-model="item.isLogifloraAllowed"
disable disable

View File

@ -249,7 +249,11 @@ const sendEmailAction = () => {
<template #body-cell-conciliated="{ row }"> <template #body-cell-conciliated="{ row }">
<QTd align="center"> <QTd align="center">
<QCheckbox :model-value="row.isConciliate === 1" disable /> <QCheckbox
:model-value="row.isConciliate === 1"
disable
class="disabled-checkbox"
/>
</QTd> </QTd>
</template> </template>

View File

@ -81,6 +81,7 @@ const tableColumnComponents = {
props: (prop) => ({ props: (prop) => ({
disable: true, disable: true,
'model-value': Boolean(prop.value), 'model-value': Boolean(prop.value),
class: 'disabled-checkbox',
}), }),
event: () => {}, event: () => {},
}, },

View File

@ -128,36 +128,43 @@ const creditWarning = computed(() => {
:text="t('customer.summary.fiscalData')" :text="t('customer.summary.fiscalData')"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('customer.summary.isEqualizated')" :label="t('customer.summary.isEqualizated')"
v-model="entity.isEqualizated" v-model="entity.isEqualizated"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('customer.summary.isActive')" :label="t('customer.summary.isActive')"
v-model="entity.isActive" v-model="entity.isActive"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('customer.summary.invoiceByAddress')" :label="t('customer.summary.invoiceByAddress')"
v-model="entity.hasToInvoiceByAddress" v-model="entity.hasToInvoiceByAddress"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('customer.summary.verifiedData')" :label="t('customer.summary.verifiedData')"
v-model="entity.isTaxDataChecked" v-model="entity.isTaxDataChecked"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('customer.summary.hasToInvoice')" :label="t('customer.summary.hasToInvoice')"
v-model="entity.hasToInvoice" v-model="entity.hasToInvoice"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('customer.summary.notifyByEmail')" :label="t('customer.summary.notifyByEmail')"
v-model="entity.isToBeMailed" v-model="entity.isToBeMailed"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('customer.summary.vies')" :label="t('customer.summary.vies')"
v-model="entity.isVies" v-model="entity.isVies"
:disable="true" :disable="true"
@ -175,18 +182,21 @@ const creditWarning = computed(() => {
<VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" /> <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
<VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" /> <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
<QCheckbox <QCheckbox
class="disabled-checkbox"
style="padding: 0" style="padding: 0"
:label="t('customer.summary.hasLcr')" :label="t('customer.summary.hasLcr')"
v-model="entity.hasLcr" v-model="entity.hasLcr"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('customer.summary.hasCoreVnl')" :label="t('customer.summary.hasCoreVnl')"
v-model="entity.hasCoreVnl" v-model="entity.hasCoreVnl"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('customer.summary.hasB2BVnl')" :label="t('customer.summary.hasB2BVnl')"
v-model="entity.hasSepaVnl" v-model="entity.hasSepaVnl"
:disable="true" :disable="true"
@ -220,6 +230,7 @@ const creditWarning = computed(() => {
:value="entity.account.name" :value="entity.account.name"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('customer.summary.webAccess')" :label="t('customer.summary.webAccess')"
v-model="entity.account.active" v-model="entity.account.active"
:disable="true" :disable="true"

View File

@ -233,6 +233,7 @@ const fetchEntryBuys = async () => {
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('entry.summary.travelDelivered')" :label="t('entry.summary.travelDelivered')"
v-model="entry.travel.isDelivered" v-model="entry.travel.isDelivered"
:disable="true" :disable="true"
@ -248,6 +249,7 @@ const fetchEntryBuys = async () => {
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('entry.summary.travelReceived')" :label="t('entry.summary.travelReceived')"
v-model="entry.travel.isReceived" v-model="entry.travel.isReceived"
:disable="true" :disable="true"
@ -262,26 +264,31 @@ const fetchEntryBuys = async () => {
<QIcon name="open_in_new" /> <QIcon name="open_in_new" />
</router-link> </router-link>
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('entry.summary.ordered')" :label="t('entry.summary.ordered')"
v-model="entry.isOrdered" v-model="entry.isOrdered"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('entry.summary.confirmed')" :label="t('entry.summary.confirmed')"
v-model="entry.isConfirmed" v-model="entry.isConfirmed"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('entry.summary.booked')" :label="t('entry.summary.booked')"
v-model="entry.isBooked" v-model="entry.isBooked"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('entry.summary.raid')" :label="t('entry.summary.raid')"
v-model="entry.isRaid" v-model="entry.isRaid"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('entry.summary.excludedFromAvailable')" :label="t('entry.summary.excludedFromAvailable')"
v-model="entry.isExcludedFromAvailable" v-model="entry.isExcludedFromAvailable"
:disable="true" :disable="true"

View File

@ -277,6 +277,7 @@ function getLink(param) {
:value="invoiceIn.company?.code" :value="invoiceIn.company?.code"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('invoiceIn.summary.booked')" :label="t('invoiceIn.summary.booked')"
v-model="invoiceIn.isBooked" v-model="invoiceIn.isBooked"
:disable="true" :disable="true"

View File

@ -7,7 +7,7 @@ import InvoiceOutNegativeFilter from './InvoiceOutNegativeBasesFilter.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue'; import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
// import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import { toCurrency } from 'src/filters'; import { toCurrency } from 'src/filters';
import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js'; import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
@ -36,24 +36,28 @@ onBeforeMount(async () => {
}; };
arrayData.value = useArrayData('InvoiceOutNegative', { arrayData.value = useArrayData('InvoiceOutNegative', {
url: 'InvoiceOuts/negativeBases', url: 'InvoiceOuts/negativeBases',
limit: 0,
userParams: defaultParams, userParams: defaultParams,
exprBuilder: exprBuilder, exprBuilder: exprBuilder,
}); });
await arrayData.value.fetch({ append: false }); const test = await arrayData.value.fetch({ append: false });
console.log('test: ', test);
stateStore.rightDrawer = true; stateStore.rightDrawer = true;
}); });
const componentIsRendered = ref(false); const componentIsRendered = ref(false);
console.log('componentIsRendered: ', componentIsRendered);
onMounted(() => onMounted(() =>
nextTick(() => { nextTick(async () => {
componentIsRendered.value = true; componentIsRendered.value = true;
await arrayData.value.fetch();
console.log('3ntra');
}) })
); );
const rows = computed(() => arrayData.value.store.data); const rows = computed(() => arrayData.value.store.data);
console.log('rows: ', rows);
const columns = computed(() => [ const columns = computed(() => [
{ {
@ -147,6 +151,13 @@ const downloadCSV = async () => {
<template> <template>
<template v-if="stateStore.isHeaderMounted()"> <template v-if="stateStore.isHeaderMounted()">
<!--<Teleport to="#searchbar">
<VnSearchbar
data-key="InvoiceOutNegative"
:limit="20"
:label="t('Search negative bases')"
/>
</Teleport>-->
<Teleport <Teleport
to="#st-actions" to="#st-actions"
v-if="stateStore?.isSubToolbarShown() && componentIsRendered" v-if="stateStore?.isSubToolbarShown() && componentIsRendered"
@ -156,36 +167,29 @@ const downloadCSV = async () => {
</QBtn> </QBtn>
</Teleport> </Teleport>
</template> </template>
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
<QScrollArea class="fit text-grey-8">
<InvoiceOutNegativeFilter data-key="InvoiceOutNegative" />
</QScrollArea>
</QDrawer>
<VnSubToolbar /> <VnSubToolbar />
<QPage class="column items-center q-pa-md"> <QPage class="column items-center q-pa-md">
<QTable <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
:columns="columns" <QScrollArea class="fit text-grey-8">
:rows="rows" <InvoiceOutNegativeFilter data-key="InvoiceOutNegative" />
row-key="clientId" </QScrollArea>
class="full-width q-mt-md" </QDrawer>
> <QTable :columns="columns" :rows="rows" class="full-width q-mt-md">
<template #body-cell-clientId="{ row }"> <template #body-cell-clientId="{ row }">
<QTd> <QTd>
<QBtn flat dense color="blue"> {{ row.clientId }}</QBtn> <QBtn flat dense> {{ row.clientId }}</QBtn>
<CustomerDescriptorProxy :id="row.clientId" /> <CustomerDescriptorProxy :id="row.clientId" />
</QTd> </QTd>
</template> </template>
<template #body-cell-ticketId="{ row }"> <template #body-cell-ticketId="{ row }">
<QTd> <QTd>
<QBtn flat dense color="blue"> {{ row.ticketFk }}</QBtn> <QBtn flat dense> {{ row.ticketFk }}</QBtn>
<TicketDescriptorProxy :id="row.ticketFk" /> <TicketDescriptorProxy :id="row.ticketFk" />
</QTd> </QTd>
</template> </template>
<template #body-cell-worker="{ row }"> <template #body-cell-worker="{ row }">
<QTd> <QTd>
<QBtn class="no-uppercase" flat dense color="blue">{{ <QBtn class="no-uppercase" flat dense>{{ row.workerName }}</QBtn>
row.workerName
}}</QBtn>
<WorkerDescriptorProxy :id="row.comercialId" /> <WorkerDescriptorProxy :id="row.comercialId" />
</QTd> </QTd>
</template> </template>
@ -196,12 +200,20 @@ const downloadCSV = async () => {
</template> </template>
<template #body-cell-hasToInvoice="{ row }"> <template #body-cell-hasToInvoice="{ row }">
<QTd> <QTd>
<QCheckbox :model-value="!!row.hasToInvoice" disable /> <QCheckbox
class="disabled-checkbox"
:model-value="!!row.hasToInvoice"
disable
/>
</QTd> </QTd>
</template> </template>
<template #body-cell-verifiedData="{ row }"> <template #body-cell-verifiedData="{ row }">
<QTd> <QTd>
<QCheckbox :model-value="!!row.isTaxDataChecked" disable /> <QCheckbox
class="disabled-checkbox"
:model-value="!!row.isTaxDataChecked"
disable
/>
</QTd> </QTd>
</template> </template>
</QTable> </QTable>
@ -216,6 +228,9 @@ const downloadCSV = async () => {
.no-uppercase { .no-uppercase {
text-transform: none; text-transform: none;
} }
.q-btn {
color: $color-link;
}
</style> </style>
<i18n> <i18n>

View File

@ -224,6 +224,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<template #body-cell-ig="{ row }"> <template #body-cell-ig="{ row }">
<QTd @click.stop> <QTd @click.stop>
<QCheckbox <QCheckbox
class="disabled-checkbox"
v-model="row.isIgnored" v-model="row.isIgnored"
:disable="true" :disable="true"
:false-value="0" :false-value="0"

View File

@ -96,6 +96,7 @@ const isAdministrative = computed(() => {
<VnLv :info="t('Este artículo necesita una foto')"> <VnLv :info="t('Este artículo necesita una foto')">
<template #value> <template #value>
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('item.summary.doPhoto')" :label="t('item.summary.doPhoto')"
v-model="item.isPhotoRequested" v-model="item.isPhotoRequested"
:disable="true" :disable="true"

View File

@ -525,7 +525,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
</template> </template>
<template #body-cell-isActive="{ row }"> <template #body-cell-isActive="{ row }">
<QTd> <QTd>
<QCheckbox :model-value="!!row.isActive" disable /> <QCheckbox
class="disabled-checkbox"
:model-value="!!row.isActive"
disable
/>
</QTd> </QTd>
</template> </template>
<template #body-cell-actions="{ row }"> <template #body-cell-actions="{ row }">

View File

@ -75,11 +75,13 @@ function getUrl(section) {
</template> </template>
</VnLv> </VnLv>
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('supplier.summary.verified')" :label="t('supplier.summary.verified')"
v-model="supplier.isSerious" v-model="supplier.isSerious"
:disable="true" :disable="true"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('supplier.summary.isActive')" :label="t('supplier.summary.isActive')"
v-model="supplier.isActive" v-model="supplier.isActive"
:disable="true" :disable="true"

View File

@ -261,6 +261,7 @@ async function setTravelData(travelData) {
:value="travel.warehouseOut?.name" :value="travel.warehouseOut?.name"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('travel.summary.delivered')" :label="t('travel.summary.delivered')"
v-model="travel.isDelivered" v-model="travel.isDelivered"
:disable="true" :disable="true"
@ -273,6 +274,7 @@ async function setTravelData(travelData) {
:value="travel.warehouseIn?.name" :value="travel.warehouseIn?.name"
/> />
<QCheckbox <QCheckbox
class="disabled-checkbox"
:label="t('travel.summary.received')" :label="t('travel.summary.received')"
v-model="travel.isReceived" v-model="travel.isReceived"
:disable="true" :disable="true"