diff --git a/app/assets/javascripts/admins/salesman_customers/index.js b/app/assets/javascripts/admins/salesman_customers/index.js index 2227cb43f..607e01f2e 100644 --- a/app/assets/javascripts/admins/salesman_customers/index.js +++ b/app/assets/javascripts/admins/salesman_customers/index.js @@ -1,16 +1,16 @@ $(document).on('turbolinks:load', function() { - if ($('body.admins-salesmans-index-page').length > 0) { + if ($('body.admins-salesman-customers-index-page').length > 0) { // ============= 添加销售人员 ============== var $addMemberModal = $('.admin-add-salesman-customer-user-modal'); var $addMemberForm = $addMemberModal.find('.admin-add-salesman-customer-user-form'); - var $memberSelect = $addMemberModal.find('.salesman-user-select'); - // var $salesmanIdInput = $addMemberForm.find('input[name="salesman_id"]') + var $memberSelect = $addMemberModal.find('.salesman-customer-user-select'); + var $salesmanIdInput = $('.salesman-customer-list-form').find(".btn-primary"); $addMemberModal.on('show.bs.modal', function(event){ var $link = $(event.relatedTarget); - var salesmanId = $link.data('salesman-id'); - $salesmanIdInput.val(salesmanId); + // var salesmanId = $link.data('salesman_id'); + // $salesmanIdInput.val(salesmanId); $memberSelect.select2('val', ' '); }); @@ -52,7 +52,7 @@ $(document).on('turbolinks:load', function() { method: 'POST', dataType: 'json', url: '/admins/salesman_customers/batch_add', - data: { user_ids: memberIds }, + data: { salesman_id: $salesmanIdInput.data("salesman-id"), user_ids: memberIds }, success: function(){ $.notify({ message: '创建成功' }); $addMemberModal.modal('hide'); diff --git a/app/controllers/admins/salesman_customers_controller.rb b/app/controllers/admins/salesman_customers_controller.rb index 1c57d4862..3fa63f147 100644 --- a/app/controllers/admins/salesman_customers_controller.rb +++ b/app/controllers/admins/salesman_customers_controller.rb @@ -5,6 +5,21 @@ class Admins::SalesmanCustomersController < Admins::BaseController @customers = @salesman.salesman_customers.includes(:user, :school) end + def batch_add + customer_ids = @salesman.salesman_customers.pluck(:user_id) + user_ids = params[:user_ids] - customer_ids + user_ids.each do |user_id| + user = UserExtension.find_by(user_id: user_id) + next if user.blank? + @salesman.salesman_customers.create!(user_id: user.user_id, school_id: user.school_id) + end + render_ok + end + + def destroy + @salesman.salesman_customers.find_by!(id: params[:id]).destroy + end + private def set_salesman @salesman = Salesman.find params[:salesman_id] diff --git a/app/views/admins/salesman_customers/destroy.js.erb b/app/views/admins/salesman_customers/destroy.js.erb new file mode 100644 index 000000000..d00e4fa08 --- /dev/null +++ b/app/views/admins/salesman_customers/destroy.js.erb @@ -0,0 +1,2 @@ +$.notify({ message: '操作成功' },{ type: 'success' }); +$("<%= params[:element]%>").remove(); \ No newline at end of file diff --git a/app/views/admins/salesman_customers/shared/_list.html.erb b/app/views/admins/salesman_customers/shared/_list.html.erb index bf8390cdf..21e639865 100644 --- a/app/views/admins/salesman_customers/shared/_list.html.erb +++ b/app/views/admins/salesman_customers/shared/_list.html.erb @@ -4,8 +4,9 @@