diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue index f7e2ffbf6..c28e95cb8 100644 --- a/src/pages/Claim/ClaimFilter.vue +++ b/src/pages/Claim/ClaimFilter.vue @@ -30,7 +30,7 @@ defineExpose({ states }); {{ formatFn(tag.value) }} - diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index 768c66f32..e9a349e0b 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -16,14 +16,17 @@ const { t } = useI18n(); const businessTypes = ref([]); const contactChannels = ref([]); -const handleSalesModelValue = (val) => ({ - or: [ - { id: val }, - { name: val }, - { nickname: { like: '%' + val + '%' } }, - { code: { like: `${val}%` } }, - ], -}); +const handleSalesModelValue = (val) => { + if (!val) val = ''; + return { + or: [ + { id: val }, + { name: val }, + { nickname: { like: '%' + val + '%' } }, + { code: { like: `${val}%` } }, + ], + }; +}; const exprBuilder = (param, value) => { return { diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue index 96f670542..c62ec7dbb 100644 --- a/src/pages/Customer/CustomerFilter.vue +++ b/src/pages/Customer/CustomerFilter.vue @@ -12,14 +12,17 @@ defineProps({ required: true, }, }); -const handleSalesModelValue = (val) => ({ - or: [ - { id: val }, - { name: val }, - { nickname: { like: '%' + val + '%' } }, - { code: { like: `${val}%` } }, - ], -}); +const handleSalesModelValue = (val) => { + if (!val) val = ''; + return { + or: [ + { id: val }, + { name: val }, + { nickname: { like: '%' + val + '%' } }, + { code: { like: `${val}%` } }, + ], + }; +}; const exprBuilder = (param, value) => { return { diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue index a75dfa1b2..665e136e4 100644 --- a/src/pages/Customer/components/CustomerSamplesCreate.vue +++ b/src/pages/Customer/components/CustomerSamplesCreate.vue @@ -107,7 +107,7 @@ const setParams = (params) => { const getPreview = async () => { const params = { - recipientId: entityId, + recipientId: entityId.value, }; const validationMessage = validateMessage(); if (validationMessage) return notify(t(validationMessage), 'negative'); diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue index 491e5e180..c480d5bd8 100644 --- a/src/pages/Worker/Card/WorkerTimeControl.vue +++ b/src/pages/Worker/Card/WorkerTimeControl.vue @@ -381,7 +381,7 @@ const isUnsatisfied = async (reason) => { const resendEmail = async () => { const params = { - recipient: worker.value?.user?.email, + recipient: worker.value[0]?.user?.emailUser?.email, week: selectedWeekNumber.value, year: selectedDate.value.getFullYear(), workerId: Number(route.params.id),