From fca3e77467030ce30346a3fc96ad27bd36fb1cd4 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Tue, 27 Aug 2019 10:34:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E9=BB=84=E5=8F=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/managements_controller.rb       |  2 +-
 app/views/managements/_user_agent_list.html.erb |  7 ++++---
 app/views/managements/user_agents.html.erb      | 11 +----------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index b018e38d..ea6b37dc 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -29,7 +29,7 @@ class ManagementsController < ApplicationController
   end
 
   def user_agents
-    @user_agents = UserAgent.where("user_agents.key is not null")
+    @user_agents = UserAgent.where("user_agents.key is not  order by action_status, register_status")
     @agents_count = @user_agents.count
     limit = 20
     @agents_pages = Paginator.new @agents_count, limit, params['page'] || 1
diff --git a/app/views/managements/_user_agent_list.html.erb b/app/views/managements/_user_agent_list.html.erb
index 43886c8d..6b47e51c 100644
--- a/app/views/managements/_user_agent_list.html.erb
+++ b/app/views/managements/_user_agent_list.html.erb
@@ -4,9 +4,9 @@
   <th width="10%">代理人登录名</th>
   <th width="10%">代理人姓名</th>
   <th width="20%">学校</th>
+  <th width="10%">用户注册状态</th>
   <th width="10%">竞赛报名状态</th>
   <th width="10%">ip</th>
-  <th width="10%">ip</th>
   <th width="20%">负责人</th>
   </thead>
   <tbody>
@@ -19,9 +19,10 @@
       <td class="edu-txt-left"><span><%= link_to ua.key, user_path(ua.key), :target => "_blank" %></span></td>
       <td><%= link_to user.try(:show_real_name), user_path(user), target:'_blank' %></td>
       <td><%= school.name %></td>
-      <td><%= "--" %></td>
+      <td><%= ua.action_status == 2 ? "代理之后注册" : "--"  %></td>
+      <td><%= ua.register_status == 2 ? "代理之后报名" : "--"  %></td>
       <td><%= ua.ip %></td>
-      <td><%= "理由" %></td>
+      <td>"--"</td>
     </tr>
   <% end %>
   </tbody>
diff --git a/app/views/managements/user_agents.html.erb b/app/views/managements/user_agents.html.erb
index d29e7bec..a1e88ef0 100644
--- a/app/views/managements/user_agents.html.erb
+++ b/app/views/managements/user_agents.html.erb
@@ -1,19 +1,10 @@
-<%= form_tag(url_for(departments_part_managements_path),:id=>"department_part_search",:method => "post",:remote=>true) do %>
-  <div class="edu-con-top clearfix mb20 xmt10 bor-grey-e mt10">
-    <input class="fl task-form-20 task-height-30 ml25" id="shixun_Look_name" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" >
-    <a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt2" onclick="$('#department_part_search').submit();">搜索</a>
-    <a href="javascript:clearSearchCondition();" class="fl task-btn ml5 mt2" id="clear_contents">清除</a>
-    <%= link_to "关联代理人",add_departments_part_managements_path(),:class => "task-btn task-btn-green fr mt6 mr30" %>
-    <input name="sx_order" type="hidden">
-  </div>
-<% end %>
 <div class="edu-con-bg01 mt15" id="managements_department_part_list">
   <%= render :partial => "managements/user_agent_list" %>
 </div>
 <script>
     function clearSearchCondition() {
         $("#shixun_Look_name").val("");
-        $.get('<%= departments_part_managements_path() %>')
+        $.get('<%= user_agents_managements_path() %>')
     }
 
 </script>
\ No newline at end of file