update

app/Http/Controllers/Admin/ProjectController.php

@@ -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) ?? '');
 
 
         // 判断是否护士长
@@ -341,8 +341,13 @@ class ProjectController extends CommonController
                 foreach ($data[$i - 2]['content'] as $item) {
                     $content .= $item['ask'] . ':' . $item['score'] . "\n";
                 }
+                if ($data[$i - 2]['mobile']) {
+                    $name = $data[$i - 2]['name'] . "(" . $data[$i - 2]['mobile'] . ")";
+                } else {
+                    $name = $data[$i - 2]['admin']['name'];
+                }
                 $sheet->setCellValue('A' . $i, $data[$i - 2]['date']);
-                $sheet->setCellValue('B' . $i, $data[$i - 2]['admin']['name']);
+                $sheet->setCellValue('B' . $i, $name);
                 $sheet->setCellValue('C' . $i, $data[$i - 2]['project']['name']);
                 $sheet->setCellValue('D' . $i, $content);
                 $sheet->setCellValue('E' . $i, $data[$i - 2]['tip']);
@@ -356,7 +361,7 @@ 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"));
     }
 
@@ -378,7 +383,7 @@ 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) {
@@ -390,7 +395,7 @@ class ProjectController extends CommonController
             "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 +415,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 +461,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"));
     }