diff --git a/app/Admin/Controllers/ImsCjdcStoreController.php b/app/Admin/Controllers/ImsCjdcStoreController.php index 21f2182..f9a4145 100644 --- a/app/Admin/Controllers/ImsCjdcStoreController.php +++ b/app/Admin/Controllers/ImsCjdcStoreController.php @@ -29,7 +29,7 @@ class ImsCjdcStoreController extends AdminController $mm = LanzuMmInfo::where(['admin_user_id' => $user->id])->first(); $builder = modelStore::with('market')->where(['mm_user_id' => $mm->id]); } - return Grid::make($builder, function (Grid $grid) { + return Grid::make($builder, function (Grid $grid) use ($user) { $grid->id->sortable(); $grid->name; $grid->column('market.name', '所属市场'); @@ -39,6 +39,9 @@ class ImsCjdcStoreController extends AdminController $grid->disableEditButton(); $grid->disableDeleteButton(); $grid->disableCreateButton(); + if ($user->isRole('lanzu_mm')){ + $grid->showCreateButton(); + } $grid->filter(function (Grid\Filter $filter) { $filter->like('name')->placeholder('输入店铺名称'); $filter->equal('tel')->placeholder('输入电话'); diff --git a/app/Admin/Controllers/LanzuFinancialRecord.php b/app/Admin/Controllers/LanzuFinancialRecord.php index 9743139..bd4be12 100644 --- a/app/Admin/Controllers/LanzuFinancialRecord.php +++ b/app/Admin/Controllers/LanzuFinancialRecord.php @@ -19,21 +19,22 @@ class LanzuFinancialRecord extends AdminController protected function grid() { $adu = Admin::user(); + $type = \Request::get('type'); $builder = new FinancialRecord0(); - $builder = $builder::where('user_type',4); + $builder = $builder::where('user_type',$type); - if ($adu->isRole('lanzu_cs')) { + if ($adu->isRole('lanzu_cs')||$adu->isRole('lanzu_mp')||$adu->isRole('lanzu_mm')) { $fr = FinancialRecord::getFinancialRecordModel($adu->id); - $builder = $fr->where('user_id',$adu->id)->where('user_type',4); - } else { + $builder = $fr->where('user_id',$adu->id)->where('user_type',$type); + }else { $param = \Request::get('user_id'); if ($param) { $fr = FinancialRecord::getFinancialRecordModel($param); - $builder = $fr::where('user_type',4); + $builder = $fr::where('user_type',$type); } } - return Grid::make($builder, function (Grid $grid) use ($adu) { + return Grid::make($builder, function (Grid $grid) use ($adu,$type) { $grid->id; $grid->user_id('用户')->display(function () { if ($this->user_type == 1) { @@ -48,9 +49,9 @@ class LanzuFinancialRecord extends AdminController $grid->created_at('创建时间')->display(function ($time) { return date('Y-m-d H:i', $time); }); - $grid->filter(function (Grid\Filter $filter) use ($adu) { + $grid->filter(function (Grid\Filter $filter) use ($adu,$type) { $filter->equal('id'); - if (!$adu->isRole('lanzu_cs')) { + if (!$adu->isRole('lanzu_cs')&&$type==4) { $filter->equal('user_id', '社区站点')->select(LanzuCsInfo::selectCsInfo()); } diff --git a/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php b/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php index b3a8714..2555d43 100644 --- a/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php +++ b/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php @@ -21,7 +21,7 @@ class TotalStore extends Card if ($aud->isRole('lanzu_mm')){ $mm = LanzuMmInfo::where('admin_user_id',$aud->id)->first(); if ($mm){ - $count = LanzuStore::where('mm_user_id',$mm->id)->count(); + $count = LanzuStore::where('mm_user_id',$mm->user_id)->count(); } }elseif($aud->isRole('lanzu_mp')){ $count = 0;