From 9d59d70016f398197ffbd962da0858162dc75b6c Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sat, 27 Jun 2026 15:57:32 +0300 Subject: [PATCH] Fix select side --- src/components/deal/DealModal.vue | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/components/deal/DealModal.vue b/src/components/deal/DealModal.vue index cb323f3..5128d1e 100644 --- a/src/components/deal/DealModal.vue +++ b/src/components/deal/DealModal.vue @@ -884,28 +884,32 @@ onMounted(async () => { })) || []; originalRequisitionsList.value = reqList; - requisitionsList.value = reqList; + requisitionsList.value = reqList.filter(req => req.id !== newDealReqId.value); if (isEditing.value && dealId) { await loadDealData(dealId); // Фильтруем список заявок для стороны 2 по типу стороны 1 if (selectedRequisitionSideOne.value) { const sideOneTypeId = selectedRequisitionSideOne.value.type?.heir || selectedRequisitionSideOne.value.type_id; + let filtered; if (sideOneTypeId === 2) { - requisitionsList.value = reqList.filter(req => req.type_id !== 2); + filtered = reqList.filter(req => req.type_id !== 2); } else { - requisitionsList.value = reqList.filter(req => req.type_id === 2); + filtered = reqList.filter(req => req.type_id === 2); } + requisitionsList.value = filtered.filter(req => req.id !== selectedRequisitionSideOneId.value); } } else if (isSideOneLoaded) { const sideOneTypeId = selectedRequisitionSideOne.value.type?.heir || selectedRequisitionSideOne.value.type_id; + let filtered; if (sideOneTypeId === 2) { - requisitionsList.value = reqList.filter(req => req.type_id !== 2); + filtered = reqList.filter(req => req.type_id !== 2); } else { - requisitionsList.value = reqList.filter(req => req.type_id === 2); + filtered = reqList.filter(req => req.type_id === 2); } + requisitionsList.value = filtered.filter(req => req.id !== selectedRequisitionSideOneId.value); } else { - requisitionsList.value = reqList; + requisitionsList.value = reqList.filter(req => req.id !== selectedRequisitionSideOneId.value); } } catch (error) { @@ -998,8 +1002,8 @@ async function filterRequisitionsList(event) { const query = event.filter || ''; if (query === '') { - // Если запрос пустой, возвращаем полный список - requisitionsList.value = [...originalRequisitionsList.value]; + // Если запрос пустой, возвращаем полный список (с исключением текущей заявки стороны 1) + requisitionsList.value = originalRequisitionsList.value.filter(req => req.id !== selectedRequisitionSideOneId.value); return; }