hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature: task

Browse Source
This commit is contained in:
zhuyu 2025-05-11 17:44:49 +08:00
parent 85ae934110
commit f131a658b7
4 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
application/admin/controller/oa/Task.php
View File

@ -24,6 +24,10 @@ class Task extends Backend
protected $dataLimit = 'personal';
protected $dataLimitField = 'exec_admin_id';
protected $dataLimitFieldAutoFill = false;
public function _initialize()
{
parent::_initialize();
@ -113,6 +117,26 @@ class Task extends Backend
return $this->view->fetch();
}
public function complete($ids)
{
if (false === $this->request->isPost()) {
$this->error(__("Invalid parameters"));
}
if (empty($ids)) {
$this->error(__('Parameter %s can not be empty', 'id'));
}
$task = $this->model->where('id', '=', $ids)->where('status', 1)->find();
if (!$task) {
$this->error('任务状态已变更，请刷新后操作');
}
$task->save(['status' => 3]);
$this->success();
}
public function review($ids)
{
if (false === $this->request->isPost()) {
@ -177,6 +201,7 @@ class Task extends Backend
$params['create_time'] = date('Y-m-d H:i:s');
$params['update_time'] = date('Y-m-d H:i:s');
$params['admin_id'] = $this->auth->id;
$result = $this->model->allowField(true)->save($params);

2
application/admin/lang/zh-cn/oa/task.php
View File

@ -3,7 +3,7 @@
return [
'Id' => 'ID',
'Admin_id' => '创建人id',
'Review_admin_id' => '审核人id',
'Exec_admin_id' => '执行人ID',
'Type' => '任务类型',
'Type 1' => '每日任务',
'Type 2' => '每周任务',

2
application/admin/model/oa/Task.php
View File

@ -62,6 +62,6 @@ class Task extends Model
public function admin()
{
return $this->belongsTo('app\admin\model\Admin', 'admin_id', 'id', [], 'LEFT')->setEagerlyType(0);
return $this->belongsTo('app\admin\model\Admin', 'exec_admin_id', 'id', [], 'LEFT')->setEagerlyType(0);
}
}

6
application/admin/view/oa/task/add.html
View File

@ -23,6 +23,12 @@
<input id="c-desc" class="form-control" name="row[desc]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Exec_admin_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-exec_admin_id" data-rule="required" data-source="auth/admin/selectpage" data-field="nickname" class="form-control selectpage" name="row[exec_admin_id]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Expire_start_time')}:</label>
<div class="col-xs-12 col-sm-8">