educode_sales 1.10.21 → 1.10.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d2ef3de0cf042aac3ccbab794698672f1023a85ca02955c411b4edf4f9a20c9
-  data.tar.gz: 3c5c9fcb1bbeb580f6869ef75016007de086c3d4a684cfe6cf8982c842e026bc
+  metadata.gz: ac157bfbdbc5c1aceeef3b0d0af4b81e74b6835ddda09a5beae4188f23720391
+  data.tar.gz: a4f7c4077fc9af0f5374fc3efec8bf42e5c3a57a27dc78090a5727cabe2f5510
 SHA512:
-  metadata.gz: 10cd26f67854df2f38eba390682d6372101a9796a9854c11db94f1c639e2173efd704c0204fca396bb72d2f1a056a7970f53d67bba2873f19025c88f0d673d7d
-  data.tar.gz: 4213ae7c4af6f959a5baf3fd30f12c622707b58480fe7eb2894e3d31220a4a433a046a989ff19ceff78ae6f5e0323f53e4954af1c2d209b1703233e196662338
+  metadata.gz: 804531ab845025fe61054b79b248a5f1f83e4194d0c23cad2f0fb4c49978db71eb695815723d50e7255fa35a4aa0b0154babb156fdd5cd953808bb2a1b56a9e9
+  data.tar.gz: 13484d3b014be703413f41b03938881aeb56bd1b7cf97f721f055f9a0aa869dfedc6b948ddbd57bb7b3174c2e3aa171dc7efa5823821f3e2b903e1e1ec9b2591

data/app/controllers/educode_sales/ideas_controller.rb

@@ -3,7 +3,35 @@ require_dependency "educode_sales/application_controller"
 module EducodeSales
   class IdeasController < ApplicationController
 
-    before_action :find_idea, only: [:edit, :destroy, :detail, :history, :update]
+    before_action :find_idea, only: [:edit, :destroy, :detail, :history, :update, :assign, :assign_staff, :assign_sale_staff, :update_sale_staff]
+
+    def assign
+      selected_staff_ids = @idea.assist_staff_ids.map(&:to_i)
+      staffs = Staff.where.not(role_id: 11).includes(:user)
+      gon.ideas_staffs = staffs.map { |d| { name: d.user.real_name, value: d.id, selected: selected_staff_ids.include?(d.id) } }
+      render layout: false
+    end
+
+    # 指派协作人  assist_staff_ids协作人
+    def assign_staff
+      @idea.assist_staff_ids = params[:to_id].to_s.split(",")
+      @idea.save
+      render_success
+    end
+
+    def assign_sale_staff
+      selected_staff_ids = Array(@idea.staff_id)
+      staffs = Staff.where.not(role_id: 11).includes(:user)
+      gon.sales_staffs = staffs.map { |d| { name: d.user.real_name, value: d.id, selected: selected_staff_ids.include?(d.id) } }
+      render layout: false
+    end
+
+    # 指派方案经理 staff_id
+    def update_sale_staff
+      @idea.staff_id = params[:to_id]
+      @idea.save
+      render_success
+    end
 
     def index
       respond_to do |format|
@@ -24,16 +52,14 @@ module EducodeSales
             level = @current_admin.role.role_areas.find_by(clazz: '方案管理').try(:level)
             case level
             when '自己'
-              # business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
-              # @businesses = Business.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
-              idea_ids = Idea.all.select { |d| Array(d.other_staff_ids).include?(@current_admin.id) }.map { |d| d.id }
+              idea_ids = Idea.all.select { |d| Array(d.other_staff_ids).include?(@current_admin.id) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id) || d.staff_id == @current_admin.id }.map { |d| d.id }
               @ideas = Idea.where("educode_sales_ideas.creator_id = ? OR educode_sales_ideas.id in (?)", @current_admin.id, idea_ids)
             when '区域'
               # 查看区域商机，需要排除掉其它人员手上的监管学校
               other_staff_school_id = EducodeSales::StaffSchool.where.not(staff_id: @current_admin.id).where("school_id IN (SELECT school_id FROM educode_sales_staff_schools WHERE staff_id = #{@current_admin.id}) IS NOT TRUE").distinct.pluck :school_id
 
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
-              idea_ids = Idea.all.select { |d| Array(d.other_staff_ids).include?(@current_admin.id) }.map { |d| d.id }
+              idea_ids = Idea.all.select { |d| Array(d.other_staff_ids).include?(@current_admin.id) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id) || d.staff_id == @current_admin.id }.map { |d| d.id }
               @ideas = @ideas.joins(department: :school).where("schools.id in (?) OR educode_sales_ideas.creator_id = ? OR educode_sales_ideas.id in (?)", school_ids, @current_admin.id, idea_ids)
             else
               @ideas = @ideas
@@ -116,8 +142,8 @@ module EducodeSales
         idea.department_id = idea.business&.department_id
       end
       idea.attachment_ids = attachment_ids
-      idea.assist_staff_ids = assist_staff_ids
-      idea.other_staff_ids = other_staff_ids
+      # idea.assist_staff_ids = assist_staff_ids
+      # idea.other_staff_ids = other_staff_ids
       idea.save
       render_success
     end
@@ -134,11 +160,11 @@ module EducodeSales
       @idea.assign_attributes(idea_params)
       # @idea.school_id = Department.find_by_id(@idea.department_id)&.school_id
       assist_staff_ids = Array(params[:assist_staff_ids].to_s.split(","))
-      @idea.assist_staff_ids = assist_staff_ids
+      # @idea.assist_staff_ids = assist_staff_ids
       attachment_ids = Array(params[:attachment_ids].to_s.split(","))
       @idea.attachment_ids = attachment_ids
       other_staff_ids = Array(params[:other_staff_ids].to_s.split(","))
-      @idea.other_staff_ids = other_staff_ids
+      # @idea.other_staff_ids = other_staff_ids
       if @idea.business_id.present?
         @idea.school_id = @idea.business&.department&.school_id
         @idea.department_id = @idea.business&.department_id
@@ -267,7 +293,7 @@ module EducodeSales
       params.permit(:name, :level, :staff_id,
                     :status, :types, :model, :hardware, :project,
                     :money, :end_time, :content, :department_id, :school_id,
-                    :manager_name, :manager_phone, :school_name, :department_name, :sale_staff_id, :attachment_id, :idea_type, :business_id)
+                    :manager_name, :manager_phone, :school_name, :department_name, :attachment_id, :idea_type, :business_id)
     end
 
     def find_idea

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -417,6 +417,49 @@ module EducodeSales
       end
     end
 
+    #拜访分析
+    def visit_analysis
+      sort_by = params[:sort_by].present? ? params[:sort_by] : "desc"
+      user_name = params[:user_name]
+      visit_type = params[:visit_type].present? ? params[:visit_type].split(",") : ""
+      title_names = %w[本年拜访数 本季拜访数 本月拜访数 本周拜访数]
+      respond_to do |format|
+        format.js do
+          @user_names = EducodeSales::Attendance.pluck(:name).uniq.map{|d| {name: d, value: d}}
+          @visit_types  = SaleTrend::VISIT_TYPE.map {|d| {name: d[0], value: d[1]}}
+          sql = "SELECT name, count(*) as name_count FROM `educode_sales_attendances` WHERE (attendance_date >= '#{Time.now.beginning_of_year}' and attendance_date <= '#{Time.now.end_of_year}') group by name order by name_count desc limit 30"
+          visit_count = EducodeSales::Attendance.find_by_sql(sql).map{|d| [d.name, d.name_count]}
+          #年拜访量前30的用户名
+          top_thirty_username = visit_count.map{ |d| d[0]}
+          @visit_count_data = visit_user_type_name(top_thirty_username, sort_by, visit_type, title_names)
+        end
+        format.json do
+          if params[:user_type].present? && params[:user_type] == "name"
+            if user_name.present?
+              sql_by_name = "SELECT name, count(*) as name_count FROM `educode_sales_attendances` WHERE (attendance_date >= '#{Time.now.beginning_of_year}' and attendance_date <= '#{Time.now.end_of_year}') and name like '%#{user_name}%' group by name"
+            else
+              sql_by_name = "SELECT name, count(*) as name_count FROM `educode_sales_attendances` WHERE (attendance_date >= '#{Time.now.beginning_of_year}' and attendance_date <= '#{Time.now.end_of_year}') group by name order by name_count desc limit 30"
+            end
+            visit_count = EducodeSales::Attendance.find_by_sql(sql_by_name).map{|d| [d.name, d.name_count]}
+            #年拜访量前30的用户名
+            top_thirty_username = visit_count.map{ |d| d[0]}
+            @visit_count_data = visit_user_type_name(top_thirty_username, sort_by, visit_type, title_names)
+          else
+            if user_name.present?
+              sql_by_customer = "SELECT name, customer, count(*) as customer_count FROM `educode_sales_attendances` WHERE (attendance_date >= '#{Time.now.beginning_of_year}' and attendance_date <= '#{Time.now.end_of_year}') and name like '%#{user_name}%' group by customer order by customer_count desc limit 30"
+            else
+              sql_by_customer = "SELECT name, customer, count(*) as customer_count FROM `educode_sales_attendances` WHERE (attendance_date >= '#{Time.now.beginning_of_year}' and attendance_date <= '#{Time.now.end_of_year}') group by customer order by customer_count desc limit 30"
+            end
+            visit_count = EducodeSales::Attendance.find_by_sql(sql_by_customer).map{|d| [d.customer, d.customer_count]}
+            #年拜访量前30的用户名
+            top_thirty_customer = visit_count.map{ |d| d[0]}
+            @visit_count_data = visit_user_type_customer(top_thirty_customer, sort_by, visit_type, title_names)
+          end
+          render json: {data: @visit_count_data }
+        end
+      end
+    end
+
     private
 
     def sale_trend_params
