weborsha/deal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix select side

Browse Source
This commit is contained in:
Vladimir 2026-06-27 15:57:32 +03:00
parent f9c2c1bc46
commit 9d59d70016
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/deal/DealModal.vue
View File

@ -884,28 +884,32 @@ onMounted(async () => {
})) || []; })) || [];
originalRequisitionsList.value = reqList; originalRequisitionsList.value = reqList;
requisitionsList.value = reqList; requisitionsList.value = reqList.filter(req => req.id !== newDealReqId.value);
if (isEditing.value && dealId) { if (isEditing.value && dealId) {
await loadDealData(dealId); await loadDealData(dealId);
// Фильтруем список заявок для стороны 2 по типу стороны 1 // Фильтруем список заявок для стороны 2 по типу стороны 1
if (selectedRequisitionSideOne.value) { if (selectedRequisitionSideOne.value) {
const sideOneTypeId = selectedRequisitionSideOne.value.type?.heir || selectedRequisitionSideOne.value.type_id; const sideOneTypeId = selectedRequisitionSideOne.value.type?.heir || selectedRequisitionSideOne.value.type_id;
let filtered;
if (sideOneTypeId === 2) { if (sideOneTypeId === 2) {
requisitionsList.value = reqList.filter(req => req.type_id !== 2); filtered = reqList.filter(req => req.type_id !== 2);
} else { } 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) { } else if (isSideOneLoaded) {
const sideOneTypeId = selectedRequisitionSideOne.value.type?.heir || selectedRequisitionSideOne.value.type_id; const sideOneTypeId = selectedRequisitionSideOne.value.type?.heir || selectedRequisitionSideOne.value.type_id;
let filtered;
if (sideOneTypeId === 2) { if (sideOneTypeId === 2) {
requisitionsList.value = reqList.filter(req => req.type_id !== 2); filtered = reqList.filter(req => req.type_id !== 2);
} else { } 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 { } else {
requisitionsList.value = reqList; requisitionsList.value = reqList.filter(req => req.id !== selectedRequisitionSideOneId.value);
} }
} catch (error) { } catch (error) {
@ -998,8 +1002,8 @@ async function filterRequisitionsList(event) {
const query = event.filter || ''; const query = event.filter || '';
if (query === '') { if (query === '') {
// Если запрос пустой, возвращаем полный список // Если запрос пустой, возвращаем полный список (с исключением текущей заявки стороны 1)
requisitionsList.value = [...originalRequisitionsList.value]; requisitionsList.value = originalRequisitionsList.value.filter(req => req.id !== selectedRequisitionSideOneId.value);
return; return;
} }