diff --git a/application/admin/controller/score/Log.php b/application/admin/controller/score/Log.php index bfd9e7a..3801303 100644 --- a/application/admin/controller/score/Log.php +++ b/application/admin/controller/score/Log.php @@ -68,7 +68,7 @@ class Log extends Backend foreach ($list as $row) { - $row->getRelation('scoreevent')->visible(['name']); + $row->getRelation('scoreevent')->visible(['name',"desc"]); $row->getRelation('employee')->visible(['name']); $row->getRelation('user')->visible(['nickname','mobile','avatar']); $row->getRelation('team')->visible(['name']); diff --git a/application/admin/lang/zh-cn/score/log.php b/application/admin/lang/zh-cn/score/log.php index 269dcef..c9a61a0 100644 --- a/application/admin/lang/zh-cn/score/log.php +++ b/application/admin/lang/zh-cn/score/log.php @@ -26,5 +26,6 @@ return [ 'User.nickname' => '昵称', 'User.mobile' => '手机号', 'User.avatar' => '头像', - 'Team.name' => '队伍名' + 'Team.name' => '队伍名', + 'Event.desc' => '积分说明' ]; diff --git a/public/assets/js/backend/score/log.js b/public/assets/js/backend/score/log.js index 3ca1e7d..c83d9b1 100644 --- a/public/assets/js/backend/score/log.js +++ b/public/assets/js/backend/score/log.js @@ -39,6 +39,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde {field: 'score_team_id', title: __('Score_team_id'),visible: false}, {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'score', title: __('Score'), operate: false}, + {field: 'scoreevent.desc', title: __('Event.desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images}, {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},