diff --git a/app/controllers/admins/nps_controller.rb b/app/controllers/admins/nps_controller.rb index 4eacba4e7..491e62778 100644 --- a/app/controllers/admins/nps_controller.rb +++ b/app/controllers/admins/nps_controller.rb @@ -7,6 +7,7 @@ class Admins::NpsController < Admins::BaseController sql = 'CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword OR users.login LIKE :keyword OR users.mail LIKE :keyword OR users.phone LIKE :keyword' @user_nps = @user_nps.where(sql, keyword: "%#{keyword}%") end + @user_nps = @user_nps.where("action_type != 'close'") if params[:done_score].present? @user_nps = paginate @user_nps.includes(:user) end diff --git a/app/views/admins/nps/_user_np_list.html.erb b/app/views/admins/nps/_user_np_list.html.erb index f4246c701..f2d5196e9 100644 --- a/app/views/admins/nps/_user_np_list.html.erb +++ b/app/views/admins/nps/_user_np_list.html.erb @@ -21,7 +21,7 @@ <%= display_text(nps.created_at&.strftime('%Y-%m-%d %H:%M')) %> <%= display_text(nps.user.last_login_on&.strftime('%Y-%m-%d %H:%M')) %> - <%= nps.score %> + <%= nps.action_type == 'close' ? '--' : nps.score %> <%= nps.memo %> <% end %> diff --git a/app/views/admins/nps/index.html.erb b/app/views/admins/nps/index.html.erb index f599d00a1..e36066cb8 100644 --- a/app/views/admins/nps/index.html.erb +++ b/app/views/admins/nps/index.html.erb @@ -6,6 +6,10 @@ <%= form_tag(admins_nps_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %> <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: 'ID/姓名/邮箱/手机号检索') %> + + <%= check_box_tag("done_score", true, false, id: "done_score", style: 'margin-left: 2px;') %> <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> NPS系统开关