8627-devToTest #1421

Merged
alexm merged 768 commits from 8627-devToTest into test 2025-02-18 12:37:37 +00:00
2 changed files with 7 additions and 9 deletions
Showing only changes of commit fc247ae413 - Show all commits

View File

@ -18,10 +18,11 @@ const maritalStatus = [
{ code: 'S', name: t('Single') }, { code: 'S', name: t('Single') },
]; ];
const advancedSummary = ref({}); const advancedSummary = ref({});
const route = useRoute();
onBeforeMount(async () => { onBeforeMount(async () => {
advancedSummary.value = console.log('route.params.id', route.params.id);
(await useAdvancedSummary('Workers', +useRoute().params.id)) ?? {}; advancedSummary.value = (await useAdvancedSummary('Workers', route.params.id)) ?? {};
console.log('advancedSummary.value: ', advancedSummary.value);
}); });
</script> </script>
<template> <template>
@ -38,8 +39,6 @@ onBeforeMount(async () => {
auto-load auto-load
/> />
<FormModel <FormModel
:filter="{ where: { id: +$route.params.id } }"
url="Workers/summary"
:url-update="`Workers/${$route.params.id}`" :url-update="`Workers/${$route.params.id}`"
auto-load auto-load
model="Worker" model="Worker"

View File

@ -20,7 +20,7 @@ const $props = defineProps({
dataKey: { dataKey: {
type: String, type: String,
required: false, required: false,
default: 'workerData', default: 'Worker',
}, },
}); });
const image = ref(null); const image = ref(null);
@ -71,8 +71,7 @@ const handlePhotoUpdated = (evt = false) => {
ref="cardDescriptorRef" ref="cardDescriptorRef"
module="Worker" module="Worker"
:data-key="dataKey" :data-key="dataKey"
url="Workers/descriptor" url="Workers/summary"
:filter="{ where: { id: entityId } }"
title="user.nickname" title="user.nickname"
@on-fetch="getIsExcluded" @on-fetch="getIsExcluded"
> >
@ -182,7 +181,7 @@ const handlePhotoUpdated = (evt = false) => {
<QBtn <QBtn
:to="{ :to="{
name: 'AccountCard', name: 'AccountCard',
params: { id: entity.user.id }, params: { id: entity.user?.id },
}" }"
size="md" size="md"
icon="face" icon="face"