diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb index c814d957..eafc1c62 100644 --- a/app/controllers/colleges_controller.rb +++ b/app/controllers/colleges_controller.rb @@ -254,7 +254,10 @@ class CollegesController < ApplicationController def manager_auth # unless (User.current.admin? || DepartmentMember.where(:user_id => User.current.id, :department_id => @department.id).first.present?) - unless (User.current.admin? || DepartmentMember.where(:user_id => User.current.id, :department_id => @department.id).first.present? || (User.current.user_extensions.try(:school_id) == @department.school_id && User.current.user_extensions.try(:identity) == 0)) + unless (User.current.admin? || + DepartmentMember.where(:user_id => User.current.id, :department_id => @department.id).first.present? || + (User.current.user_extensions.try(:school_id) == @department.school_id && User.current.user_extensions.try(:identity) == 0) || + @department.school.try(:partner_id) == User.current.partner_id) render_403 end end diff --git a/app/controllers/cooperates_controller.rb b/app/controllers/cooperates_controller.rb index 8a014d62..12467a36 100644 --- a/app/controllers/cooperates_controller.rb +++ b/app/controllers/cooperates_controller.rb @@ -23,7 +23,7 @@ class CooperatesController < ApplicationController def find_partner @partner = Partner.find_by_id(params[:id]) - render_404 if @partner.nil? || @partner.status == -1 + render_404 if @partner.nil? rescue ActiveRecord::RecordNotFound render_404 end diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 3c3a92e5..31e42f05 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -792,12 +792,22 @@ class ManagementsController < ApplicationController @menu_type = 8 @sub_type = 2 @search = params[:search] + @beginTime = params[:beginTime] + @endTime = params[:endTime] if @search.present? shixun_ids = Shixun.where("name like ?", "%#{params[:search]}%").pluck(:id) @discusses = Discuss.where(:dis_type => "Shixun", :dis_id => shixun_ids).reorder("created_at desc") else @discusses = Discuss.where(:dis_type => "Shixun").reorder("created_at desc") end + + if params[:beginTime] && params[:beginTime].strip != "" + @discusses = @discusses.where("created_at >= '#{Time.parse(params[:beginTime])}'") + end + if params[:endTime] && params[:endTime].strip != "" + @discusses = @discusses.where("created_at <= '#{Time.parse(params[:endTime])}'") + end + @all_discusses = @discusses @discusses_count = @discusses.count @limit = 20 @@ -1175,6 +1185,7 @@ end @menu_type = 6 @sub_type = 3 @partners = Partner.includes(:school).order("created_at desc") + @partners = @partners.where("concat(schools.name) like ? ", "%#{params[:search]}%") unless params[:search].blank? @current_partner = nil if params[:partner] @@ -1241,6 +1252,15 @@ end end end + def delete_customers + if params[:customer] + customer = Customer.where(id: params[:customer]).first + @current_partner = customer.partner + customer.school.update_attributes(:customer_id => nil) + customer.destroy + end + end + def all_partners @search = params[:search] @province = params[:province] @@ -1274,13 +1294,14 @@ end if school_ids.length > 0 school_ids.each do |s| school = School.where("id = ?",s).first - if school.present? + if school.present? && school.partner_id.nil? partner = Partner.new(name: school.name) partner.save school.update_attributes(:partner_id => partner.id) end end end + render :json => {status: 1, message: "创建成功!"} end @@ -4241,7 +4262,8 @@ end sheet1[count_row, 5] = discusses.count discusses.each_with_index do |discuss, j| user = discuss.user - sheet1[count_row, 6] = discuss.content.gsub(//, "【图片评论】").gsub(/!\[\].+\)/, "【图片评论】") + content = discuss.content.gsub(//, "【图片评论】").gsub(/!\[\].+\)/, "【图片评论】") + sheet1[count_row, 6] = strip_html content sheet1[count_row, 7] = "第#{discuss.position}关" sheet1[count_row, 8] = user.show_real_name sheet1[count_row, 9] = user.identity diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 9e07db32..0cfd2916 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -57,8 +57,6 @@ <% end %>
  • <%= link_to '我的项目', user_path(User.current, :type => 'a_project') %>
    • -
  • 客户管理
    • - <% if User.current.department_members.count > 0 %>
  • <%= link_to '学院统计', statistics_college_path(User.current.department_members.first.try(:department)) %>
    • <% end %> diff --git a/app/views/managements/_customer_addUnit.html.erb b/app/views/managements/_customer_addUnit.html.erb index 28ff3f36..82f880f4 100644 --- a/app/views/managements/_customer_addUnit.html.erb +++ b/app/views/managements/_customer_addUnit.html.erb @@ -61,7 +61,7 @@ s_html = s_html+ "

    " + " " + " " + - " " + + " " + " " + " \n" + " \n" + diff --git a/app/views/managements/_partner_addManage.html.erb b/app/views/managements/_partner_addManage.html.erb index 54a141a4..91eb6898 100644 --- a/app/views/managements/_partner_addManage.html.erb +++ b/app/views/managements/_partner_addManage.html.erb @@ -60,7 +60,7 @@ $.each(members,function (index,array) { s_html = s_html+ "

    " + " " + - " " + + " " + " " + " \n" + ""+array["identity"]+"" + diff --git a/app/views/managements/_partner_addUnit.html.erb b/app/views/managements/_partner_addUnit.html.erb index 0d80e5a7..cb1ac7c5 100644 --- a/app/views/managements/_partner_addUnit.html.erb +++ b/app/views/managements/_partner_addUnit.html.erb @@ -59,7 +59,7 @@ s_html = s_html+ "

    " + " " + " " + - " " + + " " + " " + " \n" + " \n" + diff --git a/app/views/managements/_partner_customer_list.html.erb b/app/views/managements/_partner_customer_list.html.erb new file mode 100644 index 00000000..4720fc96 --- /dev/null +++ b/app/views/managements/_partner_customer_list.html.erb @@ -0,0 +1,20 @@ +

  • + 序号 + 客户名称 + +添加 + 添加时间 +
    • +<% @current_partner.try(:customers).try(:each) do |customer| %> +
  • + <%= customer.school.id %> + <%= customer.school.name %> + + 删除 + + + <%= format_time customer.created_at %> + +
    • +<% end %> \ No newline at end of file diff --git a/app/views/managements/_partner_member_list.html.erb b/app/views/managements/_partner_member_list.html.erb index e705ffb6..daf382d1 100644 --- a/app/views/managements/_partner_member_list.html.erb +++ b/app/views/managements/_partner_member_list.html.erb @@ -1,9 +1,10 @@ <% partner.users.each do |user| %>
  • <%= image_tag(url_to_avatar(user)) %> - + - 胡莎莎 + <%= user.show_real_name %>
    • <% end %> \ No newline at end of file diff --git a/app/views/managements/delete_customers.js.erb b/app/views/managements/delete_customers.js.erb new file mode 100644 index 00000000..6c72d223 --- /dev/null +++ b/app/views/managements/delete_customers.js.erb @@ -0,0 +1 @@ +$("#partner_customer_list").html("<%= j(render :partial => "partner_customer_list") %>") \ No newline at end of file diff --git a/app/views/managements/partners.html.erb b/app/views/managements/partners.html.erb index 4f310c0f..89c25a9f 100644 --- a/app/views/managements/partners.html.erb +++ b/app/views/managements/partners.html.erb @@ -1,8 +1,8 @@
    - - 搜索 - 清除 + + 搜索 + 清除
    @@ -33,27 +33,8 @@
    -
    -
  • - 序号 - 客户名称 - +添加 - 添加时间 -
    • - <% @current_partner.try(:customers).try(:each) do |customer| %> -
  • - <%= customer.school.id %> - <%= customer.school.name %> - - 删除 - - - 2019-04-03 16:04 - -
    • - <% end %> - +
    + <%= render :partial => "partner_customer_list" %>
    @@ -69,4 +50,8 @@ $(this).addClass("active"); }) }) + + function submit_search_partner(){ + $.get("/managements/partners?search="+$("#partner_search").val()); + } \ No newline at end of file diff --git a/app/views/managements/shixun_feedback_message.html.erb b/app/views/managements/shixun_feedback_message.html.erb index c987f283..ff4ecebe 100644 --- a/app/views/managements/shixun_feedback_message.html.erb +++ b/app/views/managements/shixun_feedback_message.html.erb @@ -2,11 +2,17 @@ <%= form_tag(url_for(shixun_feedback_message_managements_path), :id => "managements_shixuns_search", :method => "post", :remote => true ) do %>
    + +
  • + 发布时间 + + +
  • 搜索 清除
    • - " id="shixun_search" class="task-btn mr10 task-btn-orange fr">导出 + " id="shixun_search" class="task-btn mr10 task-btn-orange fr">导出
    <% end %>
    @@ -17,4 +23,16 @@ function clearSearchCondition(){ $("#shixun_Look_name").val('') } + $("input[name='beginTime']").datetimepicker({ + allowBlank:true, + lang:'ch', + format:'Y-m-d H:i', + validateOnBlur:false + }); + $("input[name='endTime']").datetimepicker({ + allowBlank:true, + lang:'ch', + format:'Y-m-d H:i', + validateOnBlur:false + }); \ No newline at end of file diff --git a/app/views/managements/shixun_feedback_message.js.erb b/app/views/managements/shixun_feedback_message.js.erb index 135f4107..89ead852 100644 --- a/app/views/managements/shixun_feedback_message.js.erb +++ b/app/views/managements/shixun_feedback_message.js.erb @@ -1,2 +1,2 @@ $("#management_shixun_feedback_list").html("<%= j(render :partial => 'shixun_feedback_list') %>"); -$("#shixun_search").attr("href", "<%= shixun_feedback_message_managements_path(:search => @search, :format => "xls") %>") \ No newline at end of file +$("#shixun_search").attr("href", "<%= shixun_feedback_message_managements_path(:search => @search, :beginTime => @beginTime, :endTime => @endTime,:format => "xls") %>") \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index ff0be82f..3acb9123 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -713,6 +713,7 @@ RedmineApp::Application.routes.draw do ## oauth相关 post 'delete_subject_level' post 'update_level_for_subject' post :add_customers + delete :delete_customers get :customers_list end end