fix: refs #6919 roadmap

src/pages/Route/Roadmap/RoadmapBasicData.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
@@ -12,10 +12,9 @@ import { ref } from 'vue';
 
 const { t } = useI18n();
 const router = useRouter();
-const route = useRoute();
 
 const supplierList = ref([]);
-const filter = { include: [{ relation: 'supplier' }] };
+
 const onSave = (data, response) => {
     router.push({ name: 'RoadmapSummary', params: { id: response?.id } });
 };
@@ -30,10 +29,9 @@ const onSave = (data, response) => {
         @on-fetch="(data) => (supplierList = data)"
     />
     <FormModel
-        :url="`Roadmaps/${route.params?.id}`"
+        :update-url="`Roadmaps/${$route.params?.id}`"
         observe-form-changes
-        :filter="filter"
+        model="Roadmap"
-        model="roadmap"
         auto-load
         @on-data-saved="onSave"
     >

src/pages/Route/Roadmap/RoadmapCard.vue

@@ -2,6 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
 import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
+import filter from './RoadmapFilter.js';
 </script>
 <template>
     <VnCard
@@ -9,6 +10,7 @@ import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
         url="Roadmaps"
         :descriptor="RoadmapDescriptor"
         :filter-panel="RoadmapFilter"
+        :filter="filter"
         search-data-key="RoadmapList"
         :searchbar-props="{
             url: 'Roadmaps',

src/pages/Route/Roadmap/RoadmapDescriptor.vue

@@ -1,13 +1,13 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import useCardDescription from 'composables/useCardDescription';
 import { dashIfEmpty, toDateHourMin } from 'src/filters';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import RoadmapDescriptorMenu from 'pages/Route/Roadmap/RoadmapDescriptorMenu.vue';
+import filter from 'pages/Route/Roadmap/RoadmapFilter.js';
 
 const $props = defineProps({
     id: {
@@ -23,10 +23,6 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-const filter = { include: [{ relation: 'supplier' }] };
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
 </script>
 
 <template>
@@ -34,10 +30,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         module="Roadmap"
         :url="`Roadmaps/${entityId}`"
         :filter="filter"
-        :title="data.title"
+        title="code"
-        :subtitle="data.subtitle"
         data-key="Roadmap"
-        @on-fetch="setData"
     >
         <template #body="{ entity }">
             <VnLv :label="t('Roadmap')" :value="entity?.name" />

src/pages/Route/Roadmap/RoadmapFilter.js

@@ -0,0 +1,3 @@
+export default {
+    include: [{ relation: 'supplier' }],
+};

src/pages/Route/Roadmap/RoadmapSummary.vue

@@ -66,7 +66,6 @@ const filter = {
             },
         },
     ],
-    where: { id: entityId },
 };
 </script>
 
@@ -75,7 +74,7 @@ const filter = {
         <CardSummary
             data-key="RoadmapSummary"
             ref="summary"
-            :url="`Roadmaps`"
+            :url="`Roadmaps/${entityId}`"
             :filter="filter"
         >
             <template #header-left>