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

Fix object in create

Browse Source
This commit is contained in:
Vladimir 2026-06-29 17:28:49 +03:00
parent 9d59d70016
commit d13bef5e8a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@
<RequisitionDetails v-if="selectedRequisitionSideOne" :deal="deal" :requisition="selectedRequisitionSideOne" :clientsList="clientsList" side="sideOne" @closeDealRequisition="handleCloseDealRequisition" /> <RequisitionDetails v-if="selectedRequisitionSideOne" :deal="deal" :requisition="selectedRequisitionSideOne" :clientsList="clientsList" side="sideOne" @closeDealRequisition="handleCloseDealRequisition" />
</div> </div>
<div class="form__item flex flex-col gap-1 w-full" v-if="selectedRequisitionSideOne && selectedRequisitionSideOne.type_id === 2"> <div class="form__item flex flex-col gap-1 w-full" v-if="selectedRequisitionSideOne && (selectedRequisitionSideOne.type?.heir || selectedRequisitionSideOne.type_id) === 2">
<!-- Селект объекта скрыт, объект подтягивается из заявки <!-- Селект объекта скрыт, объект подтягивается из заявки
<label>Выберите объект:</label> <label>Выберите объект:</label>
<Select <Select
@ -64,7 +64,7 @@
--> -->
</div> </div>
<div class="form__item flex flex-col gap-1 w-full" v-if="selectedRequisitionSideOne && selectedRequisitionSideOne.type_id === 2"> <div class="form__item flex flex-col gap-1 w-full" v-if="selectedRequisitionSideOne && (selectedRequisitionSideOne.type?.heir || selectedRequisitionSideOne.type_id) === 2">
<ObjectDetails v-if="selectedObjectSideOne" :deal="deal" :object="selectedObjectSideOne" side="sideOne" @closeDealObject="handleCloseDealObject" /> <ObjectDetails v-if="selectedObjectSideOne" :deal="deal" :object="selectedObjectSideOne" side="sideOne" @closeDealObject="handleCloseDealObject" />
</div> </div>
@ -109,7 +109,7 @@
</div> </div>
<!-- Селект объекта скрыт, объект подтягивается из заявки <!-- Селект объекта скрыт, объект подтягивается из заявки
<div class="form__item flex flex-col gap-1 w-full" v-if="selectedRequisitionSideTwo && selectedRequisitionSideTwo.type_id === 2"> <div class="form__item flex flex-col gap-1 w-full" v-if="selectedRequisitionSideTwo && (selectedRequisitionSideTwo.type?.heir || selectedRequisitionSideTwo.type_id) === 2">
<label for="nameHome">Выберите объект:</label> <label for="nameHome">Выберите объект:</label>
<Select <Select
v-model="selectedObjectSideTwoId" v-model="selectedObjectSideTwoId"
@ -125,7 +125,7 @@
</div> </div>
--> -->
<div class="form__item" v-if="selectedRequisitionSideTwo && selectedRequisitionSideTwo.type_id === 2"> <div class="form__item" v-if="selectedRequisitionSideTwo && (selectedRequisitionSideTwo.type?.heir || selectedRequisitionSideTwo.type_id) === 2">
<ObjectDetails v-if="selectedObjectSideTwo" :deal="deal" :object="selectedObjectSideTwo" side="sideTwo" @closeDealObject="handleCloseDealObject" /> <ObjectDetails v-if="selectedObjectSideTwo" :deal="deal" :object="selectedObjectSideTwo" side="sideTwo" @closeDealObject="handleCloseDealObject" />
</div> </div>
@ -937,6 +937,7 @@ watch(selectedRequisitionSideOneId, async (newId) => {
// Автовыбор стороны 1 (Арендодатель/Продавец) по operation_type объекта // Автовыбор стороны 1 (Арендодатель/Продавец) по operation_type объекта
let operationType = null; let operationType = null;
if (!isEditing.value && requisitionSideOneDetails.value.object_id) { if (!isEditing.value && requisitionSideOneDetails.value.object_id) {
selectedObjectSideOneId.value = requisitionSideOneDetails.value.object_id;
await fetchObjectSideOneDetails(`/objects/${requisitionSideOneDetails.value.object_id}`); await fetchObjectSideOneDetails(`/objects/${requisitionSideOneDetails.value.object_id}`);
const objData = objectSideOneDetails.value; const objData = objectSideOneDetails.value;
if (objData && objData.success && objData.data?.operation_type !== undefined) { if (objData && objData.success && objData.data?.operation_type !== undefined) {
@ -1020,8 +1021,10 @@ async function filterRequisitionsList(event) {
// Получение деталей выбранного объекта 1 стороны // Получение деталей выбранного объекта 1 стороны
watch(selectedObjectSideOneId, async (newId) => { watch(selectedObjectSideOneId, async (newId) => {
console.log('[DealModal] watch selectedObjectSideOneId:', newId);
if (newId) { if (newId) {
await fetchObjectSideOneDetails(`/objects/${newId}`); await fetchObjectSideOneDetails(`/objects/${newId}`);
console.log('[DealModal] objectSideOneDetails:', objectSideOneDetails.value);
if (objectSideOneDetails.value && objectSideOneDetails.value.success) { if (objectSideOneDetails.value && objectSideOneDetails.value.success) {
selectedObjectSideOne.value = objectSideOneDetails.value.data; selectedObjectSideOne.value = objectSideOneDetails.value.data;
deal.value.side_one_object_id = newId; deal.value.side_one_object_id = newId;