From ad46bc1350da8845623fb0a85226c42f28fdb9b2 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Fri, 19 Jun 2026 18:15:34 +0300 Subject: [PATCH] Hide select objects --- src/components/deal/DealModal.vue | 32 +++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/src/components/deal/DealModal.vue b/src/components/deal/DealModal.vue index c23b7d8..d3867c0 100644 --- a/src/components/deal/DealModal.vue +++ b/src/components/deal/DealModal.vue @@ -47,10 +47,11 @@
+
@@ -106,11 +108,12 @@
-
+ -
+
@@ -464,7 +468,8 @@ const { data: requisitionSideTwoDetails, fetchData: fetchRequisitionSideTwoDetai /*Объекты*/ const { data: objectsListData, fetchData: fetchObjectsListData } = useLaravelApi(); -const objectsList = ref([]); +const objectsListSideOne = ref([]); +const objectsListSideTwo = ref([]); const { data: objectSideOneDetails, fetchData: fetchObjectSideOneDetails } = useLaravelApi(); const { data: objectSideTwoDetails, fetchData: fetchObjectSideTwoDetails } = useLaravelApi(); @@ -867,7 +872,8 @@ onMounted(async () => { fetchRequisitionsListData('/requisitions?no_pagination=1') ]); - objectsList.value = objects.data?.data || []; + objectsListSideOne.value = objects.data?.data || []; + objectsListSideTwo.value = objects.data?.data || []; clientsList.value = clients.data?.data.data || []; employeesList.value = employees.data?.success ? employees.data.data : []; @@ -945,6 +951,10 @@ watch(selectedRequisitionSideTwoId, async (newId, oldId) => { if (requisitionSideTwoDetails.value) { selectedRequisitionSideTwo.value = requisitionSideTwoDetails.value; deal.value.side_two_requisition_id = newId; + + if (requisitionSideTwoDetails.value.object_id) { + selectedObjectSideTwoId.value = requisitionSideTwoDetails.value.object_id; + } } // Установка клиента в deal для стороны 2 @@ -996,6 +1006,11 @@ watch(selectedObjectSideOneId, async (newId) => { if (objectSideOneDetails.value && objectSideOneDetails.value.success) { selectedObjectSideOne.value = objectSideOneDetails.value.data; deal.value.side_one_object_id = newId; + + const exists = objectsListSideOne.value.some(o => o.id === newId); + if (!exists && objectSideOneDetails.value.data) { + objectsListSideOne.value.push({ id: newId, name: objectSideOneDetails.value.data.nazv || `Объект ${newId}` }); + } } } else { selectedObjectSideOne.value = null; @@ -1009,6 +1024,11 @@ watch(selectedObjectSideTwoId, async (newId) => { if (objectSideTwoDetails.value && objectSideTwoDetails.value.success) { selectedObjectSideTwo.value = objectSideTwoDetails.value.data; deal.value.side_two_object_id = newId; + + const exists = objectsListSideTwo.value.some(o => o.id === newId); + if (!exists && objectSideTwoDetails.value.data) { + objectsListSideTwo.value.push({ id: newId, name: objectSideTwoDetails.value.data.nazv || `Объект ${newId}` }); + } } } else { selectedObjectSideTwo.value = null;