@@ -802,5 +845,64 @@ module EducodeSales
       @forecast_count_data_1 = @forecast_count_data[1]
     end
 
+    def visit_user_type_name(top_thirty_username, sort_by, visit_type, title_names)
+      #本年拜访数
+      visit_count_year = EducodeSales::Attendance.where("name in (?)", top_thirty_username)
+                               .where(" attendance_date >= '#{Time.now.beginning_of_year}' and attendance_date <= '#{Time.now.end_of_year}' ")
+                               .group(:name).select("name, count(*) name_count").order("name_count #{sort_by}")&.map{ |d| [d.name, d.name_count]}
+
+      #本季拜访数
+      current_year = Time.now.year
+      current_month = Time.now.month
+      start_month = (current_month - 1) / 3 * 3 + 1
+      end_month = start_month + 2
+      start_date = Date.new(current_year, start_month, 1).strftime("%Y-%m-%d") + " 00:00:00"
+      end_date = Date.new(current_year, end_month, -1).strftime("%Y-%m-%d") + " 23:59:59"
+      visit_count_season = EducodeSales::Attendance.where("name in (?)", top_thirty_username)
+                               .where("attendance_date >= '#{start_date}' and attendance_date <= '#{end_date}'")
+                               .group(:name).select("name, count(*) name_count").order("name_count #{sort_by}")&.map{ |d| [d.name, d.name_count]}
+
+      #本月拜访数
+      visit_count_month =  EducodeSales::Attendance.where("name in (?)", top_thirty_username)
+                               .where("attendance_date >= '#{Time.now.beginning_of_month}' and attendance_date <= '#{Time.now.end_of_month}'")
+                               .group(:name).select("name, count(*) name_count").order("name_count #{sort_by}")&.map{ |d| [d.name, d.name_count]}
+
+      #本周拜访数
+      visit_count_week =  EducodeSales::Attendance.where("name in (?)", top_thirty_username)
+                              .where("attendance_date >= '#{Time.now.beginning_of_week}' and attendance_date <= '#{Time.now.end_of_week}'")
+                              .group(:name).select("name, count(*) name_count").order("name_count #{sort_by}")&.map{ |d| [d.name, d.name_count]}
+
+      visit_analysis_charts(visit_count_year, visit_count_season, visit_count_month, visit_count_week, visit_type, title_names)
+    end
+
+    def visit_user_type_customer(top_thirty_customer, sort_by, visit_type, title_names)
+      #本年拜访数
+      visit_count_year = EducodeSales::Attendance.where("customer in (?)", top_thirty_customer)
+                             .where(" attendance_date >= '#{Time.now.beginning_of_year}' and attendance_date <= '#{Time.now.end_of_year}' ")
+                             .group(:customer).select("customer, count(*) customer_count").order("customer_count #{sort_by}")&.map{ |d| [d.customer, d.customer_count]}
+
+      #本季拜访数
+      current_year = Time.now.year
+      current_month = Time.now.month
+      start_month = (current_month - 1) / 3 * 3 + 1
+      end_month = start_month + 2
+      start_date = Date.new(current_year, start_month, 1).strftime("%Y-%m-%d") + " 00:00:00"
+      end_date = Date.new(current_year, end_month, -1).strftime("%Y-%m-%d") + " 23:59:59"
+      visit_count_season = EducodeSales::Attendance.where("customer in (?)", top_thirty_customer)
+                               .where("attendance_date >= '#{start_date}' and attendance_date <= '#{end_date}'")
+                               .group(:customer).select("customer, count(*) customer_count").order("customer_count #{sort_by}")&.map{ |d| [d.customer, d.customer_count]}
+
+      #本月拜访数
+      visit_count_month =  EducodeSales::Attendance.where("customer in (?)", top_thirty_customer)
+                               .where("attendance_date >= '#{Time.now.beginning_of_month}' and attendance_date <= '#{Time.now.end_of_month}'")
+                               .group(:customer).select("customer, count(*) customer_count").order("customer_count #{sort_by}")&.map{ |d| [d.customer, d.customer_count]}
+
+      #本周拜访数
+      visit_count_week =  EducodeSales::Attendance.where("customer in (?)", top_thirty_customer)
+                              .where("attendance_date >= '#{Time.now.beginning_of_week}' and attendance_date <= '#{Time.now.end_of_week}'")
+                              .group(:customer).select("customer, count(*) customer_count").order("customer_count #{sort_by}")&.map{ |d| [d.customer, d.customer_count]}
+
+      visit_analysis_charts(visit_count_year, visit_count_season, visit_count_month, visit_count_week, visit_type, title_names)
+    end
   end
 end

data/app/helpers/educode_sales/sale_trends_helper.rb

@@ -247,6 +247,86 @@ module EducodeSales
       [hash_a, hash_b]
     end
 
+    def visit_analysis_charts(visit_count_year, visit_count_season, visit_count_month, visit_count_week, visit_type, title_names)
+      names =  visit_count_year.map{|d| d[0]}
+
+      visit_count_season_data = []
+      names.each do |name|
+        data = visit_count_season.find { |d| d[0] == name}
+        if data
+          visit_count_season_data << data
+        else
+          visit_count_season_data << [name, 0]
+        end
+      end
+
+      visit_count_month_data = []
+      names.each do |name|
+        data = visit_count_month.find { |d| d[0] == name}
+        if data
+          visit_count_month_data << data
+        else
+          visit_count_month_data << [name, 0]
+        end
+      end
+
+      visit_count_week_data = []
+      names.each do |name|
+        data = visit_count_week.find { |d| d[0] == name}
+        if data
+          visit_count_week_data << data
+        else
+          visit_count_week_data << [name, 0]
+        end
+      end
+
+      year = {
+          label: title_names[0],
+          data: visit_count_year.map {|d| d[1].to_i},
+          backgroundColor: 'rgba(255, 99, 132, 1)'}
+
+      season = {
+          label: title_names[1],
+          data: visit_count_season_data.map {|d| d[1].to_i},
+          backgroundColor: 'rgba(255, 159, 64, 1)'}
+
+      month = {
+          label: title_names[2],
+          data:visit_count_month_data.map {|d| d[1].to_i},
+          backgroundColor: 'rgba(54, 162, 235, 1)'}
+
+      week = {
+          label: title_names[3],
+          data: visit_count_week_data.map {|d| d[1].to_i},
+          backgroundColor: 'rgba(153, 102, 255, 1)'}
+
+      final_data = []
+      if visit_type.include?("1")
+        final_data << year
+      end
+      if visit_type.include?("2")
+        final_data << season
+      end
+      if visit_type.include?("3")
+        final_data << month
+      end
+      if visit_type.include?("4")
+        final_data << week
+      end
+
+      if visit_type.present?
+        {
+            labels: names,
+            datasets: final_data
+        }
+      else
+        {
+            labels: names,
+            datasets: [year, season, month, week]
+        }
+      end
+    end
+
     private
 
     def plan_get(staff_id, time_range, type, property)

data/app/models/educode_sales/sale_trend.rb

@@ -9,5 +9,7 @@ module EducodeSales
       '#DC7633', '#839192', '#6C3483', '#B03A2E', '#7B7D7D', '#4D5656', '#28B463', '#0E6655', '#F39C12', '#0E6251', '#1B4F72',
       '#FAE5D3', '#82E0AA', '#FF00FF', '#663399', '#4B0082', '#7CFC00'
     ]
+
+    VISIT_TYPE = [["本年拜访数", 1],["本季拜访数", 2],["本月拜访数", 3],["本周拜访数", 4]]
   end
 end

data/app/views/educode_sales/ideas/_index.html.erb

@@ -102,6 +102,8 @@
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_recycle_s">恢复</a>
   <% end %>
   {{# }else{}}
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="assign">指派协作人</a>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="assign_sale_staff">指派方案经理</a>
   <% if can? :add_follow, EducodeSales::Idea %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-add_follow" lay-event="add_follows">添加跟进</a>
   <% end %>
@@ -256,7 +258,7 @@
                 },
                 {
                     title: '操作',
-                    minWidth: 500,
+                    minWidth: 700,
                     toolbar: '#currentTableBar',
                     align: "center",
                     fixed: 'right'
@@ -453,6 +455,40 @@
                 $(window).on("resize", function () {
                     layer.full(followup_index);
                 });
+            } else if (obj.event === 'assign') { //协作人
+                var content = miniPage.getHrefContent('/missions/ideas/' + id + '/assign');
+                var openWH = miniPage.getOpenWidthHeight();
+                var name = data.name;
+                sindex = layer.open({
+                    title: '指派协作人',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['600px', '300px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                    layer.full(sindex);
+                });
+                return false;
+            } else if (obj.event === 'assign_sale_staff') { //指派方案经理
+                var content = miniPage.getHrefContent('/missions/ideas/' + id + '/assign_sale_staff');
+                var openWH = miniPage.getOpenWidthHeight();
+                var name = data.name;
+                sindex = layer.open({
+                    title: "指派方案经理",
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['600px', '300px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                    layer.full(sindex);
+                });
+                return false;
             } else if (obj.event === 'idea_recycle') {
                 layer.confirm('确定删除' + data.name, function (index) {
                     request.delete('missions/ideas/' + id, {}, function (res) {

data/app/views/educode_sales/ideas/assign.html.erb

@@ -0,0 +1,45 @@
+<%= Gon::Base.render_data %>
+<div class="layui-form layuimini-form" style="padding:30px">
+  <div class="layui-form-item">
+    <label class="layui-form-label required">选择协作人：</label>
+    <div class="layui-input-block" style="width: 300px">
+      <div id="sales_staff_id"></div>
+    </div>
+  </div>
+  <hr>
+  <div class="layui-form-item">
+    <div class="layui-input-block">
+      <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+    </div>
+  </div>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+        staff_list_select = xmSelect.render({
+            el: '#sales_staff_id',
+            data: gon.ideas_staffs,
+            filterable: true,
+            radio: false,
+        })
+        var parentIndex = layer.index;
+        form.on('submit(saveBtn)', function (data) {
+            layer.confirm('确定指派协作人?', function (index) {
+                request.post('missions/ideas/' + parent.id + "/assign_staff", {to_id: staff_list_select.getValue('valueStr')}, function (res) {
+                    layer.close(index);
+                    layer.close(parentIndex)
+                    parent.table.reload('ideas_table')
+                })
+            });
+            return false;
+        });
+    });
+</script>

data/app/views/educode_sales/ideas/assign_sale_staff.html.erb

@@ -0,0 +1,45 @@
+<%= Gon::Base.render_data %>
+<div class="layui-form layuimini-form" style="padding:30px">
+  <div class="layui-form-item">
+    <label class="layui-form-label required">选择方案经理：</label>
+    <div class="layui-input-block" style="width: 300px">
+      <div id="sales_id"></div>
+    </div>
+  </div>
+  <hr>
+  <div class="layui-form-item">
+    <div class="layui-input-block">
+      <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+    </div>
+  </div>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+        staff_list_select = xmSelect.render({
+            el: '#sales_id',
+            data: gon.sales_staffs,
+            filterable: true,
+            radio: true,
+        })
+        var parentIndex = layer.index;
+        form.on('submit(saveBtn)', function (data) {
+            layer.confirm('确定指派方案经理?', function (index) {
+                request.post('missions/ideas/' + parent.id + "/update_sale_staff", {to_id: staff_list_select.getValue('valueStr')}, function (res) {
+                    layer.close(index);
+                    layer.close(parentIndex)
+                    parent.table.reload('ideas_table')
+                })
+            });
+            return false;
+        });
+    });
+</script>

data/app/views/educode_sales/ideas/edit.html.erb

@@ -41,20 +41,20 @@
           </div>
         </div>
         <div class="layui-col-md6">
-          <labeL class="layui-form-label">协作人:</labeL>
+          <labeL class="layui-form-label required">项目名称:</labeL>
           <div class="layui-input-block">
-            <div id="assist_staff_ids"></div>
+            <div id="business_id" style="width: 600px;"></div>
           </div>
         </div>
-      </div>
-      <div class="layui-row" style="padding-top: 15px">
-        <div class="layui-col-md6">
-          <labeL class="layui-form-label required">项目名称:</labeL>
+        <div class="layui-col-md6" style="display: none">
+          <labeL class="layui-form-label">协作人:</labeL>
           <div class="layui-input-block">
-            <div id="business_id" style="width: 600px;"></div>
+            <div id="assist_staff_ids"></div>
           </div>
         </div>
-        <div class="layui-col-md6">
+      </div>
+      <div class="layui-row" style="padding-top: 15px;display: none">
+        <div class="layui-col-md6" style="display: none">
           <labeL class="layui-form-label">方案经理:</labeL>
           <div class="layui-input-block">
             <div id="new_staff_id"></div>
@@ -96,7 +96,7 @@
             <%= select_tag "idea_type", options_for_select(EducodeSales::Idea.idea_types.keys, @idea&.idea_type), { 'lay-filter': 'idea_type', include_blank: false } %>
           </div>
         </div>
-        <div class="layui-col-md6">
+        <div class="layui-col-md6" style="display: none">
           <labeL class="layui-form-label">指派人:</labeL>
           <div class="layui-input-block">
             <div id="other_staff_ids"></div>

data/app/views/educode_sales/ideas/new.html.erb

@@ -41,20 +41,20 @@
           </div>
         </div>
         <div class="layui-col-md6">
-          <labeL class="layui-form-label">协作人:</labeL>
+          <labeL class="layui-form-label required">项目名称:</labeL>
           <div class="layui-input-block">
-            <div id="assist_staff_ids"></div>
+            <div id="business_id" style="width: 600px;"></div>
           </div>
         </div>
-      </div>
-      <div class="layui-row" style="padding-top: 15px">
-        <div class="layui-col-md6">
-          <labeL class="layui-form-label required">项目名称:</labeL>
+        <div class="layui-col-md6" style="display: none">
+          <labeL class="layui-form-label">协作人:</labeL>
           <div class="layui-input-block">
-            <div id="business_id" style="width: 600px;"></div>
+            <div id="assist_staff_ids"></div>
           </div>
         </div>
-        <div class="layui-col-md6">
+      </div>
+      <div class="layui-row" style="padding-top: 15px;display: none">
+        <div class="layui-col-md6" style="display: none">
           <labeL class="layui-form-label">方案经理:</labeL>
           <div class="layui-input-block">
             <div id="new_staff_id"></div>
@@ -96,7 +96,7 @@
             <%= select_tag "idea_type", options_for_select(EducodeSales::Idea.idea_types.keys, @idea&.idea_type), { 'lay-filter': 'idea_type', include_blank: false } %>
           </div>
         </div>
-        <div class="layui-col-md6">
+        <div class="layui-col-md6" style="display: none">
           <labeL class="layui-form-label">指派人:</labeL>
           <div class="layui-input-block">
             <div id="other_staff_ids"></div>

data/app/views/educode_sales/sale_trends/_visit_analysis.html.erb

@@ -0,0 +1,187 @@
+<div id="tab_8">
+  <div class="" style="padding-right: 50px">
+    <div style="margin: 10px 10px 10px 10px">
+      <form class="layui-form layui-form-pane" lay-filter="search_visit_form">
+        <div class="layui-form-item">
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">维度</label>
+            <div class="layui-input-inline">
+              <%= select_tag "user_type", options_for_select([['按销售经理','name'],['按客户','customer']],params[:user_type]), {'lay-filter': 'user_type'}%>
+            </div>
+          </div>
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">拜访统计</label>
+            <div class="layui-input-inline">
+              <div id="visit_type"></div>
+            </div>
+          </div>
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">销售经理</label>
+            <div class="layui-input-inline">
+              <div id="user_name"></div>
+            </div>
+          </div>
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">排序</label>
+            <div class="layui-input-inline">
+              <%= select_tag "sort_by",  options_for_select([['', ''], ['升序', 'asc'], ['降序', 'desc']], params[:sort_by]), { include_blank: true } %>
+            </div>
+          </div>
+          <div class="layui-inline">
+            <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_visit_search">重 置</button>
+            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_visit">搜 索</button>
+          </div>
+        </div>
+      </form>
+    </div>
+    <canvas id="visit_myChart" width="960" height="350"></canvas>
+    <div class="two-header" style="margin-top: 30px;">
+      <table id="visit_table" lay-filter="visit_table"></table>
+    </div>
+  </div>
+</div>
+<script>
+    layui.use(['form', 'jquery', 'request', 'element', 'laydate', 'table', 'miniPage'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request;
+
+        //拜访统计选择
+        var visit_type_select = xmSelect.render({
+            el: '#visit_type',
+            name: 'visit_type',
+            data: <%=raw @visit_types.to_json %>,
+        });
+        //销售经理选择
+        var user_name_select = xmSelect.render({
+            el: '#user_name',
+            name: 'user_name',
+            data: <%=raw @user_names.to_json %>,
+            filterable: true,
+            radio: true
+        });
+
+        var options = {
+            events: false,
+            scales: {
+                yAxes: [{
+                    ticks: {
+                        suggestedMin: 0,
+                        suggestedMax: 200,
+                        stepSize: 20
+                    }
+                }]
+            },
+            hover: {
+                animationDuration: 1
+            },
+            animation: {
+                duration: 1,
+                onComplete: function () {
+                    var chartInstance = this.chart,
+                        ctx = chartInstance.ctx;
+                    ctx.font = Chart.helpers.fontString(Chart.defaults.global.defaultFontSize, Chart.defaults.global.defaultFontStyle, Chart.defaults.global.defaultFontFamily);
+                    ctx.textAlign = 'center';
+                    ctx.textBaseline = 'bottom';
+
+                    this.data.datasets.forEach(function (dataset, i) {
+                        var meta = chartInstance.controller.getDatasetMeta(i);
+                        meta.data.forEach(function (bar, index) {
+                            var data = dataset.data[index];
+                            ctx.fillText(data, bar._model.x, bar._model.y - 5);
+                        });
+                    });
+                }
+            }
+        };
+
+        visit_count_data = <%=raw @visit_count_data.to_json %>;
+
+        //条形图
+        var ctx = document.getElementById('visit_myChart').getContext("2d");
+        var visit_myChart = new Chart(ctx, {
+            type: 'bar',
+            data: visit_count_data,
+            options: options
+        });
+
+        //重置按钮
+        form.on('submit(reset_visit_search)', function () {
+            form.val('search_visit_form', {
+                sort_by: ""
+            });
+            visit_type_select.setValue([]);
+            user_name_select.setValue([]);
+            return false;
+        });
+
+        //渲染表格
+        function renderTable(visit_count_data) {
+            var labels = [];
+            fields = [{field: 'col0', title: '', width:100}];
+            visit_count_data.labels.forEach(function (data, i) {
+                labels.push(data);
+                fields.push({field: 'col' + (i + 1), title: data, width: 100, align: 'center'})
+            });
+            var table_data = [];
+            visit_count_data.datasets.forEach(function (visit_data) {
+                var value = {};
+                value['col0'] = visit_data.label;
+                visit_data.data.forEach(function (v, i) {
+                    value['col' + (i + 1)] = v
+                });
+                table_data.push(value)
+            });
+            table.render({
+                elem: '#visit_table',
+                height: 230,
+                limit: 1000,
+                page: false,
+                data: table_data,
+                cols: [fields]
+            });
+        }
+
+        renderTable(visit_count_data);
+        form.render();
+
+        //搜索监听
+        form.on("submit(search_visit)", function(data) {
+            var layer_index = layer.load(0, {shade: [0.1, '#fff']});
+            var visit_type_value = [];
+            if (document.getElementById('visit_type')) {
+                visit_type_select.getValue().forEach(function (d) {
+                    visit_type_value.push(d.value)
+                })
+            }
+            data.field.visit_type = visit_type_value.join(",");
+            Rails.ajax({
+                url: '/missions/sale_trends/visit_analysis',
+                type: 'GET',
+                dataType: "json",
+                data: $.param(data.field, true),
+                success: function (res) {
+                    visit_myChart.data.datasets = res.data.datasets;
+                    visit_myChart.data.labels = res.data.labels;
+                    visit_myChart.update();
+                    renderTable(res.data);
+                    layer.close(layer_index);
+
+                }
+            });
+            return false;
+        });
+    });
+</script>
+
+
+
+
+
+
+
+
+
+
+

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -7,6 +7,7 @@
     <li class="">销售人员跟进分析</li>
     <li class="">中标预测图</li>
     <li class="">用户分析</li>
+    <li class="">拜访分析</li>
   </ul>
   <div class="layui-tab-content">
     <div class="layui-tab-item layui-show">
@@ -238,6 +239,9 @@
     <div class="layui-tab-item">
       <div id="page_7"></div>
     </div>
+    <div class="layui-tab-item">
+      <div id="page_8"></div>
+    </div>
   </div>
 </div>
 
@@ -264,6 +268,8 @@
                 loadPage('/missions/sale_trends/goal_forecast')
             } else if (data.index == 6 && $("#tab_7").length == 0) {
                 loadPage('/missions/sale_trends/user_stat')
+            } else if (data.index == 7 && $("#tab_8").length == 0) {
+                loadPage('/missions/sale_trends/visit_analysis')
             }
         });
 

data/app/views/educode_sales/sale_trends/visit_analysis.js.erb

@@ -0,0 +1 @@
+$("#page_8").html("<%= j render 'visit_analysis' %>");

data/config/routes.rb

@@ -173,6 +173,7 @@ EducodeSales::Engine.routes.draw do
       get :sales_followup_analysis
       get :goal_forecast
       get :user_stat
+      get :visit_analysis
     end
   end
 
@@ -383,6 +384,10 @@ EducodeSales::Engine.routes.draw do
       get :upload_file
     end
     member do
+      get :assign
+      post :assign_staff
+      get :assign_sale_staff
+      post :update_sale_staff
       get :show_schools
       post :follow_up
       put :update_advise

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.21'
+  VERSION = '1.10.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.21
+  version: 1.10.23
 platform: ruby
 authors:
 - anke1460
@@ -418,6 +418,8 @@ files:
 - app/views/educode_sales/ideas/add_courses.html.erb
 - app/views/educode_sales/ideas/add_event.html.erb
 - app/views/educode_sales/ideas/add_keys.html.erb
+- app/views/educode_sales/ideas/assign.html.erb
+- app/views/educode_sales/ideas/assign_sale_staff.html.erb
 - app/views/educode_sales/ideas/course_list.json.jbuilder
 - app/views/educode_sales/ideas/course_subject.json.jbuilder
 - app/views/educode_sales/ideas/daily_paper.html.erb
@@ -572,6 +574,7 @@ files:
 - app/views/educode_sales/sale_trends/_sales_analysis.html.erb
 - app/views/educode_sales/sale_trends/_sales_followup_analysis.html.erb
 - app/views/educode_sales/sale_trends/_user_stat.html.erb
+- app/views/educode_sales/sale_trends/_visit_analysis.html.erb
 - app/views/educode_sales/sale_trends/business_area.js.erb
 - app/views/educode_sales/sale_trends/business_followup_analysis.js.erb
 - app/views/educode_sales/sale_trends/goal_forecast.js.erb
@@ -581,6 +584,7 @@ files:
 - app/views/educode_sales/sale_trends/trends.html.erb
 - app/views/educode_sales/sale_trends/trends.json.jbuilder
 - app/views/educode_sales/sale_trends/user_stat.js.erb
+- app/views/educode_sales/sale_trends/visit_analysis.js.erb
 - app/views/educode_sales/sales/index.html.erb
 - app/views/educode_sales/sales/index.json.jbuilder
 - app/views/educode_sales/sales/operations.html.erb