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

Fix deal

Browse Source
This commit is contained in:
Vova 2026-06-04 08:41:08 +03:00
parent a635d601df
commit c9db3f3f17
9 changed files with 120 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.env.development
View File

@ -1,8 +1,19 @@
NODE_ENV=development NODE_ENV=development
VITE_API_URL=https://joyworkdev.ru #VITE_API_URL=https://joyworkdev.ru
VITE_LARAVEL_URL=https://llar.joyworkdev.ru #VITE_LARAVEL_URL=https://llar.joyworkdev.ru
VITE_LARAVEL_API_URL=https://joyworkdev.ru #VITE_LARAVEL_API_URL=https://joyworkdev.ru
VITE_DEV_SESSION_ID=87ae8a661f903a5958e2a36aeaffb970 #VITE_DEV_SESSION_ID=0f71932af5f6b31f1b3a56fdb67d8c6f
VITE_DEV_REQUISITION_ID=17539 #VITE_DEV_REQUISITION_ID=17539
VITE_API_URL=https://joywork.ru
VITE_LARAVEL_URL=https://api.joywork.ru
VITE_LARAVEL_API_URL=https://joywork.ru
VITE_DEV_SESSION_ID=javn7fjr5pjv9q075krd89k641
VITE_DEV_REQUISITION_ID=1481170
#VITE_BASIC_AUTH_USER=adminlogin #VITE_BASIC_AUTH_USER=adminlogin
#VITE_BASIC_AUTH_PASS=adminpassword #VITE_BASIC_AUTH_PASS=adminpassword

6
.env.production
View File

@ -1,7 +1,7 @@
NODE_ENV=production NODE_ENV=production
VITE_API_URL=https://joyworkdev.ru VITE_API_URL=https://joywork.ru
VITE_LARAVEL_URL=https://llar.joyworkdev.ru VITE_LARAVEL_URL=https://api.joywork.ru
VITE_LARAVEL_API_URL=https://joyworkdev.ru VITE_LARAVEL_API_URL=https://joywork.ru
VITE_DEV_SESSION_ID=e33a6f076567ef9c7c6a9e244f0fd626 VITE_DEV_SESSION_ID=e33a6f076567ef9c7c6a9e244f0fd626
VITE_DEV_REQUISITION_ID=17539 VITE_DEV_REQUISITION_ID=17539
#VITE_BASIC_AUTH_USER=adminlogin #VITE_BASIC_AUTH_USER=adminlogin

14
src/assets/css/temporary.css
View File

@ -34,4 +34,18 @@
margin-inline-end: calc(calc(var(--spacing) * 4) * calc(1 - var(--tw-space-x-reverse))); margin-inline-end: calc(calc(var(--spacing) * 4) * calc(1 - var(--tw-space-x-reverse)));
} }
} }
.text-gray-700 {
color: var(--color-gray-700);
}
.block {
display: block;
}
.font-medium {
--tw-font-weight: var(--font-weight-medium);
font-weight: var(--font-weight-medium);
}
.text-sm {
font-size: var(--text-sm);
}
} }

2
src/components/deal/addEdit/DocAddModal.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="dealAddDoc"> <div class="dealAddDoc">
<div class="modal-content"> <div class="deal-modal-content">
<!-- <span class="close" @click="closeModal">&times;</span>--> <!-- <span class="close" @click="closeModal">&times;</span>-->
<!-- <h3 class="mb-4">Добавление документа</h3>--> <!-- <h3 class="mb-4">Добавление документа</h3>-->

2
src/components/deal/addEdit/ObjectDetails.vue
View File

@ -32,7 +32,7 @@
<span class="ml-4">История и задачи</span> <span class="ml-4">История и задачи</span>
</button> </button>
</div> </div>
<div>Добавил: {{ object.add_user && object.add_user.fio ? object.add_user.fio : '' }}</div> <div>Добавил: {{ object.add_user && object.add_user.full_name ? object.add_user.full_name : '' }}</div>
</div> </div>
</div> </div>
</div> </div>

84
src/components/deal/addEdit/RequisitionDetails.vue
View File

@ -11,13 +11,13 @@
v-for="(step, index) in steps" v-for="(step, index) in steps"
:key="index" :key="index"
class="progress-step" class="progress-step"
:class="{ 'bg-green-500': index < requisition.stage, 'bg-white': index >= requisition.stage }" :class="{ 'bg-green-500': index < requisition.stage_index, 'bg-white': index >= requisition.stage_index ?? 0 }"
> >
</div> </div>
</div> </div>
</div> </div>
<div class="stage-current ml-4"> {{ currentStageName }}</div> <div class="stage-current ml-4"> {{ requisition.current_stage_name || currentStageName }}</div>
<div class="ml-auto cursor-pointer" @click="closeDealRequisition"> <div class="ml-auto cursor-pointer" @click="closeDealRequisition">
<img src="@/shared/assets/icons/close.svg" alt="Close"> <img src="@/shared/assets/icons/close.svg" alt="Close">
@ -100,8 +100,9 @@
</template> </template>
<!-- Dropdown для выбора клиентов --> <!-- Dropdown для выбора клиентов -->
<div class="w-1/2 p-2 flex justify-between items-center"> <div class="w-1/2 p-2">
<div class="client w-full"> <div class="client flex justify-between items-center">
<div class="flex-grow">
<MultiSelect <MultiSelect
v-if="Array.isArray(clientsList)" v-if="Array.isArray(clientsList)"
v-model="selectedClientIds" v-model="selectedClientIds"
@ -119,16 +120,14 @@
<DropdownIcon /> <DropdownIcon />
</template> </template>
</MultiSelect> </MultiSelect>
</div> </div>
<div class="ml-2">
<div class="p-4">
<a href="javascript:{}" class="add_client_new" style="border: none;"> <a href="javascript:{}" class="add_client_new" style="border: none;">
<img src="@/shared/assets/icons/plus-green.svg" alt="Добавить клиента" class="w-6 h-6"> <img src="@/shared/assets/icons/plus-green.svg" alt="Добавить клиента" class="w-6 h-6">
</a> </a>
</div> </div>
</div> </div>
</div>
</div> </div>
@ -249,32 +248,41 @@ const currentStageName = ref("");
watch( watch(
() => props.requisition, () => props.requisition,
(newRequisition) => { (newRequisition) => {
if (newRequisition.funnel_id === 0) { // if (newRequisition.funnel_id === 0) {
steps.value = [ // steps.value = [
"Новый", // "Новый",
"В работе", // "В работе",
"Презентация", // "Презентация",
"Показ", // "Показ",
"Бронь", // "Бронь",
"Подаем на ипотеку", // "Подаем на ипотеку",
"Сделка", // "Сделка",
"Закрыт", // "Закрыт",
]; // ];
currentStageName.value = // currentStageName.value =
steps.value[newRequisition.stage - 1] || "Неизвестный шаг"; // steps.value[newRequisition.stage - 1] || "Неизвестный шаг";
} else { // } else {
//
// // Берём шаги из funnel_steps
// if (newRequisition.funnel_steps && Array.isArray(newRequisition.funnel_steps)) {
// steps.value = newRequisition.funnel_steps.map(step => step.name);
// } else {
// steps.value = [];
// }
//
// currentStageName.value =
// newRequisition.funnel_steps?.[newRequisition.stage - 1]?.name ||
// "Неизвестный шаг";
// }
// Берём шаги из funnel_steps
if (newRequisition.funnel_steps && Array.isArray(newRequisition.funnel_steps)) { if (newRequisition.funnel_steps && Array.isArray(newRequisition.funnel_steps)) {
steps.value = newRequisition.funnel_steps.map(step => step.name); steps.value = newRequisition.funnel_steps.map(step => step.name);
} else if (newRequisition.funnel_id === 0) {
// Дефолтная воронка
steps.value = ["Новый", "В работе", "Презентация", "Показ", "Бронь", "Подаем на ипотеку", "Сделка", "Закрыт"];
} else { } else {
steps.value = []; steps.value = [];
} }
currentStageName.value =
newRequisition.funnel_steps?.[newRequisition.stage - 1]?.name ||
"Неизвестный шаг";
}
console.log('newRequisition:', newRequisition); console.log('newRequisition:', newRequisition);
console.log('steps:', steps.value); console.log('steps:', steps.value);
}, },
@ -282,15 +290,22 @@ watch(
); );
const typeReq = computed(() => {
if (props.requisition?.type?.name) {
return props.requisition.type.name;
}
if (props.requisition?.type_name) {
return props.requisition.type_name;
}
const REQ_TYPES = { const REQ_TYPES = {
1: "Подбор объекта", 1: "Подбор объекта",
2: "Реализация объекта", 2: "Реализация объекта",
3: "Другие услуги", 3: "Другие услуги",
4: "Спрос по нашему объекту", 4: "Спрос по нашему объекту",
}; };
return REQ_TYPES[props.requisition?.type_id] || "Неизвестный тип услуги";
const typeReq = computed(() => {
return REQ_TYPES[props.requisition.type_id] || "Неизвестный тип услуги";
}); });
</script> </script>
@ -353,21 +368,24 @@ const typeReq = computed(() => {
font-size: 14px; font-size: 14px;
line-height: 17px; line-height: 17px;
align-content: flex-start; align-content: flex-start;
padding: 10px 8px 8px 12px; padding: 5px 10px;
background: #FFFFFF; background: #FFFFFF;
opacity: 0.8; opacity: 0.8;
border: 1px solid #E0E0E0; border: 1px solid #E0E0E0;
border-radius: 3px; border-radius: 3px;
height: 60px; height: 48px;
box-sizing: border-box;
.client-name { .client-name {
padding: 0; padding: 0;
border: none; border: none;
white-space: nowrap;
} }
.client-info { .client-info {
height: auto; height: auto;
width: auto; width: auto;
white-space: nowrap;
} }
span { span {

3
src/services/authService.js
View File

@ -6,7 +6,8 @@ import axios from 'axios'
const isDev = import.meta.env.MODE === 'development' const isDev = import.meta.env.MODE === 'development'
const DEV_SESSION_ID = import.meta.env.VITE_DEV_SESSION_ID const DEV_SESSION_ID = import.meta.env.VITE_DEV_SESSION_ID
const BASE_URL = isDev ? '' : 'https://joyworkdev.ru/deal/index.php' //const BASE_URL = isDev ? '' : 'https://joyworkdev.ru/deal/index.php'
const BASE_URL = isDev ? '' : 'https://joywork.ru/deal/index.php'
axios.defaults.baseURL = BASE_URL axios.defaults.baseURL = BASE_URL
axios.defaults.withCredentials = true axios.defaults.withCredentials = true

18
src/services/laravelApiService.js
View File

@ -24,22 +24,6 @@ const fetchData = (endpoint, options = {}) => {
: getCookie('PHPSESSID'); : getCookie('PHPSESSID');
//const usernameDev = process.env.VUE_APP_BASIC_AUTH_USER;
//const passwordDev = process.env.VUE_APP_BASIC_AUTH_PASS;
//const authDev = btoa(`${usernameDev}:${passwordDev}`);
//let authHeaders = {};
//Добавляем Basic Auth только в dev
// if (isDev) {
// const usernameDev = process.env.VUE_APP_BASIC_AUTH_USER;
// const passwordDev = process.env.VUE_APP_BASIC_AUTH_PASS;
//
// if (usernameDev && passwordDev) {
// const authDev = btoa(`${usernameDev}:${passwordDev}`);
// authHeaders['Authorization'] = `Basic ${authDev}`;
// }
// }
// Извлекаем путь из endpoint // Извлекаем путь из endpoint
const path = endpoint.replace(/^\//, ''); const path = endpoint.replace(/^\//, '');
// //
@ -51,7 +35,7 @@ const fetchData = (endpoint, options = {}) => {
if (isFormData) { if (isFormData) {
//console.log('[laravelApiService] Используем directAxiosInstance для FormData'); //console.log('[laravelApiService] Используем directAxiosInstance для FormData');
const laravelApiUrl = 'http://llar.joyworkdev.ru/api'; const laravelApiUrl = import.meta.env.VITE_LARAVEL_URL || 'https://api.joywork.ru/api';
// временный инстанс axios без Content-Type // временный инстанс axios без Content-Type
const directAxiosInstance = axios.create({ const directAxiosInstance = axios.create({

2
src/shared/api/deal.js
View File

@ -48,7 +48,7 @@ export const dealsApi = {
method: 'GET', method: 'GET',
params: { params: {
target_id: dealId, target_id: dealId,
target_type: 10, // Пример типа (уточните актуальное значение) target_type: 10,
}, },
}); });
}, },