diff --git a/application/admin/controller/score/Event.php b/application/admin/controller/score/Event.php index 6086b86..f573245 100644 --- a/application/admin/controller/score/Event.php +++ b/application/admin/controller/score/Event.php @@ -23,8 +23,14 @@ class Event extends Backend parent::_initialize(); $this->model = new \app\admin\model\score\Event; $this->view->assign("statusList", $this->model->getStatusList()); + + $this->view->assign("statusListJson", json_encode($this->model->getStatusList(), JSON_UNESCAPED_UNICODE)); + $this->view->assign("frequencyList", $this->model->getFrequencyList()); $this->view->assign("wayList", $this->model->getWayList()); + + + } diff --git a/application/admin/model/score/Event.php b/application/admin/model/score/Event.php index e4370be..7c521cd 100644 --- a/application/admin/model/score/Event.php +++ b/application/admin/model/score/Event.php @@ -44,7 +44,7 @@ class Event extends Model public function getStatusList() { - return ['attendance' => __('Status attendance'), 'morning_meeting_hosting' => __('Status morning_meeting_hosting'), 'safety_environment' => __('Status safety_environment'), 'appearance_demeanor' => __('Status appearance_demeanor'), 'thorough_summarization' => __('Status thorough_summarization'), 'good_people_deeds' => __('Status good_people_deeds'), 'customer_service' => __('Status customer_service'), 'corporate_culture' => __('Status corporate_culture')]; + return config("site.type_point_program"); } public function getFrequencyList() diff --git a/application/admin/view/score/event/index.html b/application/admin/view/score/event/index.html index 8861a10..fef762c 100644 --- a/application/admin/view/score/event/index.html +++ b/application/admin/view/score/event/index.html @@ -44,3 +44,6 @@ + \ No newline at end of file diff --git a/application/api/controller/Score.php b/application/api/controller/Score.php index b2e8adc..80b4f5c 100644 --- a/application/api/controller/Score.php +++ b/application/api/controller/Score.php @@ -127,7 +127,7 @@ class Score extends Api // var_dump($this->model->getLastSql()); }catch (\Exception $e){ - $this->error($e->getMessage()); + $this->error($e->getMessage().$e->getFile().$e->getLine()); } $this->success('查询成功', $res); } diff --git a/application/common/model/score/Event.php b/application/common/model/score/Event.php index 9f462b3..3fbcd27 100644 --- a/application/common/model/score/Event.php +++ b/application/common/model/score/Event.php @@ -45,7 +45,7 @@ class Event extends BaseModel public function getStatusList() { - return ['attendance' => __('Status attendance'), 'morning_meeting_hosting' => __('Status morning_meeting_hosting'), 'safety_environment' => __('Status safety_environment'), 'appearance_demeanor' => __('Status appearance_demeanor'), 'thorough_summarization' => __('Status thorough_summarization'), 'good_people_deeds' => __('Status good_people_deeds'), 'customer_service' => __('Status customer_service'), 'corporate_culture' => __('Status corporate_culture')]; + return config("site.type_point_program"); } public function getFrequencyList() diff --git a/application/common/model/score/Log.php b/application/common/model/score/Log.php index 56bb99b..b45e5a4 100644 --- a/application/common/model/score/Log.php +++ b/application/common/model/score/Log.php @@ -451,7 +451,7 @@ class Log extends BaseModel } - + if($employee['team_id'] && $employee['team']){ if(!isset($team_score[$employee['team_id']])){ $team_data = [ 'id'=>$employee['team_id'], @@ -464,6 +464,7 @@ class Log extends BaseModel //累加积分 $team_score[$employee['team_id']]['score'] += $score; } + } } //自己团队的积分 if($my_team_id){ diff --git a/public/assets/js/backend/score/event.js b/public/assets/js/backend/score/event.js index 2aa2f32..ea89df5 100644 --- a/public/assets/js/backend/score/event.js +++ b/public/assets/js/backend/score/event.js @@ -29,7 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {checkbox: true}, {field: 'id', title: __('Id')}, - {field: 'status', title: __('Status'), searchList: {"attendance":__('Status attendance'),"morning_meeting_hosting":__('Status morning_meeting_hosting'),"safety_environment":__('Status safety_environment'),"appearance_demeanor":__('Status appearance_demeanor'),"thorough_summarization":__('Status thorough_summarization'),"good_people_deeds":__('Status good_people_deeds'),"customer_service":__('Status customer_service'),"corporate_culture":__('Status corporate_culture')}, formatter: Table.api.formatter.status}, + {field: 'status', title: __('Status'), searchList: statusListJson, formatter: Table.api.formatter.status}, {field: 'name', title: __('Name'), 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}, {field: 'score', title: __('Score'), operate: false},