educode_sales 0.9.84 → 0.9.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e498fa041334cb4b387425a7a7f7ff49dffffcee5a72e363b61cb9f32167ff06
-  data.tar.gz: 54d79d72be99cab109f9b40fdd4dd789f72f20d115663abd7d99db70f0ee2527
+  metadata.gz: 90a8a2173c7a406ab0cc7e93e394c7112394ad05e264004870d3a7bbe60754db
+  data.tar.gz: 1e51f78cda684acf4c051bbc75ced90b7927dd901a7c12466a1f7d68926c36b9
 SHA512:
-  metadata.gz: 1e29ad8d3c8dd8c0753dc6662e26c332444cbf10842d308977883c47149c676b0b1c06c515bcfc33e10fe0bfccbc1cecb5ab1c7f2534001c0c1d7a11042a5def
-  data.tar.gz: 5077f36f7bb732c196608fd15c696c06b3d0cf5c74e32c24495b67eadc8b5527eacb1a545966aeea4e3401410ed0e1fbe23c2fb60aea58a8b5513fd1fd570ba6
+  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)
@@ -454,6 +473,24 @@ module EducodeSales
       render layout: false
     end
 
+    def new_sales_detail
+      render layout: false
+    end
+
+    def select_product
+      render layout: false
+    end
+
+    def sales_detail
+      sales_detail = SalesDetail.new(sales_detail_params)
+      sales_detail.staff = @current_admin
+      if sales_detail.save
+        render_success
+      else
+        render_failure sales_detail
+      end
+    end
+
     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, :signed_clazz)
@@ -462,5 +499,10 @@ module EducodeSales
     def product_up_params
       params.permit(:name, :item_clazz, :brand, :specification, :unit, :param, :source_method, :supplier)
     end
+
+    def sales_detail_params
+      params.permit(:amount, :price, :total_price, :custom_clazz, :delivery_date, :product_catalog_id, :business_id)
+    end
+    
   end
 end

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

@@ -2,5 +2,140 @@ require_dependency "educode_sales/application_controller"
 
 module EducodeSales
   class SalesDetailsController < ApplicationController
+
+    def index
+      respond_to do |format|
+        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]}
+          gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
+          gon.staffs = staffs.map { |d| {name: d.user.real_name, value: d.id } }
+
+          bussiness_type = []
+          if params[:type]
+            # 项目类型
+            bussiness_type = EducodeSales::Business.include_types(params[:type]) || []
+          end
+
+          business_step = []
+          if params[:step]
+            # 项目阶段
+            business_step = EducodeSales::Business.include_steps(params[:step]) || []
+          end
+
+
+          gon.business_type = Common.where(clazz: 'business_type').map do |d|
+            {value: d.id, name: d.name, selected: bussiness_type.include?(d.extras)}
+          end
+
+          gon.business_step = Common.where(clazz: 'business_step', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).order("position").map do |d|
+            {value: d.id, name: d.name, selected: business_step.include?(d.name)}
+          end
+        end
+        format.json do
+          @sales_details = SalesDetail
+          @sales_details = @sales_details.joins(:business).includes(:business, :product_catalog)
+
+          if params[:q] && params[:q][:signed_date].present?
+            date = params[:q][:signed_date].split(" - ")
+            @sales_details = @sales_details.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?", date[0], date[1])
+          end
+
+          if params[:q] && params[:q][:bidded_date].present?
+            date = params[:q][:bidded_date].split(" - ")
+            @sales_details = @sales_details.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", date[0], date[1])
+          end
+
+          if params[:q].present? && params[:q][:name].present?
+            @sales_details = @sales_details.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
+          end
+
+          if params[:sort].present? && params[:sort][:field]
+            @sales_details = @sales_details.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @sales_details = @sales_details.order("educode_sales_sales_details.created_at desc")
+          end
+
+          if params[:q].present? && params[:q][:business_step].present?
+            @sales_details = @sales_details.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id in (?)", params[:q][:business_step].split(",").map(&:to_i))
+          end
+
+
+          if params[:q].present? && params[:q][:sales_staff_id].present?
+            # 销售经理
+            @sales_details = @sales_details.joins("LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = educode_sales_businesses.last_follow_up_id").
+                                      where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", params[:q][:sales_staff_id], params[:q][:sales_staff_id])
+
+          end
+
+          if params[:q].present? && params[:q][:department].present?
+            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:department]}%").pluck(:id)
+            @sales_details = @sales_details.joins(business: :department).where("departments.id in (?)", departments_ids)
+          end
+
+          if params[:q].present? && params[:q][:area].present?
+            area = EducodeSales::Common.find(params[:q][:area]).name
+            if @current_admin.is_admin?
+              @sales_details = @sales_details.joins("
+                JOIN departments ON educode_sales_businesses.department_id = departments.id
+                JOIN schools ON departments.school_id = schools.id
+              ").where("province = ?", area)
+            else
+              level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+              if level == "区域"
+                  @sales_details = @sales_details.joins("
+                    JOIN schools ON departments.school_id = schools.id
+                  ").where("province = ?", area)
+              else
+                @sales_details = @sales_details.joins("
+                  JOIN departments ON educode_sales_businesses.department_id = departments.id
+                  JOIN schools ON departments.school_id = schools.id
+                ").where("province = ?", area)
+              end
+            end
+          end
+  
+          @sales_details = @sales_details.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def destroy
+      sales_detail = SalesDetail.find(params[:id])
+      if sales_detail.destroy
+        render_success
+      else
+        render_failure sales_detail
+      end
+    end
+
+    def edit
+      @sale_detail = SalesDetail.find(params[:id])
+      @name = [@sale_detail.business.name, @sale_detail.product_catalog.item_clazz, @sale_detail.product_catalog.brand, @sale_detail.product_catalog.specification, @sale_detail.product_catalog.unit, @sale_detail.product_catalog.source_method, @sale_detail.product_catalog.param, @sale_detail.product_catalog.supplier].join(" ")
+      render layout: false
+    end
+
+    def update
+      sale_detail = SalesDetail.find(params[:id])
+      if sale_detail.update(sales_detail_params)
+        render_success
+      else
+        render_failure sale_detail
+      end
+    end
+
+    private
+
+    def sales_detail_params
+      params.permit(:amount, :price, :total_price, :custom_clazz, :delivery_date, :product_catalog_id)
+    end
+
   end
 end

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/models/educode_sales/sales_detail.rb

@@ -3,5 +3,6 @@ module EducodeSales
     belongs_to :business
     belongs_to :product_catalog
     belongs_to :staff
+    enum custom_clazz: ['非定制', '低定制', '高定制', '全定制']
   end
 end

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/_list.html.erb

@@ -110,6 +110,7 @@
   <% if can? :assign_contract, EducodeSales::Business %>
     <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="assign">指派售后</a>
   <% end %>
+  <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="add_sales">添加销售明细</a>
 
 </script>
 
@@ -431,7 +432,7 @@
               },
               {
                    title: '操作',
-                   minWidth: 220,
+                   minWidth: 300,
                    toolbar: '#currentTableBar',
                   align: "center",
                   fixed: 'right'
@@ -546,6 +547,26 @@
                   layer.full(sindex);
               });
               return false;
+          } else if (obj.event === 'add_sales') {
+            business_id = data.id
+            var content = miniPage.getHrefContent('/missions/contracts/new_sales_detail?id=' + data.id);
+            var openWH = miniPage.getOpenWidthHeight();
+            new_sale_index = layer.open({
+              title: '添加销售明细',
+              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,
+              success: function (layero, index) {
+                form.render('select');
+              }
+            });
+            $(window).on("resize", function () {
+              layer.full(new_follow_index);
+            });
           }
         });
 

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')
           }
         });