店铺新用户报表--修改查询

app/Admin/Controllers/StoreUserReportController.php

@@ -24,16 +24,9 @@ class StoreUserReportController extends AdminController
             $grid->disableEditButton();
             $grid->disableQuickEditButton();
             $grid->disableViewButton();
-            $marketList = [];
-            $list = marketModel::select('id','name')->get()->toArray();
-            foreach($list as $value){
-                $marketList[$value['id']] = $value['name'];
-            }
 
             $grid->store_id;
-            $grid->market_id->filter(
-                Grid\Column\Filter\In::make($marketList)
-            )->display(function ($markrtId) {
+            $grid->market_id->display(function ($markrtId) {
                 $market = marketModel::find($markrtId);
                 if (!$market) {
                     return '<span style="color: red">数据错误</span>';
@@ -41,14 +34,19 @@ class StoreUserReportController extends AdminController
                 return $market->name;
             });
             $grid->store_name;
-            $grid->mm_user_id->display(function ($markrtId) {
-                return '未关联';
-            });
+            // $grid->mm_user_id->display(function ($markrtId) {
+            //     return '未关联';
+            // });
             $grid->new_user_total;
         
             $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('store_id');
-                $filter->like('store.name');
+                $marketList = [];
+                $list = marketModel::select('id','name')->get()->toArray();
+                foreach($list as $value){
+                    $marketList[$value['id']] = $value['name'];
+                }
+                $filter->in('market_id')->multipleSelect($marketList);
+                $filter->like('store.name','店铺名称');
                 $filter->whereBetween('time', function ($q) {
                     $start = $this->input['start'] ?? null;
                     $end = $this->input['end'] ?? null;

resources/lang/zh-CN/store-user-report.php

@@ -8,11 +8,11 @@ return [
         'store_id' => '店铺ID',
         'market_id' => '所属市场',
         'name' => '商家名称',
+        'store.name' => '商家名称',
         'store_name' => '商家名称',
         'new_user_total' => '新增用户总数',
         'mm_user_id' => '所属市场经理',
         'time' => '时间',
-        'created_at' => '时间'
     ],
     'options' => [
     ],