educode_sales 0.9.28 → 0.9.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dae94f7427cfade72ce95b294b3fd759d975b369282d929a11aebd884168a2ca
-  data.tar.gz: ff21e034b9dc3cc0a8f6e956d62ea3f604f87644b004715fee5044626f175775
+  metadata.gz: 51800df7e8c3e444188f0353c66757741c5a99e710426b47da2e9593c65f819f
+  data.tar.gz: 89735f6378821ee46fc806198a24559015440a0047ee6fc4ca27f8d364b69755
 SHA512:
-  metadata.gz: d7e1ea6e2c957bd4811b77dae36106f8e43fb5cbcc4463297922bb419bd937745520bd02914ebb9aed342441793bf61b8bdf88a52e7599ae9101e42d1a10ca7e
-  data.tar.gz: c31ad80e5afda10b9b74a26fb8e1f6966e9823b44599c84bc46ce2215cf78377b3d29da900bd43088316ea689053cbae9da4da57d31b5e77f17506619234fa22
+  metadata.gz: 6f967ae4f53c7819b02f3f006a9309434b41b5d22474504464b6e22f3a5469c810a24e221e82468b642240dd81e320b019cd45f0a018e9d94fda99fa646245c5
+  data.tar.gz: 65c325fc5d46fcfdb7ec964881ab0fb832857d428a10241fced792709871c9092ce907c5f74cc23581e2f8776a972a7f3f32d17343a2d377a4b2597610d4f65c

data/app/controllers/educode_sales/businesses_controller.rb

@@ -264,11 +264,11 @@ module EducodeSales
             (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,
-            total_follow_ups.follow_ups_count
+            total_follow_ups.follow_ups_counts
             ").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
             LEFT JOIN (
-              SELECT COUNT(*) AS follow_ups_count, educode_sales_follow_ups.business_id
+              SELECT COUNT(*) AS follow_ups_counts, educode_sales_follow_ups.business_id
               FROM educode_sales_follow_ups
               WHERE educode_sales_follow_ups.deleted_at IS NULL
               GROUP BY educode_sales_follow_ups.business_id

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -117,7 +117,8 @@ module EducodeSales
             when "week" #按周
               if params[:date_week].present?
                 date = params[:date_week].split(" - ")
-                dates = (date[0].to_date..date[1].to_date).map { |d|  d.strftime("%Y-%W") }.uniq
+                # 年初第一天周数是0会导致周数重复计算
+                dates = (date[0].to_date..date[1].to_date).map { |d|  d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
                 @follow_count_data =  business_followup_charts(dates, names, x_business_ids, SaleTrend::COLORS, date, "%Y%u") do |dates|
                   dates.map { |date|
                     d = date.split("-")
@@ -190,6 +191,9 @@ module EducodeSales
             when "month" #按月
               if params[:goal_date_month].present?
                 date = params[:goal_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
                 @goal_count_data = month_sale_chart(dates, sale_names, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type, date)
               else
@@ -414,11 +418,9 @@ module EducodeSales
 
 
     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 = range[0]
+      end_at = range[1]
 
-      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).
@@ -531,8 +533,8 @@ module EducodeSales
     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
+      begin_at = DateTime.new(begin_at[0].to_i).beginning_of_year.to_date.to_s
+      end_at = DateTime.new(end_at[0].to_i).end_of_year.to_date.to_s
 
       data_1 = EducodeSales::Business.joins(:last_follow_up).
         where("educode_sales_follow_ups.clazz_id != ?", x).

data/app/models/educode_sales/business.rb

@@ -29,7 +29,7 @@ module EducodeSales
 
     def self.include_types(type)
       {
-        '1' => %w[a_class b_class c_class d_class e_class o_class],
+        '1' => %w[a_class b_class c_class d_class e_class],
         'a' => ['a_class'],
         'b' => ['b_class'],
       }[type]

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

@@ -80,7 +80,7 @@
     <div class="layui-inline">
       <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 %>">
+        <input name="total_amount" type="number" class="layui-input" value="<%= @follow_up.total_amount.to_f.round(6)  %>">
       </div>
       客户采购支出的费用。中标额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
     </div>
@@ -88,7 +88,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
-        <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
+        <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount.to_f.round(6)  %>">
       </div>
       客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
@@ -103,7 +103,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
-        <input name="divide_amount" class="layui-input" value="<%= @follow_up.divide_amount%>">
+        <input name="divide_amount" class="layui-input" value="<%= @follow_up.divide_amount.to_f.round(6) %>">
       </div>
       中标额里，渠道拿到的部分。
     </div>
@@ -111,7 +111,7 @@
     <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) %>">
+        <input name="budget_amount" class="layui-input" value="<%= @last_follow_up&.budget_amount.to_f.round(6) %>">
       </div>
     </div>
      <div class="layui-form-item">

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

@@ -8,7 +8,7 @@ json.data do
     json.department d.department.name
     json.school d.department.school.name
     json.school_id d.department.school.id
-    follow_ups_count = d['follow_ups_count'] || 0
+    follow_ups_count = d['follow_ups_counts'] || 0
     json.follow_ups_count follow_ups_count
     follow_count += follow_ups_count
     json.follow_up_id d.last_follow_up_id
@@ -23,8 +23,8 @@ json.data do
     json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
   
     json.divide_rate d.divide_rate
-    json.divide_money d.divide_amount
-    json.budget_amount d.budget_amount #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
+    json.divide_money d.divide_amount.to_f.round(2)
+    json.budget_amount d.budget_amount.to_f.round(2)  #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

@@ -87,7 +87,7 @@
       <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) %>">
+               value="<%= @last_follow_up&.total_amount.to_f.round(6) %>">
       </div>
       客户采购支出的费用。中标额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
     </div>
@@ -96,7 +96,7 @@
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
         <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
-               value="<%= @last_follow_up&.actual_amount.to_f.round(2) %>">
+               value="<%= @last_follow_up&.actual_amount.to_f.round(6) %>">
       </div>
       客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
@@ -111,7 +111,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
-        <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount.to_f.round(2) %>">
+        <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount.to_f.round(6) %>">
       </div>
       中标额里，渠道拿到的部分。
     </div>
@@ -119,7 +119,7 @@
      <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) %>">
+        <input name="budget_amount" class="layui-input" value="<%= @last_follow_up&.budget_amount.to_f.round(6) %>">
       </div>
     </div>
     <div class="layui-form-item">

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

@@ -83,13 +83,13 @@
     <div class="layui-inline">
       <label class="layui-form-label">中标额：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.total_amount.to_f.round(2) %>万
+        <%= @follow_up.total_amount.to_f.round(6) %>万
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">合同额：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.actual_amount.to_f.round(2) %>万
+        <%= @follow_up.actual_amount.to_f.round(6) %>万
       </div>
     </div>
     <br>
@@ -99,12 +99,19 @@
         <%= @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) %>万
+        <%= @follow_up.divide_amount.to_f.round(6) %>万
+      </div>
+    </div>
+    <br/>
+    <div class="layui-inline">
+      <label class="layui-form-label">预算金额：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.budget_amount.to_f.round(6) %>万
       </div>
-    </div> -->
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">分成比例：</label>
       <div class="layui-input-inline">

data/app/views/educode_sales/follow_ups/money_plans.json.jbuilder

@@ -1,6 +1,7 @@
 json.data do
   json.array! @money_plans do |d|
-    json.(d, :id, :amount, :clazz)
+    json.(d, :id, :clazz)
+    json.amount d.amount.to_f.round(6)
     json.date_at d.date_at.present? ? d.date_at.to_s(:date) : ''
   end
 end

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

@@ -54,11 +54,11 @@
       function renderTable(chart_data) {
         var labels = [];
         fields = [
-          {field: 'col0', title: '姓名', width:100}
+          {field: 'col0', title: '姓名', width:100, totalRowText: '合计：'}
         ];
         chart_data.labels.forEach(function(d, i) {
           labels.push(d);
-          fields.push({title: d.split("(").join("<br/>").replace(")", ""), field: 'col' + (i + 1), width:160,  align: 'center'})
+          fields.push({title: d.split("(").join("<br/>").replace(")", ""), field: 'col' + (i + 1), width:180,  align: 'center', sort: true, totalRow: '{{ parseInt(d.TOTAL_NUMS) }}'})
         })
         var table_data = [];
         chart_data.datasets.forEach(function(d, i) {
@@ -78,6 +78,7 @@
           url: '',
           limit: 1000,
           page: false,
+          totalRow: true,
           data: table_data,
           cols: [fields]
         });

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.28'
+  VERSION = '0.9.30'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.28
+  version: 0.9.30
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails