Merge pull request 'Hotfix: SummaryProblems' (!1699) from Hotfix-TicketSummaryAddress into master
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #1699 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
commit
6976569c42
|
@ -6,6 +6,7 @@ import { computed } from 'vue';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
label: { type: String, default: null },
|
label: { type: String, default: null },
|
||||||
|
tooltip: { type: String, default: null },
|
||||||
value: {
|
value: {
|
||||||
type: [String, Boolean, Number],
|
type: [String, Boolean, Number],
|
||||||
default: null,
|
default: null,
|
||||||
|
@ -40,7 +41,10 @@ const val = computed(() => $props.value);
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<div v-if="label || $slots.label" class="label">
|
<div v-if="label || $slots.label" class="label">
|
||||||
<slot name="label">
|
<slot name="label">
|
||||||
<span style="color: var(--vn-label-color)">{{ label }}</span>
|
<QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
|
||||||
|
<span style="color: var(--vn-label-color)">
|
||||||
|
{{ label }}
|
||||||
|
</span>
|
||||||
</slot>
|
</slot>
|
||||||
</div>
|
</div>
|
||||||
<div class="value" v-if="value || $slots.value">
|
<div class="value" v-if="value || $slots.value">
|
||||||
|
|
|
@ -208,7 +208,8 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
:text="t('customer.summary.consignee')"
|
:text="t('customer.summary.consignee')"
|
||||||
/>
|
/>
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('customer.summary.addressName')"
|
:tooltip="t('customer.summary.addressName')"
|
||||||
|
:label="t('customer.summary.addressNameAbbr')"
|
||||||
:value="entity.defaultAddress.nickname"
|
:value="entity.defaultAddress.nickname"
|
||||||
/>
|
/>
|
||||||
<VnLv
|
<VnLv
|
||||||
|
@ -252,7 +253,8 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
/>
|
/>
|
||||||
<VnLv
|
<VnLv
|
||||||
v-if="entity.claimsRatio"
|
v-if="entity.claimsRatio"
|
||||||
:label="t('customer.summary.priceIncreasingRate')"
|
:tooltip="t('customer.summary.priceIncreasingRate')"
|
||||||
|
:label="t('customer.summary.priceIncreasingRateAbbr')"
|
||||||
:value="toPercentage(priceIncreasingRate)"
|
:value="toPercentage(priceIncreasingRate)"
|
||||||
/>
|
/>
|
||||||
<VnLv
|
<VnLv
|
||||||
|
@ -261,7 +263,8 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
/>
|
/>
|
||||||
<VnLv
|
<VnLv
|
||||||
v-if="entity.claimsRatio"
|
v-if="entity.claimsRatio"
|
||||||
:label="t('customer.summary.claimRate')"
|
:label="t('customer.summary.claimRateAbbr')"
|
||||||
|
:tooltip="t('customer.summary.claimRate')"
|
||||||
:value="toPercentage(claimRate)"
|
:value="toPercentage(claimRate)"
|
||||||
/>
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
|
@ -318,8 +321,9 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('customer.summary.recommendCredit')"
|
:label="t('customer.summary.recommendCreditAbbr')"
|
||||||
:value="entity.recommendedCredit"
|
:tooltip="t('customer.summary.recommendCredit')"
|
||||||
|
:value="toCurrency(entity.recommendedCredit)"
|
||||||
/>
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="vn-max">
|
<QCard class="vn-max">
|
||||||
|
|
|
@ -42,14 +42,17 @@ customer:
|
||||||
hasCoreVnl: Has core VNL
|
hasCoreVnl: Has core VNL
|
||||||
hasB2BVnl: Has B2B VNL
|
hasB2BVnl: Has B2B VNL
|
||||||
addressName: Address name
|
addressName: Address name
|
||||||
|
addressNameAbbr: A. Name
|
||||||
addressCity: City
|
addressCity: City
|
||||||
username: Username
|
username: Username
|
||||||
webAccess: Web access
|
webAccess: Web access
|
||||||
totalGreuge: Total greuge
|
totalGreuge: Total greuge
|
||||||
mana: Mana
|
mana: Mana
|
||||||
priceIncreasingRate: Price increasing rate
|
priceIncreasingRate: Price increasing rate
|
||||||
|
priceIncreasingRateAbbr: Price inc. rate
|
||||||
averageInvoiced: Average invoiced
|
averageInvoiced: Average invoiced
|
||||||
claimRate: Claming rate
|
claimRate: Claming rate
|
||||||
|
claimRateAbbr: Claim. rate
|
||||||
payMethodFk: Billing data
|
payMethodFk: Billing data
|
||||||
risk: Risk
|
risk: Risk
|
||||||
maximumRisk: Solunion's maximum risk
|
maximumRisk: Solunion's maximum risk
|
||||||
|
@ -68,6 +71,7 @@ customer:
|
||||||
descriptorInfo: Invoices minus payments plus orders not yet
|
descriptorInfo: Invoices minus payments plus orders not yet
|
||||||
rating: Rating
|
rating: Rating
|
||||||
recommendCredit: Recommended credit
|
recommendCredit: Recommended credit
|
||||||
|
recommendCreditAbbr: Rec. credit
|
||||||
goToLines: Go to lines
|
goToLines: Go to lines
|
||||||
basicData:
|
basicData:
|
||||||
socialName: Fiscal name
|
socialName: Fiscal name
|
||||||
|
|
|
@ -42,14 +42,17 @@ customer:
|
||||||
hasCoreVnl: Recibido core VNL
|
hasCoreVnl: Recibido core VNL
|
||||||
hasB2BVnl: Recibido B2B VNL
|
hasB2BVnl: Recibido B2B VNL
|
||||||
addressName: Nombre de la dirección
|
addressName: Nombre de la dirección
|
||||||
|
addressNameAbbr: N. Dirección
|
||||||
addressCity: Ciudad
|
addressCity: Ciudad
|
||||||
username: Usuario
|
username: Usuario
|
||||||
webAccess: Acceso web
|
webAccess: Acceso web
|
||||||
totalGreuge: Greuge total
|
totalGreuge: Greuge total
|
||||||
mana: Maná
|
mana: Maná
|
||||||
priceIncreasingRate: Ratio de incremento de precio
|
priceIncreasingRate: Ratio de incremento de precio
|
||||||
|
priceIncreasingRateAbbr: R. Inc. Precio
|
||||||
averageInvoiced: Facturación media
|
averageInvoiced: Facturación media
|
||||||
claimRate: Ratio de reclamaciones
|
claimRate: Ratio de reclamaciones
|
||||||
|
claimRateAbbr: R. Reclamaciones
|
||||||
maximumRisk: Riesgo máximo asumido por Solunion
|
maximumRisk: Riesgo máximo asumido por Solunion
|
||||||
payMethodFk: Forma de pago
|
payMethodFk: Forma de pago
|
||||||
risk: Riesgo
|
risk: Riesgo
|
||||||
|
@ -68,6 +71,7 @@ customer:
|
||||||
descriptorInfo: Facturas menos recibos mas pedidos sin facturar
|
descriptorInfo: Facturas menos recibos mas pedidos sin facturar
|
||||||
rating: Clasificación
|
rating: Clasificación
|
||||||
recommendCredit: Crédito recomendado
|
recommendCredit: Crédito recomendado
|
||||||
|
recommendCreditAbbr: Cr. Recomendado
|
||||||
goToLines: Ir a líneas
|
goToLines: Ir a líneas
|
||||||
basicData:
|
basicData:
|
||||||
socialName: Nombre fiscal
|
socialName: Nombre fiscal
|
||||||
|
|
|
@ -241,6 +241,7 @@ onMounted(async () => {
|
||||||
:value="`${entity.address?.nickname} #${entity.address?.id}`"
|
:value="`${entity.address?.nickname} #${entity.address?.id}`"
|
||||||
/>
|
/>
|
||||||
<VnLv
|
<VnLv
|
||||||
|
class="white-space-normal"
|
||||||
:label="t('ticket.summary.consigneeStreet')"
|
:label="t('ticket.summary.consigneeStreet')"
|
||||||
:value="formattedAddress"
|
:value="formattedAddress"
|
||||||
/>
|
/>
|
||||||
|
@ -524,4 +525,7 @@ onMounted(async () => {
|
||||||
.grafana {
|
.grafana {
|
||||||
color: $primary-light;
|
color: $primary-light;
|
||||||
}
|
}
|
||||||
|
.white-space-normal :deep(.value span) {
|
||||||
|
white-space: normal;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue