From 841ed5d81a39747a5b3e702faea8f06b56abbaf0 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 19 Oct 2023 14:29:38 +0200 Subject: [PATCH] refs #6157 change hide, descriptor, development --- src/components/common/VnSelectFilter.vue | 1 - src/components/ui/CardDescriptor.vue | 8 +++----- src/pages/Claim/Card/ClaimAction.vue | 22 ++++++++++++++-------- src/pages/Claim/Card/ClaimDevelopment.vue | 2 ++ 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue index d3c073c6e..0ceabc87d 100644 --- a/src/components/common/VnSelectFilter.vue +++ b/src/components/common/VnSelectFilter.vue @@ -81,7 +81,6 @@ const value = computed({ map-options use-input @filter="filterHandler" - hide-selected fill-input ref="vnSelectRef" > diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 2dd531f20..8976795fb 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -2,7 +2,6 @@ import { onMounted, useSlots, ref, watch } from 'vue'; import { useI18n } from 'vue-i18n'; import axios from 'axios'; -import { useArrayData } from 'src/composables/useArrayData'; import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue'; const $props = defineProps({ @@ -27,19 +26,18 @@ const $props = defineProps({ default: 0, }, }); -const arrayData = useArrayData('claimData'); -const store = arrayData.store; -console.log('eee', store.data); + const slots = useSlots(); const { t } = useI18n(); const entity = ref(null); let lastUrl = ref(null); onMounted(async () => { - entity.value = await store.data; + await fetch(); }); const emit = defineEmits(['onFetch']); + async function fetch() { lastUrl.value = $props.url; const params = {}; diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue index 77f1dab40..f2031cf2e 100644 --- a/src/pages/Claim/Card/ClaimAction.vue +++ b/src/pages/Claim/Card/ClaimAction.vue @@ -92,7 +92,7 @@ const columns = computed(() => [ name: 'delete', }, ]); -console.log(claimData.store.data); + watchEffect(() => { if (rows.value.length) { destinations.value = rows.value.map((row) => @@ -103,6 +103,7 @@ watchEffect(() => { }); function getDestination(destinationId) { + console.log(destinationTypes.value.find((type) => type.id == destinationId)); return destinationTypes.value.find((type) => type.id == destinationId); } @@ -205,6 +206,17 @@ async function updateDestinations(claimDestinationFk) { @click="dialog = !dialog" /> +
@@ -248,9 +260,6 @@ async function updateDestinations(claimDestinationFk) { :options="destinationTypes" option-value="id" option-label="description" - @update:model-value=" - (value) => updateDestination(value, rows[rowIndex]) - " /> @@ -317,11 +326,10 @@ async function updateDestinations(claimDestinationFk) { -