diff --git a/.env.development b/.env.development index 5b2d4b7..d4db917 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,19 @@ NODE_ENV=development -VITE_API_URL=https://joyworkdev.ru -VITE_LARAVEL_URL=https://llar.joyworkdev.ru -VITE_LARAVEL_API_URL=https://joyworkdev.ru -VITE_DEV_SESSION_ID=87ae8a661f903a5958e2a36aeaffb970 -VITE_DEV_REQUISITION_ID=17539 +#VITE_API_URL=https://joyworkdev.ru +#VITE_LARAVEL_URL=https://llar.joyworkdev.ru +#VITE_LARAVEL_API_URL=https://joyworkdev.ru +#VITE_DEV_SESSION_ID=0f71932af5f6b31f1b3a56fdb67d8c6f +#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_PASS=adminpassword \ No newline at end of file diff --git a/.env.production b/.env.production index 1a45116..77775a5 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,7 @@ NODE_ENV=production -VITE_API_URL=https://joyworkdev.ru -VITE_LARAVEL_URL=https://llar.joyworkdev.ru -VITE_LARAVEL_API_URL=https://joyworkdev.ru +VITE_API_URL=https://joywork.ru +VITE_LARAVEL_URL=https://api.joywork.ru +VITE_LARAVEL_API_URL=https://joywork.ru VITE_DEV_SESSION_ID=e33a6f076567ef9c7c6a9e244f0fd626 VITE_DEV_REQUISITION_ID=17539 #VITE_BASIC_AUTH_USER=adminlogin diff --git a/src/assets/css/temporary.css b/src/assets/css/temporary.css index db7375b..9437008 100644 --- a/src/assets/css/temporary.css +++ b/src/assets/css/temporary.css @@ -34,4 +34,18 @@ 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); + } } \ No newline at end of file diff --git a/src/components/deal/addEdit/DocAddModal.vue b/src/components/deal/addEdit/DocAddModal.vue index 15034ad..f11c514 100644 --- a/src/components/deal/addEdit/DocAddModal.vue +++ b/src/components/deal/addEdit/DocAddModal.vue @@ -1,6 +1,6 @@ -
-
- - - - - -
- -
- - Добавить клиента - +
+
+
+ + + +
+
+ + Добавить клиента + +
@@ -249,31 +248,40 @@ const currentStageName = ref(""); watch( () => props.requisition, (newRequisition) => { - if (newRequisition.funnel_id === 0) { - steps.value = [ - "Новый", - "В работе", - "Презентация", - "Показ", - "Бронь", - "Подаем на ипотеку", - "Сделка", - "Закрыт", - ]; - currentStageName.value = - steps.value[newRequisition.stage - 1] || "Неизвестный шаг"; + // if (newRequisition.funnel_id === 0) { + // steps.value = [ + // "Новый", + // "В работе", + // "Презентация", + // "Показ", + // "Бронь", + // "Подаем на ипотеку", + // "Сделка", + // "Закрыт", + // ]; + // currentStageName.value = + // steps.value[newRequisition.stage - 1] || "Неизвестный шаг"; + // } 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 || + // "Неизвестный шаг"; + // } + + if (newRequisition.funnel_steps && Array.isArray(newRequisition.funnel_steps)) { + steps.value = newRequisition.funnel_steps.map(step => step.name); + } else if (newRequisition.funnel_id === 0) { + // Дефолтная воронка + steps.value = ["Новый", "В работе", "Презентация", "Показ", "Бронь", "Подаем на ипотеку", "Сделка", "Закрыт"]; } 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 || - "Неизвестный шаг"; + steps.value = []; } console.log('newRequisition:', newRequisition); console.log('steps:', steps.value); @@ -282,15 +290,22 @@ watch( ); -const REQ_TYPES = { - 1: "Подбор объекта", - 2: "Реализация объекта", - 3: "Другие услуги", - 4: "Спрос по нашему объекту", -}; - const typeReq = computed(() => { - return REQ_TYPES[props.requisition.type_id] || "Неизвестный тип услуги"; + if (props.requisition?.type?.name) { + return props.requisition.type.name; + } + + if (props.requisition?.type_name) { + return props.requisition.type_name; + } + + const REQ_TYPES = { + 1: "Подбор объекта", + 2: "Реализация объекта", + 3: "Другие услуги", + 4: "Спрос по нашему объекту", + }; + return REQ_TYPES[props.requisition?.type_id] || "Неизвестный тип услуги"; }); @@ -353,21 +368,24 @@ const typeReq = computed(() => { font-size: 14px; line-height: 17px; align-content: flex-start; - padding: 10px 8px 8px 12px; + padding: 5px 10px; background: #FFFFFF; opacity: 0.8; border: 1px solid #E0E0E0; border-radius: 3px; - height: 60px; + height: 48px; + box-sizing: border-box; .client-name { padding: 0; border: none; + white-space: nowrap; } .client-info { height: auto; width: auto; + white-space: nowrap; } span { diff --git a/src/services/authService.js b/src/services/authService.js index 4ee58e6..2e2fc2c 100644 --- a/src/services/authService.js +++ b/src/services/authService.js @@ -6,7 +6,8 @@ import axios from 'axios' const isDev = import.meta.env.MODE === 'development' 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.withCredentials = true diff --git a/src/services/laravelApiService.js b/src/services/laravelApiService.js index 4ebc20e..07f7b9d 100644 --- a/src/services/laravelApiService.js +++ b/src/services/laravelApiService.js @@ -24,22 +24,6 @@ const fetchData = (endpoint, options = {}) => { : 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 const path = endpoint.replace(/^\//, ''); // @@ -51,7 +35,7 @@ const fetchData = (endpoint, options = {}) => { if (isFormData) { //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 const directAxiosInstance = axios.create({ diff --git a/src/shared/api/deal.js b/src/shared/api/deal.js index 8517969..d13a2b2 100644 --- a/src/shared/api/deal.js +++ b/src/shared/api/deal.js @@ -48,7 +48,7 @@ export const dealsApi = { method: 'GET', params: { target_id: dealId, - target_type: 10, // Пример типа (уточните актуальное значение) + target_type: 10, }, }); },