educode_sales 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e55869ffcc832dfac95ed169a94adac8b8fbcb634bb8aa5c3aec6b6b706f6c56
-  data.tar.gz: 81fa68ebe5aa56782e95ff35ae4583250259efb701cf4f65495e9ed189fd11d7
+  metadata.gz: 7d534830cae9ef959ed6e065bb7a22a2053fdf5f6468b419cd6b2aa9d722510d
+  data.tar.gz: dc65d43f30d446b7fe4d2a22af6d18a165fd0e5b14625919ef8232e6491a3916
 SHA512:
-  metadata.gz: 899de281abd3f1d782caa15f6a0db901781f4a3d370f31897816b7f44f83a07d11dbb2e9ba8830bd3428acdfdf2c028dc19c03f93fd5bfd1ca0a07f1e7b81843
-  data.tar.gz: 7c4f9d48a48aace21df084e359843a6de29189d31c54d4e828bd0cf6c6c65c7e93713e2510303ede0cc959edf5b9dcb6d1248c5c5614778837569d9957eefbff
+  metadata.gz: b37037787d835f6abc6d78f58f56ec5344779090f68583b04ff16f3f2e2946fdd53a043f1fcb829152c9c6402e90b610cf6e08b3d0f456053b8d3a553ae69063
+  data.tar.gz: 8ad3b95b4c49d649a43ea1b7135dd9c8f1a2ea7761657471cb235e1b9ec3b9f8dc26ef5cbf83643e0140d7eba5bd5f6d899a631bc8b84a15885197041b5daac6

data/app/assets/stylesheets/educode_sales/app.css

@@ -294,4 +294,24 @@ td .layui-table-cell .layui-form-select {
   height: 6px;
   border-radius: 6px;
   background-color: red;
+}
+
+.gray-text {
+  color: #888;
+}
+.red-tips {
+  margin-left: 15px;
+  position: relative;
+  color: #888;
+}
+
+.red-tips::before {
+  width: 6px;
+  height: 6px;
+  border-radius: 3px;
+  content: " ";
+  background-color: red;
+  position: absolute;
+  top: 5px;
+  left: -10px;
 }

data/app/controllers/educode_sales/businesses_controller.rb

@@ -26,6 +26,7 @@ module EducodeSales
           end
 
           if can?(:create, EducodeSales::SalePlan)
+            # gon.menus << { title: '添加团队建议', event: 'suggest' }
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
           end
@@ -48,9 +49,15 @@ module EducodeSales
           gon.export_menus << { title: '导出记录', event: 'export_records' }
           filter = Filter.find_or_create_by(staff_id: @current_admin.id, clazz: "businesses_list")
           if filter.extras.present?
+            if filter.extras['area'].nil?
+              filter.extras['area'] = 1
+              filter.extras['property'] = 1
+              filter.extras['sale_way'] = 1
+            end
+            filter.save
             gon.filter = filter.extras
           else
-            gon.filter = {}
+            gon.filter = {'area': 1, 'property': 1, 'sale_way': 1}
           end
         end
         format.json do

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -46,8 +46,12 @@ module EducodeSales
         @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids).sum(:total_amount).round(2)
         @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids).sum(:actual_amount).round(2)
         @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
-        # @return_amount = total_return[0]['return_money']&.round(2) || 0
-        @receivable_amount = @goal_amount - @return_amount
+
+        # 往年累计已中标合同
+        @former_goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-12-31", stage_ids).sum(:actual_amount).round(2)
+        # 往年累计已回款
+        @former_return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at <= ? ", year_over_time).sum(:amount).round(2)
+        @receivable_amount = @former_goal_amount - @former_return_amount
 
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)
         @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).where("educode_sales_follow_ups.year = ?", @year).sum(:total_amount).round(2)
@@ -85,7 +89,7 @@ module EducodeSales
         end
         format.js do
           default_dates = (30.day.ago.to_date..Date.today).map { |d| d.strftime("%Y-%W") }.uniq #默认时间范围
