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

Summary fixes
gitea/salix-front/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2022-11-02 12:27:25 +01:00
parent a1fc7c6803
commit 5720dbd0f0
11 changed files with 727 additions and 727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/i18n/en/index.js
View File

@ -152,7 +152,8 @@ export default {
list: 'List', list: 'List',
createTicket: 'Create ticket', createTicket: 'Create ticket',
summary: 'Summary', summary: 'Summary',
basicData: 'Basic Data' basicData: 'Basic Data',
boxing: 'Boxing'
}, },
list: { list: {
nickname: 'Nickname', nickname: 'Nickname',

3
src/i18n/es/index.js
View File

@ -151,7 +151,8 @@ export default {
list: 'Listado', list: 'Listado',
createTicket: 'Crear ticket', createTicket: 'Crear ticket',
summary: 'Resumen', summary: 'Resumen',
basicData: 'Datos básicos' basicData: 'Datos básicos',
boxing: 'Encajado'
}, },
list: { list: {
nickname: 'Alias', nickname: 'Alias',

3
src/pages/Claim/Card/ClaimBasicData.vue
View File

@ -80,7 +80,7 @@ const statesFilter = {
auto-load auto-load
/> />
<fetch-data url="ClaimStates" @on-fetch="setClaimStates" auto-load /> <fetch-data url="ClaimStates" @on-fetch="setClaimStates" auto-load />
<q-page class="q-pa-md">
<div class="container"> <div class="container">
<q-card> <q-card>
<form-model :url="`Claims/${route.params.id}`" :filter="claimFilter" model="claim"> <form-model :url="`Claims/${route.params.id}`" :filter="claimFilter" model="claim">
@ -173,7 +173,6 @@ const statesFilter = {
</form-model> </form-model>
</q-card> </q-card>
</div> </div>
</q-page>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>

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

@ -163,7 +163,9 @@ function stateColor(code) {
</q-scroll-area> </q-scroll-area>
</q-drawer> </q-drawer>
<q-page-container> <q-page-container>
<q-page class="q-pa-md">
<router-view></router-view> <router-view></router-view>
</q-page>
</q-page-container> </q-page-container>
</template> </template>

6
src/pages/Claim/Card/ClaimRma.vue
View File

@ -80,7 +80,7 @@ function hide() {
@on-fetch="($data) => (claim = $data)" @on-fetch="($data) => (claim = $data)"
auto-load auto-load
/> />
<q-page class="q-pa-md sticky"> <div class="sticky-page">
<q-page-sticky expand position="top"> <q-page-sticky expand position="top">
<q-toolbar class="bg-grey-9"> <q-toolbar class="bg-grey-9">
<q-space /> <q-space />
@ -124,7 +124,7 @@ function hide() {
</q-card> </q-card>
</template> </template>
</paginate> </paginate>
</q-page> </div>
<q-dialog v-model="confirmShown" persistent @hide="hide"> <q-dialog v-model="confirmShown" persistent @hide="hide">
<q-card> <q-card>
<q-card-section class="row items-center"> <q-card-section class="row items-center">
@ -144,7 +144,7 @@ function hide() {
.q-toolbar { .q-toolbar {
background-color: $grey-9; background-color: $grey-9;
} }
.sticky { .sticky-page {
padding-top: 66px; padding-top: 66px;
} }

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

@ -90,7 +90,6 @@ function stateColor(code) {
</script> </script>
<template> <template>
<q-page class="q-pa-md">
<div class="summary container"> <div class="summary container">
<q-card> <q-card>
<skeleton-summary v-if="!claim" /> <skeleton-summary v-if="!claim" />
@ -158,7 +157,6 @@ function stateColor(code) {
</template> </template>
</q-card> </q-card>
</div> </div>
</q-page>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -194,4 +192,8 @@ function stateColor(code) {
} }
} }
} }
.q-dialog .summary {
max-width: 1200px;
}
</style> </style>

3
src/pages/Customer/Card/CustomerBasicData.vue
View File

@ -50,7 +50,7 @@ const filterOptions = {
/> />
<fetch-data url="ContactChannels" @on-fetch="($data) => (contactChannels = $data)" auto-load /> <fetch-data url="ContactChannels" @on-fetch="($data) => (contactChannels = $data)" auto-load />
<fetch-data url="BusinessTypes" @on-fetch="($data) => (businessTypes = $data)" auto-load /> <fetch-data url="BusinessTypes" @on-fetch="($data) => (businessTypes = $data)" auto-load />
<q-page class="q-pa-md">
<div class="container"> <div class="container">
<q-card> <q-card>
<form-model :url="`Clients/${route.params.id}`" model="customer"> <form-model :url="`Clients/${route.params.id}`" model="customer">
@ -159,7 +159,6 @@ const filterOptions = {
</form-model> </form-model>
</q-card> </q-card>
</div> </div>
</q-page>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>

2
src/pages/Customer/Card/CustomerCard.vue
View File

@ -174,7 +174,9 @@ async function fetch() {
</q-scroll-area> </q-scroll-area>
</q-drawer> </q-drawer>
<q-page-container> <q-page-container>
<q-page class="q-pa-md">
<router-view></router-view> <router-view></router-view>
</q-page>
</q-page-container> </q-page-container>
</template> </template>

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

@ -29,9 +29,7 @@ function fetch() {
} }
const balanceDue = computed(() => { const balanceDue = computed(() => {
const [defaulter] = customer.value.defaulters; return customer.value.defaulters.length && customer.value.defaulters[0].amount;
return defaulter.amount;
}); });
const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : '')); const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
@ -64,7 +62,6 @@ const creditWarning = computed(() => {
</script> </script>
<template> <template>
<q-page class="q-pa-md">
<div class="summary container"> <div class="summary container">
<q-card> <q-card>
<skeleton-summary v-if="!customer" /> <skeleton-summary v-if="!customer" />
@ -75,7 +72,10 @@ const creditWarning = computed(() => {
<q-list> <q-list>
<q-item-label header class="text-h6"> <q-item-label header class="text-h6">
{{ t('customer.summary.basicData') }} {{ t('customer.summary.basicData') }}
<router-link :to="{ name: 'CustomerBasicData' }"> <router-link
:to="{ name: 'CustomerBasicData', params: { id: entityId } }"
target="_blank"
>
<q-icon name="open_in_new" /> <q-icon name="open_in_new" />
</router-link> </router-link>
</q-item-label> </q-item-label>
@ -98,7 +98,7 @@ const creditWarning = computed(() => {
<q-item-label>{{ customer.contact }}</q-item-label> <q-item-label>{{ customer.contact }}</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item> <q-item v-if="customer.salesPersonUser">
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('customer.summary.salesPerson') }}</q-item-label> <q-item-label caption>{{ t('customer.summary.salesPerson') }}</q-item-label>
<q-item-label>{{ customer.salesPersonUser.name }}</q-item-label> <q-item-label>{{ customer.salesPersonUser.name }}</q-item-label>
@ -122,7 +122,7 @@ const creditWarning = computed(() => {
<q-item-label>{{ customer.email }}</q-item-label> <q-item-label>{{ customer.email }}</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item> <q-item v-if="customer.contactChannel">
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('customer.summary.contactChannel') }}</q-item-label> <q-item-label caption>{{ t('customer.summary.contactChannel') }}</q-item-label>
<q-item-label>{{ customer.contactChannel.name }}</q-item-label> <q-item-label>{{ customer.contactChannel.name }}</q-item-label>
@ -153,13 +153,13 @@ const creditWarning = computed(() => {
<q-item-label>{{ customer.postcode }}</q-item-label> <q-item-label>{{ customer.postcode }}</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item> <q-item v-if="customer.province">
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('customer.summary.province') }}</q-item-label> <q-item-label caption>{{ t('customer.summary.province') }}</q-item-label>
<q-item-label>{{ customer.province.name }}</q-item-label> <q-item-label>{{ customer.province.name }}</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item> <q-item v-if="customer.country">
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('customer.summary.country') }}</q-item-label> <q-item-label caption>{{ t('customer.summary.country') }}</q-item-label>
<q-item-label>{{ customer.country.country }}</q-item-label> <q-item-label>{{ customer.country.country }}</q-item-label>
@ -249,11 +249,7 @@ const creditWarning = computed(() => {
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item dense> <q-item dense>
<q-checkbox <q-checkbox v-model="customer.hasLcr" :label="t('customer.summary.hasLcr')" disable />
v-model="customer.hasLcr"
:label="t('customer.summary.hasLcr')"
disable
/>
</q-item> </q-item>
<q-item dense> <q-item dense>
<q-checkbox <q-checkbox
@ -271,7 +267,7 @@ const creditWarning = computed(() => {
</q-item> </q-item>
</q-list> </q-list>
</div> </div>
<div class="col"> <div class="col" v-if="customer.defaultAddress">
<q-list> <q-list>
<q-item-label header class="text-h6"> <q-item-label header class="text-h6">
{{ t('customer.summary.consignee') }} {{ t('customer.summary.consignee') }}
@ -296,7 +292,7 @@ const creditWarning = computed(() => {
</q-item> </q-item>
</q-list> </q-list>
</div> </div>
<div class="col"> <div class="col" v-if="customer.account">
<q-list> <q-list>
<q-item-label header class="text-h6"> <q-item-label header class="text-h6">
{{ t('customer.summary.webAccess') }} {{ t('customer.summary.webAccess') }}
@ -333,11 +329,11 @@ const creditWarning = computed(() => {
<q-item-label>{{ toCurrency(customer.mana.mana) }}</q-item-label> <q-item-label>{{ toCurrency(customer.mana.mana) }}</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item> <q-item v-if="customer.claimsRatio">
<q-item-section> <q-item-section>
<q-item-label caption>{{ <q-item-label caption>
t('customer.summary.priceIncreasingRate') {{ t('customer.summary.priceIncreasingRate') }}
}}</q-item-label> </q-item-label>
<q-item-label>{{ toPercentage(priceIncreasingRate) }}</q-item-label> <q-item-label>{{ toPercentage(priceIncreasingRate) }}</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
@ -347,7 +343,7 @@ const creditWarning = computed(() => {
<q-item-label>{{ toCurrency(customer.averageInvoiced.invoiced) }}</q-item-label> <q-item-label>{{ toCurrency(customer.averageInvoiced.invoiced) }}</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item> <q-item v-if="customer.claimsRatio">
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('customer.summary.claimRate') }}</q-item-label> <q-item-label caption>{{ t('customer.summary.claimRate') }}</q-item-label>
<q-item-label>{{ toPercentage(claimRate) }}</q-item-label> <q-item-label>{{ toPercentage(claimRate) }}</q-item-label>
@ -360,7 +356,7 @@ const creditWarning = computed(() => {
<q-item-label header class="text-h6"> <q-item-label header class="text-h6">
{{ t('customer.summary.financialData') }} {{ t('customer.summary.financialData') }}
</q-item-label> </q-item-label>
<q-item> <q-item v-if="customer.debt">
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('customer.summary.risk') }}</q-item-label> <q-item-label caption>{{ t('customer.summary.risk') }}</q-item-label>
<q-item-label :class="debtWarning"> <q-item-label :class="debtWarning">
@ -386,7 +382,7 @@ const creditWarning = computed(() => {
</q-icon> </q-icon>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item> <q-item v-if="customer.creditInsurance">
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('customer.summary.securedCredit') }}</q-item-label> <q-item-label caption>{{ t('customer.summary.securedCredit') }}</q-item-label>
<q-item-label>{{ toCurrency(customer.creditInsurance) }}</q-item-label> <q-item-label>{{ toCurrency(customer.creditInsurance) }}</q-item-label>
@ -408,7 +404,7 @@ const creditWarning = computed(() => {
</q-icon> </q-icon>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item> <q-item v-if="customer.defaulters">
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('customer.summary.balanceDue') }}</q-item-label> <q-item-label caption>{{ t('customer.summary.balanceDue') }}</q-item-label>
<q-item-label :class="balanceDueWarning"> <q-item-label :class="balanceDueWarning">
@ -433,9 +429,7 @@ const creditWarning = computed(() => {
</template> </template>
</q-card> </q-card>
</div> </div>
</q-page>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.container { .container {
display: flex; display: flex;
@ -491,4 +485,8 @@ const creditWarning = computed(() => {
} }
} }
} }
.q-dialog .summary {
max-width: 1200px;
}
</style> </style>

8
src/pages/Ticket/Card/TicketBoxing.vue
View File

@ -79,8 +79,7 @@ async function getVideoList(expeditionId, timed) {
</script> </script>
<template> <template>
<q-layout view="hhh lpr ffr" class="fit"> <q-drawer show-if-above side="right">
<q-drawer show-if-above side="right" bordered>
<q-scroll-area class="fit"> <q-scroll-area class="fit">
<q-list bordered separator style="max-width: 318px"> <q-list bordered separator style="max-width: 318px">
<q-item v-if="lastExpedition && videoList.length"> <q-item v-if="lastExpedition && videoList.length">
@ -144,8 +143,6 @@ async function getVideoList(expeditionId, timed) {
</q-scroll-area> </q-scroll-area>
</q-drawer> </q-drawer>
<q-page-container>
<q-page>
<q-card> <q-card>
<q-carousel animated v-model="slide" height="max-content"> <q-carousel animated v-model="slide" height="max-content">
<q-carousel-slide v-for="video in videoList" :key="video.value" :name="video.value"> <q-carousel-slide v-for="video in videoList" :key="video.value" :name="video.value">
@ -153,7 +150,4 @@ async function getVideoList(expeditionId, timed) {
</q-carousel-slide> </q-carousel-slide>
</q-carousel> </q-carousel>
</q-card> </q-card>
</q-page>
</q-page-container>
</q-layout>
</template> </template>

14
src/pages/Ticket/Card/TicketCard.vue
View File

@ -147,17 +147,19 @@ function stateColor(state) {
<q-separator /> <q-separator />
<q-list> <q-list>
<!-- <q-item :to="{ name: 'TicketBasicData' }" clickable v-ripple> <q-item :to="{ name: 'TicketBoxing' }" clickable v-ripple>
<q-item-section avatar> <q-item-section avatar>
<q-icon name="vn:settings" /> <q-icon name="vn:package" />
</q-item-section> </q-item-section>
<q-item-section>{{ t('ticket.pageTitles.basicData') }}</q-item-section> <q-item-section>{{ t('ticket.pageTitles.boxing') }}</q-item-section>
</q-item> --> </q-item>
</q-list> </q-list>
</q-scroll-area> </q-drawer </q-scroll-area>
>--> </q-drawer>
<q-page-container> <q-page-container>
<q-page class="q-pa-md">
<router-view></router-view> <router-view></router-view>
</q-page>
</q-page-container> </q-page-container>
</template> </template>