educode_sales 0.9.82 → 0.9.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5c4108bbab976a92d5f43a438e6d39e16331c222a0046a45745e6730e751a87
-  data.tar.gz: 7e13154cfed9228addd477ffd99ae03ba8d0defcba553f586078ad440035f7d8
+  metadata.gz: e498fa041334cb4b387425a7a7f7ff49dffffcee5a72e363b61cb9f32167ff06
+  data.tar.gz: 54d79d72be99cab109f9b40fdd4dd789f72f20d115663abd7d99db70f0ee2527
 SHA512:
-  metadata.gz: 40591e809b707f2c944e7662373e3d3160eecd854407aa900fc520c2a498a681c1e75e5c012ecab902debaefa41bcb636bdcb9a5717100fcfb5ba25bf3cc4737
-  data.tar.gz: e7c0c20ceae1b0fbadd8547cd6cf209e762bbe1b451d8659c20ff59b0f1244b94861f066134e4e7cf71fbe213f5e523cb64d5b3a52acdd99bd79d03e7d245de4
+  metadata.gz: 1e29ad8d3c8dd8c0753dc6662e26c332444cbf10842d308977883c47149c676b0b1c06c515bcfc33e10fe0bfccbc1cecb5ab1c7f2534001c0c1d7a11042a5def
+  data.tar.gz: 5077f36f7bb732c196608fd15c696c06b3d0cf5c74e32c24495b67eadc8b5527eacb1a545966aeea4e3401410ed0e1fbe23c2fb60aea58a8b5513fd1fd570ba6

data/app/controllers/educode_sales/contracts_controller.rb

@@ -233,12 +233,14 @@ module EducodeSales
       @business = Business.find(params[:id])
       @last_follow_up = @business.last_follow_up
       @deployment_type = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT
+      @signed_clazz = EducodeSales::FollowUp.signed_clazzs.keys
+      
       signed_department = @last_follow_up.signed_department
       if signed_department
-        gon.department = {value: signed_department.id, name: "#{signed_department&.school&.name}-#{signed_department&.name}"}
+        gon.department = [{value: signed_department.id, name: "#{signed_department&.school&.name}-#{signed_department&.name}"}]
         gon.value = signed_department.id
       else
-        gon.department = {}
+        gon.department = []
         gon.value = ''
       end
      
@@ -454,7 +456,7 @@ module EducodeSales
 
     private
     def follow_up_params
-      params.permit(:o_business_deployment, :plan_signed_date, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source)
+      params.permit(:o_business_deployment, :plan_signed_date, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source, :signed_clazz)
     end
 
     def product_up_params

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -3,7 +3,7 @@ require_dependency "educode_sales/application_controller"
 module EducodeSales
   class SaleTrendsController < ApplicationController
     # authorize_resource class: false
-
+    include SaleTrendsHelper
     def trends
       # authorize! :trends,  EducodeSales::SaleTrend
       @year = params[:year] ? params[:year] : Time.now.year
@@ -382,6 +382,64 @@ module EducodeSales
       end
     end
 
+    def goal_forecast
+      respond_to do |format|
+        format.html do
+
+        end
+        format.js do
+          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[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
+          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' }
+              @forecast_count_data = goal_forecast_week(dates, sale_names, staff_id)
+            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' }
+              @forecast_count_data = goal_forecast_week(forecast_default_dates, sale_names, staff_id)
+            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
+              @forecast_count_data = goal_forecast_quarter(dates, sale_names, staff_id)
+            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
+              @forecast_count_data = goal_forecast_quarter(forecast_default_dates, sale_names, staff_id)
+            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
+              @forecast_count_data = goal_forecast_month(dates, sale_names, staff_id)
+            else
+              @forecast_count_data = goal_forecast_month(forecast_default_dates, sale_names, staff_id)
+            end
+          else
+            # 按年
+            if params[:forecast_date_year].present?
+              date = params[:forecast_date_year].split(" - ")
+              dates = (date[0]..date[1]).to_a
+              @forecast_count_data = goal_forecast_year(dates, sale_names, staff_id)
+            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_count_data = goal_forecast_year(forecast_default_dates, sale_names, staff_id)
+            end
+          end
+        end
+      end
+    end
+
     private
 
     def sale_trend_params
@@ -390,7 +448,7 @@ module EducodeSales
 
     def business_followup_charts(dates, names, x_business_ids, colors, date, clazz)
       not_business = x_business_ids.present? ? x_business_ids.join(',') : ''
-      staff_ids = names.present? ? names.map { |d| d[1]}.join(",") : ''
+      staff_ids = names.present? ? names.map { |d| d[1] }.join(",") : ''
 
       sql = "SELECT DATE_FORMAT(created_at, '#{clazz}') as week, count(*) as counts, staff_id
              FROM educode_sales_follow_ups

data/app/controllers/educode_sales/sales_details_controller.rb

@@ -0,0 +1,6 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class SalesDetailsController < ApplicationController
+  end
+end

data/app/helpers/educode_sales/sale_trends_helper.rb

@@ -0,0 +1,310 @@
+module EducodeSales
+  module SaleTrendsHelper
+    NAMES = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
+    def goal_forecast_quarter(labels, selects, staff_id = nil)
+      plan_get = plan_get(staff_id, labels, "quarter")
+      actual_get = actual_get(staff_id, labels, "quarter")
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get[[year, quarter]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[1]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get[[year, quarter]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get[[year, quarter]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[3]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get[[year, quarter]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == NAMES[3] || select == NAMES[1]
+                 'line'
+               else
+                 "bar"
+               end
+        backgroundColor = if select == NAMES[3] || select == NAMES[1]
+                            'rgba(54, 162, 235, 0.2)'
+                          else
+                            SaleTrend::COLORS[i]
+                          end
+        {
+          type: type,
+          label: select,
+          data: data,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
+      end
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    def goal_forecast_week(labels, selects, staff_id = nil)
+
+      plan_get = plan_get(staff_id, labels, "week")
+      actual_get = actual_get(staff_id, labels, "week")
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_get[yearweek].to_f
+                 end
+               elsif select == NAMES[1]
+                 arr = labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_get[yearweek].to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   actual_get[yearweek].to_f
+                 end
+               elsif select == NAMES[3]
+                 arr = labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   actual_get[yearweek].to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == NAMES[0] || select == NAMES[2]
+                 'bar'
+               else
+                 "line"
+               end
+        backgroundColor = if select == NAMES[0] || select == NAMES[2]
+                            SaleTrend::COLORS[i]
+                          else
+                            'rgba(54, 162, 235, 0.2)'
+                          end
+        {
+          type: type,
+          label: select,
+          data: data,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
+      end
+
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    def goal_forecast_month(labels, selects, staff_id = nil)
+      plan_get = plan_get(staff_id, labels, "month")
+      actual_get = actual_get(staff_id, labels, "month")
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get[[year, month]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[1]
+                 arr = labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get[[year, month]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get[[year, month]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[3]
+                 arr = labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get[[year, month]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+
+        type = if select == NAMES[3] || select == NAMES[1]
+                 'line'
+               else
+                 "bar"
+               end
+        backgroundColor = if select == NAMES[3] || select == NAMES[1]
+                            'rgba(54, 162, 235, 0.2)'
+                          else
+                            SaleTrend::COLORS[i]
+                          end
+        {
+          type: type,
+          label: select,
+          data: data,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
+      end
+
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    def goal_forecast_year(labels, selects, staff_id = nil)
+      plan_get = plan_get(staff_id, labels, "year")
+      actual_get = actual_get(staff_id, labels, "year")
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map { |d| plan_get[d.to_i] || 0 }
+               elsif select == NAMES[1]
+                 arr = labels.map { |d| plan_get[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map { |d| actual_get[d.to_i] || 0 }
+               elsif select == NAMES[3]
+                 arr = labels.map { |d| actual_get[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+
+        type = if select == NAMES[3] || select == NAMES[1]
+                 'line'
+               else
+                 "bar"
+               end
+        backgroundColor = if select == NAMES[3] || select == NAMES[1]
+                            'rgba(54, 162, 235, 0.2)'
+                          else
+                            SaleTrend::COLORS[i]
+                          end
+        {
+          type: type,
+          label: select,
+          data: data,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
+      end
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    private
+
+    def plan_get(staff_id, time_range, type)
+      # budget_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 = Business.joins(:last_follow_up)
+                     .where("educode_sales_follow_ups.invitation_at >= ? and educode_sales_follow_ups.invitation_at <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", start_time, end_time)
+      case type
+      when "week"
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.invitation_at) as week").group("yearweek(educode_sales_follow_ups.invitation_at)").sum(:budget_amount)
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.invitation_at) 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.invitation_at) as year, month(educode_sales_follow_ups.invitation_at) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.invitation_at) as year").group("year(educode_sales_follow_ups.invitation_at)").sum(:budget_amount)
+      end
+    end
+
+    def actual_get(staff_id, time_range, type)
+      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
+      # actual_amount 合同额
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = Business.joins(:last_follow_up)
+                     .where("educode_sales_follow_ups.bidded_date >= ? and educode_sales_follow_ups.bidded_date <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", start_time, end_time)
+      case type
+      when "week"
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.bidded_date) as week").group("yearweek(educode_sales_follow_ups.bidded_date)").sum(:actual_amount)
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.bidded_date) as quarter, year(educode_sales_follow_ups.bidded_date) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.bidded_date) as year, month(educode_sales_follow_ups.bidded_date) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.bidded_date) as year").group("year(educode_sales_follow_ups.bidded_date)").sum(:actual_amount)
+      end
+    end
+
+  end
+end

data/app/models/educode_sales/follow_up.rb

@@ -10,6 +10,8 @@ module EducodeSales
 
     InfoClazz = ['跟进信息', '建议信息', '评论信息', '审核信息']
 
+    enum signed_clazz: ['直签', '代签', '总集', '渠道']
+
     enum funding_source: ['贷款资金', '财政资金', '自由资金']
 
     include ::Deletable

data/app/models/educode_sales/sale_trend.rb

@@ -2,12 +2,12 @@ module EducodeSales
   class SaleTrend < ApplicationRecord
 
     COLORS = [
-      '#44D7B6', '#4CACFF', '#F7B500', '#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF',
-      '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 
+      '#44D7B6', '#7CFC00', '#4CACFF', "#110FD7", '#F7B500', '#48D1CC', '#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF',
+      '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)',
       'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)', 'rgba(255, 0, 250, 1)', '#A2D9CE', '#D6EAF8', '#E8DAEF', '#FADBD8',
       '#F5B7B1', '#E6B0AA', '#FCF3CF', '#FDEBD0', '#F6DDCC', '#D98880', '#EC7063', '#A569BD', '#85C1E9', '#45B39D', '#F7DC6F',
       '#DC7633', '#839192', '#6C3483', '#B03A2E', '#7B7D7D', '#4D5656', '#28B463', '#0E6655', '#F39C12', '#0E6251', '#1B4F72',
-      '#FAE5D3', '#82E0AA', '#FF00FF', '#663399', '#4B0082', '#7CFC00', '#48D1CC'
+      '#FAE5D3', '#82E0AA', '#FF00FF', '#663399', '#4B0082', '#7CFC00'
     ]
   end
 end

data/app/models/educode_sales/sales_detail.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class SalesDetail < ApplicationRecord
+    belongs_to :business
+    belongs_to :product_catalog
+    belongs_to :staff
+  end
+end

data/app/services/return_forecast_service.rb

@@ -0,0 +1,230 @@
+module EducodeSales
+  class ReturnForecastService
+    attr_reader :user, :params, :request
+    # ReturnForecastService.new(current_user, request, params).call
+    def initialize(user, request, params)
+      @user = user
+      @request = request
+      @params = params
+    end
+
+    def call
+    end
+
+    def return_forecast_quarter(labels, selects, staff_id = nil)
+      plan_get = plan_get(staff_id, labels, "quarter")
+      actual_get = actual_get(staff_id, labels, "quarter")
+      datasets = selects.map do |select|
+        if select == "计划投标额"
+          {
+            label: select,
+            data: labels.map do |d|
+              quarter = d.split("-").last.to_i
+              year = d.split("-").first.to_i
+              plan_get[[year, quarter]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+            end,
+            backgroundColor: [
+              'rgba(255, 99, 132, 0.2)',
+            ],
+            borderColor: [
+              'rgba(255,99,132,1)',
+            ],
+            borderWidth: 1
+          }
+        else
+          {
+            label: select,
+            data: labels.map do |d|
+              quarter = d.split("-").last.to_i
+              year = d.split("-").first.to_i
+              actual_get[[year, quarter]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+            end,
+            backgroundColor: [
+              'rgba(54, 162, 235, 0.2)',
+            ],
+            borderColor: [
+              'rgba(54, 162, 235, 1)',
+            ],
+            borderWidth: 1
+          }
+        end
+      end
+
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    def return_forecast_week(labels, selects, staff_id = nil)
+
+      plan_get = plan_get(staff_id, labels, "week")
+      actual_get = actual_get(staff_id, labels, "week")
+      datasets = selects.map do |select|
+        if select == "计划投标额"
+          {
+            label: select,
+            data: labels.map do |d|
+              week = d.split("-").last
+              year = d.split("-").first
+              yearweek = "#{year}#{week}".to_i
+              plan_get[yearweek].to_f
+            end,
+            backgroundColor: [
+              'rgba(255, 99, 132, 0.2)',
+            ],
+            borderColor: [
+              'rgba(255,99,132,1)',
+            ],
+            borderWidth: 1
+          }
+        else
+          {
+            label: select,
+            data: labels.map do |d|
+              week = d.split("-").last
+              year = d.split("-").first
+              yearweek = "#{year}#{week}".to_i
+              actual_get[yearweek].to_f
+            end,
+            backgroundColor: [
+              'rgba(54, 162, 235, 0.2)',
+            ],
+            borderColor: [
+              'rgba(54, 162, 235, 1)',
+            ],
+            borderWidth: 1
+          }
+        end
+      end
+
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    def return_forecast_month(labels, selects, staff_id = nil)
+      plan_get = plan_get(staff_id, labels, "month")
+      actual_get = actual_get(staff_id, labels, "month")
+      datasets = selects.map do |select|
+        if select == "计划投标额"
+          {
+            label: select,
+            data: labels.map do |d|
+              month = d.split("-").last.to_i
+              year = d.split("-").first.to_i
+              plan_get[[year, month]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+            end,
+            backgroundColor: [
+              'rgba(255, 99, 132, 0.2)',
+            ],
+            borderColor: [
+              'rgba(255,99,132,1)',
+            ],
+            borderWidth: 1
+          }
+        else
+          {
+            label: select,
+            data: labels.map do |d|
+              month = d.split("-").last.to_i
+              year = d.split("-").first.to_i
+              actual_get[[year, month]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+            end,
+            backgroundColor: [
+              'rgba(54, 162, 235, 0.2)',
+            ],
+            borderColor: [
+              'rgba(54, 162, 235, 1)',
+            ],
+            borderWidth: 1
+          }
+        end
+      end
+
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    def return_forecast_year(labels, selects, staff_id = nil)
+      plan_get = plan_get(staff_id, labels, "year")
+      actual_get = actual_get(staff_id, labels, "year")
+      datasets = selects.map do |select|
+        if select == "计划投标额"
+          {
+            label: select,
+            data: labels.map { |d| plan_get[d.to_i] || 0 },
+            backgroundColor: [
+              'rgba(255, 99, 132, 0.2)',
+            ],
+            borderColor: [
+              'rgba(255,99,132,1)',
+            ],
+            borderWidth: 1
+          }
+        else
+          {
+            label: select,
+            data: labels.map { |d| actual_get[d.to_i] || 0 },
+            backgroundColor: [
+              'rgba(54, 162, 235, 0.2)',
+            ],
+            borderColor: [
+              'rgba(54, 162, 235, 1)',
+            ],
+            borderWidth: 1
+          }
+        end
+      end
+
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    private
+
+    def plan_get(staff_id, time_range, type)
+      # budget_amount 预算额
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = Business.joins(:last_follow_up)
+                     .where("educode_sales_follow_ups.invitation_at >= ? and educode_sales_follow_ups.invitation_at <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", time_range.first, time_range.last)
+      case type
+      when "week"
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.invitation_at) as week").group("yearweek(educode_sales_follow_ups.invitation_at)").sum(:budget_amount)
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.invitation_at) 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.invitation_at) as year, month(educode_sales_follow_ups.invitation_at) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.invitation_at) as year").group("year(educode_sales_follow_ups.invitation_at)").sum(:budget_amount)
+      end
+    end
+
+    def actual_get(staff_id, time_range, type)
+      # actual_amount 合同额
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = Business.joins(:last_follow_up)
+                     .where("educode_sales_follow_ups.bidded_date >= ? and educode_sales_follow_ups.bidded_date <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", time_range.first, time_range.last)
+      case type
+      when "week"
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.bidded_date) as week").group("yearweek(educode_sales_follow_ups.bidded_date)").sum(:actual_amount)
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.bidded_date) as quarter, year(educode_sales_follow_ups.bidded_date) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.bidded_date) as year, month(educode_sales_follow_ups.bidded_date) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.bidded_date) as year").group("year(educode_sales_follow_ups.bidded_date)").sum(:actual_amount)
+      end
+    end
+
+  end
+end

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

@@ -516,8 +516,8 @@
                 },
                 {
                     field: 'invitation_at',
-                    width: 105,
-                    title: '招标时间',
+                    width: 150,
+                    title: '计划投标时间',
                     sort: true,
                     hide: gon.filter.invitation_at
                 },

data/app/views/educode_sales/contracts/new_follow_up.html.erb

@@ -102,7 +102,7 @@
     <hr>
     <div class="layui-inline">
         <label class="layui-form-label">计划签单时间：</label>
-        <div class="layui-input-inline" style="line-height: 38px;">
+        <div class="layui-input-inline" style="line-height: 38px;width: 100px;">
         <input type="text" class="layui-input date" name="plan_signed_date" autocomplete="off" value="<%= @last_follow_up&.plan_signed_date %>">
         </div>
     </div>
@@ -115,10 +115,16 @@
     </div>
     <div class="layui-inline">
         <label class="layui-form-label" style="width:100px;">实际签单时间：</label>
-        <div class="layui-input-inline" style="line-height: 38px;">
+        <div class="layui-input-inline" style="line-height: 38px;width: 100px;">
         <input type="text" class="layui-input date" name="signed_date" autocomplete="off" value="<%= @last_follow_up&.signed_date %>">
         </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">签约类型：</label>
+      <div class="layui-input-inline" style="line-height: 38px;width:110px;">
+        <%= select_tag "signed_clazz", options_for_select(@signed_clazz, @last_follow_up&.signed_clazz), class: 'required' %>
+      </div>
+    </div>
     <div class="layui-inline">
         <label class="layui-form-label" style="width:100px;">签约单位：</label>
         <div class="layui-input-inline" style="line-height: 38px;">
@@ -611,7 +617,7 @@
             initValue: gon.value, // 渲染初始化默认值
             hasSelectIcon: false,
             placeholder: '请输入头歌平台上单位部门', // 渲染的inputplaceholder值
-            data: [gon.department],
+            data: gon.department,
             remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
             remoteMethod: function (value, cb) { // 远程搜索的回调函数
               if (!value) {

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

@@ -0,0 +1,166 @@
+<div id="tab_6" lay-filter="test1">
+  <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">
+              <%= select_tag "staff_id", options_for_select(EducodeSales::Staff.all.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': 'forecast_count' } %>
+            </div>
+          </div>
+          <div class="layui-inline">
+            <label class="layui-form-label">时间范围</label>
+            <div class="layui-input-inline">
+              <input type="text" class="layui-input forecast_month " id="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="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="forecast_date_day" name="forecast_date_day" placeholder=" - " value="<%= params[:forecast_date_day] %>" autocomplete="off">
+            </div>
+          </div>
+          <div class="layui-inline">
+            <button type="button" id="search_bt" class="forecast_count_bt layui-btn layui-btn-primary" lay-submit lay-filter="search_sales">确定
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+    <canvas id="forecast_myChart2" width="960" height="350"></canvas>
+    <!--    <canvas id="forecast_myChart2_1" width="960" height="350" style="margin-top: 30px;display: none"></canvas>-->
+  </div>
+</div>
+<script>
+    var forecast_type = "<%=@forecast_count_range %>";
+    layui.use(['form', 'jquery', 'request', 'element'], function () {
+        form = layui.form;
+
+        var opt = {
+            events: false,
+            tooltips: {
+                enabled: false
+            },
+            layout: {
+                padding: {
+                    left: 50,
+                    right: 50,
+                    top: 0,
+                    bottom: 0
+                }
+            },
+            hover: {
+                animationDuration: 0
+            },
+            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);
+                        });
+                    });
+                }
+            }
+        };
+
+        var res_data = <%=raw @forecast_count_data.to_json %>;
+        var datasets = [];
+        var color = ['#44D7B6', '#4CACFF', '#F7B500', '#FF0000', '#FF7F00'];
+        res_data.datasets.forEach(function (d, i) {
+            datasets.push({
+                label: d.label,
+                type: 'line',
+                data: d.data1,
+                borderColor: color[i],
+                pointRadius: 1,
+                fill: false,
+                lineTension: 0
+            })
+        })
+
+        laydate.render({
+            type: 'year',
+            elem: '#forecast_date_year',
+            range: true
+        });
+        laydate.render({
+            elem: '#forecast_date_day',
+            range: true
+        });
+        laydate.render({
+            type: 'month',
+            elem: '#forecast_date_month',
+            range: true
+        });
+
+        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(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')
+            }
+        })
+
+
+        var ctx = document.getElementById('forecast_myChart2');
+        var forecast_myChart2 = new Chart(ctx, {
+            type: 'bar',
+            data: <%=raw @forecast_count_data.to_json %>,
+            options: {
+                elements: {
+                    line: {
+                        tension: 0
+                    }
+                }
+            }
+        });
+        form.render();
+        form.on("submit(search_sales)", function (data) {
+            var layer_index = layer.load(0, {shade: [0.1, '#fff']});
+            Rails.ajax({
+                url: '/missions/sale_trends/goal_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/goal_forecast.js.erb

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

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

@@ -5,18 +5,19 @@
     <li class="">销售额分析</li>
     <li class="">商机区域分布</li>
     <li class="">销售人员跟进分析</li>
+    <li class="">中标预测图</li>
   </ul>
-   <div class="layui-tab-content">
+  <div class="layui-tab-content">
     <div class="layui-tab-item layui-show">
       <form class="layui-form" action="">
         <div class="welcome">
           <div class="content-body" style="padding: 15px;">
-              <div class="m-b-10">
-                <i class="fa fa-warning icon"></i>年度
-                <div class="layui-input-inline">
-                  <%= select_tag "years", options_for_select(@years, @year), {'lay-filter': 'year'} %>
-                </div>
+            <div class="m-b-10">
+              <i class="fa fa-warning icon"></i>年度
+              <div class="layui-input-inline">
+                <%= select_tag "years", options_for_select(@years, @year), { 'lay-filter': 'year' } %>
               </div>
+            </div>
             <div class="layui-card-bodys">
               <div class="">
                 <div class="layui-row layui-col-space30">
@@ -25,7 +26,7 @@
                       <div class="panel-body">
                         <div class="panel-title">
                           <% if can? :sale_trends, EducodeSales::SaleTrend %>
-                          <span class="layui-icon layui-icon-edit pull-right" id="chance_money_edit"></span>
+                            <span class="layui-icon layui-icon-edit pull-right" id="chance_money_edit"></span>
                           <% end %>
                           <h5>商机目标</h5>
                         </div>
@@ -220,58 +221,63 @@
       <div id="page_2"></div>
     </div>
 
-     <div class="layui-tab-item">
+    <div class="layui-tab-item">
       <div id="page_3"></div>
-     </div>
+    </div>
 
-      <div class="layui-tab-item">
-        <div id="page_4"></div>
-     </div>
-     <div class="layui-tab-item">
-        <div id="page_5"></div>
-     </div>
+    <div class="layui-tab-item">
+      <div id="page_4"></div>
+    </div>
+    <div class="layui-tab-item">
+      <div id="page_5"></div>
+    </div>
+    <div class="layui-tab-item">
+      <div id="page_6"></div>
+    </div>
   </div>
 </div>
 
 
-  <script>
+<script>
     layui.use(['form', 'jquery', 'request', 'element'], function () {
-      var $ = layui.jquery,
-        form = layui.form,
-        request = layui.request;
+        var $ = layui.jquery,
+            form = layui.form,
+            request = layui.request;
         var year = "<%= @year %>";
         var element = layui.element;
         laydate = layui.laydate;
         element.render();
-        element.on('tab(sale_trend_tab)', function(data) {
-          if (data.index == 1 && $("#tab_2").length == 0) {
-            loadPage('/missions/sale_trends/business_followup_analysis')
-          } else if (data.index == 2 && $("#tab_3").length == 0 ) {
-            loadPage('/missions/sale_trends/sales_analysis')
-          } else if (data.index == 3  && $("#tab_4").length == 0 ) {
-            loadPage('/missions/sale_trends/business_area')
-          } else if (data.index == 4  && $("#tab_5").length == 0 ) {
-            loadPage('/missions/sale_trends/sales_followup_analysis')
-          }
+        element.on('tab(sale_trend_tab)', function (data) {
+            if (data.index == 1 && $("#tab_2").length == 0) {
+                loadPage('/missions/sale_trends/business_followup_analysis')
+            } else if (data.index == 2 && $("#tab_3").length == 0) {
+                loadPage('/missions/sale_trends/sales_analysis')
+            } else if (data.index == 3 && $("#tab_4").length == 0) {
+                loadPage('/missions/sale_trends/business_area')
+            } else if (data.index == 4 && $("#tab_5").length == 0) {
+                loadPage('/missions/sale_trends/sales_followup_analysis')
+            } else if (data.index == 5 && $("#tab_6").length == 0) {
+                loadPage('/missions/sale_trends/goal_forecast')
+            }
         });
 
 
         function loadPage(url) {
-          var layer_index = layer.load(0, {shade: [0.1, '#fff']});
-          Rails.ajax({
-            url: url,
-            type: 'GET',
-            dataType: "script",
-            success: function (res) {
-              layer.close(layer_index);
-            }
-          });
+            var layer_index = layer.load(0, {shade: [0.1, '#fff']});
+            Rails.ajax({
+                url: url,
+                type: 'GET',
+                dataType: "script",
+                success: function (res) {
+                    layer.close(layer_index);
+                }
+            });
         }
 
         function editForm(el) {
-          $("#" + el + "_edit").click(function() {
-            if ($("#" + el + "_field")[0].classList.contains("layui-hide")) {
-              $("#" + el + "_field").removeClass("layui-hide")
+            $("#" + el + "_edit").click(function () {
+                if ($("#" + el + "_field")[0].classList.contains("layui-hide")) {
+                    $("#" + el + "_field").removeClass("layui-hide")
               $("#" + el + "_value").addClass("layui-hide")
             } else {
               $("#" + el + "_field").addClass("layui-hide")

data/app/views/layouts/educode_sales/application.html.erb

@@ -71,6 +71,8 @@
               <dd><a href="/missions/contracts/product_list" class="<%= current?('layui-this', product_list_contracts_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>产品目录</a>
               </dd>
             <% end %>
+            <dd><a href="/missions/sales_details" class="<%= current?('layui-this', sales_details_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售明细</a>
+            </dd>
             <% if can? :read, EducodeSales::MoneyPlan %>
               <dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>回款计划</a>
               </dd>

data/config/routes.rb

@@ -22,6 +22,9 @@ EducodeSales::Engine.routes.draw do
   resources :sessions do
   end
 
+  resources :sales_details do
+  end
+
   resources :contracts do
     collection do
       get :follow_ups
@@ -122,6 +125,7 @@ EducodeSales::Engine.routes.draw do
       get :sales_analysis
       get :business_area
       get :sales_followup_analysis
+      get :goal_forecast
     end
   end
 

data/db/migrate/20230510144317_create_educode_sales_sales_details.rb

@@ -0,0 +1,16 @@
+class CreateEducodeSalesSalesDetails < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_sales_details do |t|
+      t.references :business
+      t.references :product_catalog
+      t.references :staff
+      t.float :price
+      t.float :amount
+      t.float :total_price
+      t.integer :custom_clazz
+      t.date :delivery_date
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.82'
+  VERSION = '0.9.84'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.82
+  version: 0.9.84
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -173,6 +173,7 @@ files:
 - app/controllers/educode_sales/sale_reports_controller.rb
 - app/controllers/educode_sales/sale_trends_controller.rb
 - app/controllers/educode_sales/sales_controller.rb
+- app/controllers/educode_sales/sales_details_controller.rb
 - app/controllers/educode_sales/sessions_controller.rb
 - app/controllers/educode_sales/staffs_controller.rb
 - app/controllers/educode_sales/teacher_follows_controller.rb
@@ -185,6 +186,7 @@ files:
 - app/helpers/educode_sales/business_helper.rb
 - app/helpers/educode_sales/follow_up_helper.rb
 - app/helpers/educode_sales/home_helper.rb
+- app/helpers/educode_sales/sale_trends_helper.rb
 - app/helpers/educode_sales/sessions_helper.rb
 - app/helpers/educode_sales/teachers_helper.rb
 - app/jobs/educode_sales/application_job.rb
@@ -242,6 +244,7 @@ files:
 - app/models/educode_sales/sale_plan.rb
 - app/models/educode_sales/sale_report.rb
 - app/models/educode_sales/sale_trend.rb
+- app/models/educode_sales/sales_detail.rb
 - app/models/educode_sales/staff.rb
 - app/models/educode_sales/staff_permission.rb
 - app/models/educode_sales/staff_school.rb
@@ -249,6 +252,7 @@ files:
 - app/models/educode_sales/teacher.rb
 - app/models/educode_sales/teacher_assign_follow.rb
 - app/models/educode_sales/teacher_follow.rb
+- app/services/return_forecast_service.rb
 - app/views/educode_sales/activities/_follows.html.erb
 - app/views/educode_sales/activities/_index.html.erb
 - app/views/educode_sales/activities/edit.html.erb
@@ -516,10 +520,12 @@ files:
 - app/views/educode_sales/sale_reports/show.html.erb
 - 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/_sales_analysis.html.erb
 - app/views/educode_sales/sale_trends/_sales_followup_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
 - app/views/educode_sales/sale_trends/operations.html.erb
 - app/views/educode_sales/sale_trends/sales_analysis.js.erb
 - app/views/educode_sales/sale_trends/sales_followup_analysis.js.erb
@@ -532,6 +538,7 @@ files:
 - app/views/educode_sales/sales/school.html.erb
 - app/views/educode_sales/sales/trends.html.erb
 - app/views/educode_sales/sales/xschool.html.erb
+- app/views/educode_sales/sales_details/index.html.erb
 - app/views/educode_sales/sessions/login.html.erb
 - app/views/educode_sales/staffs/edit.html.erb
 - app/views/educode_sales/staffs/follow_up_departments.json.jbuilder
@@ -663,6 +670,7 @@ files:
 - db/migrate/20230430134710_create_educode_sales_assign_staffs.rb
 - db/migrate/20230501034307_create_educode_sales_follow_up_trends.rb
 - db/migrate/20230502142912_create_educode_sales_product_catalogs.rb
+- db/migrate/20230510144317_create_educode_sales_sales_details.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb