educode_sales 0.9.19 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e382eb55f259af6a9b8cbb31f1e8b058ad84d556edfa07d9fca0d143c9b21049
-  data.tar.gz: 5c732f8b0ee0d2c3966e7f496af10d455bf79d1c9f00d13f28f23eecc82cae76
+  metadata.gz: 482f37ccd129a5ea2fab08879a380aeed531a2026aac73a42528e6ee653a9aae
+  data.tar.gz: 27893e5d818e5bf26ec582dfed97bc1793f822fb818a5c2ec7311dea47439e13
 SHA512:
-  metadata.gz: a62487b82d2d67d80dac7c2166feff916b75e6b2d2684edf3b5efbb4d70f9cb78bb2ee9e520c49d2d66769a7ba1b3d275add6fb65eb943e54b405ed2920ed0a7
-  data.tar.gz: bced66e19f8f323e649d480f222c6c571b6547ca2bd2fc45c15c8b3d56b8763b3916bf91b697f43047482732d899330dbff095d414d9ef3f07a45b9b9f78f539
+  metadata.gz: 0a416d26f945870f4c40587ec1fd0f89d3c661f671d5162b4643f79bdd9bc4d23d05025b07604dbc459f05e2df660f1f1898cd1c4cf6101da472586a27b265f3
+  data.tar.gz: d45d9f2fd66387be4c58a46e072b21a80ec9b1285283a77f0cb9dbe11eb7b034ff503dae8fa01dc89422977b47315df4916c96d78f4d06224a64527eb0953bb7

data/app/controllers/educode_sales/businesses_controller.rb

@@ -230,7 +230,7 @@ module EducodeSales
             @businesses = @businesses.where("number like :data",  data: "%#{params[:q][:number].strip}%")
           end
 
-          if params[:q][:clazz].present?
+          if params[:q].present? && params[:q][:clazz].present?
             # 我的关注
             if params[:q][:clazz] == 'followes'
               my_ids = BusinessRelationShip.where(user_id:@current_admin.user_id).pluck(:business_id)
@@ -256,6 +256,7 @@ module EducodeSales
           @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
+            last_follow.budget_amount,
             last_follow.service_time_long,
             last_follow.service_end_time,
             last_follow.service_start_time,
@@ -265,6 +266,9 @@ module EducodeSales
             last_follow.year,
             last_follow.created_at as latest_time,
             last_follow.actual_amount,
+            last_follow.divide_rate,
+            last_follow.divide_amount,
+            (last_follow.total_amount - last_follow.actual_amount) as divide_money,
             (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
             last_follow.total_amount
             ").joins("
@@ -282,12 +286,12 @@ module EducodeSales
       business = EducodeSales::FollowUp.joins("
         JOIN educode_sales_businesses ON educode_sales_businesses.id = educode_sales_follow_ups.business_id
         JOIN educode_sales_follow_ups AS last_up ON last_up.id = educode_sales_businesses.last_follow_up_id
-       ").where("educode_sales_businesses.staff_id = ? AND educode_sales_follow_ups.staff_id = ? AND last_up.clazz_id IN (?)", @current_admin.id, @current_admin.id, ab)
+       ").where("educode_sales_businesses.staff_id = ? AND educode_sales_follow_ups.staff_id = ? AND last_up.clazz_id IN (?) AND last_up.staff_id = #{@current_admin.id}", @current_admin.id, @current_admin.id, ab)
      
 
-      @month = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_month).group("educode_sales_follow_ups.business_id").select("COUNT(DISTINCT(educode_sales_follow_ups.business_id)) AS num")
-      @quarter = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_quarter).group("educode_sales_follow_ups.business_id").select("COUNT(DISTINCT(educode_sales_follow_ups.business_id)) AS num")
-      @year = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_year).group("educode_sales_follow_ups.business_id").select("COUNT(DISTINCT(educode_sales_follow_ups.business_id)) AS num")
+      @month = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_month).count("DISTINCT(educode_sales_follow_ups.business_id)")
+      @quarter = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_quarter).count("DISTINCT(educode_sales_follow_ups.business_id)")
+      @year = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_year).count("DISTINCT(educode_sales_follow_ups.business_id)")
      
       render layout: false
     end
@@ -649,6 +653,7 @@ module EducodeSales
           @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
+            last_follow.budget_amount,
             last_follow.reception_at,
             last_follow.service_time_long,
             last_follow.service_end_time,
@@ -657,6 +662,9 @@ module EducodeSales
             last_follow.signed_date,
             last_follow.created_at as latest_time,
             last_follow.actual_amount,
+            last_follow.divide_rate,
+            last_follow.divide_amount,
+            (last_follow.total_amount - last_follow.actual_amount) as divide_money,
             (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id AND last_follow.deleted_at IS NULL
@@ -690,6 +698,7 @@ module EducodeSales
       @businesses=Business.where(id:p)
       @businesses=@businesses.select("
             educode_sales_businesses.*,
+            last_follow.budget_amount,
             last_follow.invitation_at,
             last_follow.reception_at,
             last_follow.service_time_long,

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -196,7 +196,7 @@ module EducodeSales
       if params[:name].blank?
         return render_failure '请从平台里选择教师'
       end
-      
+
       names = params[:name].split("-")
       if names[0] == 't'
         # 从教师列表里选择的用户
@@ -255,7 +255,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment)
     end
 
     def teacher_params

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -217,9 +217,10 @@ module EducodeSales
     def business_area
       respond_to do |format|
         format.html do
-
         end
         format.js do
+          @business_types = EducodeSales::Common.where(clazz: 'business_type').where.not(extras: "x_class").map { |d| {name: d.name, value: d.id } }
+          @select_business_type = params[:business_type].present? ?  params[:business_type].split(",") : []
           x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
           o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
           provinces = EducodeSales::Common.where(clazz: 'area').pluck(:name)
@@ -228,11 +229,23 @@ module EducodeSales
               if params[:business_type].blank?
                 Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:total_amount).round(2)
               else
-                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id = ?", params[:business_type]).sum(:total_amount).round(2)
+                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id in (?)", params[:business_type].split(",")).sum(:total_amount).round(2)
               end
             }
             if params[:sort_by].present?
-              data.sort! { |a, b| params[:sort_by] == 'asc' ?  a <=> b  : b <=> a }
+              data_hash = []
+              data.each_with_index do |d, i|
+                data_hash << {id: i, num: d}
+              end
+
+              data_hash.sort! { |a, b| params[:sort_by] == 'asc' ?  a[:num] <=> b[:num]  : b[:num] <=> a[:num] }
+              data = []
+              provinces_sort = []
+              data_hash.each_with_index do |d|
+                data << d[:num]
+                provinces_sort << provinces[d[:id]]
+              end
+              provinces = provinces_sort
             end
             @business_data = {
               labels: provinces,
@@ -251,11 +264,23 @@ module EducodeSales
               if params[:business_type].blank?
                 Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).count
               else
-                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id = ?", params[:business_type]).count
+                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id in (?)", params[:business_type].split(",")).count
               end
             }
             if params[:sort_by].present?
-              data.sort! { |a, b| params[:sort_by] == 'asc' ?  a <=> b  : b <=> a }
+              data_hash = []
+              data.each_Wit_index do |d, i|
+                data_hash << {id: i, num: d}
+              end
+
+              data_hash.sort! { |a, b| params[:sort_by] == 'asc' ?  a[:num] <=> b[:num]  : b[:num] <=> a[:num] }
+              data = []
+              provinces_sort = []
+              data_hash.each_with_index do |d|
+                data << d[:num]
+                provinces_sort << provinces[d[:id]]
+              end
+              provinces = provinces_sort
             end
             @business_data = {
               labels: provinces,

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

@@ -5,17 +5,17 @@
 
     <p>一、AB类商机开拓情况</p>
     <p style="margin-bottom: 30px;">
-      本月-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @month[0]&.[]('num') || 0 %>, </span>
-      本季-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @quarter[0]&.[]('num') || 0  %>, </span>
-      本年-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @year[0]&.[]('num') || 0  %></span>
+      本月-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @month %>, </span>
+      本季-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @quarter %>, </span>
+      本年-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @year %></span>
     </p>
     <p style="margin-bottom: 30px;">二、本月已组织会议</p>
     <p>三、客户跟进情况</p>
     <% text = "\n" %>
     <% text += "一、AB类商机开拓情况\n" %>
-    <% text += "本月-#{@month[0]&.[]('num') || 0 }, "%>
-    <% text += "本季-#{@quarter[0]&.[]('num') || 0 }, "%>
-    <% text += "本年-#{@year[0]&.[]('num') || 0 }\n\n"%>
+    <% text += "本月-#{@month }, "%>
+    <% text += "本季-#{@quarter }, "%>
+    <% text += "本年-#{@year }\n\n"%>
     <% text += "二、本月已组织会议 \n\n"%>
     <% text += "三、客户跟进情况 \n"%>
     <% @followups.each_with_index do |d, i| %>

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

@@ -78,11 +78,11 @@
     </div>
     <br class="service_show layui-hide">
     <div class="layui-inline">
-      <label class="layui-form-label">总额(万)</label>
+      <label class="layui-form-label">中标额(万)</label>
       <div class="layui-input-inline">
         <input name="total_amount" type="number" class="layui-input" value="<%= @follow_up.total_amount %>">
       </div>
-      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
+      客户采购支出的费用。中标额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
     </div>
     <br>
     <div class="layui-inline">
@@ -105,7 +105,23 @@
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @follow_up.divide_amount%>">
       </div>
-      总额里，渠道拿到的部分。
+      中标额里，渠道拿到的部分。
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">预算金额(万)</label>
+      <div class="layui-input-inline">
+        <input name="budget_amount" class="layui-input" value="<%= @last_follow_up&.budget_amount.to_f.round(2) %>">
+      </div>
+    </div>
+     <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">分成比例</label>
+        <div class="layui-input-inline">
+          <input name="divide_rate" class="layui-input" value="<%= @follow_up&.divide_rate.to_f.round(2) %>">
+        </div>
+        % 渠道拿到的分成比例。
+      </div>
     </div>
     <div class="layui-form-item">
       <div class="layui-inline">

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

@@ -23,6 +23,10 @@ json.data do
         break
       end
     end
+
+    json.divide_rate d.divide_rate
+    json.divide_money d.divide_money
+    json.budget_money d.budget_amount
     json.area d.department.school.province
     school_property = d.department.school.school_property
     property = []

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

@@ -410,10 +410,24 @@
                     sort: true,
                     hide: gon.filter.budget_money
                 },
+                {
+                    field: 'divide_rate',
+                    width: 160,
+                    title: '渠道分成比例',
+                    sort: true,
+                    hide: gon.filter.divide_rate
+                },
+                {
+                  field: 'divide_money',
+                  width: 160,
+                  title: '渠道分成金额',
+                  sort: true,
+                  hide: gon.filter.divide_money
+                },
                 {
                     field: 'total_amount',
                     width: 100,
-                    title: '总额',
+                    title: '中标额',
                     totalRow: true,
                     sort: true,
                     hide: gon.filter.total_amount

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

@@ -26,7 +26,9 @@ json.data do
         break
       end
     end
-    json.budget_money d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
+    json.divide_rate d.divide_rate
+    json.divide_money d.divide_amount
+    json.budget_money d.budget_amount #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
     json.area d.department.school.province
     school_property = d.department.school.school_property
     property = []

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

@@ -84,12 +84,12 @@
 
     <br class="service_show layui-hide">
     <div class="layui-inline">
-      <label class="layui-form-label">总额(万)</label>
+      <label class="layui-form-label">中标额(万)</label>
       <div class="layui-input-inline">
         <input name="total_amount" type="number" class="layui-input" autocomplete="off"
                value="<%= @last_follow_up&.total_amount.to_f.round(2) %>">
       </div>
-      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
+      客户采购支出的费用。中标额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
     </div>
     <br>
     <div class="layui-inline">
@@ -113,7 +113,23 @@
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount.to_f.round(2) %>">
       </div>
-      总额里，渠道拿到的部分。
+      中标额里，渠道拿到的部分。
+    </div>
+    <br>
+     <div class="layui-inline">
+      <label class="layui-form-label">预算金额(万)</label>
+      <div class="layui-input-inline">
+        <input name="budget_amount" class="layui-input" value="<%= @last_follow_up&.budget_amount.to_f.round(2) %>">
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">分成比例</label>
+        <div class="layui-input-inline">
+          <input name="divide_rate" class="layui-input" value="<%= @last_follow_up&.divide_rate.to_f.round(2) %>">
+        </div>
+        % 渠道拿到的分成比例。
+      </div>
     </div>
     <div class="layui-form-item">
     <div class="layui-inline">

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

@@ -186,7 +186,7 @@
                 {
                     field: 'total_amount',
                     width: 100,
-                    title: '总额',
+                    title: '中标额',
                 },
                 {
                     field: 'actual_amount',
@@ -519,7 +519,7 @@
                 obj.del();
                 layer.close(index);
               })
-              
+
             });
           } else if (obj.event === 'show') {
             content = miniPage.getHrefContent('/missions/plans/show_week?id=' + data.id);
@@ -559,7 +559,7 @@
                   layer.full(sindex);
                 });
                 return false;
-            } 
+            }
             // else if (obj.event === 'show_follow') {
             //     content = miniPage.getHrefContent('/educode_sales/businesses/show_follow');
             //     openWH = miniPage.getOpenWidthHeight();

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

@@ -81,7 +81,7 @@
     <br>
 
     <div class="layui-inline">
-      <label class="layui-form-label">总额：</label>
+      <label class="layui-form-label">中标额：</label>
       <div class="layui-input-inline">
         <%= @follow_up.total_amount.to_f.round(2) %>万
       </div>
@@ -99,11 +99,17 @@
         <%= @follow_up.place&.name %>
       </div>
     </div>
-    <div class="layui-inline">
+    <!-- <div class="layui-inline">
       <label class="layui-form-label">渠道分成：</label>
       <div class="layui-input-inline">
         <%= @follow_up.divide_amount.to_f.round(2) %>万
       </div>
+    </div> -->
+    <div class="layui-inline">
+      <label class="layui-form-label">分成比例：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.divide_rate.to_f.round(2) %>%
+      </div>
     </div>
     <div class="layui-form-item">
       <div class="layui-inline">

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

@@ -12,7 +12,7 @@
           <div class="layui-inline m-t-10">
             <label class="layui-form-label">商机类型</label>
             <div class="layui-input-inline">
-              <%= select_tag "business_type", options_for_select(EducodeSales::Common.where(clazz: 'business_type').where.not(extras: "x_class").pluck(:name, :id), params[:business_type]), { 'lay-filter': 'clazz_id', include_blank: true } %>
+              <div id="business_type"></div>
             </div>
           </div>
           <div class="layui-inline m-t-10">
@@ -64,7 +64,13 @@
           }
         }
       };
-
+      var business_type_select = xmSelect.render({
+        el: '#business_type', 
+        name: 'business_type',
+        data: <%= raw @business_types.to_json %>
+      })
+      business_type_select.setValue(<%= raw @select_business_type.to_json %>);
+      
 
       var ctx = document.getElementById('myChart3');
       var myChart3 = new Chart(ctx, {

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

@@ -29,8 +29,8 @@
         </div>
       </form>
       </div>
-      <canvas id="myChart2" width="960" height="250"></canvas>
-      <canvas id="myChart2_1" width="960" height="250" style="margin-top: 30px;"></canvas>
+      <canvas id="myChart2" width="960" height="350"></canvas>
+      <canvas id="myChart2_1" width="960" height="350" style="margin-top: 30px;"></canvas>
   </div>
 </div>
 <script>
@@ -43,6 +43,14 @@
         tooltips: {
           enabled: false
         },
+        layout: {
+          padding: {
+            left: 50,
+            right: 50,
+            top: 0,
+            bottom: 0
+          }
+        },
         hover: {
           animationDuration: 0
         },

data/db/migrate/20221107122147_change_divide_rate_follow_ups.rb

@@ -0,0 +1,15 @@
+class ChangeDivideRateFollowUps < ActiveRecord::Migration[5.2]
+  def self.up
+    change_table :educode_sales_follow_ups do |t|
+      t.change :divide_rate, :float
+    end
+    add_column :educode_sales_follow_ups, :budget_amount, :float, comment: '预算金额'
+  end
+
+  def self.down
+    change_table :educode_sales_follow_ups do |t|
+      t.change :divide_rate, :integer
+    end
+    remove_column :educode_sales_follow_ups, :budget_amount
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.19'
+  VERSION = '0.9.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.20
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -479,6 +479,7 @@ files:
 - db/migrate/20220921131116_add_change_clazz_to_follow_up.rb
 - db/migrate/20220923084102_create_table_to_busines_number_recoreds.rb
 - db/migrate/20221025094655_delete_business_number.rb
+- db/migrate/20221107122147_change_divide_rate_follow_ups.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb