三级筛选

application/admin/controller/orders/Revisitorder.php

@@ -186,7 +186,7 @@ class Revisitorder extends Backend
                 }
             }
         }
-        $op['orderb.area_id'] = 'like%';
+        $op['area_id'] = 'LIKE%';
 
 
        /* if($returnvalue>0){

application/admin/controller/statistics/Worker.php

@@ -353,7 +353,31 @@ class Worker extends Backend
         $this->request->get([config('paginate.var_page') => $page]);
         $filter = (array)json_decode($filter, true);
         unset($filter['daterange']);
+
+
+
+        $province_id = $filter['province_id']??null;
+        $city_id = $filter['city_id']??null;
+        $area_id = $filter['city_id']??null;
+        unset($filter['city_id']);
+        unset($filter['province_id']);
+        unset($filter['area_id']);
+
+        if(!empty($area_id)){
+            $filter['fa_worker.area_id'] = $area_id;
+        }else{
+            if(!empty($city_id)){
+                $filter['fa_worker.area_id'] = $city_id;
+            }else{
+                if(!empty($province_id)){
+                    $filter['fa_worker.area_id'] = $province_id;
+                }
+            }
+        }
+
         $op = (array)json_decode($op, true);
+        $op['fa_worker.area_id'] = 'LIKE%';
+
         $filter = $filter ? $filter : [];
         $where = [];
         $alias = [];

application/admin/view/statistics/worker/index.html

@@ -340,3 +340,20 @@
         </div>
     </div>
 </script>-->
+
+
+<script id="categorytpl" type="text/html">
+    <div class="row">
+        <div class="col-xs-12">
+            <div class="form-inline" data-toggle="cxselect" data-selects="province,city,area">
+                <select style="width: 25%;" class="province form-control" name="province_id" data-url="ajax/area"></select>
+                <select style="width: 30%;" class="city form-control" name="city_id" data-url="ajax/area" data-query-name="province"></select>
+                <select style="width:auto" class="area form-control" name="area_id" data-url="ajax/area" data-query-name="city"></select>
+                <input type="hidden" class="operate" data-name="province_id" value="LIKE%" />
+                <input type="hidden" class="operate" data-name="city_id" value="LIKE%" />
+                <input type="hidden" class="operate" data-name="area_id" value="LIKE%" />
+            </div>
+        </div>
+    </div>
+</script>
+

public/assets/js/backend/statistics/worker.js

@@ -62,7 +62,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'echarts', 'echarts-t
                                     }
                                 },
 */
-                                {field: 'area2.merge_name', title: __('地区'),operate: 'LIKE',visible:false},
+                                {field: 'area2.merge_name', title: __('地区'),operate: false},
 
                                 {field: 'daterange', title: __('时间筛选'), addclass:'datetimerange',
                                     autocomplete:false,
@@ -74,6 +74,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'echarts', 'echarts-t
                                     defaultValue: Config.default_daterange
                                 },
 
+                                {field: 'area', title: __('地区'), searchList: function (column) {
+                                        return Template('categorytpl', {});
+                                    }, formatter: function (value, row, index) {
+                                        return '无';
+                                    }, visible: false
+                                },
+
                                 {field: 'operate', title: __('Operate'), table: table2, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
                                     buttons: [
                                         {