sync actual

This commit is contained in:
mac 2026-06-20 12:14:33 +03:00
parent 0e9fb83cc2
commit c4658b0835
4 changed files with 26 additions and 2 deletions

View File

@ -2299,7 +2299,7 @@ if($request == 'get_view_page'){
if($request == 'get_deal_by_req'){ if($request == 'get_deal_by_req'){
$req_id = intval($data->req_id); $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); $q = $pdo->query($sql);
$deal_id = null; $deal_id = null;
if($q && $pdo->num_rows($q) > 0){ if($q && $pdo->num_rows($q) > 0){

View File

@ -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) { showObject(id) {
console.log(id); console.log(id);

View File

@ -1332,7 +1332,7 @@ $t = $endtime - $starttime;
</div> </div>
<div class="actions"> <div class="actions">
<a v-if="item.is_deal == 1" href="javascript:{};" class="no-border" title="Сделка" <a v-if="item.is_deal == 1" href="javascript:{};" class="no-border" title="Сделка"
@click="initEditDeal(item.id)"> @click="initEditDealFromList(item.id)">
<span style="color: #43A047 !important;" class="simple-button settings"><i class="fas fa-handshake"></i></span> <span style="color: #43A047 !important;" class="simple-button settings"><i class="fas fa-handshake"></i></span>
</a> </a>

View File

@ -988,6 +988,15 @@ $menuPermissions = $user->checkMenuPermissions();
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="form-block">
<div class="label">Создать сделку</div>
<div class="checkbox">
<input id="create_deal" v-model="create_deal" type="checkbox" value="">
<label for="create_deal" class="label"></label>
</div>
</div>
<div class="form-block"> <div class="form-block">
<div class="label">Сменить ответственного</div> <div class="label">Сменить ответственного</div>
<div class="checkbox"> <div class="checkbox">