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

feature: 面板

Browse Source
This commit is contained in:
zhuyu 2025-05-23 15:09:32 +08:00
parent ba346a4520
commit 01ff921514
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ class Task extends Backend
$list = $this->model $list = $this->model
->with(['admin']) ->with(['exec'])
->where($where) ->where($where)
->order($sort, $order) ->order($sort, $order)
->paginate($limit); ->paginate($limit);

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

@ -32,6 +32,7 @@ return [
'Admin.id' => 'ID', 'Admin.id' => 'ID',
'Admin.username' => '用户名', 'Admin.username' => '用户名',
'Admin.nickname' => '昵称', 'Admin.nickname' => '昵称',
'ExecAdmin.nickname' => '执行人',
'Admin.password' => '密码', 'Admin.password' => '密码',
'Admin.salt' => '密码盐', 'Admin.salt' => '密码盐',
'Admin.area_ids' => '地区ID,英文逗号分隔', 'Admin.area_ids' => '地区ID,英文逗号分隔',

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

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

2
public/assets/js/backend/oa/task.js
View File

@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
[ [
{checkbox: true}, {checkbox: true},
{field: 'id', title: __('Id')}, {field: 'id', title: __('Id')},
{field: 'exec.nickname', title: __('ExecAdmin.nickname'), operate: 'LIKE'},
{field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal},
{field: 'title', title: __('Title'), operate: 'LIKE'}, {field: 'title', title: __('Title'), operate: 'LIKE'},
{field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
@ -36,7 +37,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'expire_start_time', title: __('Expire_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'expire_start_time', title: __('Expire_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'expire_end_time', title: __('Expire_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'expire_end_time', title: __('Expire_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'complete_time', title: __('Complete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'complete_time', title: __('Complete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
buttons:[ buttons:[
{ {