Merge branch 'zengjun'

app/Filters/OrderIssueFilters.php

@@ -67,7 +67,8 @@ class OrderIssueFilters
         'user_owner_group',
         'archive_at_start',
         'archive_at_end',
-        'result_explain'
+        'result_explain',
+        'is_intercept'
     ];
     protected $array_filter;
     protected $params = [];
@@ -455,4 +456,9 @@ class OrderIssueFilters
     public function result_explain($result_explain){
         $this->queryBuilder->where('order_issues.result_explain','like',"%{$result_explain}%");
     }
+
+    public function is_intercept($is_intercept)
+    {
+        $this->queryBuilder->where('order_issues.is_intercept',1);
+    }
 }

resources/views/order/issue/index.blade.php

@@ -1217,6 +1217,7 @@
                         {name: 'archive_at_end', type: 'dateTime', tip: '归档结束日期'},
                             @endcannot
                         {name: 'is_handle', type: 'checkbox', tip: '是否已处理', data: [{name: 'ture', value: '已解决'}]},
+                        {name: 'is_intercept', type: 'checkbox', tip: '是否已拦截', data: [{name: 'ture', value: '已拦截'}]},
                     ]
                 ];
                 this.form = new query({