From 43117e7ca10cc64cb5bb57b753378e1bc73bc267 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 4 Apr 2019 15:42:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/managements_controller.rb     | 29 +++++++++++----
 .../managements/_partner_addManage.html.erb   | 36 +++++++++----------
 .../managements/_partner_member_list.html.erb |  8 +++++
 .../managements/add_partner_member.js.erb     |  1 +
 .../managements/add_partner_member_box.js.erb |  2 +-
 app/views/managements/partners.html.erb       | 18 ++++------
 6 files changed, 57 insertions(+), 37 deletions(-)
 create mode 100644 app/views/managements/_partner_member_list.html.erb
 create mode 100644 app/views/managements/add_partner_member.js.erb

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index 75ee3edf..94d2b962 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -1232,7 +1232,6 @@ end
           school.update_attributes(:partner_id => partner.id)
         end
       end
-      render :json => {status: 1, message: "创建成功!"}
     end
   end
 
@@ -1279,13 +1278,18 @@ end
     @partner = Partner.where(:id => params[:partner]).first
     @members =
         if params[:search]
-          User.where("LOWER(concat(lastname, firstname, nickname, mail)) LIKE '%#{params[:search]}%'")
+          User.where("LOWER(concat(lastname, firstname, nickname, mail)) LIKE ?", "%#{params[:search]}%").
+              where(:certification => 1, :partner_id => nil)
         else
-          User.where(:certification => 1)
+          User.where(:certification => 1, :partner_id => nil)
         end
-    @members = paginateHelper @members, 8
+    @total_pages = (@members.count / 10.0).ceil
+    @members = paginateHelper @members, 10
     respond_to do |format|
       format.js
+      format.json {
+        render json: member_json_data(@members)
+      }
     end
   end
 
@@ -1298,8 +1302,6 @@ end
         user.update_attributes(partner_id: @partner.id) if !@partner.nil? && !user.nil?
       end
     end
-
-    redirect_to partners_managements_path
   end
 
   # check 部门 identifier是否重复
@@ -4319,4 +4321,19 @@ end
     book.write xls_report
     xls_report.string
   end
+
+  def member_json_data mmebers
+    mmebers.map do |member|
+      real_name = member.show_real_name
+      identity = member.identity
+      school_name = member.school_name
+      user_phone = member.phone || ""
+      member.attributes.dup.except("login", "hashed_password", "salt", "status", "mail", "experience", "grade",
+                                   "authentication", "professional_certification").merge({real_name: real_name,
+                                                                                          identity: identity,
+                                                                                          school_name: school_name,
+                                                                                          user_phone: user_phone})
+    end
+  end
+
 end
diff --git a/app/views/managements/_partner_addManage.html.erb b/app/views/managements/_partner_addManage.html.erb
index 9c8769ae..54a141a4 100644
--- a/app/views/managements/_partner_addManage.html.erb
+++ b/app/views/managements/_partner_addManage.html.erb
@@ -14,7 +14,7 @@
       </p>
       <%= form_for @partner, :url => add_partner_member_managements_path,:html => {:id => 'add_partner_member_form', :remote => true, :method => :post} do |f| %>
         <input type="hidden" value="<%= @partner.id %>" name="partner">
-        <div id="serch_user_list">
+        <div class="edu-back-skyblue clearfix pl10 over280" id="member_search_user_list">
           <%= render :partial => "partner_member_search_list" %>
         </div>
       <% end %>
@@ -27,14 +27,14 @@
   </div>
 </div>
 <script>
-    var i = 1; //设置当前页数
+    var member_i = 1; //设置当前页数
     var msg_list_loading = false;
     $(function() {
         var totalpage = <%= @total_pages.to_i %>; //总页数，防止超过总页数继续滚动
         var winH = $(window).height(); //页面可视区域高度
 
-        $("#search_user_list").scroll(function() {
-            if (i < totalpage) { // 当滚动的页数小于总页数的时候，继续加载
+        $("#member_search_user_list").scroll(function() {
+            if (member_i < totalpage) { // 当滚动的页数小于总页数的时候，继续加载
                 var pageH = $(document.body).height();
 
                 var scrollT = $(window).scrollTop(); //滚动条top
@@ -42,7 +42,7 @@
                 console.log(aa);
                 if ( !msg_list_loading ){
                     if (aa < 0.01 ) {
-                        get_schools(i+1)
+                        get_schools(member_i+1)
                     }
                 }
             }
@@ -50,26 +50,26 @@
     });
 
     function get_schools(page) {
-        var msg_list = $('#search_user_list');
+        var msg_list = $('#member_search_user_list');
         if (msg_list.height() + msg_list[0].scrollTop >= msg_list[0].scrollHeight - 60) {
             msg_list_loading = true;
-            $.getJSON("/managements/add_partner_member_box?partner=<%= @partner.id %>&search="+$("#partner_member_search").val()+"&page="+page, function(schools) {
-                if (schools) {
+            $.getJSON("/managements/add_partner_member_box?partner=<%= @partner.id %>&search="+$("#partner_member_search").val()+"&page="+page, function(members) {
+                if (members) {
                     msg_list_loading = false;
                     var s_html = "";
-                    $.each(schools,function (index,array) {
-                        s_html = s_html+ "<p class='clearfix mt5'>" +
-                            "          <span class='fl with70'>" +
-                            "            <span>" +
-                            "                <input type='checkbox' name='school[id]' value='"+array["school"]["id"]+"' id='school_'"+array["school"]["id"]+"'class='magic-checkbox'>" +
-                            "                <label for='school_'"+array["school"]["id"]+">"+array["school"]["name"]+"</label>" +
-                            "            </span>\n" +
+                    $.each(members,function (index,array) {
+                        s_html = s_html+ "<p class='clearfix'>" +
+                            "          <span class='fl edu-txt-w90'>" +
+                            "                <input type='checkbox' name='partner_member[]' value='"+array["id"]+"' id='user_'"+array["id"]+"'class='magic-checkbox'>" +
+                            "                <label for='user_'"+array["id"]+">"+array["real_name"]+"</label>" +
                             "          </span>\n" +
-                            "          <span class='fl with30'>"+array["school"]["province"]+"</span>" +
+                            "<span class='fl edu-txt-w90 mt5 edu-txt-center color-grey-6 pointer'>"+array["identity"]+"</span>" +
+                            "<span class=\"fl task-hide edu-txt-w200 mt5 edu-txt-left color-grey-9\">"+array["school_name"]+"</span>" +
+                            "<span class=\"fl edu-txt-w100 mt5 edu-txt-center color-grey-9\">"+array["user_phone"]+"</span>" +
                             "        </p>"
                     });
-                    $("#search_user_list").append(s_html);
-                    i ++;
+                    $("#member_search_user_list").append(s_html);
+                    member_i ++;
                 }
             });
         }
diff --git a/app/views/managements/_partner_member_list.html.erb b/app/views/managements/_partner_member_list.html.erb
new file mode 100644
index 00000000..2c4aa79e
--- /dev/null
+++ b/app/views/managements/_partner_member_list.html.erb
@@ -0,0 +1,8 @@
+<% partner.users.each do |user| %>
+  <li>
+    <%= image_tag(url_to_avatar(user)) %>
+    <a href="javascript:void(0)" class="removeImg">
+      <i class="iconfont icon-htmal5icon19 color-grey-9"></i>
+    </a>
+  </li>
+<% end %>
\ No newline at end of file
diff --git a/app/views/managements/add_partner_member.js.erb b/app/views/managements/add_partner_member.js.erb
new file mode 100644
index 00000000..017b71b0
--- /dev/null
+++ b/app/views/managements/add_partner_member.js.erb
@@ -0,0 +1 @@
+$("#partner_member_list").html("<%= j(render :partial => "partner_member_list", :locals => {partner: @partner}) %>")
\ No newline at end of file
diff --git a/app/views/managements/add_partner_member_box.js.erb b/app/views/managements/add_partner_member_box.js.erb
index c5ba340b..7ddc34c2 100644
--- a/app/views/managements/add_partner_member_box.js.erb
+++ b/app/views/managements/add_partner_member_box.js.erb
@@ -1,5 +1,5 @@
 <% if params[:search] %>
-$("#serch_user_list").html("<%= j(render :partial => "partner_member_search_list") %>")
+$("#member_search_user_list").html("<%= j(render :partial => "partner_member_search_list") %>")
 <% else %>
   var html="<%= escape_javascript(render :partial => "managements/partner_addManage") %>";
   pop_box_new(html,572,500);
diff --git a/app/views/managements/partners.html.erb b/app/views/managements/partners.html.erb
index b7471786..f70ac32c 100644
--- a/app/views/managements/partners.html.erb
+++ b/app/views/managements/partners.html.erb
@@ -23,19 +23,13 @@
             <div class="clearfix">
               <span class="mr45 color-grey-9 fl">管理员</span>
               <ul class="manageList">
-                <li>
-                  <%= link_to '+', add_partner_member_box_managements_path(:partner => 1), :remote => true, :class => "addManage" %>
-                </li>
-
                 <% unless @current_partner.nil? %>
-                  <% @current_partner.users.each_with_index do |user, index| %>
-                    <li>
-                      <%= image_tag(url_to_avatar(user)) %>
-                      <a href="javascript:void(0)" class="removeImg">
-                        <i class="iconfont icon-htmal5icon19 color-grey-9"></i>
-                      </a>
-                    </li>
-                  <% end %>
+                  <li>
+                    <%= link_to '+', add_partner_member_box_managements_path(:partner => @current_partner.try(:id)), :remote => true, :class => "addManage" %>
+                  </li>
+                  <div id="partner_member_list" class="fl">
+                    <%= render :partial => "partner_member_list", :locals => {partner: @current_partner} %>
+                  </div>
                 <% end %>
               </ul>
             </div>