-          @follow_count_data =  business_followup_charts(default_dates, names, x_business_ids, SaleTrend::COLORS, [30.day.ago.to_date.beginning_of_week, Date.today], "%Y-%u") do |default_dates|
+          @follow_count_data =  business_followup_charts(default_dates, names, x_business_ids, SaleTrend::COLORS, [30.day.ago.to_date.beginning_of_week, Date.today], "%Y%u") do |default_dates|
             default_dates.map { |date|
               d = date.split("-")
               year = d[0].to_i
@@ -172,7 +176,7 @@ module EducodeSales
 
           goal_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 = ['已中标', '已签单', '已回款']
-          @goal_count_data = month_sale_chart(goal_default_dates, sale_names, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type)
+         
           if params[:goal_count_range].present?
             case params[:goal_count_range]
             when "week"
@@ -180,16 +184,23 @@ module EducodeSales
               if params[:goal_date_month].present?
                 date = params[:goal_date_month].split(" - ")
                 dates = ((date[0] + "-01").to_date..(date[1] + "-01").to_date).map { |d| d.strftime("%Y-%m") }.uniq
-                @goal_count_data = month_sale_chart(dates, sale_names, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type)
+                @goal_count_data = month_sale_chart(dates, sale_names, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type, date)
+              else
+                @goal_count_data = month_sale_chart(goal_default_dates, sale_names, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type, ["#{Time.now.year}-01", "#{Time.now.year}-#{Time.now.month}"])
               end
             else
               #按年
               if params[:goal_date_year].present?
                 date = params[:goal_date_year].split(" - ")
                 dates = (date[0]..date[1]).to_a
-                @goal_count_data = year_sale_chart(dates, sale_names, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type)
+                @goal_count_data = year_sale_chart(dates, sale_names, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type, date)
+              else
+                goal_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
+                @goal_count_data = year_sale_chart(goal_default_dates, sale_names, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type, ["#{Time.now.year}", "#{Time.now.year}"])
               end
             end
+          else
+            @goal_count_data = month_sale_chart(goal_default_dates, sale_names, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type, ["#{Time.now.year}-01", "#{Time.now.year}-#{Time.now.month}"])
           end
         end
       end
@@ -351,9 +362,9 @@ module EducodeSales
             hidden: name[2] == 11, #role_id:11 离职角色
             data: dates.map { |date| data["#{name[1]}-#{ date.gsub("-", '')}"]&.[](0)&.[]('counts') || 0 },
             backgroundColor: "#fff",
-            pointBorderColor: colors[i % 15 + 1],
-            borderColor: colors[i % 15 + 1],
-            pointBackgroundColor: colors[i % 15 + 1],
+            pointBorderColor: colors[i % 50 + 1],
+            borderColor: colors[i % 50 + 1],
+            pointBackgroundColor: colors[i % 50 + 1],
             borderWidth: 2
           }
         end
@@ -361,7 +372,88 @@ module EducodeSales
     end
 
 
-    def month_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type)
+    def month_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type, range)
+      begin_at = range[0].split("-")
+      end_at = range[1].split("-")
+
+      begin_at = DateTime.new begin_at[0].to_i, begin_at[1].to_i
+      end_at = DateTime.new end_at[0].to_i, end_at[1].to_i
+      data_1 = EducodeSales::Business.joins(:last_follow_up).
+        where("educode_sales_follow_ups.clazz_id != ?", x).
+        where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).
+        where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", begin_at, end_at).
+        select("SUM(#{count_type}) AS count_type, DATE_FORMAT(bidded_date, '%Y-%m') AS month").
+        group("DATE_FORMAT(bidded_date, '%Y-%m')").
+        order("DATE_FORMAT(bidded_date, '%Y-%m')")
+      data_1_hash = {}
+      data_1_total_hash = {}
+      data_1.each do |d|
+        data_1_hash[d.month] = d.count_type.round(2)
+      end
+
+      last_month = 0
+      last_sum = 0
+      dates.each do |month|
+        # 只累计当前年份
+        if last_month != month.split("-")[0]
+          last_sum = 0
+        end
+        data_1_total_hash[month] = (data_1_hash[month] || 0) + last_sum
+        last_sum += data_1_hash[month] || 0
+        last_month = month.split("-")[0]
+      end
+
+      data_2 = EducodeSales::Business.joins(:last_follow_up).
+        where("educode_sales_follow_ups.clazz_id != ?", x).
+        where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).
+        where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?", begin_at, end_at).
+        select("SUM(#{count_type}) AS count_type, DATE_FORMAT(signed_date, '%Y-%m') AS month").
+        group("DATE_FORMAT(signed_date, '%Y-%m')").
+        order("DATE_FORMAT(signed_date, '%Y-%m')")
+      data_2_hash = {}
+      data_2_total_hash = {}
+      data_2.each do |d|
+        data_2_hash[d.month] = d.count_type.round(2)
+      end
+
+      last_month = 0
+      last_sum = 0
+      dates.each do |month|
+        # 只累计当前年份
+        if last_month != month.split("-")[0]
+          last_sum = 0
+        end
+        data_2_total_hash[month] = (data_2_hash[month] || 0) + last_sum
+        last_sum += data_2_hash[month] || 0
+        last_month = month.split("-")[0]
+      end
+
+      data_3 = EducodeSales::Business.joins(last_follow_up: :money_plans).
+        where("educode_sales_follow_ups.clazz_id != ?", x).
+        where.not("educode_sales_money_plans.clazz!= ?", 1).
+        where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at <= ?", begin_at, end_at).
+        select("SUM(amount) AS count_type, DATE_FORMAT(date_at, '%Y-%m') AS month").
+        group("DATE_FORMAT(date_at, '%Y-%m')").
+        order("DATE_FORMAT(date_at, '%Y-%m')")
+      data_3_hash = {}
+      data_3.each do |d|
+        data_3_hash[d.month] = d.count_type.round(2)
+      end
+
+      data_3_total_hash = {}
+      last_month = 0
+      last_sum = 0
+      dates.each do |month|
+        # 只累计当前年份
+        if last_month != month.split("-")[0]
+          last_sum = 0
+        end
+        data_3_total_hash[month] = (data_3_hash[month] || 0) + last_sum
+        last_sum += data_3_hash[month] || 0
+        last_month = month.split("-")[0]
+      end
+
+
       {
         labels: dates,
         datasets: names.map.with_index do |name, i|
@@ -370,11 +462,21 @@ module EducodeSales
             data: dates.map { |d|
               case i
               when 0
-                Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", stage_ids).sum(count_type).round(2)
+                data_1_hash[d] || 0
               when 1
-                Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", s_stage_ids).sum(count_type).round(2)
+                data_2_hash[d] || 0
               else
-                Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
+                data_3_hash[d] || 0
+              end
+            },
+            data1: dates.map { |d|
+              case i
+              when 0
+                data_1_total_hash[d] || 0
+              when 1
+                data_2_total_hash[d] || 0
+              else
+                data_3_total_hash[d] || 0
               end
             },
             backgroundColor: colors[i],
@@ -385,7 +487,90 @@ module EducodeSales
       }
     end
 
-    def year_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type)
+    def year_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type, range)
+      begin_at = range[0].split("-")
+      end_at = range[1].split("-")
+      begin_at = DateTime.new(begin_at[0].to_i).beginning_of_year
+      end_at = DateTime.new(end_at[0].to_i).end_of_year
+
+      data_1 = EducodeSales::Business.joins(:last_follow_up).
+        where("educode_sales_follow_ups.clazz_id != ?", x).
+        where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).
+        where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", begin_at, end_at).
+        select("SUM(#{count_type}) AS count_type, DATE_FORMAT(bidded_date, '%Y') AS year").
+        group("DATE_FORMAT(bidded_date, '%Y')").
+        order("DATE_FORMAT(bidded_date, '%Y')")
+      data_1_hash = {}
+      data_1.each do |d|
+        data_1_hash[d.year] = d.count_type.round(2)
+      end
+
+      data_1_total_hash = {}
+      last_month = 0
+      last_sum = 0
+      dates.each do |month|
+        # 只累计当前年份
+        if last_month != month.split("-")[0]
+          last_sum = 0
+        end
+        data_1_total_hash[month] = (data_1_hash[month] || 0) + last_sum
+        last_sum += data_1_hash[month] || 0
+        last_month = month.split("-")[0]
+      end
+
+      data_2 = EducodeSales::Business.joins(:last_follow_up).
+        where("educode_sales_follow_ups.clazz_id != ?", x).
+        where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).
+        where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?", begin_at, end_at).
+        select("SUM(#{count_type}) AS count_type, DATE_FORMAT(signed_date, '%Y') AS year").
+        group("DATE_FORMAT(signed_date, '%Y')").
+        order("DATE_FORMAT(signed_date, '%Y')")
+      data_2_hash = {}
+      data_2.each do |d|
+        data_2_hash[d.year] = d.count_type.round(2)
+      end
+
+      data_2_total_hash = {}
+      last_month = 0
+      last_sum = 0
+      dates.each do |month|
+        # 只累计当前年份
+        if last_month != month.split("-")[0]
+          last_sum = 0
+        end
+        data_2_total_hash[month] = (data_2_hash[month] || 0) + last_sum
+        last_sum += data_2_hash[month] || 0
+        last_month = month.split("-")[0]
+      end
+
+      data_3 = EducodeSales::Business.joins(last_follow_up: :money_plans).
+        where("educode_sales_follow_ups.clazz_id != ?", x).
+        where.not("educode_sales_money_plans.clazz!= ?", 1).
+        where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at <= ?", begin_at, end_at).
+        select("SUM(amount) AS count_type, DATE_FORMAT(date_at, '%Y') AS year").
+        group("DATE_FORMAT(date_at, '%Y')").
+        order("DATE_FORMAT(date_at, '%Y')")
+      data_3_hash = {}
+      data_3.each do |d|
+        data_3_hash[d.year] = d.count_type.round(2)
+      end
+
+      data_3_total_hash = {}
+      last_month = 0
+      last_sum = 0
+      dates.each do |month|
+        # 只累计当前年份
+        if last_month != month.split("-")[0]
+          last_sum = 0
+        end
+   
+        data_3_total_hash[month] = (data_3_hash[month] || 0) + last_sum
+        last_sum += data_3_hash[month] || 0
+        last_month = month.split("-")[0]
+      end
+
+
+
       {
         labels: dates,
         datasets: names.map.with_index do |name, i|
@@ -394,12 +579,22 @@ module EducodeSales
             data: dates.map { |d|
               case i
               when 0
-                Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01-01", "#{d}-12-31", stage_ids).sum(count_type).round(2)
+                data_1_hash[d] || 0
               when 1
-                Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01-01", "#{d}-12-31", s_stage_ids).sum(count_type).round(2)
+                data_2_hash[d] || 0
               else
-                Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01-01", "#{d}-12-31").sum(:amount).round(2)
+                data_3_hash[d]|| 0
               end },
+            data1: dates.map { |d|
+              case i
+              when 0
+                data_1_total_hash[d] || 0
+              when 1
+                data_2_total_hash[d] || 0
+              else
+                data_3_total_hash[d] || 0
+              end
+            },
             backgroundColor: colors[i],
             borderColor: colors[i],
             borderWidth: 1

data/app/models/educode_sales/sale_trend.rb

@@ -1,6 +1,13 @@
 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)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)', 'rgba(255, 0, 250, 1)']
+    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)', 
+      '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'
+    ]
   end
 end

data/app/views/educode_sales/businesses/get_export_data.json.jbuilder

@@ -23,6 +23,18 @@ json.data do
         break
       end
     end
+    json.area d.department.school.province
+    school_property = d.department.school.school_property
+    property = []
+
+    if school_property.present?
+      property << '本科地方院校' if school_property.regular_college || school_property.project_985 ||  school_property.project_211
+      property << '高职' if school_property.junior_college || school_property.secondary_school
+      property << '本科军校' if school_property.military_school
+      property << '企业' if school_property.enterprise
+    end
+    json.property property.join("、")
+    json.sale_way d.last_follow_up&.place&.name.present? ? '渠道' : '直销'
     json.actual_amount d.last_follow_up&.actual_amount.to_f.round(2)
     json.return_money d.return_money
     json.wait_return_money d.wait_return_money.to_f.round(2)

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

@@ -100,6 +100,8 @@
 <script type="text/html" id="bussinessBar">
   <div class="layui-btn-container">
     <span class="table-label">商机列表</span>
+    <span class="table-label gray-text">（</span>
+    <span class="table-label red-tips">标记该商机类型已被更改过）</span>
     <% if can?(:export_business, EducodeSales::Business) %>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm data-count-edit export_more-btn pull-right" style="color: #0000ff;" data-name="export" data-id="export">导出<i class="layui-icon layui-icon-down  layui-nav-more" style="font-size: 12px"></i></button>
     <% end %>
@@ -259,8 +261,8 @@
 
 
         var data = form.val("search_form");
-        data.business_type = <%=params[:clazz_id] %>
-            console.log(data);
+        data.business_type = "<%=params[:clazz_id] %>";
+    
 
         table = layui.table;
         var cols_table = [
@@ -283,10 +285,16 @@
                     field: 'name',
                     width: 170,
                     title: '商机名称',
-                    templet: '<div><span title="{{d.name}}">{{d.name}}</span></div>',
+                    templet: '<div><a href="javascript:void(0);" class="layui-table-link" lay-event="show_business"><span title="{{d.name}}">{{d.name}}</span></a></div>',
                     fixed: 'left',
                     hide: gon.filter.name
                 },
+                {
+                    field: 'area',
+                    width: 100,
+                    title: '地域',
+                    hide: gon.filter.area
+                },
                 {
                     field: 'school',
                     width: 150,
@@ -294,6 +302,12 @@
                     templet: '#school_name',
                     hide: gon.filter.school
                 },
+                {
+                    field: 'property',
+                    width: 150,
+                    title: '客户类型',
+                    hide: gon.filter.property
+                },
                 {
                     field: 'department',
                     width: 150,
@@ -433,6 +447,12 @@
                     title: '渠道',
                     hide: gon.filter.place
                 },
+                {
+                  field: 'sale_way',
+                  width: 160,
+                  title: '销售方式',
+                  hide: gon.filter.sale_way
+                },
                 {
                     field: 'year',
                     width: 105,
@@ -480,7 +500,6 @@
           skin: 'line',
           done: function (res) {
               exportData=res.data;
-              console.log(exportData);
               drowpdwonRender()
             export_drowpdwonRender()
           }
@@ -903,7 +922,6 @@
                     });
             }
 
-
             if (obj.event === 'add') { // 监听添加操作
                 var content = miniPage.getHrefContent('/missions/businesses/new');
                 var openWH = miniPage.getOpenWidthHeight();
@@ -1095,24 +1113,27 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'show_follow') {
-                 self_flag = data.self_flag
-                business_id = obj.data.id
-                 business_name = data.name
-                content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
-                openWH = miniPage.getOpenWidthHeight();
-                index = layer.open({
-                    title: '商机列表/' + data.name + '的跟进记录',
-                    type: 1,
-                    shade: 0.2,
-                    maxmin: true,
-                    shadeClose: true,
-                    area: [openWH[0] + 'px', openWH[1] + 'px'],
-                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
-                    content: content
-                });
-                $(window).on("resize", function () {
-                    layer.full(index);
-                });
+              time_line(obj.data.id, obj.data.name);
+                // self_flag = data.self_flag
+                // business_id = obj.data.id
+                // business_name = data.name
+                // content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
+                // openWH = miniPage.getOpenWidthHeight();
+                // index = layer.open({
+                //     title: '商机列表/' + data.name + '的跟进记录',
+                //     type: 1,
+                //     shade: 0.2,
+                //     maxmin: true,
+                //     shadeClose: true,
+                //     area: [openWH[0] + 'px', openWH[1] + 'px'],
+                //     offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                //     content: content
+                // });
+                // $(window).on("resize", function () {
+                //     layer.full(index);
+                // });
+            } else if (obj.event == 'show_business') {
+              time_line(obj.data.id, obj.data.name)
             }
         });
     });

data/app/views/educode_sales/businesses/index.json.jbuilder

@@ -26,6 +26,19 @@ json.data do
         break
       end
     end
+
+    json.area d.department.school.province
+    school_property = d.department.school.school_property
+    property = []
+
+    if school_property.present?
+      property << '本科地方院校' if school_property.regular_college || school_property.project_985 ||  school_property.project_211
+      property << '高职' if school_property.junior_college || school_property.secondary_school
+      property << '本科军校' if school_property.military_school
+      property << '企业' if school_property.enterprise
+    end
+    json.property property.join("、")
+    json.sale_way d.last_follow_up&.place&.name.present? ? '渠道' : '直销'
     json.year d.last_follow_up&.year.to_s
     json.total_amount d.last_follow_up&.total_amount.to_f.round(2)
     json.actual_amount d.last_follow_up&.actual_amount.to_f.round(2)

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

@@ -73,7 +73,8 @@
         datasets.push({
           label: d.label,
           type: 'line',
-          data: d.data,borderColor: color[i],
+          data: d.data1,
+          borderColor: color[i],
           pointRadius: 1,
           fill: false,
           lineTension: 0

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.10'
+  VERSION = '0.9.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ 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
@@ -486,7 +485,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -501,8 +500,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []