|
|
|
|
@ -301,7 +301,7 @@ class ProjectController extends CommonController
|
|
|
|
|
$is_export = \request('export', 0);
|
|
|
|
|
$userId = auth()->id();
|
|
|
|
|
$projects = (new ProjectController())->_checkProjects();
|
|
|
|
|
$project_id = \request('project_id', ($projects[0]->id)??'');
|
|
|
|
|
$project_id = \request('project_id', ($projects[0]->id) ?? '');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 判断是否护士长
|
|
|
|
|
@ -356,19 +356,14 @@ class ProjectController extends CommonController
|
|
|
|
|
exit;
|
|
|
|
|
}
|
|
|
|
|
$data = $data->orderBy('id', 'desc')->paginate(10);
|
|
|
|
|
$data = $data->appends(['project_id'=>$project_id]);
|
|
|
|
|
$data = $data->appends(['project_id' => $project_id]);
|
|
|
|
|
return view($this->bladePath . ".asksubmit_index", compact("data", "projects", "project_id"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public function askSubmitCreate(FormBuilder $formBuilder)
|
|
|
|
|
{
|
|
|
|
|
$project_ids = auth()->user()->project_ids;
|
|
|
|
|
$project_id = \request('project_id');
|
|
|
|
|
if ($project_ids) {
|
|
|
|
|
$project_ids = explode(',', $project_ids);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($project_id == 7) {
|
|
|
|
|
$askSubmitForm = AskSubmitScForm::class;
|
|
|
|
|
} else {
|
|
|
|
|
@ -378,19 +373,15 @@ class ProjectController extends CommonController
|
|
|
|
|
$form = $formBuilder->create($askSubmitForm, [
|
|
|
|
|
"method" => "POST",
|
|
|
|
|
"id" => "fm",
|
|
|
|
|
"url" => url($this->urlPrefix . "/asksubmit_store?project_id=".$project_id)
|
|
|
|
|
"url" => url($this->urlPrefix . "/asksubmit_store?project_id=" . $project_id)
|
|
|
|
|
]);
|
|
|
|
|
$choices = (new Project())->where(function ($query) use ($project_ids) {
|
|
|
|
|
if ($project_ids) {
|
|
|
|
|
$query->whereIn("id", $project_ids);
|
|
|
|
|
}
|
|
|
|
|
})->get()->pluck("name", "id");
|
|
|
|
|
$choices = (new Project())->get()->pluck("name", "id");
|
|
|
|
|
|
|
|
|
|
$form->modify("project_id", "select", [
|
|
|
|
|
"choices" => $choices->toArray(),
|
|
|
|
|
"selected" => $choices->keys()->first()
|
|
|
|
|
]);
|
|
|
|
|
$form->modify('project_id',Field::HIDDEN,["default_value" => $project_id]);
|
|
|
|
|
$form->modify('project_id', Field::HIDDEN, ["default_value" => $project_id]);
|
|
|
|
|
$form->modify('date', Field::DATE, ['default_value' => date('Y-m-d')]);
|
|
|
|
|
return view($this->bladePath . ".asksubmit_create", compact("form"));
|
|
|
|
|
}
|
|
|
|
|
@ -410,7 +401,7 @@ class ProjectController extends CommonController
|
|
|
|
|
$content = [];
|
|
|
|
|
$socre = 0;
|
|
|
|
|
$askList = AskSubmit::$askList;
|
|
|
|
|
if($project_id == 7){
|
|
|
|
|
if ($project_id == 7) {
|
|
|
|
|
$askList = AskSubmit::$askListSc;
|
|
|
|
|
}
|
|
|
|
|
foreach ($all['ask'] as $key => $item) {
|
|
|
|
|
@ -456,7 +447,7 @@ class ProjectController extends CommonController
|
|
|
|
|
}
|
|
|
|
|
})->get()->pluck("name", "id")->toArray()
|
|
|
|
|
]);
|
|
|
|
|
$form->modify('project_id',Field::HIDDEN,["default_value" => $vo->project_id]);
|
|
|
|
|
$form->modify('project_id', Field::HIDDEN, ["default_value" => $vo->project_id]);
|
|
|
|
|
$form->add("_previous", "hidden", ["value" => (url()->previous())]);
|
|
|
|
|
return view($this->bladePath . ".asksubmit_create", compact("form"));
|
|
|
|
|
}
|
|
|
|
|
|