kroutony/project-management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
kroutony 2022-05-04 10:41:51 +08:00
parent e85df8de0a
commit bc09cf9f24
3 changed files with 100 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/ProjectController.php
View File

@ -14,7 +14,7 @@ private function createOrEdit(Project $project)
{ {
$statuses = __('enums.project_status'); $statuses = __('enums.project_status');
$clients = Client::all()->pluck('name', 'id'); $clients = Client::all()->pluck('name', 'id');
$projects = collect(['' => '無'])->merge(Project::all()->pluck('title', 'id')); $projects = collect(['' => '無'])->union(Project::all()->pluck('title', 'id'));
return view('project.edit', ['project' => $project, 'projectStatuses' => $statuses, 'clients' => $clients, 'projects' => $projects]); return view('project.edit', ['project' => $project, 'projectStatuses' => $statuses, 'clients' => $clients, 'projects' => $projects]);
} }
@ -34,8 +34,7 @@ public function index(Request $request)
$builder->where('client_id', $clientId); $builder->where('client_id', $clientId);
} }
$projects = $builder->get(); $projects = $builder->get();
$statuses[''] = '所有狀態'; $statuses = collect(['' => '所有狀態'])->union(__('enums.project_status'));
$statuses += __('enums.project_status');
return view('project.index', ['projects' => $projects, 'statuses' => $statuses]); return view('project.index', ['projects' => $projects, 'statuses' => $statuses]);
} }

27
resources/views/client/view.blade.php
View File

@ -2,22 +2,21 @@
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row"> <div class="row justify-content">
<div class="col"> <div class="col">
<strong>名稱</strong> <table class="table table-bordered table-hover table-sm table-striped">
</div> <tbody>
<div class="col"> <tr>
{{ $client->name }} <th>名稱</th>
</div> <td>{{ $client->name }}</td>
</div> </tr>
<div class="row"> <tr>
<div class="col"> <th>專案
<strong>專案</strong>
<a href="{{ route('adm.project.index', ['client_id' => $client->id]) }}" class="btn btn-sm btn-outline-primary"> <a href="{{ route('adm.project.index', ['client_id' => $client->id]) }}" class="btn btn-sm btn-outline-primary">
<i class="bi bi-eye"></i> <i class="bi bi-eye"></i>
</a> </a>
</div> </th>
<div class="col"> <td>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
@ -34,6 +33,10 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</td>
</tr>
</tbody>
</table>
</div> </div>
</div> </div>
</div> </div>

142
resources/views/project/view.blade.php
View File

@ -4,92 +4,52 @@
<div class="container"> <div class="container">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col"> <div class="col">
<div class="row"> <table class="table table-bordered table-hover table-sm table-striped">
<div class="col"> <tbody>
<strong>名稱</strong> <tr>
</div> <th>名稱</th>
<div class="col"> <td>{{ $project->title }}</td>
{{ $project->title }} </tr>
</div> <tr>
</div> <th>狀態</th>
<div class="row"> <td>{{ __('enums.project_status.' . $project->status) }}</td>
<div class="col"> </tr>
<strong>狀態</strong> <tr>
</div> <th>客戶</th>
<div class="col"> <td>{{ $project->client->name }}</td>
{{ __('enums.project_status.' . $project->status) }} </tr>
</div> <tr>
</div> <th>描述</th>
<div class="row"> <td>{!! nl2br($project->description) !!}</td>
<div class="col"> </tr>
<strong>客戶</strong> <tr>
</div> <th>起始日</th>
<div class="col"> <td>{{ $project->begin_at }}</td>
{{ $project->client->name }} </tr>
</div> <tr>
</div> <th>結束日</th>
<div class="row"> <td>{{ $project->end_at }}</td>
<div class="col"> </tr>
<strong>描述</strong> <tr>
</div> <th>金額</th>
<div class="col"> <td>{{ $project->price }}</td>
{!! nl2br($project->description) !!} </tr>
</div> <tr>
</div> <th>建立日期</th>
<div class="row"> <td>{{ $project->created_at }}</td>
<div class="col"> </tr>
<strong>起始日</strong> <tr>
</div> <th>更新日期</th>
<div class="col"> <td>{{ $project->updated_at }}</td>
{{ $project->begin_at }} </tr>
</div> <tr>
</div> <th>未收款項</th>
<div class="row"> <td>@if($project->unpaid_amount) {{ $project->unpaid_amount }} @endif</td>
<div class="col"> </tr>
<strong>結束日</strong> <tr>
</div> <th>已收款項 <a href="{{ route('adm.payment.create', ['project_id' => $project->id]) }}"
<div class="col"> class="btn btn-sm btn-outline-success"><i class="bi bi-plus"></i></a></th>
{{ $project->end_at }} <td>
</div>
</div>
<div class="row">
<div class="col">
<strong>金額</strong>
</div>
<div class="col">
{{ $project->price }}
</div>
</div>
<div class="row">
<div class="col">
<strong>建立日期</strong>
</div>
<div class="col">
{{ $project->created_at }}
</div>
</div>
<div class="row">
<div class="col">
<strong>更新日期</strong>
</div>
<div class="col">
{{ $project->updated_at }}
</div>
</div>
<div class="row">
<div class="col">
<strong>未收款項</strong>
</div>
<div class="col">
@if($project->unpaid_amount) {{ $project->unpaid_amount }} @endif
</div>
</div>
<div class="row">
<div class="col">
<strong>已收款項</strong>
<a href="{{ route('adm.payment.create', ['project_id' => $project->id]) }}" class="btn btn-sm btn-outline-success"><i class="bi bi-plus"></i></a>
</div>
<div class="col">
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
@ -108,12 +68,10 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
<ul> </td>
</tr>
</ul> </tbody>
</table>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>