From c0b7273126f90de9f2fe241b9bb66c7b528b55b8 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 25 Feb 2020 12:25:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admins/salesman_channels/index.js | 30 +- .../admins/salesman_channels_controller.rb | 12 +- app/models/salesman_channel.rb | 16 +- .../admins/salesman_channels/index.html.erb | 7 +- ..._add_salesman_channels_user_modal.html.erb | 5 +- .../salesman_channels/shared/_list.html.erb | 8 +- app/views/admins/shared/_sidebar.html.erb | 6 +- ...fest-7657344e1d61e579de6a996a4498d7a2.json | 2 +- ...038d175f26ee098d43e266c2138b07163a2da9e.js | 142257 +++++++++++++++ ...d175f26ee098d43e266c2138b07163a2da9e.js.gz | Bin 0 -> 1004361 bytes ...cd22920bb7d043578b1b16250e09dbe76b7bc6.css | 26215 +++ ...2920bb7d043578b1b16250e09dbe76b7bc6.css.gz | Bin 0 -> 74899 bytes ...22f1c5a5caa26f1df87dbbf0c6d04232c4ac4e.css | 11520 ++ ...1c5a5caa26f1df87dbbf0c6d04232c4ac4e.css.gz | Bin 0 -> 30753 bytes ...4de43d14e0db0b4001822f996e803bacbda169.css | 16850 ++ ...43d14e0db0b4001822f996e803bacbda169.css.gz | Bin 0 -> 45996 bytes ...923847b33f7388d49741062fe3cb20346da315.css | 25516 +++ ...847b33f7388d49741062fe3cb20346da315.css.gz | Bin 0 -> 72696 bytes 18 files changed, 222403 insertions(+), 41 deletions(-) create mode 100644 public/assets/admin-04ff7d4c76f406e0df9e02923038d175f26ee098d43e266c2138b07163a2da9e.js create mode 100644 public/assets/admin-04ff7d4c76f406e0df9e02923038d175f26ee098d43e266c2138b07163a2da9e.js.gz create mode 100644 public/assets/admin-31e7cc6208d66802217e899555cd22920bb7d043578b1b16250e09dbe76b7bc6.css create mode 100644 public/assets/admin-31e7cc6208d66802217e899555cd22920bb7d043578b1b16250e09dbe76b7bc6.css.gz create mode 100644 public/assets/application-8853af8ba870ca7fc8bdae048322f1c5a5caa26f1df87dbbf0c6d04232c4ac4e.css create mode 100644 public/assets/application-8853af8ba870ca7fc8bdae048322f1c5a5caa26f1df87dbbf0c6d04232c4ac4e.css.gz create mode 100644 public/assets/college-893ba916d2b043f4b751cacc104de43d14e0db0b4001822f996e803bacbda169.css create mode 100644 public/assets/college-893ba916d2b043f4b751cacc104de43d14e0db0b4001822f996e803bacbda169.css.gz create mode 100644 public/assets/cooperative-bef1905d0c3e15357e3a376225923847b33f7388d49741062fe3cb20346da315.css create mode 100644 public/assets/cooperative-bef1905d0c3e15357e3a376225923847b33f7388d49741062fe3cb20346da315.css.gz diff --git a/app/assets/javascripts/admins/salesman_channels/index.js b/app/assets/javascripts/admins/salesman_channels/index.js index 9b6659761..6d25688fe 100644 --- a/app/assets/javascripts/admins/salesman_channels/index.js +++ b/app/assets/javascripts/admins/salesman_channels/index.js @@ -3,19 +3,11 @@ $(document).on('turbolinks:load', function() { // ============= 添加销售人员 ============== var $addMemberModal = $('.admin-add-salesman-channel-user-modal'); - var searchscForm = $(".saleman-channel-list-form .search-form"); - var scFormUrl = searchscForm.data('data-search-form-url'); var $addMemberForm = $addMemberModal.find('.admin-add-salesman-channel-user-form'); var $memberSelect = $addMemberModal.find('.salesman-channel-user-select'); - var $salesmanIdInput = $('.salesman-channel-list-form').find(".btn-primary"); - var $start_time = $('#start_time'); - var $end_time = $('#end_time'); + var $form = $addMemberModal.find('form.admin-add-salesman-user-form'); $addMemberModal.on('show.bs.modal', function(event){ - var $link = $(event.relatedTarget); - // var salesmanId = $link.data('salesman_id'); - // $salesmanIdInput.val(salesmanId); - $memberSelect.select2('val', ' '); }); @@ -52,12 +44,12 @@ $(document).on('turbolinks:load', function() { // var salesmanId = $salesmanIdInput.val(); var memberIds = $memberSelect.val(); if (memberIds && memberIds.length > 0) { - alert(start_time); + var url = $form.data('url'); $.ajax({ method: 'POST', dataType: 'json', - url: '/admins/salesman_channels/batch_add', - data: { salesman_id: $salesmanIdInput.data("salesman-id"), school_ids: memberIds }, + url: url, + data: $form.serialize(), success: function(){ $.notify({ message: '创建成功' }); $addMemberModal.modal('hide'); @@ -68,7 +60,7 @@ $(document).on('turbolinks:load', function() { }, error: function(res){ var data = res.responseJSON; - $form.find('.error').html(data.message); + $addMemberForm.find('.error').html(data.message); } }); } else { @@ -76,6 +68,16 @@ $(document).on('turbolinks:load', function() { } }); + // 搜索 + var searchscForm = $(".saleman-channel-list-form .search-form"); + + // 清空 + searchscForm.on('click', '.clear-btn', function () { + searchscForm.find('.start_date').val(''); + searchscForm.find('.end_date').val('').trigger('change'); + searchscForm.find('input[name="keyword"]').val(''); + }); + // 时间跨度 var baseOptions = { autoclose: true, @@ -102,8 +104,8 @@ $(document).on('turbolinks:load', function() { }); var submitForm = function(){ + var url = searchscForm.data('search-form-url'); var form = searchscForm; - var url = "/admins/salesman_channels"; $.ajax({ url: url, data: form.serialize(), diff --git a/app/controllers/admins/salesman_channels_controller.rb b/app/controllers/admins/salesman_channels_controller.rb index a1cdcb254..385503d3a 100644 --- a/app/controllers/admins/salesman_channels_controller.rb +++ b/app/controllers/admins/salesman_channels_controller.rb @@ -2,10 +2,12 @@ class Admins::SalesmanChannelsController < Admins::BaseController before_action :set_salesman def index - @channels = SalesmanChannel.all - @start_time = params[:start_time] - @end_time = params[:end_time] || Time.now - @keyword = params[:keyword] + @channels = @salesman.salesman_channels + if params[:keyword].present? + @channels = @channels.joins(:school).where("schools.name like ?", "%#{params[:keyword]}%") + end + @start_time = params[:start_date] + @end_time = params[:end_date].blank? ? Time.now : params[:end_date] end def batch_add @@ -17,6 +19,8 @@ class Admins::SalesmanChannelsController < Admins::BaseController @salesman.salesman_channels.create!(school_id: school.id) end render_ok + rescue Exception => ex + render_error(ex.message) end def destroy diff --git a/app/models/salesman_channel.rb b/app/models/salesman_channel.rb index 0aee5f635..020baf75a 100644 --- a/app/models/salesman_channel.rb +++ b/app/models/salesman_channel.rb @@ -6,22 +6,20 @@ class SalesmanChannel < ApplicationRecord school.name end - def teacher_count(start_time, end_time, keyword) - UserExtension.joins(:school).where("schools.name like '%#{keyword}%' and user_extensions.identity=0 - and user_extensions.created_at between '#{start_time}' and '#{end_time}'").count + def teacher_count(start_time, end_time) + UserExtension.where("identity = 0 and school_id = #{school_id} and created_at between '#{start_time}' and '#{end_time}'").count # UserExtension.where(school_id: school_id).where(query).count end - def student_count(start_time, end_time, keyword) - UserExtension.joins(:school).where("schools.name like '%#{keyword}%' and user_extensions.identity=1 - and user_extensions.created_at between '#{start_time}' and '#{end_time}'").count + def student_count(start_time, end_time) + UserExtension.where("identity = 1 and school_id = #{school_id} and created_at between '#{start_time}' and '#{end_time}'").count end - def course_count(start_time, end_time, keyword) - Course.joins(:school).where("schools.name like '%#{keyword}%' and courses.created_at between '#{start_time}' and '#{end_time}'").count + def course_count(start_time, end_time) + Course.where("school_id = #{school_id} and courses.created_at between '#{start_time}' and '#{end_time}'").count end - def shixuns_count(start_time, end_time, keyword) + def shixuns_count(start_time, end_time) ShixunMember.joins("join user_extensions on user_extensions.user_id = shixun_members.user_id and shixun_members.created_at between '#{start_time}' and '#{end_time}'") .where(user_extensions: {school_id: school_id}).pluck(:shixun_id).uniq.count end diff --git a/app/views/admins/salesman_channels/index.html.erb b/app/views/admins/salesman_channels/index.html.erb index 237ef61d5..75847a542 100644 --- a/app/views/admins/salesman_channels/index.html.erb +++ b/app/views/admins/salesman_channels/index.html.erb @@ -7,13 +7,13 @@ <% end %>
-
+
<%= text_field_tag :start_date, params[:start_date], class: 'form-control start-date mx-0', placeholder: '开始时间' %>
- <%= text_field_tag :end_date, params[:start_date], class: 'form-control end-date mx-0', placeholder: '结束时间' %> + <%= text_field_tag :end_date, params[:end_date], class: 'form-control end-date mx-0', placeholder: '结束时间' %>
@@ -21,9 +21,10 @@ <%= text_field_tag :keyword, params[:keyword], placeholder: 'ID/单位名称检索', class: 'form-control mx-3 search-input' %> <%= javascript_void_link '搜索', class: 'btn btn-primary search-btn', target: '' %> +
- <%= javascript_void_link '新增渠道', class: 'btn btn-primary', data: {salesman_id: @salesman.id, toggle: 'modal', target: '.admin-add-salesman-channel-user-modal' } %> + <%= javascript_void_link '新增渠道', class: 'btn btn-primary', data: {toggle: 'modal', target: '.admin-add-salesman-channel-user-modal' } %>
diff --git a/app/views/admins/salesman_channels/shared/_add_salesman_channels_user_modal.html.erb b/app/views/admins/salesman_channels/shared/_add_salesman_channels_user_modal.html.erb index 9c435178d..121e711be 100644 --- a/app/views/admins/salesman_channels/shared/_add_salesman_channels_user_modal.html.erb +++ b/app/views/admins/salesman_channels/shared/_add_salesman_channels_user_modal.html.erb @@ -8,13 +8,12 @@