Merge pull request '7323 # FIX Department descriptor and routerLink' (!435) from 7323_department_descriptor_routerLink into dev
Reviewed-on: #435 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
ec7b0c1416
|
@ -22,6 +22,10 @@ const props = defineProps({
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
|
moduleName: {
|
||||||
|
type: String,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
const emit = defineEmits(['onFetch']);
|
const emit = defineEmits(['onFetch']);
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
@ -83,7 +87,7 @@ function existSummary(routes) {
|
||||||
v-if="showRedirectToSummaryIcon"
|
v-if="showRedirectToSummaryIcon"
|
||||||
class="header link"
|
class="header link"
|
||||||
:to="{
|
:to="{
|
||||||
name: `${route.meta.moduleName}Summary`,
|
name: `${moduleName ?? route.meta.moduleName}Summary`,
|
||||||
params: { id: entityId || entity.id },
|
params: { id: entityId || entity.id },
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import DepartmentDescriptor from './DepartmentDescriptor.vue';
|
import DepartmentDescriptor from './DepartmentDescriptor.vue';
|
||||||
import DepartmentSummaryDialog from './DepartmentSummaryDialog.vue';
|
import DepartmentSummary from './DepartmentSummary.vue';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
id: {
|
id: {
|
||||||
|
@ -15,7 +15,7 @@ const $props = defineProps({
|
||||||
<DepartmentDescriptor
|
<DepartmentDescriptor
|
||||||
v-if="$props.id"
|
v-if="$props.id"
|
||||||
:id="$props.id"
|
:id="$props.id"
|
||||||
:summary="DepartmentSummaryDialog"
|
:summary="DepartmentSummary"
|
||||||
/>
|
/>
|
||||||
</QPopupProxy>
|
</QPopupProxy>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -32,6 +32,7 @@ onMounted(async () => {
|
||||||
:url="`Departments/${entityId}`"
|
:url="`Departments/${entityId}`"
|
||||||
class="full-width"
|
class="full-width"
|
||||||
style="max-width: 900px"
|
style="max-width: 900px"
|
||||||
|
module-name="Department"
|
||||||
>
|
>
|
||||||
<template #header="{ entity }">
|
<template #header="{ entity }">
|
||||||
<div>{{ entity.name }}</div>
|
<div>{{ entity.name }}</div>
|
||||||
|
|
|
@ -9,7 +9,7 @@ export default {
|
||||||
moduleName: 'Department',
|
moduleName: 'Department',
|
||||||
},
|
},
|
||||||
component: RouterView,
|
component: RouterView,
|
||||||
redirect: { name: 'DepartmentCard' },
|
redirect: { name: 'WorkerDepartment' },
|
||||||
menus: {
|
menus: {
|
||||||
main: [],
|
main: [],
|
||||||
card: ['DepartmentBasicData'],
|
card: ['DepartmentBasicData'],
|
||||||
|
|
Loading…
Reference in New Issue