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

Hide select objects

Browse Source
This commit is contained in:
Vladimir 2026-06-19 18:15:34 +03:00
parent 09b389a784
commit ad46bc1350
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,10 +47,11 @@
</div>
<div class="form__item flex flex-col gap-1 w-full" v-if="selectedRequisitionSideOne && selectedRequisitionSideOne.type_id === 2">
<!-- Селект объекта скрыт, объект подтягивается из заявки
<label>Выберите объект:</label>
<Select
v-model="selectedObjectSideOneId"
:options="objectsList"
:options="objectsListSideOne"
optionLabel="name"
optionValue="id"
placeholder="Выберите объект"
@ -60,6 +61,7 @@
<DropdownIcon />
</template>
</Select>
-->
</div>
<div class="form__item flex flex-col gap-1 w-full" v-if="selectedRequisitionSideOne && selectedRequisitionSideOne.type_id === 2">
@ -106,11 +108,12 @@
<RequisitionDetails v-if="selectedRequisitionSideTwo" :deal="deal" :requisition="selectedRequisitionSideTwo" :clientsList="clientsList" side="sideTwo" @closeDealRequisition="handleCloseDealRequisition" />
</div>
<div class="form__item flex flex-col gap-1 w-full" v-if="selectedObjectSideTwo && selectedObjectSideTwo.type_id === 2">
<!-- Селект объекта скрыт, объект подтягивается из заявки
<div class="form__item flex flex-col gap-1 w-full" v-if="selectedRequisitionSideTwo && selectedRequisitionSideTwo.type_id === 2">
<label for="nameHome">Выберите объект:</label>
<Select
v-model="selectedObjectSideTwoId"
:options="objectsList"
:options="objectsListSideTwo"
optionLabel="name"
optionValue="id"
placeholder="Выберите объект"
@ -120,8 +123,9 @@
</template>
</Select>
</div>
-->
<div class="form__item" v-if="selectedObjectSideTwo && selectedObjectSideTwo.type_id === 2">
<div class="form__item" v-if="selectedRequisitionSideTwo && selectedRequisitionSideTwo.type_id === 2">
<ObjectDetails v-if="selectedObjectSideTwo" :deal="deal" :object="selectedObjectSideTwo" side="sideTwo" @closeDealObject="handleCloseDealObject" />
</div>
@ -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;