hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复项目任务列表新建时间戳

Browse Source 
修复区域销售品类报表错误
This commit is contained in:
hawind
2021-06-14 03:52:48 +08:00
parent dc44127259
commit 43e437209e
9 changed files with 70 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Project/Controllers/TaskController.php
+4 -6
View File
@@ -42,12 +42,10 @@ class TaskController extends DefaultController
'master_table' => 'project_task',
];
/*
$header['buttons'] = [
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
//['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
//['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
*/
$header['search_form'] = $search;
$query = $search['query'];
@@ -130,7 +128,7 @@ class TaskController extends DefaultController
}
if ($gets['start_at'] == '') {
$gets['start_at'] = time();
$gets['start_at'] = date('Y-m-d H:i:s');
}
$attachment = $gets['attachment'];
@@ -154,7 +152,7 @@ class TaskController extends DefaultController
if ($gets['is_item'] == '0') {
$task = Task::find($task->id);
$task->created_at = format_datetime($task->created_at);
$task->user_name = get_user($task->user_id, 'name', false);
$task->user_name = get_user($task->user_id, 'name', false);
return $this->json($task, true);
} else {
return $this->json('恭喜你，添加任务成功。', true);
app/Gdoo/Project/views/project/index.blade.php
+1 -1
View File
@@ -12,7 +12,7 @@
<div class="thumbnail" style="{{$upload_url}}/{{$row->image}}">
<div class="caption">
<h4 class="m-t-none">
<span class="pull-right text-muted text-xs hinted" title="项目拥有者">{{get_user($row->user_id, 'name', false)}}</span>
<span class="pull-right text-muted text-xs hinted" title="项目拥有者">{{get_user($row->user_id, 'name', false)}} @if($row->permission)<span class="label label-info">私有</span> @else <span class="label label-success">公开</span> @endif</span>
@if($row->tasks->count())
<span class="text-base badge bg-danger">{{$row->tasks->count()}}</span>
@endif