educode_sales 0.9.86 → 0.9.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85457062bb8c20c8e1703353efcb1f958eb39d5e15ca0936efac9f58ca720184
-  data.tar.gz: f115e02bf7cdfc392673bf27c533fd6d6cbb87a462936708eb3d1e8e093607f4
+  metadata.gz: 90a8a2173c7a406ab0cc7e93e394c7112394ad05e264004870d3a7bbe60754db
+  data.tar.gz: 1e51f78cda684acf4c051bbc75ced90b7927dd901a7c12466a1f7d68926c36b9
 SHA512:
-  metadata.gz: 0d0b2b9d028276ee69d72a5e480772c4676c341c8390c6bdfad9880bb9b303f8ab004c9ca2b52f44a9b0bf20e6d259a5973bb0fa83f022b4fa23cb96f27ac581
-  data.tar.gz: 2ee2104f1259feac76bc7d562616e266cce1488d5785e5383158dab5450799b7d3436822f29d57d3ae9f3c7044fb94815f3dec0450890ea6a1ef0db2451359af
+  metadata.gz: ef42ae93980e1cad1414a09e6c8a8213d759b1722396b2901839dad11a2a24aa30672e24cf7f2a1c196eac11e366958b75c1b6a4686a739d87722f0a887e4182
+  data.tar.gz: caa434156ad1796fdffdf59afccc406ed9723968b6f1bd7856f8df237436cf91a838efee688e7a5b452c73a2a1b33d2cfbb9369b58c92266fd98675d136904d5

data/app/controllers/educode_sales/contracts_controller.rb

@@ -243,6 +243,19 @@ module EducodeSales
         gon.department = []
         gon.value = ''
       end
+
+      @list = {}
+      EducodeSales::ContractDateList.clazzs.each do |d, i|
+        @list[d] = [EducodeSales::ContractDateList.new]
+      end
+
+      @last_follow_up.contract_date_lists.each do |d|
+        if @list[d.clazz][0].id ==  nil
+          @list[d.clazz][0] = d
+        else
+          @list[d.clazz] << d
+        end
+      end
      
       render layout: false
     end
@@ -312,6 +325,8 @@ module EducodeSales
     end
 
     def add_follow_ups
+      @business = Business.find(params[:business_id])
+      last_follow_up = @business.last_follow_up
       data = []
       6.times do |i|
         data[i] = []
@@ -326,14 +341,18 @@ module EducodeSales
         end
         params["#{i+1}_actual_date"].each do |d, v|
           data[i][d.to_i] << v
+          if i == 1 && last_follow_up
+            # 验收时间
+            last_follow_up.reception_at = v
+          end
         end
+       
       end
       data.each do |d|
         d.select! { |d| d.delete_if{|f| f == ''}.present? }
       end
 
-      @business = Business.find(params[:business_id])
-      last_follow_up = @business.last_follow_up
+    
 
       follow_up = last_follow_up.dup
       follow_up.assign_attributes(follow_up_params)

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -388,6 +388,7 @@ module EducodeSales
 
         end
         format.js do
+          property = params[:property] || nil
           staff_id = params[:staff_id] || nil
           @forecast_count_range = params[:forecast_count_range] || "month"
           forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%m") }.uniq
@@ -398,10 +399,10 @@ module EducodeSales
             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)
+              @forecast_count_data = goal_forecast_week(dates, sale_names, staff_id, property)
             else
               forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
-              @forecast_count_data = goal_forecast_week(forecast_default_dates, sale_names, staff_id)
+              @forecast_count_data = goal_forecast_week(forecast_default_dates, sale_names, staff_id, property)
             end
           when "quarter"
             # 按年
@@ -409,11 +410,11 @@ module EducodeSales
               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)
+              @forecast_count_data = goal_forecast_quarter(dates, sale_names, staff_id, property)
             else
               forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
               forecast_default_dates = forecast_default_dates.map { |d| [d.to_s + "-" + "1", d.to_s + "-" + "2", d.to_s + "-" + "3", d.to_s + "-" + "4"] }.flatten
