educode_sales 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd1dede8ec609b98a19dcd71c21bac7b6024098a7cdb8bad5c600784bd9a649e
-  data.tar.gz: 34bdddc9c368c11588d2d9dc0a3307f8cfbc4568489f539e344b13f32bf41702
+  metadata.gz: 745a9b47b47d917186df80e64b85698ecb980c6348773520b8dc03ca0b2cd985
+  data.tar.gz: c2e13cdd710e59bc828a7af7c28f944a65a11bc4419225c89fbbb20fb830e13a
 SHA512:
-  metadata.gz: 372e451790e777e0c9df20e7bdd9bc133e4d15351c6ae5b541c53a9761b14c2cbd5645c7517d0ae20ea4301872592fd43de82013ae90166546b5ae647b59db32
-  data.tar.gz: f9a5c5518474de3e1aa03e2fe1fae7bbede839df9649227e1c0c0ddba1f4aaaf62e3e903c813c3115dd7d792d56e48e9c6659226cf0ed4b29169ac1198dda8a4
+  metadata.gz: 7b530302422fffd437080d469f59851436f3d3667e52c05da0804c5ccf9ab13038563809918a94d5842622ac478beaf4c4c7e77842ced01e8eb43bcd486eadf3
+  data.tar.gz: f2476d1ad5479026a211698f4e0f3c49f9e060da98bbf319c99a25181457e158fc8df186ac00b0221e310a67142f2cacf06b9fd55cb1e9ee207590501e50bb43

data/app/controllers/educode_sales/businesses_controller.rb

@@ -152,11 +152,16 @@ module EducodeSales
               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][:place_id].present?
+          if params[:q].present? && params[:q][:place_id].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.place_id = ?", params[:q][:place_id])
           end
+          if params[:q].present? && params[:q][: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[:q][:business_year])
+          end
 
           if params[:q].present? && params[:q][:area].present?
             p = EducodeSales::Common.find(params[:q][:area]).name

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -95,7 +95,7 @@ module EducodeSales
       business = follow_up.business
       if follow_up.soft_destroy(@current_admin.id)
         if follow_up.id == business.last_follow_up_id
-          business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: business.follow_ups.last&.id).sum(:amount))
+          business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: business.follow_ups.last&.id).sum(:amount))
         end
         render_success
       else

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -8,14 +8,14 @@ module EducodeSales
       # authorize! :trends,  EducodeSales::SaleTrend
       @year = params[:year] ? params[:year] : Time.now.year
       @years = ['全部'] + (1..(Time.now.year - 2014)).reverse_each.map { |d| 2014 + d }
-      if(@year == '全部')
+      if (@year == '全部')
         x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
         o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
         @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)
-        stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+        stage_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
         @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).sum(:total_amount).round(2)
         @actual_goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).sum(:actual_amount).round(2)
-        s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+        s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
         @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:total_amount).round(2)
         @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:actual_amount).round(2)
         @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).sum(:amount).round(2)
@@ -29,62 +29,63 @@ module EducodeSales
         x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
         o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
         @sale_trend = SaleTrend.find_or_create_by(year: @year)
-        @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.year = ?",@year).sum(:total_amount).round(2)
-        stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+        @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.year = ?", @year).sum(:total_amount).round(2)
+        stage_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
         @goal_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).sum(:total_amount).round(2)
         @actual_goal_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).sum(:actual_amount).round(2)
-        s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+        s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
         @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:total_amount).round(2)
         @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:actual_amount).round(2)
         @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 >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)
-        @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).where("educode_sales_follow_ups.year = ?",@year).sum(:total_amount).round(2)
+        @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).where("educode_sales_follow_ups.year = ?", @year).sum(:total_amount).round(2)
         b = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name).pluck(:id)
-        @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).where("educode_sales_follow_ups.year = ?",@year).sum(:total_amount).round(2)
+        @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).where("educode_sales_follow_ups.year = ?", @year).sum(:total_amount).round(2)
       end
 
       count_type = params[:count_type] || "actual_amount"
       common = Common.find_by(clazz: 'staff_type', name: '销售')
       names = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
       x_business_ids = []
-      default_dates = (30.day.ago.to_date..Date.today).map { |d| d.strftime("%Y-%W")}.uniq #默认时间范围
+      default_dates = (30.day.ago.to_date..Date.today).map { |d| d.strftime("%Y-%W") }.uniq #默认时间范围
       Business.all.each do |d|
         if d.last_follow_up&.clazz&.id == x
           x_business_ids << d.id
         end
       end
-      colors = ['#44D7B6','#4CACFF','#F7B500','#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF', '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)' ,'rgba(255, 0, 250, 1)']
+      colors = ['#44D7B6', '#4CACFF', '#F7B500', '#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF', '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)', 'rgba(255, 0, 250, 1)']
       @follow_count_range = params[:follow_count_range] || "week"
       @goal_count_range = params[:goal_count_range] || "month"
       # 商机跟进数图表
-      @follow_count_data = week_follow_count_chart(default_dates,names,x_business_ids,colors)
+      @follow_count_data = week_follow_count_chart(default_dates, names, x_business_ids, colors)
       if params[:follow_count_range].present?
         case params[:follow_count_range]
-        when "week"   #按周
+        when "week" #按周
           if params[:date_week].present?
             date = params[:date_week].split(" - ")
             dates = (date[0].to_date..date[1].to_date).map { |d|
-              d.strftime("%Y-%W")}.uniq
-            @follow_count_data = week_follow_count_chart(dates,names,x_business_ids,colors)
+              d.strftime("%Y-%W") }.uniq
+            @follow_count_data = week_follow_count_chart(dates, names, x_business_ids, colors)
           end
-        when "month"  #按月
+        when "month" #按月
           if params[:date_month].present?
             # (Date.new(2020,12,1)..Date.new(2021,12,1)).map { |d| d.strftime("%Y-%m")}.uniq
             date = params[:date_month].split(" - ")
-            dates = ((date[0]+"-01").to_date..(date[1]+"-01").to_date).map { |d| d.strftime("%Y-%m")}.uniq
-            @follow_count_data = month_follow_count_chart(dates,names,x_business_ids,colors)
+            dates = ((date[0] + "-01").to_date..(date[1] + "-01").to_date).map { |d| d.strftime("%Y-%m") }.uniq
+            @follow_count_data = month_follow_count_chart(dates, names, x_business_ids, colors)
           end
-        when "year"   #按年
+        when "year" #按年
           if params[:date_year].present?
             date = params[:date_year].split(" - ")
             dates = (date[0]..date[1]).to_a
-            @follow_count_data = year_follow_count_chart(dates,names,x_business_ids,colors)
+            @follow_count_data = year_follow_count_chart(dates, names, x_business_ids, colors)
           end
-        else          #按天
+        else
+          #按天
           if params[:date].present?
             date = params[:date].split(" - ")
             dates = (date[0].to_date..date[1].to_date).to_a
-            @follow_count_data = day_follow_count_chart(dates,names,x_business_ids,colors)
+            @follow_count_data = day_follow_count_chart(dates, names, x_business_ids, colors)
           end
         end
       end
@@ -92,12 +93,12 @@ module EducodeSales
       #商机区域分布图表
       provinces = EducodeSales::Common.where(clazz: 'area').pluck(:name)
       if params[:business_count_type] == 'money' || params[:business_count_type].blank?
-        @business_data =  {
+        @business_data = {
           labels: provinces,
-          datasets:[
+          datasets: [
             {
               label: "商机总额",
-              data: provinces.map{|province|
+              data: provinces.map { |province|
                 if params[:business_type].blank?
                   Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)
                 else
@@ -111,12 +112,12 @@ module EducodeSales
           ]
         }
       else
-        @business_data =  {
+        @business_data = {
           labels: provinces,
-          datasets:[
+          datasets: [
             {
               label: "商机数量",
-              data: provinces.map{|province|
+              data: provinces.map { |province|
                 if params[:business_type].blank?
                   Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ?", x).count
                 else
@@ -131,8 +132,6 @@ module EducodeSales
         }
       end
 
-
-
       #  销售人员跟进分析
       begin_time = Time.now.at_beginning_of_year.to_s
       end_time = Time.now.at_end_of_year.to_s
@@ -166,18 +165,16 @@ module EducodeSales
           end_time = date[1] + "23:59:59"
         end
       end
-      100.times{p begin_time}
-      100.times{p end_time}
       common = Common.find_by(clazz: 'staff_type', name: '销售')
-      staff_names = Staff.joins(:user).where(job_type: common.id).map { |d| d.user.real_name}
+      staff_names = Staff.joins(:user).where(job_type: common.id).map { |d| d.user.real_name }
       staff_ids = Staff.joins(:user).where(job_type: common.id).pluck(:id)
       if params[:customer_count_type] == 'money' || params[:customer_count_type].blank?
-        @customer_data =  {
+        @customer_data = {
           labels: staff_names,
-          datasets:[
+          datasets: [
             {
               label: "跟进客户数",
-              data: staff_ids.map{|staff_id|
+              data: staff_ids.map { |staff_id|
                 (EducodeSales::CustomerFollow.where(staff_id: staff_id).where("created_at >= ? AND created_at <= ?", begin_time, end_time).pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where(staff_id: staff_id).where("created_at >= ? AND created_at <= ?", begin_time, end_time).pluck(:business_id).uniq).pluck(:school_id)).uniq.size
               },
               backgroundColor: colors[0],
@@ -187,12 +184,12 @@ module EducodeSales
           ]
         }
       else
-        @customer_data =  {
+        @customer_data = {
           labels: staff_names,
-          datasets:[
+          datasets: [
             {
               label: "跟进客户次数",
-              data: staff_ids.map{|staff_id|
+              data: staff_ids.map { |staff_id|
                 EducodeSales::CustomerFollow.where(staff_id: staff_id).where("created_at >= ? AND created_at <= ?", begin_time, end_time).size + EducodeSales::FollowUp.where(staff_id: staff_id).where("created_at >= ? AND created_at <= ?", begin_time, end_time).size
               },
               backgroundColor: colors[0],
@@ -203,26 +200,25 @@ module EducodeSales
         }
       end
 
-
-
-      # 已中标图表
-      goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a
-      sale_names = ['已中标','已签单','已回款']
-       @goal_count_data = month_sale_chart(goal_default_dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
+      # 销售额分析
+      goal_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
+      sale_names = ['已中标', '已签单', '已回款']
+      @goal_count_data = month_sale_chart(goal_default_dates, sale_names, colors, x, stage_ids, s_stage_ids, count_type)
       if params[:goal_count_range].present?
         case params[:goal_count_range]
         when "week"
-        when "month"  #按月
+        when "month" #按月
           if params[:goal_date_month].present?
             date = params[:goal_date_month].split(" - ")
-            dates = ((date[0]+"-01").to_date..(date[1]+"-01").to_date).map { |d| d.strftime("%Y-%m")}.uniq
-            @goal_count_data =  month_sale_chart(dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
+            dates = ((date[0] + "-01").to_date..(date[1] + "-01").to_date).map { |d| d.strftime("%Y-%m") }.uniq
+            @goal_count_data = month_sale_chart(dates, sale_names, colors, x, stage_ids, s_stage_ids, count_type)
           end
-          else        #按年
+        else
+          #按年
           if params[:goal_date_year].present?
             date = params[:goal_date_year].split(" - ")
             dates = (date[0]..date[1]).to_a
-            @goal_count_data = year_sale_chart(dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
+            @goal_count_data = year_sale_chart(dates, sale_names, colors, x, stage_ids, s_stage_ids, count_type)
           end
         end
       end
@@ -247,140 +243,144 @@ module EducodeSales
       params.permit(:chance_money, :ballot_money, :sign_money, :returned_money)
     end
 
-    def day_follow_count_chart(dates,names,x_business_ids,colors)
+    def day_follow_count_chart(dates, names, x_business_ids, colors)
       {
         labels: dates,
-        datasets:names.map.with_index do |name,i|
+        datasets: names.map.with_index do |name, i|
           {
             # hidden: i < 3 ? false : true,
             label: name[0],
-            data: dates.map{ |d| @follow_up = FollowUp.where(staff_id: name[1], created_at: d.beginning_of_day..d.end_of_day).where.not(business: x_business_ids).count },
+            data: dates.map { |d| @follow_up = FollowUp.where(staff_id: name[1], created_at: d.beginning_of_day..d.end_of_day).where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
-            pointBorderColor: colors[i%15+1],
-            borderColor: colors[i%15+1],
-            pointBackgroundColor: colors[i%15+1],
+            pointBorderColor: colors[i % 15 + 1],
+            borderColor: colors[i % 15 + 1],
+            pointBackgroundColor: colors[i % 15 + 1],
             borderWidth: 2
           }
         end
       }
     end
-    def week_follow_count_chart(dates,names,x_business_ids,colors)
+
+    def week_follow_count_chart(dates, names, x_business_ids, colors)
       {
-        labels: dates.map{ |date|
+        labels: dates.map { |date|
           d = date.split("-")
           year = d[0].to_i
           week = d[1].to_i
           if week == 0
             0
           else
-            month = Date.commercial(year,week).strftime("%m月%d日")
-            day = Date.commercial(year,week,7).strftime("%m月%d日")
+            month = Date.commercial(year, week).strftime("%m月%d日")
+            day = Date.commercial(year, week, 7).strftime("%m月%d日")
             date.to_s + "(#{month}-#{day})"
           end
         } - [0],
-        datasets:names.map.with_index do |name,i|
+        datasets: names.map.with_index do |name, i|
           {
             # hidden: i < 3 ? false : true,
             label: name[0],
-            data: dates.map{ |d|
+            data: dates.map { |d|
               d = d.split("-")
               year = d[0].to_i
               week = d[1].to_i
-               if week == 0
-                 @follow_up = 999999
-               else
-                 @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", Date.commercial(year,week).strftime("%Y-%m-%d"), Date.commercial(year,week,7).strftime("%Y-%m-%d")).where.not(business: x_business_ids).count
-               end
-               } - [999999],
+              if week == 0
+                @follow_up = 999999
+              else
+                @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", Date.commercial(year, week).strftime("%Y-%m-%d"), Date.commercial(year, week, 7).strftime("%Y-%m-%d")).where.not(business: x_business_ids).count
+              end
+            } - [999999],
             backgroundColor: "#fff",
-            pointBorderColor: colors[i%15+1],
-            borderColor: colors[i%15+1],
-            pointBackgroundColor: colors[i%15+1],
+            pointBorderColor: colors[i % 15 + 1],
+            borderColor: colors[i % 15 + 1],
+            pointBackgroundColor: colors[i % 15 + 1],
             borderWidth: 2
           }
         end
       }
     end
-    def month_follow_count_chart(dates,names,x_business_ids,colors)
+
+    def month_follow_count_chart(dates, names, x_business_ids, colors)
       {
         labels: dates,
-        datasets:names.map.with_index do |name,i|
+        datasets: names.map.with_index do |name, i|
           {
             # hidden: i < 3 ? false : true,
             label: name[0],
-            data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01", "#{d}-31").where.not(business: x_business_ids).count },
+            data: dates.map { |d| @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01", "#{d}-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
-            pointBorderColor: colors[i%15+1],
-            borderColor: colors[i%15+1],
-            pointBackgroundColor: colors[i%15+1],
+            pointBorderColor: colors[i % 15 + 1],
+            borderColor: colors[i % 15 + 1],
+            pointBackgroundColor: colors[i % 15 + 1],
             borderWidth: 2,
           }
         end
       }
     end
-    def year_follow_count_chart(dates,names,x_business_ids,colors)
+
+    def year_follow_count_chart(dates, names, x_business_ids, colors)
       {
         labels: dates,
-        datasets:names.map.with_index do |name,i|
+        datasets: names.map.with_index do |name, i|
           {
             # hidden: i < 3 ? false : true,
             label: name[0],
-            data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01-01", "#{d}-12-31").where.not(business: x_business_ids).count },
+            data: dates.map { |d| @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01-01", "#{d}-12-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
-            pointBorderColor: colors[i%15+1],
-            borderColor: colors[i%15+1],
-            pointBackgroundColor: colors[i%15+1],
+            pointBorderColor: colors[i % 15 + 1],
+            borderColor: colors[i % 15 + 1],
+            pointBackgroundColor: colors[i % 15 + 1],
             borderWidth: 2
           }
         end
       }
     end
 
-    def month_sale_chart(dates,names,colors,x,stage_ids,s_stage_ids,count_type)
+    def month_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type)
       {
         labels: dates,
-        datasets: names.map.with_index do |name,i|{
-          label: name,
-          data: dates.map{ |d|
-            case i
-            when 0
-              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 (?)", "#{d}-01", "#{d}-31", stage_ids).sum(count_type).round(2)
-            when 1
-              Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", s_stage_ids).sum(count_type).round(2)
-            else
-              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 >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
-            end
-          },
-          backgroundColor: colors[i],
-          borderColor: colors[i],
-          borderWidth: 1
-        }
+        datasets: names.map.with_index do |name, i|
+          {
+            label: name,
+            data: dates.map { |d|
+              case i
+              when 0
+                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 (?)", "#{d}-01", "#{d}-31", stage_ids).sum(count_type).round(2)
+              when 1
+                Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", s_stage_ids).sum(count_type).round(2)
+              else
+                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 >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
+              end
+            },
+            backgroundColor: colors[i],
+            borderColor: colors[i],
+            borderWidth: 1
+          }
         end
       }
     end
 
-    def year_sale_chart(dates,names,colors,x,stage_ids,s_stage_ids,count_type)
+    def year_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type)
       {
         labels: dates,
-        datasets:names.map.with_index do |name,i| {
-          label: name,
-          data: dates.map{ |d|
-            case i
-            when 0
-              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 (?)", "#{d}-01-01", "#{d}-12-31", stage_ids).sum(count_type).round(2)
-            when 1
-              Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01-01", "#{d}-12-31", s_stage_ids).sum(count_type).round(2)
-            else
-              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 >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01-01", "#{d}-12-31").sum(:amount).round(2)
-            end                           },
-          backgroundColor: colors[i],
-          borderColor: colors[i],
-          borderWidth: 1
-        }
+        datasets: names.map.with_index do |name, i|
+          {
+            label: name,
+            data: dates.map { |d|
+              case i
+              when 0
+                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 (?)", "#{d}-01-01", "#{d}-12-31", stage_ids).sum(count_type).round(2)
+              when 1
+                Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01-01", "#{d}-12-31", s_stage_ids).sum(count_type).round(2)
+              else
+                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 >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01-01", "#{d}-12-31").sum(:amount).round(2)
+              end },
+            backgroundColor: colors[i],
+            borderColor: colors[i],
+            borderWidth: 1
+          }
         end
       }
     end
 
-
   end
 end

data/app/helpers/educode_sales/follow_up_helper.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  module FollowUpHelper
+    def key_people(teacher_ids)
+      EducodeSales::Teacher.where(id: teacher_ids).pluck(:name).join('、')
+    end
+  end
+end

data/app/models/educode_sales/money_plan.rb

@@ -3,7 +3,7 @@ module EducodeSales
     belongs_to :staff
     belongs_to :follow_up, counter_cache: true
 
-    enum clazz: ['未完成', '已完成']
+    enum clazz: ['计划回款', '实际回款']
 
     after_save :update_return_money
     after_destroy :update_return_money
@@ -13,9 +13,9 @@ module EducodeSales
 
     def update_return_money
       if follow_up.business.last_follow_up_id == self.follow_up_id
-        follow_up.business.update(return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: self.follow_up_id).sum(:amount))
+        follow_up.business.update(return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: self.follow_up_id).sum(:amount))
       else
-        follow_up.update(return_money: follow_up.money_plans.where(clazz: '已完成').sum(:amount))
+        follow_up.update(return_money: follow_up.money_plans.where(clazz: '实际回款').sum(:amount))
       end
     end
   end

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

@@ -24,7 +24,7 @@
         <div class="layui-input-inline" style="width: 300px;" id="professional_title_div">
           <label class="layui-form-label required">状态</label>
           <div class="layui-input-block">
-            <%= select_tag "clazz", options_for_select(['未完成', '已完成']), class: 'required' %>
+            <%= select_tag "clazz", options_for_select(['计划回款', '实际回款']), class: 'required' %>
           </div>
         </div>
       </div>
@@ -43,7 +43,7 @@
 <script type="text/html" id="return_money_select">
   <div class="layui-input-block table-select">
     <select name="clazz" lay-filter="return_money_select">
-      {{# layui.each(['未完成', '已完成'], function(i, data) { }}
+      {{# layui.each(['计划回款', '实际回款'], function(i, data) { }}
       {{# if (data == d.clazz) { }}
       <option value="{{data}}" selected="{{d.clazz}}">{{data}}</option>
       {{# } else { }}
@@ -90,8 +90,8 @@
           layer.alert(res.msg)
         } else {
           // layer.close(parent.plan_index);
-          parent.table.reload('sale_plan_follow_table');
-          parent.table.reload('businesses_table');
+          table.reload('sale_plan_follow_table');
+          table.reload('businesses_table');
           table.reload('return_money_list');
         }
       })

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

@@ -1,7 +1,6 @@
 json.data do
   json.array! @records do |d|
-    json.id d.id
-    json.name d.name
+    json.(d, :id, :name)
     json.staff d.staff&.user&.real_name
     json.created_at d.created_at.to_s
   end

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

@@ -18,7 +18,7 @@ json.data do
     json.actual_amount d.last_follow_up&.actual_amount
     json.return_money d.return_money
     json.wait_return_money d.wait_return_money.to_i.round(2)
-    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '已完成').present? ? (d.last_follow_up.money_plans.where(clazz: '已完成').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
+    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '实际回款').present? ? (d.last_follow_up.money_plans.where(clazz: '实际回款').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
     json.place d.last_follow_up&.place&.name
     json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
     json.source d.source

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

@@ -57,6 +57,12 @@
                   <%= 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;">
+                <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-input-inline">
@@ -89,7 +95,7 @@
   <div class="layui-btn-container">
     <span class="table-label">商机列表</span>
     <% if can?(:export_business, EducodeSales::Business) %>
-    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm data-count-edit export_more-btn pull-right" style="color: #0000FF;" data-name="export" data-id="export">导出<i class="layui-icon layui-icon-down layui-nav-more"></i></button>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm data-count-edit export_more-btn pull-right" style="color: #0000FF;" data-name="export" data-id="export">导出<i class="layui-icon layui-icon-down  layui-nav-more" style="font-size: 12px"></i></button>
     <% end %>
     <% if can? :create, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加商机</button>
@@ -142,35 +148,45 @@
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
 <script type="text/html" id="school_name">
-  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school
+    }}</a>
 </script>
 
 
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown'], function () {
-      var $ = layui.jquery,
-        form = layui.form,
-        request = layui.request,
-        miniPage = layui.miniPage,
-        dropdown = layui.dropdown,
-        laydate = layui.laydate;
-
-      laydate.render({
-        elem: '#date',
-        range: true
-      });
-      laydate.render({
-        elem: '#invitation_at',
-        range: true
-      });
+        var $ = layui.jquery,
+            form = layui.form,
+            request = layui.request,
+            miniPage = layui.miniPage,
+            dropdown = layui.dropdown,
+            laydate = layui.laydate;
+
+        laydate.render({
+            elem: '#date',
+            range: true
+        });
+        laydate.render({
+            elem: '#invitation_at',
+            range: true
+        });
 
-         var is_show = <%=params[:name].present? || params[:clazz_id].present? || params[:place_id].present? || params[:school].present? %>
-      if(is_show){
-          $('.follows_li').removeClass('layui-this');
-          $('.follows_div').removeClass('layui-show');
-          $('.businesses_list_li').addClass('layui-this');
-          $('.businesses_list_div').addClass('layui-show');
-      }
+        // function hn() {
+        //     $("#search_bt").trigger("click");
+        // }
+        //
+        // $(document).ready(function () {
+        //     window.onload = hn;
+        // });
+
+        var is_show =
+        <%=params[:name].present? || params[:clazz_id].present? || params[:place_id].present? || params[:school].present? %>
+        if (is_show) {
+            $('.follows_li').removeClass('layui-this');
+            $('.follows_div').removeClass('layui-show');
+            $('.businesses_list_li').addClass('layui-this');
+            $('.businesses_list_div').addClass('layui-show');
+        }
 
         var business_type_list = xmSelect.render({
             el: '#business_type',
@@ -224,62 +240,68 @@
                 })
             }
         })
-            index_place_list.setValue(gon.place)
-
-
-      table = layui.table;
-      var business_table = table.render({
-          elem: '#businesses_table',
-          url: '/missions/businesses',
-          where: {q: form.val('search_form')},
-          defaultToolbar: ['filter'],
-          toolbar: '#bussinessBar',
-          title: '商机数据表',
-          totalRow: true,//开启合并行
-          cols: [
-            [
-              {
-                field: 'id',
-                width: 60,
-                title:'序号',type: 'numbers',
-                  totalRowText: '合计',
-              },
-              {
-                field: 'name',
-                width: 170,
-                  title: '名称',
-                  templet:'<div><span title="{{d.name}}">{{d.name}}</span></div>'
-              },
-              {
-                field: 'school',
-                width: 150,
-                title: '单位',
-                  templet:'#school_name'
-              },
-              {
-                field: 'department',
-                width: 150,
-                title: '部门',
-                  templet:'<div><span title="{{d.department}}">{{d.department}}</span></div>'
-              },
-              {
-                field: 'follow_ups_count',
-                title: '跟进',
-                width: 60,
-                templet: '#show_follow',
-                  totalRow: true,
-              },
-              // {
-              //   field: 'teachers_count',
-              //   width: 100,
-              //   title: '关键人',
-              //   templet: '#show_keys'
-              // },
-              {
-                field: 'clazz',
-                width: 80,
-                title: '类型',
-                  templet:'<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
+        index_place_list.setValue(gon.place)
+
+
+        var data = form.val("search_form");
+        data.business_type = <%=params[:clazz_id] %>
+            console.log(data);
+
+        table = layui.table;
+        var business_table = table.render({
+            elem: '#businesses_table',
+            url: '/missions/businesses',
+            where: {q: data},
+            defaultToolbar: ['filter'],
+            toolbar: '#bussinessBar',
+            title: '商机数据表',
+            totalRow: true,//开启合并行
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 60,
+                        title: '序号', type: 'numbers',
+                        totalRowText: '合计',
+                        fixed: "left"
+                    },
+                    {
+                        field: 'name',
+                        width: 170,
+                        title: '商机名称',
+                        templet: '<div><span title="{{d.name}}">{{d.name}}</span></div>',
+                        fixed: 'left'
+                    },
+                    {
+                        field: 'school',
+                        width: 150,
+                        title: '单位',
+                        templet: '#school_name'
+                    },
+                    {
+                        field: 'department',
+                        width: 150,
+                        title: '部门',
+                        templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>'
+                    },
+                    {
+                        field: 'follow_ups_count',
+                        title: '跟进',
+                        width: 60,
+                        templet: '#show_follow',
+                        totalRow: true,
+                    },
+                    // {
+                    //   field: 'teachers_count',
+                    //   width: 100,
+                    //   title: '关键人',
+                    //   templet: '#show_keys'
+                    // },
+                    {
+                        field: 'clazz',
+                        width: 80,
+                        title: '类型',
+                        templet: '<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
               },
               {
                 field: 'stage',
@@ -639,12 +661,6 @@
         });
       }
 
-        function hn(){
-            $("#search_bt").trigger("click");
-        }
-        $(document).ready(function(){
-            window.onload=hn;
-        });
 
 
       var sort = {}, search = {};
@@ -699,11 +715,11 @@
             return false;
         });
         form.on('submit(reset_business_search)', function (data) {
-          var field = data.field;
-          form.val('search_form', {
-              name: '', department: '', staff_id: '', business_type: '', business_step: '',
-              place_id: '', date: '', area: '', invitation_at: ''
-          })
+            var field = data.field;
+            form.val('search_form', {
+                name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                place_id: '', date: '', area: '', invitation_at: '', business_year: ''
+            })
             business_type_list.setValue([])
             business_step_list.setValue([])
             index_place_list.setValue([])

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

@@ -21,8 +21,8 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.actual_amount d.last_follow_up&.actual_amount
     json.return_money d.return_money
-    json.wait_return_money d.wait_return_money.to_i.round(2)
-    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '已完成').present? ? (d.last_follow_up.money_plans.where(clazz: '已完成').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
+    json.wait_return_money d.wait_return_money.to_f.round(2)
+    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '实际回款').present? ? (d.last_follow_up.money_plans.where(clazz: '实际回款').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
     json.place d.last_follow_up&.place&.name
     json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
     json.source d.source

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

@@ -75,7 +75,7 @@
 <script type="text/html" id="edit_plan">
   <a href="javascript:void(0);" lay-event="edit_plan" class="layui-table-link">{{ d.money_plans_count }}</a>
 </script>
-<!--未完成计划列表-->
+<!--计划回款计划列表-->
 <script type="text/html" id="unfinish_table_tabar">
   <div class="layui-btn-container">
     <span class="table-label">跟进计划列表</span>
@@ -355,10 +355,11 @@
                   layer.full(keyindex);
               });
           } else if (obj.event === 'edit_plan') {
-              content = miniPage.getHrefContent('/missions/businesses/edit_plan');
-              openWH = miniPage.getOpenWidthHeight();
               is_latest = obj.data.is_latest
               flag = obj.data.flag
+              follow_up_id = obj.data.id
+              content = miniPage.getHrefContent('/missions/businesses/edit_plan');
+              openWH = miniPage.getOpenWidthHeight();
               plan_index = layer.open({
                   title: '回款计划',
                   type: 1,
@@ -379,7 +380,7 @@
           }
         });
 
-       // 未完成计划
+       // 计划回款计划
          table.render({
             elem: '#unfinish_table',
             url: '/missions/businesses/' + parent.business_id + "/unfinish_plans",

data/app/views/educode_sales/customers/show_follow.html.erb

@@ -203,7 +203,7 @@
 
 
 
-<!--未完成计划列表-->
+<!--计划回款计划列表-->
 <script type="text/html" id="unfinish_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">跟进记录</span>

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

@@ -12,7 +12,7 @@ json.data do
     json.business d.business.name
     json.business_id d.business.id
     teacher_ids = d.key_person.pluck(:teacher_id)
-    json.key_people EducodeSales::Teacher.where(id: teacher_ids).pluck(:name).join('、')
+    json.key_people key_people(teacher_ids)
 
   end
 end

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

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

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

@@ -22,7 +22,7 @@
       <div class="layui-inline">
         <label class="layui-form-label">状态</label>
         <div class="layui-input-inline">
-          <%= select_tag "clazz", options_for_select(['已完成','未完成']), {  include_blank: true } %>
+          <%= select_tag "clazz", options_for_select(['实际回款','计划回款']), {  include_blank: true } %>
         </div>
       </div>
       <div class="layui-inline">

data/app/views/educode_sales/operation_plans/_monthPlan.html.erb

@@ -89,12 +89,12 @@
                         field: 'id',
                         width: 60,
                         title:'序号',type: 'numbers',
-                        totalRowText:"合计",
+                        totalRowText:'合计',fixed: 'left'
                     },
                     {
                         field: 'staff',
                         width: 90,
-                        title: '姓名'
+                        title: '姓名',fixed: 'left'
                     },
                     {
                         field: 'teacher_name',
@@ -289,4 +289,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-fixed .layui-table-body {
+        height: auto!important;
+    }
+</style>

data/app/views/educode_sales/operation_plans/_monthly.html.erb

@@ -86,12 +86,12 @@
                         field: 'id',
                         width: 60,
                         title:'序号',type: 'numbers',
-                        totalRowText:"合计",
+                        totalRowText:'合计',fixed: 'left'
                     },
                     {
                         field: 'staff',
                         width: 90,
-                        title: '姓名'
+                        title: '姓名',fixed: 'left'
                     },
                     {
                         field: 'month',

data/app/views/educode_sales/operation_plans/_weekPlan.html.erb

@@ -90,12 +90,12 @@
                         field: 'id',
                         width: 60,
                         title:'序号',type: 'numbers',
-                        totalRowText:"合计",
+                        totalRowText:'合计',fixed: 'left'
                     },
                     {
                         field: 'staff',
                         width: 80,
-                        title: '姓名'
+                        title: '姓名',fixed: 'left'
                     },
                     {
                         field: 'teacher_name',

data/app/views/educode_sales/operation_plans/_weekly.html.erb

@@ -87,12 +87,12 @@
                         field: 'id',
                         width: 60,
                         title:'序号',type: 'numbers',
-                        totalRowText:"合计",
+                        totalRowText:'合计',fixed: 'left'
                     },
                     {
                         field: 'staff',
                         width: 90,
-                        title: '姓名'
+                        title: '姓名',fixed: 'left'
                     },
                     {
                         field: 'weekly',

data/app/views/educode_sales/plans/_monthPlan.html.erb

@@ -88,12 +88,12 @@
                 field: 'id',
                 width: 60,
                 title:'序号',type: 'numbers',
-                        totalRowText:"合计",
+                        totalRowText:'合计',fixed: 'left'
               },
               {
                 field: 'staff',
                 width: 90,
-                title: '姓名'
+                title: '姓名',fixed: 'left'
               },
               {
                 field: 'business_name',
@@ -277,4 +277,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-fixed .layui-table-body {
+        height: auto!important;
+    }
+</style>

data/app/views/educode_sales/plans/_monthly.html.erb

@@ -85,12 +85,12 @@
             field: 'id',
             width: 60,
             title:'序号',type: 'numbers',
-            totalRowText:"合计",
+            totalRowText:'合计',fixed: 'left'
           },
           {
             field: 'staff',
             width: 90,
-            title: '姓名'
+            title: '姓名',fixed: 'left'
           },
             {
                 field: 'month',

data/app/views/educode_sales/plans/_weekPlan.html.erb

@@ -88,12 +88,12 @@
                 field: 'id',
                 width: 60,
                 title:'序号',type: 'numbers',
-                  totalRowText: '合计'
+                  totalRowText: '合计',fixed: 'left'
               },
               {
                 field: 'staff',
                 width: 90,
-                title: '姓名'
+                title: '姓名',fixed: 'left'
               },
               {
                 field: 'business_name',

data/app/views/educode_sales/plans/_weekly.html.erb

@@ -87,12 +87,12 @@
               field: 'id',
               width: 60,
               title:'序号',type: 'numbers',
-                totalRowText:"合计",
+                totalRowText:'合计',fixed: 'left'
             },
             {
               field: 'staff',
               width: 90,
-              title: '姓名'
+              title: '姓名',fixed: 'left'
             },
             {
               field: 'weekly',

data/app/views/educode_sales/sale_reports/audit.html.erb

@@ -151,6 +151,8 @@
     table.on('tool(showWeeklyTable)', function (obj) {
       var data = obj.data;
       if (obj.event === 'show_follow') {
+          business_id = obj.data.business_id
+          business_name = data.business_name
         id = data.business_id
         content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
         openWH = miniPage.getOpenWidthHeight();

data/app/views/educode_sales/sale_reports/edit.html.erb

@@ -257,6 +257,8 @@
         });
         return false;
       } else if (obj.event === 'show_follow') {
+          business_id = obj.data.business_id
+          business_name = data.business_name
         id = data.business_id
         content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
         openWH = miniPage.getOpenWidthHeight();

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -102,6 +102,8 @@
     table.on('tool(showWeeklyTable)', function (obj) {
       var data = obj.data;
       if (obj.event === 'show_follow') {
+          business_id = obj.data.business_id
+          business_name = data.business_name
         id = data.business_id
         content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
         openWH = miniPage.getOpenWidthHeight();

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

@@ -7,7 +7,7 @@
     <span style="float: right;padding-right: 10px">年度</span>
   </form>
   <hr>
-  <table class="layui-hide" id="table" lay-filter="table" ></table>
+  <table class="layui-hide" id="table" lay-filter="table"></table>
 </div>
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
@@ -16,32 +16,32 @@
 </script>
 <script type="text/html" id="business_a">
   <div class="layui-text">
-   <a href="/missions/businesses?clazz_id={{d.a_clazz_id}}&staff_id={{d.id}}">{{d.business_a}}</a>
+    <a href="/missions/businesses?clazz_id={{d.a_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_a}}</a>
   </div>
 </script>
 <script type="text/html" id="business_b">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.b_clazz_id}}&staff_id={{d.id}}">{{d.business_b}}</a>
+    <a href="/missions/businesses?clazz_id={{d.b_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_b}}</a>
   </div>
 </script>
 <script type="text/html" id="business_c">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.c_clazz_id}}&staff_id={{d.id}}">{{d.business_c}}</a>
+    <a href="/missions/businesses?clazz_id={{d.c_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_c}}</a>
   </div>
 </script>
 <script type="text/html" id="business_d">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.d_clazz_id}}&staff_id={{d.id}}">{{d.business_d}}</a>
+    <a href="/missions/businesses?clazz_id={{d.d_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_d}}</a>
   </div>
 </script>
 <script type="text/html" id="business_e">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.e_clazz_id}}&staff_id={{d.id}}">{{d.business_e}}</a>
+    <a href="/missions/businesses?clazz_id={{d.e_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_e}}</a>
   </div>
 </script>
 <script type="text/html" id="business_o">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.o_clazz_id}}&staff_id={{d.id}}">{{d.business_o}}</a>
+    <a href="/missions/businesses?clazz_id={{d.o_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_o}}</a>
   </div>
 </script>
 <script type="text/html" id="school_count">

data/app/views/educode_sales/teachers/show_follow.html.erb

@@ -257,7 +257,7 @@
 
 
 
-<!--未完成计划列表-->
+<!--计划回款计划列表-->
 <script type="text/html" id="unfinish_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">跟进计划列表</span>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,6 +165,7 @@ files:
 - app/helpers/educode_sales/activities_helper.rb
 - app/helpers/educode_sales/application_helper.rb
 - app/helpers/educode_sales/business_helper.rb
+- app/helpers/educode_sales/follow_up_helper.rb
 - app/helpers/educode_sales/home_helper.rb
 - app/helpers/educode_sales/sessions_helper.rb
 - app/helpers/educode_sales/teachers_helper.rb