Merge pull request 'fix: refs #7318 fixed claim summary warnings' (!1347) from 7318-claimSummaryFixWarnings into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #1347 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
This commit is contained in:
commit
b2f011e7cc
|
@ -18,7 +18,12 @@ import VnInput from 'components/common/VnInput.vue';
|
||||||
|
|
||||||
const emit = defineEmits(['onFetch']);
|
const emit = defineEmits(['onFetch']);
|
||||||
|
|
||||||
const $attrs = useAttrs();
|
const originalAttrs = useAttrs();
|
||||||
|
|
||||||
|
const $attrs = computed(() => {
|
||||||
|
const { style, ...rest } = originalAttrs;
|
||||||
|
return rest;
|
||||||
|
});
|
||||||
|
|
||||||
const isRequired = computed(() => {
|
const isRequired = computed(() => {
|
||||||
return Object.keys($attrs).includes('required')
|
return Object.keys($attrs).includes('required')
|
||||||
|
|
|
@ -86,7 +86,7 @@ onMounted(async () => {
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :label="t('claim.zone')">
|
<VnLv v-if="entity.ticket?.zone?.id" :label="t('claim.zone')">
|
||||||
<template #value>
|
<template #value>
|
||||||
<span class="link">
|
<span class="link">
|
||||||
{{ entity.ticket?.zone?.name }}
|
{{ entity.ticket?.zone?.name }}
|
||||||
|
@ -98,11 +98,10 @@ onMounted(async () => {
|
||||||
:label="t('claim.province')"
|
:label="t('claim.province')"
|
||||||
:value="entity.ticket?.address?.province?.name"
|
:value="entity.ticket?.address?.province?.name"
|
||||||
/>
|
/>
|
||||||
<VnLv :label="t('claim.ticketId')">
|
<VnLv v-if="entity.ticketFk" :label="t('claim.ticketId')">
|
||||||
<template #value>
|
<template #value>
|
||||||
<span class="link">
|
<span class="link">
|
||||||
{{ entity.ticketFk }}
|
{{ entity.ticketFk }}
|
||||||
|
|
||||||
<TicketDescriptorProxy :id="entity.ticketFk" />
|
<TicketDescriptorProxy :id="entity.ticketFk" />
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed } from 'vue';
|
import { computed, useAttrs } from 'vue';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
import { useState } from 'src/composables/useState';
|
import { useState } from 'src/composables/useState';
|
||||||
import VnNotes from 'src/components/ui/VnNotes.vue';
|
import VnNotes from 'src/components/ui/VnNotes.vue';
|
||||||
|
@ -7,6 +7,7 @@ import VnNotes from 'src/components/ui/VnNotes.vue';
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const state = useState();
|
const state = useState();
|
||||||
const user = state.getUser();
|
const user = state.getUser();
|
||||||
|
const $attrs = useAttrs();
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
id: { type: [Number, String], default: null },
|
id: { type: [Number, String], default: null },
|
||||||
|
|
|
@ -131,7 +131,7 @@ const STATE_COLOR = {
|
||||||
prefix="claim"
|
prefix="claim"
|
||||||
:array-data-props="{
|
:array-data-props="{
|
||||||
url: 'Claims/filter',
|
url: 'Claims/filter',
|
||||||
order: ['cs.priority ASC', 'created ASC'],
|
order: 'cs.priority ASC, created ASC',
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<template #advanced-menu>
|
<template #advanced-menu>
|
||||||
|
|
Loading…
Reference in New Issue