-              @forecast_count_data = goal_forecast_quarter(forecast_default_dates, sale_names, staff_id)
+              @forecast_count_data = goal_forecast_quarter(forecast_default_dates, sale_names, staff_id, property)
             end
           when "month" # 按月
             if params[:forecast_date_month].present?
@@ -421,21 +422,23 @@ module EducodeSales
               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)
+              @forecast_count_data = goal_forecast_month(dates, sale_names, staff_id, property)
             else
-              @forecast_count_data = goal_forecast_month(forecast_default_dates, sale_names, staff_id)
+              @forecast_count_data = goal_forecast_month(forecast_default_dates, sale_names, staff_id, property)
             end
           else
             # 按年
             if params[:forecast_date_year].present?
               date = params[:forecast_date_year].split(" - ")
               dates = (date[0]..date[1]).to_a
-              @forecast_count_data = goal_forecast_year(dates, sale_names, staff_id)
+              @forecast_count_data = goal_forecast_year(dates, sale_names, staff_id, property)
             else
               forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
-              @forecast_count_data = goal_forecast_year(forecast_default_dates, sale_names, staff_id)
+              @forecast_count_data = goal_forecast_year(forecast_default_dates, sale_names, staff_id, property)
             end
           end
+          @forecast_count_data_0 = @forecast_count_data[0]
+          @forecast_count_data_1 = @forecast_count_data[1]
         end
       end
     end

data/app/controllers/educode_sales/sales_details_controller.rb

@@ -5,7 +5,7 @@ module EducodeSales
 
     def index
       respond_to do |format|
-        format.html do
+        format.js do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11)
           @staffs = staffs.map { |d| [d.user.real_name, d.id]}

data/app/helpers/educode_sales/sale_trends_helper.rb

@@ -1,9 +1,10 @@
 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")
+
+    def goal_forecast_quarter(labels, selects, staff_id = nil, property)
+      plan_get = plan_get(staff_id, labels, "quarter", property)
+      actual_get = actual_get(staff_id, labels, "quarter", property)
       datasets = selects.map.with_index do |select, i|
         data = if select == NAMES[0]
                  labels.map do |d|
@@ -53,16 +54,21 @@ module EducodeSales
           borderWidth: 1
         }
       end
-      {
+      hash_a = {
+        labels: labels,
+        datasets: [datasets[0], datasets[2]]
+      }
+      hash_b = {
         labels: labels,
-        datasets: datasets
+        datasets: [datasets[1], datasets[3]]
       }
+      [hash_a, hash_b]
     end
 
-    def goal_forecast_week(labels, selects, staff_id = nil)
+    def goal_forecast_week(labels, selects, staff_id = nil, property)
 
-      plan_get = plan_get(staff_id, labels, "week")
-      actual_get = actual_get(staff_id, labels, "week")
+      plan_get = plan_get(staff_id, labels, "week", property)
+      actual_get = actual_get(staff_id, labels, "week", property)
       datasets = selects.map.with_index do |select, i|
         data = if select == NAMES[0]
                  labels.map do |d|
@@ -117,15 +123,20 @@ module EducodeSales
         }
       end
 
-      {
+      hash_a = {
         labels: labels,
-        datasets: datasets
+        datasets: [datasets[0], datasets[2]]
       }
+      hash_b = {
+        labels: labels,
+        datasets: [datasets[1], datasets[3]]
+      }
+      [hash_a, hash_b]
     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")
+    def goal_forecast_month(labels, selects, staff_id = nil, property)
+      plan_get = plan_get(staff_id, labels, "month", property)
+      actual_get = actual_get(staff_id, labels, "month", property)
       datasets = selects.map.with_index do |select, i|
         data = if select == NAMES[0]
                  labels.map do |d|
@@ -177,15 +188,20 @@ module EducodeSales
         }
       end
 
-      {
+      hash_a = {
         labels: labels,
-        datasets: datasets
+        datasets: [datasets[0], datasets[2]]
       }
+      hash_b = {
+        labels: labels,
+        datasets: [datasets[1], datasets[3]]
+      }
+      [hash_a, hash_b]
     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")
+    def goal_forecast_year(labels, selects, staff_id = nil, property)
+      plan_get = plan_get(staff_id, labels, "year", property)
+      actual_get = actual_get(staff_id, labels, "year", property)
       datasets = selects.map.with_index do |select, i|
         data = if select == NAMES[0]
                  labels.map { |d| plan_get[d.to_i] || 0 }
@@ -220,15 +236,20 @@ module EducodeSales
           borderWidth: 1
         }
       end
-      {
+      hash_a = {
+        labels: labels,
+        datasets: [datasets[0], datasets[2]]
+      }
+      hash_b = {
         labels: labels,
-        datasets: datasets
+        datasets: [datasets[1], datasets[3]]
       }
+      [hash_a, hash_b]
     end
 
     private
 
-    def plan_get(staff_id, time_range, type)
+    def plan_get(staff_id, time_range, type, property)
       # budget_amount 预算额
       start_time = case type
                    when "month"
@@ -253,6 +274,9 @@ module EducodeSales
       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)
+      if property.present?
+        data = data.joins(department: [school: :school_tags]).where("school_tags.id = ?", property)
+      end
       case type
       when "week"
         data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.invitation_at) as week").group("yearweek(educode_sales_follow_ups.invitation_at)").sum(:budget_amount)
@@ -267,7 +291,7 @@ module EducodeSales
       end
     end
 
-    def actual_get(staff_id, time_range, type)
+    def actual_get(staff_id, time_range, type, property)
       start_time = case type
                    when "month"
                      time_range.first + "-01"
@@ -292,6 +316,9 @@ module EducodeSales
       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)
+      if property.present?
+        data = data.joins(department: [school: :school_tags]).where("school_tags.id = ?", property)
+      end
       case type
       when "week"
         data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.bidded_date) as week").group("yearweek(educode_sales_follow_ups.bidded_date)").sum(:actual_amount)

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

@@ -59,14 +59,7 @@
                placeholder="请选择日期">
       </div>
     </div>
-    <div class="layui-inline">
-      <label class="layui-form-label">验收时间</label>
-      <div class="layui-input-inline">
-        <input type="text" class="layui-input" name="reception_at" autocomplete="off" id="reception_at_add"
-               value="<%= @last_follow_up&.reception_at %>"
-               placeholder="请选择日期">
-      </div>
-    </div>
+    <input type="hidden" class="layui-input" name="reception_at" value="<%= @last_follow_up&.reception_at %>">
     <div class="layui-inline">
       <label class="layui-form-label">部署时间</label>
       <div class="layui-input-inline">

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

@@ -3,6 +3,9 @@
     <ul class="layui-tab-title">
         <li class="layui-this follows_li">跟进动态</li>
         <li class="contracts_list_li">合同列表</li>
+        <% if can? :read_sales_detail, EducodeSales::Business %>
+        <li class="sales_list_li">销售明细</li>
+        <% end %>
     </ul>
     <div class="layui-tab-content">
         <div class="layui-tab-item follows_div layui-show">
@@ -11,6 +14,11 @@
         <div class="layui-tab-item contracts_list_div">
           <div id="contract_list_wraper"></div>
         </div>
+        <% if can? :read_sales_detail, EducodeSales::Business %>
+        <div class="layui-tab-item sales_list_div">
+          <div id="sales_list_wraper"></div>
+        </div>
+        <% end %>
     </div>
 </div>
 
@@ -31,6 +39,8 @@
         element.on('tab(contract_tab)', function(data) {
           if (data.index == 1 && $("#contract_list").length == 0) {
             loadPage('/missions/contracts/list')
+          } else if (data.index == 2 && $("#sales_list").length == 0) {
+            loadPage('/missions/sales_details')
           }
         });