Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
39228ed257
|
@ -41,7 +41,6 @@ const sampleType = ref({ hasPreview: false });
|
|||
const initialData = reactive({});
|
||||
const entityId = computed(() => route.params.id);
|
||||
const customer = computed(() => useArrayData('Customer').store?.data);
|
||||
const filterEmailUsers = { where: { userFk: user.value.id } };
|
||||
const filterClientsAddresses = {
|
||||
include: [
|
||||
{ relation: 'province', scope: { fields: ['name'] } },
|
||||
|
@ -73,7 +72,7 @@ onBeforeMount(async () => {
|
|||
|
||||
const setEmailUser = (data) => {
|
||||
optionsEmailUsers.value = data;
|
||||
initialData.replyTo = data[0]?.email;
|
||||
initialData.replyTo = data[0]?.notificationEmail;
|
||||
};
|
||||
|
||||
const setClientsAddresses = (data) => {
|
||||
|
@ -182,10 +181,12 @@ const toCustomerSamples = () => {
|
|||
|
||||
<template>
|
||||
<FetchData
|
||||
:filter="filterEmailUsers"
|
||||
:filter="{
|
||||
where: { id: customer.departmentFk },
|
||||
}"
|
||||
@on-fetch="setEmailUser"
|
||||
auto-load
|
||||
url="EmailUsers"
|
||||
url="Departments"
|
||||
/>
|
||||
<FetchData
|
||||
:filter="filterClientsAddresses"
|
||||
|
|
Loading…
Reference in New Issue