educode_sales 0.9.22 → 0.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4fae64ecffcde833caad4eeb11687321dbdca19dfac5341a925a3a4b87dd432
-  data.tar.gz: d64d6231647df25b5acbcff39343dc47fa4004cee0eabae5f1b445ef992a9042
+  metadata.gz: 8c2b7f37f4b1fda07383d7cca772b7ee22fab18ca21a73ea6865f3d09e208dbc
+  data.tar.gz: 92ab5c8bd9aa56c678d3f54e7720ba6d851d4745f16c55c6b841dd9810128471
 SHA512:
-  metadata.gz: af522a8b74ab3c53caf2829135dce88059fa79dab77e898a56a60e6a6e0f39fc87f730bdff119d490d224bfe9ef4dc2a7e90cd22c02cece971b968b0971a07f9
-  data.tar.gz: 855b240baed276147aa6130ba441cc7bcffb0ed7e4e3d5dd764c26a0a74c246907aea41263d26aeb25e6bcbc7d2de3cc425d7bff2339c9d6424aa696d9cdd0f9
+  metadata.gz: 0f823e988d77eb4aff8ad1999a4ef058beb639bba844948144e444cd70065d0835e6865801537aabe4d03c3835f7db686edec6844de218afd925a14a2134801d
+  data.tar.gz: 6009835052d5b11ce9d9609d16e2cb5e26d0cda5afb6f9bbeb3c2d8b7acd61e4a1ea1be955e9d6873143e25d5ec48e79903d3485ed42d7c4e7a8a348546f79f4

data/app/controllers/educode_sales/businesses_controller.rb

@@ -16,13 +16,42 @@ module EducodeSales
           gon.menus = []
           gon.export_menus = []
           gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
+
+          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
+
+          if params[:business_year].present? && params[:business_year] != '全部'
+            gon.business_year = params[:business_year]
+          end
+
+          if params[:bidded_date_year].present? && params[:bidded_date_year] != '全部'
+            gon.bidded_date = Time.new(params[:bidded_date_year]).strftime("%Y-%m-%d") + " - " + Time.new(params[:bidded_date_year]).end_of_year.strftime("%Y-%m-%d")
+          end
+          
+          if params[:signed_date_year].present? && params[:signed_date_year] != '全部'
+            gon.signed_date = Time.new(params[:signed_date_year]).strftime("%Y-%m-%d") + " - " + Time.new(params[:signed_date_year]).end_of_year.strftime("%Y-%m-%d")
+          end
+
+          if params[:date_at].present? && params[:date_at] != '全部'
+            # 回款时间
+            gon.date_at = Time.new(params[:date_at]).strftime("%Y-%m-%d") + " - " + Time.new(params[:date_at]).end_of_year.strftime("%Y-%m-%d")
+          end
+
           gon.business_type = Common.where(clazz: 'business_type').map do |d|
-            {value: d.id, name: d.name}
+            {value: d.id, name: d.name, selected: bussiness_type.include?(d.extras)}
           end
 
-          gon.type = params[:clazz_id].present? ? [{ value: params[:clazz_id], name: Common.find(params[:clazz_id]).name }] : []
           gon.business_step = Common.where(clazz: 'business_step').order("position").map do |d|
-            {value: d.id, name: d.name}
+            {value: d.id, name: d.name, selected: business_step.include?(d.name)}
           end
 
           if can?(:create, EducodeSales::SalePlan)
@@ -81,81 +110,34 @@ module EducodeSales
             @year = params[:q][:name].split("-")[1].present? ? params[:q][:name].split("-")[1] : ''
           end
 
-          @budget_stage_ids = Common.where(clazz: '商机阶段', name: ['初步接洽', '准备方案','已交方案', '已立项']).pluck(:id)
-
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-现有商机)"
-            ids = Common.where(extras: %w[a_class b_class c_class d_class e_class o_class]).pluck(:id)
-            if @year == '全部'
-              @businesses = @businesses.joins("
-              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where("educode_sales_follow_ups.clazz_id in (?)",ids)
-            else
-              @businesses = @businesses.joins("
-              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where("educode_sales_follow_ups.clazz_id in (?)",ids).where("educode_sales_follow_ups.year = ?",@year)
-            end
-
-          end
-
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已中标商机)"
-            stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-            if @year == '全部'
-              @businesses = @businesses.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 (?)",stage_ids)
-            else
-              @businesses = @businesses.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 < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids)
-            end
+          # @budget_stage_ids = Common.where(clazz: '商机阶段', name: ['初步接洽', '准备方案','已交方案', '已立项']).pluck(:id)
 
-          end
 
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已签单商机)"
-            s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-            if @year == '全部'
-              @businesses = @businesses.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 (?)",s_stage_ids)
-            else
-              @businesses = @businesses.joins("
+          if params[:q] && params[:q][:signed_date].present?
+            date = params[:q][:signed_date].split(" - ")
+            @businesses = @businesses.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 < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids)
-            end
+            ").where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?", date[0], date[1])
           end
 
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已回款商机)"
+          if params[:q]&& params[:q][:date_at].present?
+            date = params[:q][:date_at].split(" - ")
             x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
-            year_time = "#{@year}-01-01 00:00:00"
-            year_over_time = "#{@year}-12-31 23:59:59"
-            money_plan_clazz = 1
-            if @year == '全部'
-              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", money_plan_clazz).distinct
-            else
-              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", money_plan_clazz).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).distinct
-            end
+            @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= 1").where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", date[0] + " 00:00:00", date[1] + " 23:59:59").distinct
           end
 
-           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-应收款商机)"
-            stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-            if @year == '全部'
-              @businesses = @businesses.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 (?)", stage_ids)
-            else
-              @businesses = @businesses.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.stage_id IN (?)", "#{@year}-12-31", stage_ids)
-            end
-
+          if params[:q] && params[:q][:bidded_date].present?
+            date = params[:q][:bidded_date].split(" - ")
+            @businesses = @businesses.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][:all].present?
             @businesses = @businesses
           end
 
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-" + @year + "-已中标商机)" && params[:q][:name] != "(销售态势-" + @year + "-已签单商机)" && params[:q][:name] != "(销售态势-" + @year + "-已回款商机)" && params[:q][:name] != "(销售态势-" + @year + "-现有商机)" && params[:q][:name] != "(销售态势-" + @year + "-应收款商机)"
+          if params[:q].present? && params[:q][:name].present?
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:department].present?
@@ -294,12 +276,12 @@ module EducodeSales
         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 (?) 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).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
 
@@ -503,74 +485,30 @@ module EducodeSales
             end
           end
 
-          if params[:name].present?
-            @year = params[:name].split("-")[1].present? ? params[:name].split("-")[1] : ''
-          end
-
-          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-现有商机)"
-            ids = Common.where(extras: %w[a_class b_class c_class d_class e_class o_class]).pluck(:id)
-            if @year == '全部'
-              @businesses = @businesses.joins("
-              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where("educode_sales_follow_ups.clazz_id in (?)",ids)
-            else
-              @businesses = @businesses.joins("
-              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where("educode_sales_follow_ups.clazz_id in (?)",ids).where("educode_sales_follow_ups.year = ?",@year)
-            end
-
-          end
-
-          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已中标商机)"
-            stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-            if @year == '全部'
-              @businesses = @businesses.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 (?)",stage_ids)
-            else
-              @businesses = @businesses.joins("
+          if params[:signed_date].present?
+            date = params[:signed_date].split(" - ")
+            @businesses = @businesses.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 < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids)
-            end
-
+            ").where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?", date[0], date[1])
           end
 
-          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-应收款商机)"
-            stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-            if @year == '全部'
-              @businesses = @businesses.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 (?)",stage_ids)
-            else
-              @businesses = @businesses.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.stage_id IN (?)", "#{@year}-12-31", stage_ids)
-            end
-
+          if params[:date_at].present?
+            date = params[:date_at].split(" - ")
+            x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+            @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= 1").where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", date[0] + " 00:00:00", date[1] + " 23:59:59").distinct
           end
 
-          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已签单商机)"
-            s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-            if @year == '全部'
-              @businesses = @businesses.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 (?)",s_stage_ids)
-            else
-              @businesses = @businesses.joins("
+          if params[:bidded_date].present?
+            date = params[:bidded_date].split(" - ")
+            @businesses = @businesses.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 < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids)
-            end
+            ").where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", date[0], date[1])
           end
 
-          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已回款商机)"
-            x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
-            year_time = "#{@year}-01-01 00:00:00"
-            year_over_time = "#{@year}-12-31 23:59:59"
-            if @year == '全部'
-              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).distinct
-            else
-              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).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).distinct
-            end
+          if params[:business_year].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.year = ?", params[:business_year])
           end
 
           if params[:all].present?
@@ -589,7 +527,7 @@ module EducodeSales
           end
 
           @businesses = @businesses
-          if params[:name].present? && params[:name] != "(销售态势-" + @year + "-已中标商机)" && params[:name] != "(销售态势-" + @year + "-已签单商机)" && params[:name] != "(销售态势-" + @year + "-已回款商机)" && params[:name] != "(销售态势-" + @year + "-现有商机)"&&  params[:name] != "(销售态势-" + @year + "-应收款商机)"
+          if params[:name].present? # && params[:name] != "(销售态势-" + @year + "-已中标商机)" && params[:name] != "(销售态势-" + @year + "-已签单商机)" && params[:name] != "(销售态势-" + @year + "-已回款商机)" && params[:name] != "(销售态势-" + @year + "-现有商机)"&&  params[:name] != "(销售态势-" + @year + "-应收款商机)"
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:name]}%")
           end
           if params[:department].present?

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -102,6 +102,7 @@ module EducodeSales
         @business.update(last_follow_up_id: follow_up.id)
         # 增加o商机编号
         add_business_number
+        update_department
         render_success
       else
         render_failure follow_up
@@ -140,6 +141,7 @@ module EducodeSales
         # 增加o类商机
         @business = follow_up.business
         add_business_number
+        update_department
         render_success
       else
         render_failure follow_up
@@ -258,6 +260,21 @@ module EducodeSales
       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 update_department
+      clazz = %w[已中标 已签单 已验收 回款中 服务中]
+      name = @business.last_follow_up&.stage&.name
+      Rails.logger.debug("调试======#{clazz.include?(name)}")
+      if clazz.include?(name)
+        department = @business.department
+        if department
+          department.level = 2
+          department.save!
+          UserExtension.where(department_id:@business.department_id,identity:0).update_all(level:2)
+        end
+      end
+    end
+
     def teacher_params
       params.permit(:professional_title, :job, :attitude_id, :sex, :birth_date, :remark, :tel)
     end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -57,7 +57,7 @@ module EducodeSales
         # @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
 
-        @receivable_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).select("(SUM(educode_sales_follow_ups.actual_amount) - SUM(educode_sales_businesses.return_money)) AS num")
+        @receivable_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.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).select("(SUM(educode_sales_follow_ups.actual_amount) - SUM(educode_sales_businesses.return_money)) AS num")
         @receivable_amount = @receivable_amount.present? && @receivable_amount[0]['num'] ? @receivable_amount[0]['num'].round(2) : 0
 
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)

data/app/controllers/educode_sales/staffs_controller.rb

@@ -2,7 +2,6 @@ require_dependency "educode_sales/application_controller"
 
 module EducodeSales
   class StaffsController < ApplicationController
-
     def index
       respond_to do |format|
         format.html do
@@ -35,7 +34,9 @@ module EducodeSales
     def create
       user = User.find(params[:id])
       staff = Staff.new(user_id: user.id)
+      params[:current_admin] = @current_admin.id
       if staff.save
+        impressionist(staff, params)
         render_success
       else
         render_failure staff
@@ -60,6 +61,8 @@ module EducodeSales
 
     def destroy
       staff = Staff.find(params[:id])
+      params[:current_admin] = @current_admin.id
+      impressionist(staff, params)
       staff.update(deleted_at: Time.now, expired_at: Time.now.days_ago(1))
       render_success
     # rescue ActiveRecord::DeleteRestrictionError => e
@@ -68,6 +71,8 @@ module EducodeSales
 
     def disable
       staff = Staff.find(params[:id])
+      params[:current_admin] = @current_admin.id
+      impressionist(staff, params)
       staff.update(expired_at: Time.now.days_ago(1))
       render_success
     end
@@ -89,6 +94,8 @@ module EducodeSales
       else
         staff.staff_schools.destroy_all
       end
+      params[:current_admin] = @current_admin.id
+      impressionist(staff, params)
       if staff.save
         render_success
       else

data/app/models/educode_sales/business.rb

@@ -25,5 +25,22 @@ module EducodeSales
       self.follow_ups.update_all(deleted_at: Time.now)
       EducodeSales::Recycle.create(source: self, deleter_id: user_id)
     end
+
+
+    def self.include_types(type)
+      {
+        '1' => %w[a_class b_class c_class d_class e_class o_class],
+        'a' => ['a_class'],
+        'b' => ['b_class'],
+      }[type]
+    end
+
+    def self.include_steps(type)
+      {
+        '已中标' => ['已中标','已签单','已验收','回款中', '服务中','已结束'],
+        '已签单' => ['已签单','已验收','回款中', '服务中','已结束'],
+        '应收款' => ['已中标','已签单','已验收','回款中', '服务中','已结束']
+      }[type]
+    end
   end
 end

