Fix employee name
This commit is contained in:
parent
ab26f502df
commit
a080a84fd7
@ -651,7 +651,7 @@ async function loadDealData(dealId) {
|
|||||||
if (employeesRes.data) {
|
if (employeesRes.data) {
|
||||||
selectedEmployees.value = employeesRes.data.map(emp => ({
|
selectedEmployees.value = employeesRes.data.map(emp => ({
|
||||||
...emp,
|
...emp,
|
||||||
fullName: emp.fio || `${emp.first_name} ${emp.last_name}`,
|
fullName: `${emp.last_name} ${emp.first_name}` || emp.fio,
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1525,7 +1525,7 @@ async function addResponsibleEmployee(userId) {
|
|||||||
...selectedEmployees.value,
|
...selectedEmployees.value,
|
||||||
{
|
{
|
||||||
...employee,
|
...employee,
|
||||||
fullName: employee.fio || `${employee.first_name} ${employee.last_name}`,
|
fullName: `${employee.last_name} ${employee.first_name}` || employee.fio,
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,7 +39,7 @@ const selectedEmployeeIds = ref([]);
|
|||||||
const employeesWithFullName = computed(() => {
|
const employeesWithFullName = computed(() => {
|
||||||
return (props.employees || []).map(employee => ({
|
return (props.employees || []).map(employee => ({
|
||||||
...employee,
|
...employee,
|
||||||
fullName: employee.fio || `${employee.first_name} ${employee.last_name}`,
|
fullName: `${employee.last_name} ${employee.first_name}` || employee.fio,
|
||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div v-if="object" class="mt-3 deal-obj-card mr-4 sm:w-1/2 md:w-1/3 lg:w-full p-4 flex">
|
<div v-if="object" class="mt-3 deal-obj-card mr-4 sm:w-1/2 md:w-1/3 lg:w-full p-4 flex">
|
||||||
<div class="w-full flex">
|
<div class="w-full flex">
|
||||||
<div class="md:w-1/4 mr-2 flex items-center justify-center overflow-hidden h-50">
|
<div class="md:w-1/4 mr-2 flex items-center justify-center overflow-hidden h-40">
|
||||||
<img
|
<img
|
||||||
v-if="object.photos && object.photos.length > 0"
|
v-if="object.photos && object.photos.length > 0"
|
||||||
:src="object.photos[0].photo"
|
:src="object.photos[0].photo"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user