diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 94d2b962..76f5946e 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1193,6 +1193,54 @@ end end + # 添加客户 + def customers_list + @search = params[:search] + @province = params[:province] + partner_id = params[:partner_id] + @partner = Partner.find partner_id + @customers = @partner.customers + if @customers.present? + @schools = School.where("(partner_id != ? or partner_id is NULL) and (customer_id is NULL or customer_id not in(#{@customers.map(&:id).join(",")}))", @partner.id) + else + @schools = School.where("partner_id != ? or partner_id is NULL", @partner.id) + end + if params[:search] + @schools = @schools.where("name like ?", "%#{@search}%") + end + + if params[:province] && params[:province] != '0' + @schools = @schools.where("province like ?", "%#{@province}%") + end + @limit = 10 + @page = params[:page] || 1 + @schools_count = @schools.count + + @total_pages = (@schools_count / 10.0).ceil + @schools = paginateHelper @schools, @limit + respond_to do |format| + format.js + format.json { + render json: @schools + } + end + end + + def add_customers + school_ids = params[:school_ids] + if school_ids.length > 0 + school_ids.each do |s| + school = School.where("id = ?",s).first + if school.present? + customer = Customer.new(partner_id: params[:partner_id]) + customer.save! + school.update_attributes(:customer_id => customer.id) + end + end + render :json => {status: 1, message: "创建成功!"} + end + end + def all_partners @search = params[:search] @province = params[:province] @@ -1237,6 +1285,8 @@ end + + # 删除部门管理员 def delete_depart_member DepartmentMember.where(:department_id => params[:depart], :user_id => params[:user_id]).destroy_all diff --git a/app/views/managements/_customer_addUnit.html.erb b/app/views/managements/_customer_addUnit.html.erb new file mode 100644 index 00000000..28ff3f36 --- /dev/null +++ b/app/views/managements/_customer_addUnit.html.erb @@ -0,0 +1,100 @@ +
+
添加客户
+
+
+
+ <%= render partial: "managements/customers_search_form" %> +
+ 搜索 +
+
+

+ 单位 + 地区 +

+
+ <%= render :partial => "partners_list" %> +
+

+
+ +
  • + 取消 + 确定 +
    • +
    +
    + \ No newline at end of file diff --git a/app/views/managements/_customers_search_form.html.erb b/app/views/managements/_customers_search_form.html.erb new file mode 100644 index 00000000..28c7ece0 --- /dev/null +++ b/app/views/managements/_customers_search_form.html.erb @@ -0,0 +1,19 @@ +<%= form_for "", :url => {:controller=> 'managements', :action => 'customers_list', :partner_id => @partner.id}, :html => {:id => 'partners_search_form'}, :method => "get", :remote => true do |f| %> +
    + 地区： + +
    +
    + 单位： + +
    + +<% end %> + + \ No newline at end of file diff --git a/app/views/managements/customers_list.js.erb b/app/views/managements/customers_list.js.erb new file mode 100644 index 00000000..b112b613 --- /dev/null +++ b/app/views/managements/customers_list.js.erb @@ -0,0 +1,6 @@ +<% if params[:search] %> + $("#search_customers_list").html("<%= j(render :partial => "partners_list") %>") +<% else %> + var html="<%= escape_javascript(render :partial => "managements/customer_addUnit",locals: {all_path: customers_list_managements_path}) %>"; + pop_box_new(html,572,500); +<% end %> diff --git a/app/views/managements/partners.html.erb b/app/views/managements/partners.html.erb index f70ac32c..7ba9fecb 100644 --- a/app/views/managements/partners.html.erb +++ b/app/views/managements/partners.html.erb @@ -15,49 +15,51 @@ <% end %> -
    -
    -
    -
    -

    添加时间<%= format_time @current_partner.try(:created_at) %>

    -
    - 管理员 -
      - <% unless @current_partner.nil? %> + <% if @current_partner.present? %> +
      +
      +
      +
      +

      添加时间<%= format_time @current_partner.try(:created_at) %>

      +
      + 管理员 +
      • <%= link_to '+', add_partner_member_box_managements_path(:partner => @current_partner.try(:id)), :remote => true, :class => "addManage" %>
        • <%= render :partial => "partner_member_list", :locals => {partner: @current_partner} %>
        - <% end %> -
      +
    +
    -
    -
    -
  • - 序号 - 客户名称 - +添加 - 添加时间 -
    • - <% @current_partner.try(:customers).try(:each) do |customer| %> -
  • - <%= customer.school.id %> - <%= customer.school.name %> - +
    +
  • + 序号 + 客户名称 + +添加 + 添加时间 +
    • + <% @current_partner.try(:customers).try(:each) do |customer| %> +
  • + <%= customer.school.id %> + <%= customer.school.name %> + 删除 - + 2019-04-03 16:04 -
    • - <% end %> + + <% end %> +
    - + <% end %> +