data/app/models/educode_sales/staff.rb

@@ -3,6 +3,8 @@ module EducodeSales
     belongs_to :user
     belongs_to :role, optional: true
 
+    is_impressionable
+
     has_many :follow_ups, dependent: :destroy
     has_many :operation_plans, dependent: :destroy
     has_many :operation_reports, dependent: :destroy

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

@@ -17,7 +17,7 @@
               <div class="layui-inline">
                 <label class="layui-form-label">商机名称</label>
                 <div class="layui-input-inline">
-                  <input type="text" name="name" class="layui-input" value="<%=params[:name] %>">
+                  <input type="text" name="name" class="layui-input" value="">
                   <input type="text" style="display: none" name="place_id" class="layui-input" value="<%=params[:place_id] %>">
                 </div>
               </div>
@@ -33,49 +33,67 @@
                   <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true } %>
                 </div>
               </div>
-              <div class="layui-inline show_item" style="display:none;">
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
                 <label class="layui-form-label">项目类型</label>
                 <div class="layui-input-inline">
                   <div id="business_type" style="width: 190px;"></div>
                 </div>
               </div>
-              <div class="layui-inline show_item" style="display:none;">
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
                 <label class="layui-form-label">项目阶段</label>
                 <div class="layui-input-inline">
                   <div id="business_step" style="width: 190px;"></div>
                 </div>
               </div>
-              <div class="layui-inline show_item" style="display:none;">
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
                 <label class="layui-form-label">渠道名称</label>
                 <div class="layui-input-inline">
                   <div id="index_place" style="width: 190px;"></div>
                 </div>
               </div>
-              <div class="layui-inline show_item" style="display:none;">
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
                 <label class="layui-form-label">区域</label>
                 <div class="layui-input-inline">
                   <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
                 </div>
               </div>
-              <div class="layui-inline show_item" style="display:none;">
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
                 <label class="layui-form-label">所属年度</label>
                 <div class="layui-input-inline">
                   <%= select_tag "business_year", options_for_select((2015..Time.now.year).to_a.reverse, params[:business_year]), { include_blank: true } %>
                 </div>
               </div>
-              <div class="layui-inline show_item" style="display:none;">
-                <label class="layui-form-label">创建时间</label>
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
+                <label class="layui-form-label">招标时间</label>
                 <div class="layui-input-inline">
-                  <input type="text" class="layui-input" id="date" name="date" placeholder=" - " autocomplete="off">
+                  <input type="text" class="layui-input" id="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
                 </div>
               </div>
-              <div class="layui-inline show_item" style="display:none;">
-                <label class="layui-form-label">招标时间</label>
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
+                <label class="layui-form-label">中标时间</label>
                 <div class="layui-input-inline">
-                  <input type="text" class="layui-input" id="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
+                  <input type="text" class="layui-input" id="bidded_date" name="bidded_date" placeholder=" - " autocomplete="off">
                 </div>
               </div>
-              <div class="layui-inline show_item" style="display:none;">
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
+                <label class="layui-form-label">签单时间</label>
+                <div class="layui-input-inline">
+                  <input type="text" class="layui-input" id="signed_date" name="signed_date" placeholder=" - " autocomplete="off">
+                </div>
+              </div>
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
+                <label class="layui-form-label">回款时间</label>
+                <div class="layui-input-inline">
+                  <input type="text" class="layui-input" id="date_at" name="date_at" placeholder=" - " autocomplete="off">
+                </div>
+              </div>
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
+                <label class="layui-form-label">创建时间</label>
+                <div class="layui-input-inline">
+                  <input type="text" class="layui-input" id="date" name="date" placeholder=" - " autocomplete="off">
+                </div>
+              </div>
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
                 <label class="layui-form-label">编号</label>
                 <div class="layui-input-inline">
                   <input type="text" class="layui-input" id="number" name="number" placeholder=" - " autocomplete="off">
@@ -182,14 +200,33 @@
             laydate = layui.laydate;
         var openWH = miniPage.getOpenWidthHeight();
         laydate.render({
-            elem: '#date',
-            range: true
+          elem: '#date',
+          range: true
+        });
+        laydate.render({
+          elem: '#invitation_at',
+          range: true
         });
+
+        laydate.render({
+          elem: '#bidded_date',
+          range: true,
+          value: gon.bidded_date
+        });
+        laydate.render({
+          elem: '#signed_date',
+          range: true,
+          value: gon.signed_date
+        });
+
         laydate.render({
-            elem: '#invitation_at',
-            range: true
+          elem: '#date_at',
+          range: true,
+          value: gon.date_at
         });
 
+        
+        
         // $('#businesses_table_wraper .layui-table-body').on('scroll', function(e) {
         //   var leftPx = $(e.target).scrollLeft(); //获取表格body，滚动条距离左边的长度
         //   var left = 'translateX(-' + leftPx + 'px)';
@@ -197,7 +234,7 @@
         // });
 
         var is_show =
-        <%=params[:name].present? || params[:clazz_id].present? || params[:place_id].present? || params[:school].present? %>
+        <%=params[:name].present? || params[:type].present? || params[:place_id].present? || params[:school].present? %>
         if (is_show) {
             $('.follows_li').removeClass('layui-this');
             $('.follows_div').removeClass('layui-show');
@@ -209,7 +246,7 @@
             el: '#business_type',
             data: gon.business_type
         })
-        business_type_list.setValue(gon.type)
+       
         var business_step_list = xmSelect.render({
             el: '#business_step',
             data: gon.business_step
@@ -261,8 +298,10 @@
 
 
         var data = form.val("search_form");
-        data.business_type = "<%=params[:clazz_id] %>";
+        data.business_year = gon.business_year;
 
+        data.business_type = business_type_list.getValue('valueStr')
+        data.business_step = business_step_list.getValue('valueStr');
 
         table = layui.table;
         var cols_table = [
@@ -653,6 +692,10 @@
                 place_id: data.place_id,
                 select: data.select,
                 staff_id: data.staff_id,
+                signed_date: data.signed_date,
+                date_at: data.date_at,
+                bidded_date: data.bidded_date,
+                business_year: data.business_year,
                 mine: search['clazz'] == 'me' ? true : '',
                 is_follow: search['clazz'] == 'followes' ? true : '',
             }, function (res) {

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

@@ -98,7 +98,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>现有商机<a href="/missions/businesses?name=(销售态势-<%=@year %>-现有商机)"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>现有商机<a href="/missions/businesses?name=(销售态势-<%=@year %>-现有商机)&type=1&business_year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @business_amount.round(2) %>万</h1>
@@ -111,7 +111,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>已中标（总额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>已中标（总额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)&step=已中标&bidded_date_year=<%= @year %>"   style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @goal_amount %>万</h1>
@@ -124,7 +124,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>已签单（总额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>已签单（总额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)&step=已签单&signed_date_year=<%= @year %>"   style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @service_amount %>万</h1>
@@ -137,7 +137,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>已回款<a href="/missions/businesses?name=(销售态势-<%=@year %>-已回款商机)"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>已回款<a href="/missions/businesses?name=(销售态势-<%=@year %>-已回款商机)&date_at=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @return_amount %>万</h1>
@@ -150,7 +150,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>A类商机<a href="/missions/businesses?clazz_id=<%=EducodeSales::Common.find_by(extras: EducodeSales::Common::ATYPE)&.id %>"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>A类商机<a href="/missions/businesses?type=a&business_year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @a_amount %>万</h1>
@@ -162,7 +162,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>已中标（合同额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>已中标（合同额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)&step=已中标&bidded_date_year=<%= @year %>"   style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @actual_goal_amount %>万</h1>
@@ -175,7 +175,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>已签单（合同额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>已签单（合同额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)&step=已签单&signed_date_year=<%= @year %>"   style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @actual_service_amount %>万</h1>
@@ -188,7 +188,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>应收款<a href="/missions/businesses?name=(销售态势-<%=@year %>-应收款商机)"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>应收款<a href="/missions/businesses?name=(销售态势-<%=@year %>-应收款商机)&step=应收款&bidded_date_year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @receivable_amount.round(2) %>万</h1>
@@ -201,7 +201,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>B类商机<a href="/missions/businesses?clazz_id=<%=EducodeSales::Common.find_by(extras: EducodeSales::Common::BTYPE)&.id %>" style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>B类商机<a href="/missions/businesses?type=b&business_year=<%= @year %>" style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @b_amount %>万</h1>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.22'
+  VERSION = '0.9.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.22
+  version: 0.9.24
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails