educode_sales 1.10.41 → 1.10.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75f1104743151bb685cb17c27471acf756a43103c059b78fdbbc85d897008420
-  data.tar.gz: 1abca2361e351da1e62f2a04e1a98c72e01f953ab653d6e6fc3904294532e38e
+  metadata.gz: da45d6ae994d92a3ef3274e654b591e9165ba976e765e2c8e09b786f7f0b5c05
+  data.tar.gz: fe907bc45b55f7dbe5b454eb785693302f460622576a7a14cde80efc9cf3d293
 SHA512:
-  metadata.gz: b93100ae277a43e93b44ed6ba56433123a8427d44b34ec3706b09e62987698d3672b81f8322bc6fc4af43f0e4ea0b2758b71e11368b87b33d7225ca28287b0a2
-  data.tar.gz: 1ddb1e12b4f3102d9ad751d04fc00975cd18c765fa378f454862a73e8f2927b8cc3810ad151ae06b9d1451a26bfb2604ec730822dc63a72da23449d9fe948b17
+  metadata.gz: 8dc1ac6fd68d7a04df6f28d39a74f565701600b25348c60a6586f3b8027f63b796132489e6f0dd37e4a896ee9241f44c5764ec5f4fb2e740b38033060c0ff10f
+  data.tar.gz: b3b6130b8e98a8b5bdd05281af4f7faf27e690725de86337fec94abf974b8be798f8a451ed4f549affbe8e548bd66bd485b3f177a80b70e57f74f59c49459fe1

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -114,11 +114,15 @@ module EducodeSales
       last_follow_up = @business.last_follow_up
       if @business.clazz.present?
         follow_up.clazz_changed = @business.clazz_id != follow_up.clazz_id
-        if follow_up.clazz_changed 
+        if follow_up.clazz_changed
           if @business.clazz.extras == 'a_class'
             @business.state_id = 3
           end
-          clazz_changes = "#{@business.clazz.extras.split('_')[0]}-#{follow_up.clazz.extras.split('_')[0]}"
+          if @business.clazz.extras.present? && follow_up.clazz.extras.present?
+            clazz_changes = "#{@business.clazz.extras.split('_')[0]}-#{follow_up.clazz.extras.split('_')[0]}"
+          else
+            clazz_changes = "-"
+          end
           business_clazz_change = EducodeSales::BusinessClazzChange.find_or_initialize_by(business_id: @business.id, clazz_changed: clazz_changes)
           business_clazz_change.save unless business_clazz_change.persisted?
         end

data/app/controllers/educode_sales/plans_controller.rb

@@ -510,6 +510,20 @@ module EducodeSales
       @months = (1..12).map { |d| d }
     end
 
+
+    def target_track
+      respond_to do |format|
+        format.html do
+         
+        end
+        format.js do
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+          gon.school_tags = SchoolTag.where(for_missions: true).map { |d| {value: d.id, name: d.name } }
+        end
+      end
+    end
+
     private
 
     def plan_params

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -418,6 +418,15 @@ module EducodeSales
       end
     end
 
+    #回款预测图
+    def return_money_forecast
+      respond_to do |format|
+        format.js do
+          return_forecast_by_money
+        end
+      end
+    end
+
     def user_stat
       respond_to do |format|
         format.html do
@@ -927,5 +936,61 @@ module EducodeSales
 
       visit_analysis_charts(visit_count_year, visit_count_season, visit_count_month, visit_count_week, visit_type, title_names)
     end
+
+
+    def return_forecast_by_money
+      property = params[:property] || nil
+      staff_id = params[:staff_id] || nil
+      @forecast_count_range = params[:forecast_count_range] || "month"
+      forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%m") }.uniq
+      sale_names = %w[实际回款额 计划回款额 实际回款 计划回款额-全部 计划回款额-o类]
+      case @forecast_count_range
+      when "week"
+        # 年初第一天周数是0会导致周数重复计算
+        if params[:forecast_date_day].present?
+          date = params[:forecast_date_day].split(" - ")
+          dates = (date[0].to_date..date[1].to_date).map { |d| d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
+          @return_forecast_count_data = return_money_forecast_week(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
+          @return_forecast_count_data = return_money_forecast_week(forecast_default_dates, sale_names, staff_id, property)
+        end
+      when "quarter"
+        # 按年
+        if params[:forecast_date_year].present?
+          date = params[:forecast_date_year].split(" - ")
+          dates = (date[0]..date[1]).to_a
+          dates = dates.map { |d| [d.to_s + "-" + "1", d.to_s + "-" + "2", d.to_s + "-" + "3", d.to_s + "-" + "4"] }.flatten
+          @return_forecast_count_data = return_money_forecast_quarter(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
+          forecast_default_dates = forecast_default_dates.map { |d| [d.to_s + "-" + "1", d.to_s + "-" + "2", d.to_s + "-" + "3", d.to_s + "-" + "4"] }.flatten
+          @return_forecast_count_data = return_money_forecast_quarter(forecast_default_dates, sale_names, staff_id, property)
+        end
+      when "month" # 按月
+        if params[:forecast_date_month].present?
+          date = params[:forecast_date_month].split(" - ")
+          date[0] = (date[0] + "-01").to_date.to_s
+          date[1] = (date[1] + "-01").to_date.end_of_month.to_s
+          dates = ((date[0] + "-01").to_date..(date[1] + "-01").to_date).map { |d| d.strftime("%Y-%m") }.uniq
+          @return_forecast_count_data = return_money_forecast_month(dates, sale_names, staff_id, property)
+        else
+          @return_forecast_count_data = return_money_forecast_month(forecast_default_dates, sale_names, staff_id, property)
+        end
+      else
+        # 按年
+        if params[:forecast_date_year].present?
+          date = params[:forecast_date_year].split(" - ")
+          dates = (date[0]..date[1]).to_a
+          @return_forecast_count_data = return_money_forecast_year(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
+          @return_forecast_count_data = return_money_forecast_year(forecast_default_dates, sale_names, staff_id, property)
+        end
+      end
+      @return_forecast_count_data_0 = @return_forecast_count_data[0]
+      @return_forecast_count_data_1 = @return_forecast_count_data[1]
+    end
+
   end
 end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -204,15 +204,31 @@ module EducodeSales
           end
 
           if params[:q].present? && params[:q][:is_contact].present?
-            @teachers = @teachers.where("last_follow.is_contact = ?" , params[:q][:is_contact].to_i)
+            @teachers = @teachers.where("last_follow.is_contact = ?", params[:q][:is_contact].to_i)
           end
-
-          if params[:sort].present? && params[:sort][:field]
+          if params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'created_at'
+            @teachers = @teachers.order("educode_sales_teachers.created_at #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'last_login_on'
+            @teachers = @teachers.order("users.last_login_on #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'created_on'
+            @teachers = @teachers.order("users.created_on #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'latest_time'
+            @teachers = @teachers.order("last_follow.created_at #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'experience'
+            @teachers = @teachers.order("users.experience #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'grade'
+            @teachers = @teachers.order("users.grade #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field]
             @teachers = @teachers.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
             @teachers = @teachers.order("educode_sales_teachers.created_at desc")
           end
-          @teachers = @teachers.page(params[:page]).per(params[:limit])
+          @teachers = @teachers.includes(:teacher_assign_follows, :department, :user, :follow_up, :activity_teachers, [assign_staffs: :staff])
+          if params[:type].to_s == 'export'
+            @teachers = @teachers.page(1).per(1000)
+          else
+            @teachers = @teachers.page(params[:page]).per(params[:limit])
+          end
         end
 
         end

data/app/helpers/educode_sales/sale_trends_helper.rb

@@ -1,6 +1,7 @@
 module EducodeSales
   module SaleTrendsHelper
     NAMES = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
+    RETURN_NAMES = %w[实际回款额 计划回款额 实际回款 计划回款额-全部 计划回款额-o类]
 
     def goal_forecast_quarter(labels, selects, staff_id = nil, property)
       plan_get = plan_get(staff_id, labels, "quarter", property)
@@ -337,6 +338,274 @@ module EducodeSales
       end
     end
 
+
+    def return_money_forecast_week(labels, selects, staff_id = nil, property)
+      plan_return = plan_return(staff_id, labels, "week", property)
+      actual_return = actual_return(staff_id, labels, "week", property)
+      plan_return_by_o = plan_return_by_o(staff_id, labels, "week", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == RETURN_NAMES[0]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   actual_return[yearweek].to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[1]
+                 arr = labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_return[yearweek].to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == RETURN_NAMES[2]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   actual_return[yearweek].to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[3]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_return[yearweek].to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[4]
+                 arr = labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_return_by_o[yearweek].to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                 'bar'
+               else
+                 "line"
+               end
+        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                            'rgba(54, 162, 235, 1)'
+                          else
+                            SaleTrend::COLORS[i]
+                            'rgba(54, 162, 235, 0)'
+                          end
+        {
+            type: type,
+            label: select,
+            data: data&.map { |d| d.round(2) },
+            backgroundColor: backgroundColor,
+            borderColor: SaleTrend::COLORS[i],
+            borderWidth: 1
+        }
+      end
+
+      hash_a = {
+          labels: labels,
+          datasets: [datasets[0], datasets[1]]
+      }
+      hash_b = {
+          labels: labels,
+          datasets: [datasets[2], datasets[3], datasets[4]]
+      }
+      [hash_a, hash_b]
+    end
+
+    def return_money_forecast_quarter(labels, selects, staff_id = nil, property)
+      plan_return = plan_return(staff_id, labels, "quarter", property)
+      actual_return = actual_return(staff_id, labels, "quarter", property)
+      plan_return_by_o = plan_return_by_o(staff_id, labels, "quarter", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == RETURN_NAMES[0]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[1]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == RETURN_NAMES[2]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[3]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[4]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return_by_o[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                 'bar'
+               else
+                 "line"
+               end
+        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                            'rgba(54, 162, 235, 1)'
+                          else
+                            SaleTrend::COLORS[i]
+                            'rgba(54, 162, 235, 0)'
+                          end
+        {
+            type: type,
+            label: select,
+            data: data.map { |d| d.round(2) },
+            backgroundColor: backgroundColor,
+            borderColor: SaleTrend::COLORS[i],
+            borderWidth: 1
+        }
+      end
+
+      hash_a = {
+          labels: labels,
+          datasets: [datasets[0], datasets[1]]
+      }
+      hash_b = {
+          labels: labels,
+          datasets: [datasets[2], datasets[3], datasets[4]]
+      }
+      [hash_a, hash_b]
+    end
+
+
+    def return_money_forecast_month(labels, selects, staff_id = nil, property)
+      plan_return = plan_return(staff_id, labels, "month", property)
+      actual_return = actual_return(staff_id, labels, "month", property)
+      plan_return_by_o = plan_return_by_o(staff_id, labels, "month", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == RETURN_NAMES[0]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[1]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == RETURN_NAMES[2]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[3]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[4]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return_by_o[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                 'bar'
+               else
+                 "line"
+               end
+        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                            'rgba(54, 162, 235, 1)'
+                          else
+                            SaleTrend::COLORS[i]
+                            'rgba(54, 162, 235, 0)'
+                          end
+        {
+            type: type,
+            label: select,
+            data: data.map { |d| d.round(2) },
+            backgroundColor: backgroundColor,
+            borderColor: SaleTrend::COLORS[i],
+            borderWidth: 1
+        }
+      end
+
+      hash_a = {
+          labels: labels,
+          datasets: [datasets[0], datasets[1]]
+      }
+      hash_b = {
+          labels: labels,
+          datasets: [datasets[2], datasets[3], datasets[4]]
+      }
+      [hash_a, hash_b]
+    end
+
+    def return_money_forecast_year(labels, selects, staff_id = nil, property)
+      plan_return = plan_return(staff_id, labels, "year", property)
+      actual_return = actual_return(staff_id, labels, "year", property)
+      plan_return_by_o = plan_return_by_o(staff_id, labels, "year", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == RETURN_NAMES[0]
+                 labels.map { |d| actual_return[d.to_i] || 0 }
+               elsif select == RETURN_NAMES[1]
+                 arr = labels.map { |d| plan_return[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == RETURN_NAMES[2]
+                 labels.map { |d| actual_return[d.to_i] || 0 }
+               elsif select == RETURN_NAMES[3]
+                 labels.map { |d| plan_return[d.to_i] || 0 }
+               elsif select == RETURN_NAMES[4]
+                 arr = labels.map { |d| plan_return_by_o[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                 'bar'
+               else
+                 "line"
+               end
+        backgroundColor = if RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                            'rgba(54, 162, 235, 1)'
+                          else
+                            SaleTrend::COLORS[i]
+                            'rgba(54, 162, 235, 0)'
+                          end
+        {
+            type: type,
+            label: select,
+            data: data.map { |d| d.round(2) },
+            backgroundColor: backgroundColor,
+            borderColor: SaleTrend::COLORS[i],
+            borderWidth: 1
+        }
+      end
+
+      hash_a = {
+          labels: labels,
+          datasets: [datasets[0], datasets[1]]
+      }
+      hash_b = {
+          labels: labels,
+          datasets: [datasets[2], datasets[3], datasets[4]]
+      }
+      [hash_a, hash_b]
+    end
+
     private
 
     def plan_get(staff_id, time_range, type, property)
@@ -433,5 +702,146 @@ module EducodeSales
       end
     end
 
+    def plan_return(staff_id, time_range, type, property)
+      # plan_return_money 计划回款额
+      start_time = case type
+                   when "month"
+                     time_range.first + "-01"
+                   when "year"
+                     time_range.first + "-01-01"
+                   when "week"
+                     time_range.first.split("-").first + "-01-01"
+                   when "quarter"
+                     time_range.first.split("-").first + "-01-01"
+                   end
+      end_time = case type
+                 when "month"
+                   time_range.last + "-31"
+                 when "year"
+                   time_range.last + "-12-31"
+                 when "week"
+                   time_range.last.split("-").first + "-12-31"
+                 when "quarter"
+                   time_range.last.split("-").first + "-12-31"
+                 end
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = Business.joins(:last_follow_up)
+                 .where("educode_sales_follow_ups.plan_return_date >= ? and educode_sales_follow_ups.plan_return_date <= ?", start_time, end_time)
+      if staff_id.present?
+        data = data.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+            where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", staff_id, staff_id)
+      end
+      if property.present?
+        data = data.joins(department: [school: :school_tags]).where("school_tags.id = ?", property)
+      end
+      case type
+      when "week"
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.plan_return_date) as week").group("yearweek(educode_sales_follow_ups.plan_return_date)").sum("educode_sales_follow_ups.plan_return_money")
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.plan_return_date) as quarter, year(educode_sales_follow_ups.invitation_at) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.plan_return_date) as year, month(educode_sales_follow_ups.plan_return_date) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.plan_return_date) as year").group("year(educode_sales_follow_ups.plan_return_date)").sum("educode_sales_follow_ups.plan_return_money")
+      end
+    end
+
+
+    def actual_return(staff_id, time_range, type, property)
+      # money_plan_records表中 amount: 回款金额
+      start_time = case type
+                   when "month"
+                     time_range.first + "-01"
+                   when "year"
+                     time_range.first + "-01-01"
+                   when "week"
+                     time_range.first.split("-").first + "-01-01"
+                   when "quarter"
+                     time_range.first.split("-").first + "-01-01"
+                   end
+      end_time = case type
+                 when "month"
+                   time_range.last + "-31"
+                 when "year"
+                   time_range.last + "-12-31"
+                 when "week"
+                   time_range.last.split("-").first + "-12-31"
+                 when "quarter"
+                   time_range.last.split("-").first + "-12-31"
+                 end
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = MoneyPlanRecord.joins(business: [department: [school: :school_tags]]).where("educode_sales_money_plan_records.date_at >= ? and educode_sales_money_plan_records.date_at <= ?", start_time, end_time)
+      if staff_id.present?
+        data = data.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+            where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", staff_id, staff_id)
+      end
+      if property.present?
+        data = data.where("school_tags.id = ?", property)
+      end
+      case type
+      when "week"
+        data.select("educode_sales_money_plan_records.*, yearweek(educode_sales_money_plan_records.date_at) as week").group("yearweek(educode_sales_money_plan_records.date_at)").sum("educode_sales_money_plan_records.amount")
+      when "quarter"
+        data = data.select("educode_sales_money_plan_records.*, quarter(educode_sales_money_plan_records.date_at) as quarter, year(educode_sales_money_plan_records.date_at) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_money_plan_records.*, year(educode_sales_money_plan_records.date_at) as year, month(educode_sales_money_plan_records.date_at) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_money_plan_records.*, year(educode_sales_money_plan_records.date_at) as year").group("year(educode_sales_money_plan_records.date_at)").sum("educode_sales_money_plan_records.amount")
+      end
+    end
+
+    def plan_return_by_o(staff_id, time_range, type, property)
+      # plan_return_money 计划回款额-o类
+      clazz_id =  Common.find_by(name: "O类-中标商机", clazz: "business_type", extras: "o_class").id
+      start_time = case type
+                   when "month"
+                     time_range.first + "-01"
+                   when "year"
+                     time_range.first + "-01-01"
+                   when "week"
+                     time_range.first.split("-").first + "-01-01"
+                   when "quarter"
+                     time_range.first.split("-").first + "-01-01"
+                   end
+      end_time = case type
+                 when "month"
+                   time_range.last + "-31"
+                 when "year"
+                   time_range.last + "-12-31"
+                 when "week"
+                   time_range.last.split("-").first + "-12-31"
+                 when "quarter"
+                   time_range.last.split("-").first + "-12-31"
+                 end
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = Business.joins(:last_follow_up).where("educode_sales_businesses.clazz_id = ?", clazz_id)
+                 .where("educode_sales_follow_ups.plan_return_date >= ? and educode_sales_follow_ups.plan_return_date <= ?", start_time, end_time)
+      if staff_id.present?
+        data = data.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+            where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", staff_id, staff_id)
+      end
+      if property.present?
+        data = data.joins(department: [school: :school_tags]).where("school_tags.id = ?", property)
+      end
+      case type
+      when "week"
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.plan_return_date) as week").group("yearweek(educode_sales_follow_ups.plan_return_date)").sum("educode_sales_follow_ups.plan_return_money")
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.plan_return_date) as quarter, year(educode_sales_follow_ups.invitation_at) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.plan_return_date) as year, month(educode_sales_follow_ups.plan_return_date) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.plan_return_date) as year").group("year(educode_sales_follow_ups.plan_return_date)").sum("educode_sales_follow_ups.plan_return_money")
+      end
+    end
   end
 end

data/app/views/educode_sales/plans/_target_track.html.erb

@@ -0,0 +1,178 @@
+<%= Gon::Base.render_data %>
+<div id="target_track_wraper">
+<div class="layuimini-main  min-height-table" id="monthly_table_wraper">
+  <form class="layui-form layui-form-pane" lay-filter="assessment_progress_form">
+    <div class="layui-form-item">
+    <div class="layui-inline">
+        <label class="layui-form-label">人员</label>
+        <div class="layui-input-inline large-select">
+        <%= select_tag "staff_id", options_for_select(@staffs), { id: 'weekly_staff_id', include_blank: true} %>
+        </div>
+    </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">年度</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" autocomplete="off" name="assessment_year" value="<%= Time.now.year %>" id="assessment_year">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">客户类型</label>
+        <div class="layui-input-inline">
+            <div id="property" style="width: 190px;"></div>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">目标类别</label>
+        <div class="layui-input-inline">
+            <div id="clazz" style="width: 190px;"></div>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="progress_resert_btn">重置
+        </button>
+        <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="progress_search_btn">检索
+        </button>
+      </div>
+    </div>
+  </form>
+  <table class="layui-tab" id="finished_table"  lay-filter="progressTable"></table>
+</div>
+<script type="text/html" id="progress_Toolbar">
+  <div class="layui-btn-container">
+    <button class="layui-btn layui-btn-default layui-btn-sm data-add-btn pull-right" lay-event="add"> 导出</button>
+    <button class="layui-btn layui-btn-primary layui-btn-sm data-add-btn pull-right" lay-event="add"> 人员显示</button>
+    <button class="layui-btn layui-btn-primary layui-btn-sm data-add-btn pull-right" lay-event="add"> 分类显示</button>
+  </div>
+</script>
+
+<script>
+  layui.use(['form', 'table', 'miniPage', 'element', 'rate', 'laydate', 'request', 'xmSelect'], function () {
+
+    var $ = layui.jquery,
+      form = layui.form,
+      laydate = layui.laydate,
+      request = layui.request,
+      table = layui.table,
+      rate = layui.rate,
+      xmSelect = layui.xmSelect,
+      miniPage = layui.miniPage,
+      dropdown = layui.dropdown;
+
+
+    laydate.render({
+      elem: '#assessment_year',
+      type: 'year'
+    });
+
+    var property_list = xmSelect.render({
+        el: '#property',
+        data: gon.school_tags
+    })
+
+    var clazz = xmSelect.render({
+      el: '#clazz',
+      data: [{value: '中标', name: '中标'}, {value: '回款', name: '回款'}, {value: '商机', name: '商机'}]
+    })
+
+
+    var progress_table = table.render({
+      elem: '#finished_table'
+      ,toolbar: '#progress_Toolbar'
+      ,totalRow:true
+      ,title: "绩效考核指标完成情况" // 目前发现的作用(导出文件的文件名)
+      ,defaultToolbar: ['filter']
+      ,cols:[
+        [ //标题栏
+          {field: 'id', title: '序号', width: 120, rowspan: 2, colspan: 9},
+          {field: 'name', title: '姓名', width: 120, rowspan: 2, colspan: 9},
+          {field: 'assessment', title: '类别', width: 120, rowspan: 2},
+          ,{field: 'year', align: 'center', title: '年度目标', width: 100, rowspan: 2}
+          ,{align: 'center', title: '客户类型', width: 120,rowspan: 2}
+          ,{align: 'center', title: '分项目标', width: 120, rowspan: 2}
+          ,{field: 'name', title: '年度计划', width: 120, rowspan: 2}
+          ,{field: 'name', title: '年度完成', width: 120, rowspan: 2}
+
+          ,{align: 'center', title: '1月', colspan: 3}
+          ,{align: 'center', title: '2月', colspan: 3}
+          ,{align: 'center', title: '3月', colspan: 3}
+          ,{align: 'center', title: '4月', colspan: 3}
+          ,{align: 'center', title: '5月', colspan: 3}
+          ,{align: 'center', title: '6月', colspan: 3}
+          ,{align: 'center', title: '7月', colspan: 3}
+          ,{align: 'center', title: '8月', colspan: 3}
+          ,{align: 'center', title: '9月', colspan: 3}
+          ,{align: 'center', title: '10月', colspan: 3}
+          ,{align: 'center', title: '11月', colspan: 3}
+          ,{align: 'center', title: '12月', colspan: 3}
+        ],
+        [
+          {field: 'target_1', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_1', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_1', title: '完成', width: 100, totalRow:true}
+
+          ,{field: 'target_2', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_2', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_2', title: '完成', width: 100, totalRow:true}
+
+          ,{field: 'target_3', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_3', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_3', title: '完成', width: 100, totalRow:true}
+
+           ,{field: 'target_4', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_4', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_4', title: '完成', width: 100, totalRow:true}
+
+          ,{field: 'target_5', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_5', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_5', title: '完成', width: 100, totalRow:true}
+
+          ,{field: 'target_6', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_6', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_6', title: '完成', width: 100, totalRow:true}
+
+          ,{field: 'target_7', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_7', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_7', title: '完成', width: 100, totalRow:true}
+
+          ,{field: 'target_8', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_8', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_8', title: '完成', width: 100, totalRow:true}
+
+          ,{field: 'target_9', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_9', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_9', title: '完成', width: 100, totalRow:true}
+
+          ,{field: 'target_10', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_10', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_10', title: '完成', width: 100, totalRow:true}
+
+          ,{field: 'target_11', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_11', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_11', title: '完成', width: 100, totalRow:true}
+
+          ,{field: 'target_12', title: '目标', width: 100, totalRow:true}
+          ,{field: 'plan_12', title: '计划', width: 100, totalRow:true}
+          ,{field: 'finish_12', title: '完成', width: 100, totalRow:true}
+
+        ]]
+    });
+    loadFinishTable(form.val('assessment_progress_form'))
+
+    form.on('submit(progress_search_btn)', function (data) {
+      var search = data.field;
+      search.assessment_id = assement_list.getValue('valueStr').split(",");
+      loadFinishTable(search);
+      return false;
+    })
+
+    function loadFinishTable(search) {
+      table.reload('finished_table', {
+        where: search,
+        url: '/missions/assessments/finished'
+      });
+    }
+
+  })
+
+  </script>
+</div>

data/app/views/educode_sales/plans/index.html.erb

@@ -5,6 +5,7 @@
     <li data="month">月计划</li>
     <li data="monthly">月报</li>
     <li data="year">年计划</li>
+    <!-- <li data="target_track">年度执行</li> -->
   </ul>
   <div class="layui-tab-content">
     <div class="layui-tab-item layui-show">
@@ -22,6 +23,8 @@
     <div class="layui-tab-item">
       <div id="year_plan_tab_wraper"></div>
     </div>
+    <div class="layui-tab-item" id="target_track_tab">
+    </div>
   </div>
 </div>
 
@@ -70,6 +73,8 @@
         loadPage('/missions/plans/monthly')
       } else if (data.index == 4 && $("#year_table_wraper").length == 0) {
         loadPage('/missions/plans/year_plan')
+      } else if (data.index == 5 && $("#target_track_wraper").length == 0) {
+        loadPage('/missions/plans/target_track')
       }
     });
 

data/app/views/educode_sales/plans/target_track.js.erb

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

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

@@ -0,0 +1,176 @@
+<div id="tab_9">
+  <div class="" style="padding-right: 50px">
+    <div style="margin: 10px 10px 10px 10px">
+      <form class="layui-form layui-form-pane" lay-filter="search_form">
+        <div class="layui-form-item">
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">销售人员</label>
+            <div class="layui-input-inline">
+              <% common = EducodeSales::Common.find_by(clazz: 'staff_type', name: '销售')
+                 staffs = EducodeSales::Staff.where(job_type: common.id) %>
+              <%= select_tag "staff_id", options_for_select(staffs.includes(:user).map { |d| [d.user.real_name, d.id] }, params[:staff_id]), {'lay-filter': 'staff_id', include_blank: true} %>
+            </div>
+          </div>
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">视图</label>
+            <div class="layui-input-inline">
+              <%= select_tag "forecast_count_range", options_for_select([['按周', 'week'], ['按月', 'month'], ['按季', 'quarter'], ['按年', 'year']], params[:forecast_count_range] || "month"), {'lay-filter': 'return_forecast_count'} %>
+            </div>
+          </div>
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">时间范围</label>
+            <div class="layui-input-inline">
+              <input type="text" class="layui-input forecast_month " id="return_forecast_date_month" name="forecast_date_month" placeholder=" - " value="<%= params[:forecast_date_month].present? ? params[:forecast_date_month] : Time.now.year.to_s + "-01" + " - " + Time.now.strftime("%Y-%m") %>" autocomplete="off">
+              <input type="text" class="layui-input forecast_year layui-hide" id="return_forecast_date_year" name="forecast_date_year" placeholder=" - " value="<%= params[:forecast_date_year] %>" autocomplete="off">
+              <input type="text" class="layui-input forecast_day layui-hide" id="return_forecast_date_day" name="forecast_date_day" placeholder=" - " value="<%= params[:forecast_date_day] %>" autocomplete="off">
+            </div>
+          </div>
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">客户类型</label>
+            <div class="layui-input-inline">
+              <%= select_tag "property", options_for_select(SchoolTag.where(for_missions: true).pluck(:name, :id), params[:property]), {include_blank: true} %>
+            </div>
+          </div>
+          <div class="layui-inline m-t-10">
+            <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_search">重 置</button>
+            <button type="button" class="forecast_count_bt layui-btn layui-btn-primary" lay-submit lay-filter="search_sales">确 定</button>
+          </div>
+        </div>
+      </form>
+    </div>
+    <canvas id="return_forecast_myChart2" width="960" height="350"></canvas>
+    <canvas id="return_forecast_myChart2_1" width="960" height="350" style="margin-top: 30px;"></canvas>
+  </div>
+</div>
+
+<script>
+    layui.use(['form', 'jquery', 'request', 'laydate', 'element'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            request = layui.request,
+            laydate = layui.laydate;
+
+        form.render();
+
+        var opt = {
+            events: false,
+            tooltips: {
+                enabled: false
+            },
+            layout: {
+                padding: {
+                    left: 20,
+                    right: 20,
+                    top: 20,
+                    bottom: 0
+                }
+            },
+            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) {
+                        ctx.fillStyle = "#444";
+                        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);
+                        });
+                    });
+                }
+            }
+        };
+
+        laydate.render({
+            type: 'year',
+            elem: '#return_forecast_date_year',
+            range: true
+        });
+
+        laydate.render({
+            elem: '#return_forecast_date_day',
+            range: true
+        });
+
+        laydate.render({
+            type: 'month',
+            elem: '#return_forecast_date_month',
+            range: true
+        });
+
+        var forecast_type = "month";
+        if (forecast_type === "month") {
+            $(".forecast_year").addClass('layui-hide');
+            $(".forecast_day").addClass('layui-hide');
+            $(".forecast_month").removeClass('layui-hide')
+        } else if (forecast_type === "year" || forecast_type === "quarter") {
+            $(".forecast_month").addClass('layui-hide');
+            $(".forecast_year").removeClass('layui-hide');
+            $(".forecast_day").addClass('layui-hide')
+        } else {
+            $(".forecast_day").removeClass('layui-hide');
+            $(".forecast_month").addClass('layui-hide');
+            $(".forecast_year").addClass('layui-hide')
+        }
+
+        form.on('select(return_forecast_count)', function (data) {
+            const value = data.value;
+            if (value === "month") {
+                $(".forecast_year").addClass('layui-hide');
+                $(".forecast_day").addClass('layui-hide');
+                $(".forecast_month").removeClass('layui-hide')
+            } else if (value === "year" || value === "quarter") {
+                $(".forecast_month").addClass('layui-hide');
+                $(".forecast_year").removeClass('layui-hide');
+                $(".forecast_day").addClass('layui-hide')
+            } else {
+                $(".forecast_day").removeClass('layui-hide');
+                $(".forecast_month").addClass('layui-hide');
+                $(".forecast_year").addClass('layui-hide')
+            }
+        });
+
+        //重置按钮
+        form.on('submit(reset_search)', function () {
+            form.val('search_form', {
+                staff_id: "",
+                property: ""
+            });
+            return false;
+        });
+
+        var ctx = document.getElementById('return_forecast_myChart2');
+        var return_forecast_myChart2 = new Chart(ctx, {
+            type: 'bar',
+            data: <%=raw @return_forecast_count_data_0.to_json %>,
+            options: opt
+        });
+
+        var ctx01 = document.getElementById('return_forecast_myChart2_1');
+        var return_forecast_myChart2_1 = new Chart(ctx01, {
+            type: 'bar',
+            data: <%=raw @return_forecast_count_data_1.to_json %>,
+            options: opt
+        });
+
+        form.on("submit(search_sales)", function (data) {
+            var layer_index = layer.load(0, {shade: [0.1, '#fff']});
+            Rails.ajax({
+                url: '/missions/sale_trends/return_money_forecast',
+                type: 'GET',
+                data: $.param(data.field, true),
+                dataType: "script",
+                success: function (res) {
+                    layer.close(layer_index);
+                }
+            });
+        })
+    })
+</script>

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

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

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

@@ -8,6 +8,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">
@@ -242,6 +243,9 @@
     <div class="layui-tab-item">
       <div id="page_8"></div>
     </div>
+    <div class="layui-tab-item">
+      <div id="page_9"></div>
+    </div>
   </div>
 </div>
 
@@ -270,6 +274,8 @@
                 loadPage('/missions/sale_trends/user_stat')
             } else if (data.index == 7 && $("#tab_8").length == 0) {
                 loadPage('/missions/sale_trends/visit_analysis')
+            } else if (data.index == 8 && $("#tab_9").length == 0) {
+                loadPage('/missions/sale_trends/return_money_forecast')
             }
         });
 

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

@@ -111,12 +111,14 @@
     <% if can? :create, EducodeSales::Teacher %>
       <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import">导入数据</button>
       <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加老师</button>
-     <% end %>
-    </button>
+    <% end %>
+    <% if can? :export_teacher_list, EducodeSales::Teacher %>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="export">导出</button>
+    <% end %>
   </div>
 </script>
 <div class="">
-<table class="layui-hide" id="teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
+  <table class="layui-hide" id="teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
 </div>
 <script type="text/html" id="currentTableBar">
   <% if can? :create, EducodeSales::TeacherFollow %>
@@ -295,7 +297,8 @@
                 field: 'followup_at',
                 width: 180,
                 title: '最新跟进时间',
-                hide: gon.filter.followup_at
+                hide: gon.filter.followup_at,
+                sort: true
             },
             {
                 field: 'latest_time',
@@ -401,16 +404,16 @@
         ]];
 
         table = layui.table;
-        table.render({
+        var teachers_table = table.render({
             elem: '#teachers_table',
             url: '/missions/teachers',
             where: {q: form.val('search_form')},
             toolbar: '#toolbarDemo',
-            totalRow:true,
+            totalRow: true,
             defaultToolbar: ['filter'],
             cols: cols_table,
             limit: 20,
-          limits: [10,15,20,30,40,50,60,70,80,90],
+            limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
             page: true,
             done: function (res) {
                 drowpdwonRender()
@@ -418,11 +421,11 @@
         });
         var dropmenu = gon.menus;
 
-        drowpdwonRender = function() {
+        drowpdwonRender = function () {
             dropdown.render({
                 elem: '.more-btn',
                 data: dropmenu,
-                click: function(data, othis){
+                click: function (data, othis) {
                     var elem = $(this.elem);
                     id = elem.data('id');
                     switch (data.event) {
@@ -640,6 +643,15 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
+            } else if (obj.event === 'export') {
+                layer.load(0, {});
+                var data = form.val('search_teachers');
+                console.log(data)
+                request.authGet("missions/teachers?type=export&" + $.param({q: data}), {}, function (res) {
+                    data = res.data;
+                    table.exportFile(teachers_table.config.id, data, 'xls')
+                    layer.closeAll('loading');
+                })
             }
         });
 

data/config/routes.rb

@@ -174,6 +174,7 @@ EducodeSales::Engine.routes.draw do
       get :goal_forecast
       get :user_stat
       get :visit_analysis
+      get :return_money_forecast
     end
   end
 
@@ -266,6 +267,7 @@ EducodeSales::Engine.routes.draw do
       get :month_plan
       get :monthly
       get :year_plan
+      get :target_track
     end
     member do
       delete :delete_business_info

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.41'
+  VERSION = '1.10.48'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.41
+  version: 1.10.48
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-22 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
+- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -503,6 +504,7 @@ files:
 - app/views/educode_sales/places/new.html.erb
 - app/views/educode_sales/plans/_monthPlan.html.erb
 - app/views/educode_sales/plans/_monthly.html.erb
+- app/views/educode_sales/plans/_target_track.html.erb
 - app/views/educode_sales/plans/_weekPlan.html.erb
 - app/views/educode_sales/plans/_weekly.html.erb
 - app/views/educode_sales/plans/_yearPlan.html.erb
@@ -532,6 +534,7 @@ files:
 - app/views/educode_sales/plans/show_monthly.html.erb
 - app/views/educode_sales/plans/show_week.html.erb
 - app/views/educode_sales/plans/show_weekly.html.erb
+- app/views/educode_sales/plans/target_track.js.erb
 - app/views/educode_sales/plans/weekly.js.erb
 - app/views/educode_sales/plans/year_plan.js.erb
 - app/views/educode_sales/plans/years_plan.json.jbuilder
@@ -577,6 +580,7 @@ files:
 - app/views/educode_sales/sale_trends/_business_area.html.erb
 - app/views/educode_sales/sale_trends/_business_followup_analysis.html.erb
 - app/views/educode_sales/sale_trends/_goal_forecast.html.erb
+- app/views/educode_sales/sale_trends/_return_money_forecast.html.erb
 - 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
@@ -585,6 +589,7 @@ files:
 - app/views/educode_sales/sale_trends/business_followup_analysis.js.erb
 - app/views/educode_sales/sale_trends/goal_forecast.js.erb
 - app/views/educode_sales/sale_trends/operations.html.erb
+- app/views/educode_sales/sale_trends/return_money_forecast.js.erb
 - app/views/educode_sales/sale_trends/sales_analysis.js.erb
 - app/views/educode_sales/sale_trends/sales_followup_analysis.js.erb
 - app/views/educode_sales/sale_trends/trends.html.erb
@@ -757,7 +762,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -773,7 +778,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.9
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []