diff --git a/src/components/deal/DealModal.vue b/src/components/deal/DealModal.vue index 1933655..ddefd05 100644 --- a/src/components/deal/DealModal.vue +++ b/src/components/deal/DealModal.vue @@ -651,7 +651,7 @@ async function loadDealData(dealId) { if (employeesRes.data) { selectedEmployees.value = employeesRes.data.map(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, { ...employee, - fullName: employee.fio || `${employee.first_name} ${employee.last_name}`, + fullName: `${employee.last_name} ${employee.first_name}` || employee.fio, } ]; } diff --git a/src/components/deal/addEdit/EmployeeAddModal.vue b/src/components/deal/addEdit/EmployeeAddModal.vue index ec93fd1..f9fe0df 100644 --- a/src/components/deal/addEdit/EmployeeAddModal.vue +++ b/src/components/deal/addEdit/EmployeeAddModal.vue @@ -39,7 +39,7 @@ const selectedEmployeeIds = ref([]); const employeesWithFullName = computed(() => { return (props.employees || []).map(employee => ({ ...employee, - fullName: employee.fio || `${employee.first_name} ${employee.last_name}`, + fullName: `${employee.last_name} ${employee.first_name}` || employee.fio, })); }); diff --git a/src/components/deal/addEdit/ObjectDetails.vue b/src/components/deal/addEdit/ObjectDetails.vue index 795d593..4de82e3 100644 --- a/src/components/deal/addEdit/ObjectDetails.vue +++ b/src/components/deal/addEdit/ObjectDetails.vue @@ -1,7 +1,7 @@