meteteme/projectmanager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复任务bug

Browse Source
This commit is contained in:
hero920103
2026-02-12 17:21:23 +08:00
parent 63e6365337
commit 1a74cc8d25
3 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/controller/Index.php
+26 -27
View File
@@ -22,7 +22,10 @@ class Index extends BaseController
{
if (request()->isAjax()) {
$param = get_params();
$param['uid'] = $this->uid;
// 检查是否需要显示所有任务
if (!isset($param['show_all']) || $param['show_all'] != 1) {
$param['uid'] = $this->uid;
}
$list = (new TaskList())->list($param);
return table_assign(0, '', $list);
} else {
@@ -276,34 +279,30 @@ class Index extends BaseController
if (in_array($this->uid, $role_uid)) {
$role_edit = 'edit';
}
$project_ids = Db::name('ProjectUser')->where(['uid' => $this->uid, 'delete_time' => 0])->column('project_id');
if (in_array($detail['project_id'], $project_ids) || in_array($this->uid, $role_uid) || in_array($this->uid, explode(",", $detail['assist_admin_ids']))) {
$file_array = Db::name('FileInterfix')
->field('mf.id,mf.topic_id,mf.admin_id,f.name,f.filesize,f.filepath,a.name as admin_name')
->alias('mf')
->join('File f', 'mf.file_id = f.id', 'LEFT')
->join('Admin a', 'mf.admin_id = a.id', 'LEFT')
->order('mf.create_time desc')
->where(array('mf.topic_id' => $id, 'mf.module' => 'task'))
->select()->toArray();
$file_array = Db::name('FileInterfix')
->field('mf.id,mf.topic_id,mf.admin_id,f.name,f.filesize,f.filepath,a.name as admin_name')
->alias('mf')
->join('File f', 'mf.file_id = f.id', 'LEFT')
->join('Admin a', 'mf.admin_id = a.id', 'LEFT')
->order('mf.create_time desc')
->where(array('mf.topic_id' => $id, 'mf.module' => 'task'))
->select()->toArray();
$link_array = Db::name('LinkInterfix')
->field('i.id,i.topic_id,i.admin_id,i.desc,i.url,a.name as admin_name')
->alias('i')
->join('Admin a', 'i.admin_id = a.id', 'LEFT')
->order('i.create_time desc')
->where(array('i.topic_id' => $id, 'i.module' => 'task', 'delete_time' => 0))
->select()->toArray();
$link_array = Db::name('LinkInterfix')
->field('i.id,i.topic_id,i.admin_id,i.desc,i.url,a.name as admin_name')
->alias('i')
->join('Admin a', 'i.admin_id = a.id', 'LEFT')
->order('i.create_time desc')
->where(array('i.topic_id' => $id, 'i.module' => 'task', 'delete_time' => 0))
->select()->toArray();
View::assign('detail', $detail);
View::assign('file_array', $file_array);
View::assign('link_array', $link_array);
View::assign('role_edit', $role_edit);
View::assign('id', $id);
return view();
} else {
return to_assign(1, '您没权限查看该任务');
}
View::assign('detail', $detail);
View::assign('file_array', $file_array);
View::assign('link_array', $link_array);
View::assign('role_edit', $role_edit);
View::assign('id', $id);
return view();
}
}
app/task/view/index/index.html
+10 -1
View File
@@ -5,6 +5,10 @@
.layui-unselect dl {
max-height: 188px;
}
.layui-table-cell{
display: grid;
align-items: center;
}
</style>
{/block} {block name="breadcrumb"}
<span class="layui-breadcrumb">
@@ -98,7 +102,7 @@
<button type="reset" class="layui-btn layui-btn-primary layui-border-blue" lay-filter="clear">
重置
</button>
<button type="reset" class="layui-btn" lay-filter="onlyme">只看我</button>
<button type="reset" class="layui-btn" lay-filter="onlyme">指派我的</button>
<input id="loginusers" type="hidden" value="{$user_info.id}" />
</form>
</div>
@@ -277,6 +281,11 @@
title: "指派负责人",
width: 140,
},
{
field: "create_time",
title: "创建时间",
width: 180,
},
// { field: "assist_admin_names", title: "协作人", width: 200 },
// { field: "cate_name", title: "工作类型", width: 90, align: "center" },
// {