educode_sales 0.9.23 → 0.9.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c58fda9ebef8022559880649de7e90de9c0b5537ccab09a2bdf1900bea0373a1
-  data.tar.gz: cea666fa1f5c0939b3ad387cf023faf9a27169495d607ce32918208c0562f326
+  metadata.gz: 7326e12d52dc97f7f251f63b033f3c470591be1100f6f9bd06ab057e9a21bd14
+  data.tar.gz: 80817718f3efdcb1a247095f468123ad1111d996dffe3f858cd6b29aab0f52ad
 SHA512:
-  metadata.gz: '0905e5bc74bb514316f7e053e54768ae633f42591929d627033acab86bdc180ad7c660b1df276104be4f99fda43d9d21f37c58170b973a22e65e9285077e681a'
-  data.tar.gz: 489498f262416a5a5ce3eed6327796116d705299eac68a08600d0ab6b2a3bfcfbe708214a921c3aa7cc6f1cf383ea11f7d69df774d7a3581d4ce6db97150f43b
+  metadata.gz: 4430c0f16dac2deda9e833d7962020fd8727a60d43b3823b631ac7cc5196d40c0bbd66b8170ac114e6cdf5dc197978f3674dfe2d5dad720963baefce8537f76a
+  data.tar.gz: 34fb199238d1d1181e1b07fb8f2e00371e271aa9cc3689af2a916dbeb089f9a2624a0c14140de4cbc550d9faa04a03525db1c9407e9b5d3ae439e8d8152946f9

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?
@@ -191,6 +173,12 @@ module EducodeSales
             ").where("educode_sales_follow_ups.year = ?", params[:q][:business_year])
           end
 
+          if params[:q].present? && params[:q][:o_business_deployment].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.o_business_deployment = ?", params[:q][:o_business_deployment])
+          end
+
           if params[:q].present? && params[:q][:area].present?
             p = EducodeSales::Common.find(params[:q][:area]).name
             if @current_admin.is_admin?
@@ -257,6 +245,7 @@ module EducodeSales
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.budget_amount,
+            last_follow.o_business_deployment,
             last_follow.service_time_long,
             last_follow.service_end_time,
             last_follow.service_start_time,
@@ -294,12 +283,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 +492,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 +534,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/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/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/views/educode_sales/businesses/_follows.html.erb

@@ -195,15 +195,15 @@
                 },
                 where: {q: search, sort: sort}
             }, 'data');
-            table.reload('businesses_table', {
-                page: {
-                    curr: 1
-                },
-                where: {q: search, sort: sort}
-            }, 'data');
-            form.val('search_form', {
-                name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area , description: data.field.description
-            })
+            // table.reload('businesses_table', {
+            //     page: {
+            //         curr: 1
+            //     },
+            //     where: {q: search, sort: sort}
+            // }, 'data');
+            // form.val('search_form', {
+            //     name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area , description: data.field.description
+            // })
             return false;
         });
 

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

@@ -19,8 +19,8 @@
     <% text += "二、本月已组织会议 \n\n"%>
     <% text += "三、客户跟进情况 \n"%>
     <% @followups.each_with_index do |d, i| %>
-      <% text += "#{i+1}、**学校--**商机：#{d .description}\n" %>
-      <p><%= i+1 %>、**学校--**商机：<%= d .description%></p>
+      <% text += "#{i+1}、#{d.business&.department&.school&.name}--**商机：#{d.description}\n" %>
+      <p><%= i+1 %>、<%= d.business&.department&.school&.name %>--**商机：<%= d.description%></p>
     <% end %>
 
     <% text += "\n四、需要协助支持事宜 \n\n"%>

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,52 +33,75 @@
                   <%= 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="<%= 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="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="number" name="number" placeholder=" - " autocomplete="off">
+                  <select name="o_business_deployment">
+                    <option value=""></option>
+                    <option value="1">公有云</option>
+                    <option value="2">私有云</option>
+                    <option value="3">混合云</option>
+                  </select>
                 </div>
               </div>
               <div class="layui-inline">
@@ -182,14 +205,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
+          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: '#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 +239,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 +251,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 +303,9 @@
 
 
         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 = [
@@ -508,6 +551,7 @@
         var business_table = table.render({
             elem: '#businesses_table',
             url: '/missions/businesses',
+            autoSort: false,
             where: {q: data},
             toolbar: '#bussinessBar',
             defaultToolbar: ['filter'],
@@ -653,6 +697,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) {
@@ -821,11 +869,10 @@
 
 
 
-      var sort = {}, search = {};
-      <% if params[:name].present? %>
-      search.name = "<%= params[:name] %>";
-      <% end %>
+      var sort = {}, search = data;
+
       table.on('sort(businesses_table)', function (obj) {
+        var data = form.val("search_form");
         sort.field = obj.field;
         sort.order = obj.type;
         table.reload('businesses_table', {
@@ -862,15 +909,15 @@
             },
             where: {q: search, sort: sort}
           }, 'data');
-            table.reload('teachers_table', {
-                page: {
-                    curr: 1
-                },
-                where: {q: search, sort: sort}
-            }, 'data');
-            form.val('search_follows', {
-                name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
-            })
+            // table.reload('teachers_table', {
+            //     page: {
+            //         curr: 1
+            //     },
+            //     where: {q: search, sort: sort}
+            // }, 'data');
+            // form.val('search_follows', {
+            //     name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
+            // })
             if (search['clazz'] == 'me') {
               $(".my-btn").addClass("selected-btn");
             } else if (search['clazz'] == 'followes') {

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

@@ -19,13 +19,9 @@ json.data do
     json.reception_at d.last_follow_up&.reception_at.to_s
     json.bidded_date d.last_follow_up&.bidded_date.to_s
     json.signed_date d.last_follow_up&.signed_date.to_s
+    json.o_business_deployment  EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].to_h.invert[d.last_follow_up&.o_business_deployment]
     json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
-    EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].each do |m|
-      if d.last_follow_up&.o_business_deployment == m[1]
-        json.o_business_deployment m[0]
-        break
-      end
-    end
+  
     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

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

@@ -25,15 +25,20 @@
       </form>
     </div>
     <canvas id="myChart" width="960" height="400"></canvas>
+    <div class="two-header" style="margin-top: 30px;">
+      <table id="followup_table" lay-filter="followup_table"></table>
+    </div>
   </div>
 </div>
 <script>
-    layui.use(['form', 'jquery', 'request', 'element'], function () {
-       form = layui.form;
+    layui.use(['form', 'jquery', 'request', 'element', 'table'], function () {
+      var table = layui.table,
+      form = layui.form;
+      chart_data = <%=raw @follow_count_data.to_json %>;
       var ctx = document.getElementById('myChart');
        myChart = new Chart(ctx, {
           type: 'line',
-          data: <%=raw @follow_count_data.to_json %>,
+          data: chart_data,
           options: {
             elements: {
               line: {
@@ -42,12 +47,46 @@
             }
           }
       });
+   
+    
       form.render();
+
+      function renderTable(chart_data) {
+        var labels = [];
+        fields = [
+          {field: 'col0', title: '姓名', width:100}
+        ];
+        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'})
+        })
+        var table_data = [];
+        chart_data.datasets.forEach(function(d, i) {
+          var value = {}
+          value['col0'] = d.label;
+          d.data.forEach(function(v, i1) {
+            value['col' + (i1 + 1)] = v;
+          })
+          table_data.push(value);
+        })
+        table.render({
+          elem: '#followup_table',
+          height: 312,
+          url: '',
+          limit: 30,
+          page: true,
+          data: table_data,
+          cols: [fields]
+        });
+      }
+
+      renderTable(chart_data);
       laydate.render({
         elem: '#date',
         range: true
       });
 
+     
       laydate.render({
         elem: '#date_week',
         range: true
@@ -101,7 +140,8 @@
             } else {
               myChart.data.datasets = res.data.datasets;
               myChart.data.labels = res.data.labels;
-              myChart.update()
+              myChart.update();
+              renderTable(res.data);
             }
           }
         });

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/app/views/layouts/educode_sales/application.html.erb

@@ -297,4 +297,7 @@
     .ul-down .layui-icon-down{
         display: none;!important;
     }
+    .two-header thead .layui-table-cell {
+      height: auto;
+    }
 </style>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.23'
+  VERSION = '0.9.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.23
+  version: 0.9.25
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2022-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -489,7 +488,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -504,8 +503,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []