diff --git a/ajax/ajax_vue_requisitions.php b/ajax/ajax_vue_requisitions.php index 2221733..d313246 100644 --- a/ajax/ajax_vue_requisitions.php +++ b/ajax/ajax_vue_requisitions.php @@ -2299,7 +2299,7 @@ if($request == 'get_view_page'){ if($request == 'get_deal_by_req'){ $req_id = intval($data->req_id); - $sql = "SELECT id FROM deals WHERE side_one_requisition_id = $req_id LIMIT 1"; + $sql = "SELECT id FROM deals WHERE status != 2 AND (side_one_requisition_id = $req_id OR side_two_requisition_id = $req_id) LIMIT 1"; $q = $pdo->query($sql); $deal_id = null; if($q && $pdo->num_rows($q) > 0){ diff --git a/js/requisitions_vue.js b/js/requisitions_vue.js index 1729345..850514a 100644 --- a/js/requisitions_vue.js +++ b/js/requisitions_vue.js @@ -710,6 +710,21 @@ if ($('#requisitions_list').length > 0) { } }, + initEditDealFromList(reqId) { + $.ajax({ + url: '/ajax/ajax_vue_requisitions.php', + type: 'POST', + contentType: 'application/json', + data: JSON.stringify({ request: 'get_deal_by_req', req_id: reqId }), + success: function(response) { + var res = typeof response === 'string' ? JSON.parse(response) : response; + if (res.deal_id) { + window.editDeal(reqId, res.deal_id); + } + } + }); + }, + //показать объект showObject(id) { console.log(id); diff --git a/requisitions.php b/requisitions.php index c15f7d6..c5560bc 100644 --- a/requisitions.php +++ b/requisitions.php @@ -1332,7 +1332,7 @@ $t = $endtime - $starttime;
+ @click="initEditDealFromList(item.id)"> diff --git a/tuning_funnel.php b/tuning_funnel.php index a51abaf..58a2e30 100644 --- a/tuning_funnel.php +++ b/tuning_funnel.php @@ -988,6 +988,15 @@ $menuPermissions = $user->checkMenuPermissions();
+ +
+
Создать сделку
+
+ + +
+
+
Сменить ответственного