|
|
|
|
@ -288,7 +288,7 @@ class ProjectController extends CommonController
|
|
|
|
|
public function askSubmit()
|
|
|
|
|
{
|
|
|
|
|
$userId = auth()->id();
|
|
|
|
|
$project_id = \request('project_id',0);
|
|
|
|
|
// $project_id = \request('project_id',0);
|
|
|
|
|
|
|
|
|
|
// 判断是否护士长
|
|
|
|
|
$roleId = Role::where('name', 'like', '%护士长%')->where('guard_name', 'admin')->value('id');
|
|
|
|
|
@ -299,11 +299,11 @@ class ProjectController extends CommonController
|
|
|
|
|
$data = AskSubmit::with("admin", "project")
|
|
|
|
|
->where(function ($qeury) use ($hushizhang, $userId, $project_id) {
|
|
|
|
|
if ($hushizhang) $qeury->where('admin_id', $userId);
|
|
|
|
|
if ($project_id) $qeury->where('project_id', $project_id);
|
|
|
|
|
// if ($project_id) $qeury->where('project_id', $project_id);
|
|
|
|
|
})->paginate(10);
|
|
|
|
|
|
|
|
|
|
$projects = (new StatisticsController())->_checkProjects();
|
|
|
|
|
return view($this->bladePath . ".asksubmit_index", compact("data", "projects","project_id"));
|
|
|
|
|
// $projects = (new StatisticsController())->_checkProjects();
|
|
|
|
|
return view($this->bladePath . ".asksubmit_index", compact("data","project_id"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|