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

7837-testToMaster_2432 #592

Merged
alexm merged 165 commits from 7837-testToMaster_2432 into master 2024-08-06 05:54:11 +00:00
Conversation 0 Commits 165 Files Changed 210 +74 -82
3 changed files with 74 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8fbaf43b82 - Show all commits

22
src/components/ui/VnRow.vue
View File

@ -1,18 +1,28 @@
<script setup>
defineProps({ wrap: { type: Boolean, default: false } });
</script>
<template> <template>
<div class="vn-row q-gutter-md q-mb-md"> <div class="vn-row q-gutter-md q-mb-md" :class="{ wrap }">
<slot></slot> <slot />
</div> </div>
</template> </template>
<style lang="scss" scopped> <style lang="scss" scoped>
.vn-row { .vn-row {
display: flex; display: flex;
> * { &.wrap {
flex: 1; flex-wrap: wrap;
}
&:not(.wrap) {
> :slotted(*) {
flex: 1;
}
} }
} }
@media screen and (max-width: 800px) { @media screen and (max-width: 800px) {
.vn-row { .vn-row {
flex-direction: column; &:not(.wrap) {
flex-direction: column;
}
} }
} }
</style> </style>

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

@ -9,7 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue'; import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue'; import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
import VnTitle from 'src/components/common/VnTitle.vue'; import VnTitle from 'src/components/common/VnTitle.vue';
import VnRow from 'src/components/ui/VnRow.vue';
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
@ -131,41 +131,33 @@ const creditWarning = computed(() => {
:url="`#/customer/${entityId}/fiscal-data`" :url="`#/customer/${entityId}/fiscal-data`"
:text="t('customer.summary.fiscalData')" :text="t('customer.summary.fiscalData')"
/> />
<QCheckbox <VnRow>
:label="t('customer.summary.isEqualizated')" <VnLv
v-model="entity.isEqualizated" :label="t('customer.summary.isEqualizated')"
:disable="true" :value="entity.isEqualizated"
/> />
<QCheckbox <VnLv
:label="t('customer.summary.isActive')" :label="t('customer.summary.isActive')"
v-model="entity.isActive" :value="entity.isActive"
:disable="true" />
/> </VnRow>
<QCheckbox <VnRow>
:label="t('customer.summary.invoiceByAddress')" <VnLv
v-model="entity.hasToInvoiceByAddress" :label="t('customer.summary.verifiedData')"
:disable="true" :value="entity.isTaxDataChecked"
/> />
<QCheckbox <VnLv
:label="t('customer.summary.verifiedData')" :label="t('customer.summary.hasToInvoice')"
v-model="entity.isTaxDataChecked" :value="entity.hasToInvoice"
:disable="true" />
/> </VnRow>
<QCheckbox <VnRow>
:label="t('customer.summary.hasToInvoice')" <VnLv
v-model="entity.hasToInvoice" :label="t('customer.summary.notifyByEmail')"
:disable="true" :value="entity.isToBeMailed"
/> />
<QCheckbox <VnLv :label="t('customer.summary.vies')" :value="entity.isVies" />
:label="t('customer.summary.notifyByEmail')" </VnRow>
v-model="entity.isToBeMailed"
:disable="true"
/>
<QCheckbox
:label="t('customer.summary.vies')"
v-model="entity.isVies"
:disable="true"
/>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<VnTitle <VnTitle
@ -178,23 +170,18 @@ 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 <VnRow class="q-mt-sm" wrap>
style="padding: 0" <VnLv :label="t('customer.summary.hasLcr')" :value="entity.hasLcr" />
:label="t('customer.summary.hasLcr')" <VnLv
v-model="entity.hasLcr" :label="t('customer.summary.hasCoreVnl')"
:disable="true" :value="entity.hasCoreVnl"
/> />
<QCheckbox
:label="t('customer.summary.hasCoreVnl')"
v-model="entity.hasCoreVnl"
:disable="true"
/>
<QCheckbox <VnLv
:label="t('customer.summary.hasB2BVnl')" :label="t('customer.summary.hasB2BVnl')"
v-model="entity.hasSepaVnl" :value="entity.hasSepaVnl"
:disable="true" />
/> </VnRow>
</QCard> </QCard>
<QCard class="vn-one" v-if="entity.defaultAddress"> <QCard class="vn-one" v-if="entity.defaultAddress">
<VnTitle <VnTitle

43
src/pages/Worker/Card/WorkerSummary.vue
View File

@ -10,6 +10,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
import VnUserLink from 'src/components/ui/VnUserLink.vue'; import VnUserLink from 'src/components/ui/VnUserLink.vue';
import VnTitle from 'src/components/common/VnTitle.vue'; import VnTitle from 'src/components/common/VnTitle.vue';
import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue'; import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue';
import VnRow from 'src/components/ui/VnRow.vue';
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
@ -133,30 +134,24 @@ const filter = {
/> />
<VnLv :label="t('worker.summary.fi')" :value="worker.fi" /> <VnLv :label="t('worker.summary.fi')" :value="worker.fi" />
<VnLv :label="t('worker.summary.birth')" :value="toDate(worker.birth)" /> <VnLv :label="t('worker.summary.birth')" :value="toDate(worker.birth)" />
<QCheckbox <VnRow class="q-mt-sm" wrap>
class="padding-none" <VnLv
:label="t('worker.summary.isFreelance')" :label="t('worker.summary.isFreelance')"
v-model="worker.isFreelance" :value="worker.isFreelance"
:disable="true" />
/> <VnLv
<QCheckbox :label="t('worker.summary.isSsDiscounted')"
class="padding-none" :value="worker.isSsDiscounted"
:label="t('worker.summary.isSsDiscounted')" />
v-model="worker.isSsDiscounted" <VnLv
:disable="true" :label="t('worker.summary.hasMachineryAuthorized')"
/> :value="worker.hasMachineryAuthorized"
<QCheckbox />
class="padding-none" <VnLv
:label="t('worker.summary.hasMachineryAuthorized')" :label="t('worker.summary.isDisable')"
v-model="worker.hasMachineryAuthorized" :value="worker.isDisable"
:disable="true" />
/> </VnRow>
<QCheckbox
class="padding-none"
:label="t('worker.summary.isDisable')"
v-model="worker.isDisable"
:disable="true"
/>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<VnTitle :text="t('worker.summary.userData')" /> <VnTitle :text="t('worker.summary.userData')" />