wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into 6486-salixColors

This commit is contained in:
Pablo Natek 2024-03-06 08:43:21 +00:00
parent 0192ec344f 8a964c7382
commit 1aedb3c7da
8 changed files with 110 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/ui/CardSummary.vue
View File

@ -138,6 +138,20 @@ watch(props, async () => {
.header.link:hover { .header.link:hover {
color: lighten($primary, 20%); color: lighten($primary, 20%);
} }
.q-checkbox {
display: flex;
margin-bottom: 9px;
& .q-checkbox__label {
margin-left: 25px;
color: var(--vn-text);
}
& .q-checkbox__inner {
position: absolute;
left: 0;
margin-left: 5px;
color: var(--vn-label);
}
}
} }
} }

11
src/components/ui/VnLv.vue
View File

@ -1,5 +1,4 @@
<script setup> <script setup>
import { computed } from 'vue';
import { dashIfEmpty } from 'src/filters'; import { dashIfEmpty } from 'src/filters';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useClipboard } from 'src/composables/useClipboard'; import { useClipboard } from 'src/composables/useClipboard';
@ -16,7 +15,6 @@ const $props = defineProps({
}); });
const { t } = useI18n(); const { t } = useI18n();
const isBooleanValue = computed(() => typeof $props.value === 'boolean');
const { copyText } = useClipboard(); const { copyText } = useClipboard();
function copyValueText() { function copyValueText() {
@ -42,14 +40,7 @@ function copyValueText() {
</slot> </slot>
</div> </div>
<div class="value"> <div class="value">
<span v-if="isBooleanValue"> <slot name="value">
<QIcon
:name="$props.value ? `check` : `close`"
:color="$props.value ? `positive` : `negative`"
size="sm"
/>
</span>
<slot v-else name="value">
<span :title="$props.value"> <span :title="$props.value">
{{ $props.dash ? dashIfEmpty($props.value) : $props.value }} {{ $props.dash ? dashIfEmpty($props.value) : $props.value }}
</span> </span>

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

@ -220,9 +220,9 @@ function openDialog(dmsId) {
</VnLv> </VnLv>
<VnLv :label="t('claim.summary.returnOfMaterial')" :value="claim.rma" /> <VnLv :label="t('claim.summary.returnOfMaterial')" :value="claim.rma" />
<QCheckbox <QCheckbox
:align-items="right"
:label="t('claim.basicData.picked')" :label="t('claim.basicData.picked')"
v-model="claim.hasToPickUp" v-model="claim.hasToPickUp"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-three claimVnNotes full-height"> <QCard class="vn-three claimVnNotes full-height">

62
src/pages/Customer/Card/CustomerSummary.vue
View File

@ -132,28 +132,41 @@ const creditWarning = computed(() => {
{{ t('customer.summary.fiscalData') }} {{ t('customer.summary.fiscalData') }}
<QIcon name="open_in_new" /> <QIcon name="open_in_new" />
</a> </a>
<VnLv <QCheckbox
:label="t('customer.summary.isEqualizated')" :label="t('customer.summary.isEqualizated')"
:value="entity.isEqualizated" v-model="entity.isEqualizated"
:disable="true"
/> />
<VnLv :label="t('customer.summary.isActive')" :value="entity.isActive" /> <QCheckbox
<VnLv :label="t('customer.summary.isActive')"
v-model="entity.isActive"
:disable="true"
/>
<QCheckbox
:label="t('customer.summary.invoiceByAddress')" :label="t('customer.summary.invoiceByAddress')"
:value="entity.hasToInvoiceByAddress" v-model="entity.hasToInvoiceByAddress"
:disable="true"
/> />
<VnLv <QCheckbox
:label="t('customer.summary.verifiedData')" :label="t('customer.summary.verifiedData')"
:value="entity.isTaxDataChecked" v-model="entity.isTaxDataChecked"
:disable="true"
/> />
<VnLv <QCheckbox
:label="t('customer.summary.hasToInvoice')" :label="t('customer.summary.hasToInvoice')"
:value="entity.hasToInvoice" v-model="entity.hasToInvoice"
:disable="true"
/> />
<VnLv <QCheckbox
:label="t('customer.summary.notifyByEmail')" :label="t('customer.summary.notifyByEmail')"
:value="entity.isToBeMailed" v-model="entity.isToBeMailed"
:disable="true"
/>
<QCheckbox
:label="t('customer.summary.vies')"
v-model="entity.isVies"
:disable="true"
/> />
<VnLv :label="t('customer.summary.vies')" :value="entity.isVies" />
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<a <a
@ -170,14 +183,22 @@ 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" />
<VnLv :label="t('customer.summary.hasLcr')" :value="entity.hasLcr" /> <QCheckbox
<VnLv style="padding: 0"
:label="t('customer.summary.hasCoreVnl')" :label="t('customer.summary.hasLcr')"
:value="entity.hasCoreVnl" v-model="entity.hasLcr"
:disable="true"
/> />
<VnLv <QCheckbox
:label="t('customer.summary.hasCoreVnl')"
v-model="entity.hasCoreVnl"
:disable="true"
/>
<QCheckbox
:label="t('customer.summary.hasB2BVnl')" :label="t('customer.summary.hasB2BVnl')"
:value="entity.hasSepaVnl" v-model="entity.hasSepaVnl"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-one" v-if="entity.defaultAddress"> <QCard class="vn-one" v-if="entity.defaultAddress">
@ -211,9 +232,10 @@ const creditWarning = computed(() => {
:label="t('customer.summary.username')" :label="t('customer.summary.username')"
:value="entity.account.name" :value="entity.account.name"
/> />
<VnLv <QCheckbox
:label="t('customer.summary.webAccess')" :label="t('customer.summary.webAccess')"
:value="entity.account.active" v-model="entity.account.active"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-one" v-if="entity.account"> <QCard class="vn-one" v-if="entity.account">

45
src/pages/Entry/Card/EntrySummary.vue
View File

@ -192,18 +192,30 @@ const fetchEntryBuys = async () => {
:label="t('entry.summary.invoiceNumber')" :label="t('entry.summary.invoiceNumber')"
:value="entry.invoiceNumber" :value="entry.invoiceNumber"
/> />
<QCheckbox
<VnLv :label="t('entry.summary.ordered')" :value="entry.isOrdered" /> :label="t('entry.summary.ordered')"
v-model="entry.isOrdered"
<VnLv :label="t('entry.summary.confirmed')" :value="entry.isConfirmed" /> :disable="true"
/>
<VnLv :label="t('entry.summary.booked')" :value="entry.isBooked" /> <QCheckbox
:label="t('entry.summary.confirmed')"
<VnLv :label="t('entry.summary.raid')" :value="entry.isRaid" /> v-model="entry.isConfirmed"
:disable="true"
<VnLv />
<QCheckbox
:label="t('entry.summary.booked')"
v-model="entry.isBooked"
:disable="true"
/>
<QCheckbox
:label="t('entry.summary.raid')"
v-model="entry.isRaid"
:disable="true"
/>
<QCheckbox
:label="t('entry.summary.excludedFromAvailable')" :label="t('entry.summary.excludedFromAvailable')"
:value="entry.isExcludedFromAvailable" v-model="entry.isExcludedFromAvailable"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
@ -236,11 +248,11 @@ const fetchEntryBuys = async () => {
:value="entry.travel.warehouseOut.name" :value="entry.travel.warehouseOut.name"
/> />
<VnLv <QCheckbox
:label="t('entry.summary.travelDelivered')" :label="t('entry.summary.travelDelivered')"
:value="entry.travel.isDelivered" v-model="entry.isDelivered"
:disable="true"
/> />
<VnLv <VnLv
:label="t('entry.summary.travelLanded')" :label="t('entry.summary.travelLanded')"
:value="toDate(entry.travel.landed)" :value="toDate(entry.travel.landed)"
@ -251,9 +263,10 @@ const fetchEntryBuys = async () => {
:value="entry.travel.warehouseIn.name" :value="entry.travel.warehouseIn.name"
/> />
<VnLv <QCheckbox
:label="t('entry.summary.travelReceived')" :label="t('entry.summary.travelReceived')"
:value="entry.travel.isReceived" v-model="entry.isReceived"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-two" style="min-width: 100%"> <QCard class="vn-two" style="min-width: 100%">

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

@ -275,9 +275,10 @@ function getLink(param) {
:label="t('invoiceIn.summary.company')" :label="t('invoiceIn.summary.company')"
:value="invoiceIn.company?.code" :value="invoiceIn.company?.code"
/> />
<VnLv <QCheckbox
:label="t('invoiceIn.summary.booked')" :label="t('invoiceIn.summary.booked')"
:value="invoiceIn.isBooked" v-model="invoiceIn.isBooked"
:disable="true"
/> />
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">

19
src/pages/Supplier/Card/SupplierSummary.vue
View File

@ -86,27 +86,16 @@ const isAdministrative = computed(() => {
<span> {{ dashIfEmpty(supplier.note) }} </span> <span> {{ dashIfEmpty(supplier.note) }} </span>
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('supplier.summary.verified')" class="q-mb-xs">
<template #value>
<QCheckbox <QCheckbox
:label="t('supplier.summary.verified')"
v-model="supplier.isSerious" v-model="supplier.isSerious"
dense :disable="true"
disable
class="full-width q-mb-xs"
/> />
</template>
</VnLv>
<VnLv :label="t('supplier.summary.isActive')" class="q-mb-xs">
<template #value>
<QCheckbox <QCheckbox
:label="t('supplier.summary.isActive')"
v-model="supplier.isActive" v-model="supplier.isActive"
dense :disable="true"
disable
class="full-width q-mb-xs"
/> />
</template>
</VnLv>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<a <a

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

@ -269,15 +269,11 @@ async function setTravelData(travelData) {
:label="t('globals.wareHouseOut')" :label="t('globals.wareHouseOut')"
:value="travel.warehouseOut?.name" :value="travel.warehouseOut?.name"
/> />
<VnLv :label="t('travel.summary.delivered')" class="q-mb-xs"> <QCheckbox
<template #value> :label="t('travel.summary.delivered')"
<QIcon v-model="travel.isDelivered"
:name="travel.isDelivered ? 'check' : 'close'" :disable="true"
:color="travel.isDelivered ? 'positive' : 'negative'"
size="sm"
/> />
</template>
</VnLv>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" /> <VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" />
@ -285,15 +281,11 @@ async function setTravelData(travelData) {
:label="t('globals.wareHouseIn')" :label="t('globals.wareHouseIn')"
:value="travel.warehouseIn?.name" :value="travel.warehouseIn?.name"
/> />
<VnLv :label="t('travel.summary.received')" class="q-mb-xs"> <QCheckbox
<template #value> :label="t('travel.summary.received')"
<QIcon v-model="travel.isReceived"
:name="travel.isReceived ? 'check' : 'close'" :disable="true"
:color="travel.isReceived ? 'positive' : 'negative'"
size="sm"
/> />
</template>
</VnLv>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<VnLv :label="t('globals.agency')" :value="travel.agency?.name" /> <VnLv :label="t('globals.agency')" :value="travel.agency?.name" />