change locale and z-index add filter

css/crm.css

@@ -5310,7 +5310,8 @@
  }
  .p-portal,
  .p-select-overlay,
- .p-datepicker-overlay,
+ .p-datepicker-panel,
- .p-dropdown-panel {
+ .p-dropdown-panel,
+ .p-multiselect-overlay {
      z-index: 100000 !important;
  }

engine/classes/Requisitions.php

@@ -2224,6 +2224,12 @@
                  $wherePart2 .= " AND doer_clients = 1";
              }
 
+             if(isset($filtr->is_deal) && $filtr->is_deal){
+                 $where .= " AND req.deal_id IS NOT NULL AND req.deal_id > 0";
+                 $wherePart1 .= " AND req.deal_id IS NOT NULL AND req.deal_id > 0";
+                 $wherePart2 .= " AND req.deal_id IS NOT NULL AND req.deal_id > 0";
+             }
+ 
              if(isset($filtr->expired_stages) && $filtr->expired_stages > 0){
                  $expired_stages = 1;
              }
@@ -5395,6 +5401,7 @@
         $result['activities'] = array();
         $result['order'] = 0;
         $result['isPartner'] = false;
+        $result['is_deal'] = false;
         $result['source'] = -1;
         $result['employee_id'] = -1;
         $result['fields'] = array();

js/requisitions_vue.js

@@ -2805,6 +2805,7 @@ if ($('#req_filtr').length > 0) {
                     activities: [],
                     order: $('#sort_order_req').val(),
                     isPartner: false,
+                    is_deal: false,
                     source: -1,
                     fields: {},
                     is_contract: false,
@@ -2851,6 +2852,7 @@ if ($('#req_filtr').length > 0) {
                     activities: [],
                     order: $('#sort_order_req').val(),
                     isPartner: false,
+                    is_deal: false,
                     source: -1,
                     fields: {},
                     is_contract: false,
@@ -3040,6 +3042,9 @@ if ($('#req_filtr').length > 0) {
                 if (this.filtr.isPartner) {
                     this.options++;
                 }
+                if (this.filtr.is_deal) {
+                    this.options++;
+                }
                 if (this.filtr.fields && Object.keys(this.filtr.fields).length) {
                     this.options++;
                 }

requisitions.php

@@ -1017,6 +1017,12 @@ $_SESSION['event_id_temp'] *= -1;
                                     <label for="isPartnerReq">Совместные заявки</label>
                                 </div>
                             </div>
+                            <div class="filter-popup-input">
+                                <div class="checkbox">
+                                    <input name="is_deal" @change="checkTasks" id="isDealReq" v-model="filtr.is_deal" type="checkbox">
+                                    <label for="isDealReq">Есть сделка</label>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>