From 2c1bd03c4651f5aa9d441c54b1841fcf34ba2584 Mon Sep 17 00:00:00 2001
From: jasder <jasder@jasderdeMacBook-Pro.local>
Date: Thu, 4 Apr 2019 09:27:08 +0800
Subject: [PATCH] ADD

---
 app/controllers/managements_controller.rb     | 12 +++++++
 .../managements/_partner_addManage.html.erb   | 34 +++++++++----------
 .../managements/add_partner_member_box.js.erb |  7 ++++
 config/routes.rb                              |  1 +
 4 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 app/views/managements/add_partner_member_box.js.erb

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index 9a42aae4..6fcc149a 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -1206,6 +1206,18 @@ end
     end
   end
 
+  # 添加合作伙伴管理员- 弹框
+  def add_partner_member_box
+    @partner = Partner.first
+    @members =
+        if params[:search]
+          User.where("LOWER(concat(lastname, firstname, nickname, mail)) LIKE '%#{params[:search]}%'")
+        else
+          User.where(:certification => 1)
+        end
+    @members = paginateHelper @members, 8
+  end
+
   # check 部门 identifier是否重复
   def check_depart_identifier
     logger.info("###############{params}")
diff --git a/app/views/managements/_partner_addManage.html.erb b/app/views/managements/_partner_addManage.html.erb
index 818a4777..4f7e145f 100644
--- a/app/views/managements/_partner_addManage.html.erb
+++ b/app/views/managements/_partner_addManage.html.erb
@@ -33,24 +33,22 @@
         <span class="fl edu-txt-w100 edu-txt-center">手机号</span>
       </p>
       <div class="edu-back-skyblue clearfix pl10 over280" id="serch_user_list">
-        <p class="clearfix">
-          <span class="fl edu-txt-w90">
-            <input type="checkbox" name="user_id[]" value="12545" id="user_12545" class="magic-checkbox">
-            <label for="user_12545">李健</label>
-          </span>
-          <span class="fl edu-txt-w90 mt5 edu-txt-center color-grey-6 pointer">学生</span>
-          <span class="fl task-hide edu-txt-w200 mt5 edu-txt-left color-grey-9">湖北工业大学 </span>
-          <span class="fl edu-txt-w100 mt5 edu-txt-center color-grey-9">156****9087</span>
-        </p>
-        <p class="clearfix">
-          <span class="fl edu-txt-w90">
-            <input type="checkbox" name="user_id[]" value="12545" id="user_12545" class="magic-checkbox">
-            <label for="user_12545">李健</label>
-          </span>
-          <span class="fl edu-txt-w90 mt5 edu-txt-center color-grey-6 pointer">学生</span>
-          <span class="fl task-hide edu-txt-w200 mt5 edu-txt-left color-grey-9">湖北工业大学 </span>
-          <span class="fl edu-txt-w100 mt5 edu-txt-center color-grey-9"></span>
-        </p>
+
+        <%= form_for @partner, :url => add_depart_member_managements_path,:html => {:id => 'add_depart_member_form', :remote => true, :method => :post} do |f| %>
+          <% @members.each do |member| %>
+            <p class="clearfix">
+              <span class="fl edu-txt-w90">
+                <input type="checkbox" name="partner_member[]" value="<%= member.id %>" id="user_<%= member.id %>" class="magic-checkbox">
+                <label for="user_<%= member.id %>"><%= member.show_real_name %></label>
+              </span>
+              <span class="fl edu-txt-w90 mt5 edu-txt-center color-grey-6 pointer"><%= member.identity %></span>
+              <span class="fl task-hide edu-txt-w200 mt5 edu-txt-left color-grey-9"><%= member.school_name %> </span>
+              <span class="fl edu-txt-w100 mt5 edu-txt-center color-grey-9"><%= member.phone %></span>
+            </p>
+          <% end %>
+        <% end %>
+
+
       </div>
     </div>
     <p class="color-orange-tip" id="form_notice"></p>
diff --git a/app/views/managements/add_partner_member_box.js.erb b/app/views/managements/add_partner_member_box.js.erb
new file mode 100644
index 00000000..72197cd0
--- /dev/null
+++ b/app/views/managements/add_partner_member_box.js.erb
@@ -0,0 +1,7 @@
+
+<% if params[:search] || params[:page] %>
+$("#depart_member_search_list").html("<%= j(render :partial => "depart_member_search_list") %>")
+<% else %>
+  var html="<%= escape_javascript(render :partial => "managements/partner_addManage") %>";
+  pop_box_new(html,572,500);
+<% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 57410238..f98c6e4f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -554,6 +554,7 @@ RedmineApp::Application.routes.draw do ## oauth相关
       post 'import_departments'
       match 'departments', :via => [:get, :post]
       get 'partners'
+      get 'add_partner_member_box'
       delete 'delete_depart_member'
       get 'add_depart_member_box'
       post 'add_depart_member'