educode_sales 0.4.2 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41790fb0313e3f22aff7bbd0046de7bd203e8523b72cfa22712cbf12f9cbb61d
-  data.tar.gz: 1bc23b24c70fbaccbd3993f022042564d49dc81f87ffcbb9761b57ef81d37593
+  metadata.gz: c5ec520db3019e20ddbbd8615880ee3060fdd6d6e5f859130dfb0b0845be8f6d
+  data.tar.gz: 7f678fb5d8c6b9dd77dc8c002b49f1e7228d8ce30b3eddb77fb2e7717b93d1d4
 SHA512:
-  metadata.gz: 23fe3b32747285c645c7d2a6e0cf42684a3fc175bdc05df9b69353801a87d145bcf55a5eed40af789737ca1b3697c2b6a0cd36ea64f41a5eb4d5cfeac6eb6ae0
-  data.tar.gz: da31bffc608e4e52526df99b2a9add2e56c3e3d4c943dad31a050656f80db0ad4da934dbd6a653e3511687ab97382d2beedcdab145dbafc7d34c8f96f7cd2d7c
+  metadata.gz: 7ffcbfc616f3ab9241834c9642dfc13e8d18a1ea7c5bc16edcb46398503f80456e2fee80a09da8fec8377a748f0f60a56e4fdf53640470a1e7521a160642a7b7
+  data.tar.gz: 3dd3605a2b1f4cd3469201c87dc7237bb76c01ea6da7cb968e81fd5702b57ab847c919a176a792cb3b7c47547bcc1dad06711cc38dda351935f7096d87001fc1

data/app/controllers/educode_sales/businesses_controller.rb

@@ -40,6 +40,16 @@ module EducodeSales
             end
           end
 
+          if params[:q].present? && params[:q][:all].present?
+            @businesses = @businesses
+          end
+
+          if params[:q].present? && params[:q][:mine].present?
+            ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+            ids1 = FollowUp.where(id: ids).pluck(:business_id)
+            @businesses =@businesses.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
+          end
+
           @businesses = @businesses
           if params[:q].present? && params[:q][:name].present?
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
@@ -49,7 +59,12 @@ module EducodeSales
             @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
           end
           if params[:q].present? && params[:q][:staff_id].present?
-            @businesses = @businesses.where(staff_id: params[:q][:staff_id])
+            part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND staff_id = ?",params[:q][:staff_id]).ids
+            part_b_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is not null").joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.staff_id = ?", params[:q][:staff_id]).pluck(:business_id)
+            business_ids = part_a_ids + part_b_ids
+            @businesses = EducodeSales::Business.where(id:business_ids)
           end
           if params[:q].present? && params[:q][:business_type].present?
             @businesses = @businesses.joins("
@@ -80,7 +95,6 @@ module EducodeSales
             @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1])
           end
 
-
           if params[:sort].present? && params[:sort][:field]
             @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
@@ -89,6 +103,8 @@ module EducodeSales
 
           @business_count = @businesses.count
 
+
+
           @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
@@ -177,6 +193,7 @@ module EducodeSales
 
     def new_follow_record
       load_business
+      @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       @stages = Common.where(clazz: 'business_step').order("position").pluck(:name, :id)
       @places = Place.order("created_at desc").pluck(:name, :id)
@@ -201,6 +218,7 @@ module EducodeSales
     end
 
     def edit_follow_record
+      @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @follow_up = FollowUp.find(params[:follow_up_id])
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       @stages = Common.where(clazz: 'business_step').order("position").pluck(:name, :id)
@@ -222,7 +240,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_rate, :description, :advise, :place_id)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
     end
 
   end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -11,7 +11,7 @@ module EducodeSales
         follow_up.assign_follow_ups.build(staff_id: d)
       end
       
-      follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
+      follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) if follow_up.actual_amount
       if follow_up.save
         if @business.last_follow_up.present?
           @business.last_follow_up.key_person.each do |d|
@@ -54,7 +54,7 @@ module EducodeSales
         assign_follow_ups << follow_up.assign_follow_ups.find_or_initialize_by(staff_id: d)
       end
       follow_up.assign_follow_ups = assign_follow_ups
-      follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
+      follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
         render_success
       else
@@ -156,7 +156,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_rate, :description, :advise, :place_id)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
     end
 
     def teacher_params

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -21,7 +21,7 @@ module EducodeSales
               @sale_plans = OperationPlan.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_plans = OperationPlan.where("staff_id in (?)", staff_ids)
+              @sale_plans = OperationPlan.where("staff_id in (?) OR educode_sales_operation_plans.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_plans = OperationPlan
             end
@@ -44,7 +44,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_plans = @sale_plans.order("updated_at desc")
+            @sale_plans = @sale_plans.order("created_at desc")
           end
           @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
         end

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -18,7 +18,7 @@ module EducodeSales
               @sale_reports = OperationReport.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_reports = OperationReport.where("staff_id in (?)", staff_ids)
+              @sale_reports = OperationReport.where("staff_id in (?) OR educode_sales_operation_reports.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_reports = OperationReport
             end
@@ -40,7 +40,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_reports = @sale_reports.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_reports = @sale_reports.order("updated_at desc")
+            @sale_reports = @sale_reports.order("created_at desc")
           end
           @sale_reports = @sale_reports.page(params[:page]).per(params[:limit])
         end
@@ -126,6 +126,6 @@ module EducodeSales
       params.permit(:level1_opinion, :level2_opinion, :level3_opinion, :level1_score, :level2_score, :level3_score)
     end
 
-    
+
   end
 end

data/app/controllers/educode_sales/places_controller.rb

@@ -9,7 +9,7 @@ module EducodeSales
         end
         format.json do
           @places = Place.page(params[:page]).per(params[:limit])
-          @x = Common.find_by(clazz: '商机类型', name: 'X类')&.id
+          @x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
           @stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
         end
       end

data/app/controllers/educode_sales/plans_controller.rb

@@ -22,7 +22,7 @@ module EducodeSales
               @sale_plans = SalePlan.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_plans = SalePlan.where("staff_id in (?)", staff_ids)
+              @sale_plans = SalePlan.where("staff_id in (?) OR educode_sales_sale_plans.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_plans = SalePlan
             end
@@ -44,7 +44,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_plans = @sale_plans.order("updated_at desc")
+            @sale_plans = @sale_plans.order("created_at desc")
           end
 
           @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
@@ -78,7 +78,9 @@ module EducodeSales
       else
         @weeks = [week]
       end
-      @businesses = @current_admin.businesses.pluck(:name, :id)
+      ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+      ids1 = FollowUp.where(id: ids).pluck(:business_id)
+      @businesses =Business.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id).pluck(:name, :id)
       render layout: false
     end
 
@@ -92,7 +94,9 @@ module EducodeSales
 
     def new_month
       @business = Business.find_by(id: params[:business_id])
-      @businesses = @current_admin.businesses.pluck(:name, :id)
+      ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+      ids1 = FollowUp.where(id: ids).pluck(:business_id)
+      @businesses =Business.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id).pluck(:name, :id)
       render layout: false
     end
 

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -9,7 +9,7 @@ module EducodeSales
       else
         sale_report = @current_admin.sale_reports.build(month: Date.today.beginning_of_month, weekly: Time.now.strftime('%W').to_i)
       end
-      
+
       sale_report.finish_rate = params[:finish_rate]
       sale_report.client = params[:client]
       sale_report.content = params[:content]
@@ -51,7 +51,7 @@ module EducodeSales
               @sale_reports = SaleReport.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_reports = SaleReport.where("staff_id in (?)", staff_ids)
+              @sale_reports = SaleReport.where("staff_id in (?) OR educode_sales_sale_reports.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_reports = SaleReport
             end
@@ -73,7 +73,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_reports = @sale_reports.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_reports = @sale_reports.order("updated_at desc")
+            @sale_reports = @sale_reports.order("created_at desc")
           end
           @sale_reports = @sale_reports.page(params[:page]).per(params[:limit])
         end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -9,15 +9,15 @@ module EducodeSales
       @year = params[:year] ? params[:year] : Time.now.year
       @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
       year_time = "#{@year}-01-01 00:00:00"
-      x = Common.find_by(clazz: '商机类型', name: 'X类')&.id
-      o = Common.find_by(clazz: '商机类型', name: 'O类')&.id
+      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 != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).where("educode_sales_follow_ups.created_at >= ?", year_time).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.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, stage_ids).sum(:total_amount).round(2)
       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.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, s_stage_ids).sum(:total_amount).round(2)
-      @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_money_plans.date_at >= ?", year_time).sum(: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 >= ?", year_time).sum(:amount).round(2)
       a = Common.where(clazz: '商机类型', name: 'A类').pluck(:id)
       @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).sum(:total_amount).round(2)
       b = Common.where(clazz: '商机类型', name: 'B类').pluck(:id)

data/app/controllers/educode_sales/sales_controller.rb

@@ -14,7 +14,7 @@ module EducodeSales
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @a_clazz = Common.find_by(clazz: 'business_type', name: 'A类')
           @b_clazz = Common.find_by(clazz: 'business_type', name: 'B类')
-          @x = Common.find_by(clazz: 'business_type', name: 'X类')
+          @x = Common.find_by(extras: EducodeSales::Common::XTYPE)
           @step_ids = Common.where(name: %w(已中标 已签单 已验收 回款中 服务中 已结束), clazz: 'business_step').pluck(:id)
           
           @staffs = Staff.where(job_type: common.id).page(params[:page]).per(params[:limit])

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -34,7 +34,7 @@ module EducodeSales
     def update
       follow_up = TeacherFollow.find(params[:id])
       follow_up.assign_attributes(follow_up_params)
-      # follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
+      # follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_amount.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
         render_success
       else

data/app/models/educode_sales/common.rb

@@ -2,6 +2,8 @@ module EducodeSales
   class Common < ApplicationRecord
     acts_as_list scope: [:clazz]
 
+    XTYPE = "x_class"
+    OTYPE = 'o_class'
 
     validates :name, uniqueness: {scope: :clazz, message: '已存在'}
     

data/app/models/educode_sales/teacher.rb

@@ -13,29 +13,22 @@ module EducodeSales
     belongs_to :follow_up, class_name: 'TeacherFollow', optional: true
     validates :user_id, uniqueness: { allow_blank: true, message: '已存在老师列表'}
 
+    def cal_courses_count
+      if self.user_id.present?
+        Course.joins(:course_members).where(course_members: {user_id: self.user_id}).where("is_delete = 0 and role != 4  and excellent = 0 and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct(:course_id).count
+      else
+        0
+      end
+    end
 
-    # def teacher_used_of_department
-    #   if user_id.present?
-    #     user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
-    #     course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
-    #     if course_ids.present?
-    #       course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
-    #       course_members.present? ? course_members[0]['count'] : 0
-    #     else
-    #       0
-    #     end
-    #   else
-    #     0
-    #   end
-    # end
     def teacher_used_of_department
-        user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
-        course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
-        course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
-        course_members.present? ? course_members[0]['count'] : 0
+      user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
+      course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
+      course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
+      course_members.present? ? course_members[0]['count'] : 0
     end
 
-    def students_count
+    def cal_students_count
       if user_id.present?
         course_ids = Course.joins(:course_members).where(course_members: {user_id: user_id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct("course_id").pluck(:course_id)
         CourseMember.where(course_id: course_ids, role: "STUDENT").count

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

@@ -39,12 +39,14 @@
             elem: '#activities_table',
             url: '/missions/activities',
             toolbar: '#activity_toolbar',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
               [
                 {
                   field: 'id',
                   title:'序号',type: 'numbers',
+                    totalRowText:'合计',
                   width: 60
                 },
                 {
@@ -68,11 +70,13 @@
                   field: 'teachers_count',
                   title: '教师数',
                   width: 100,
+                    totalRow:true,
                   templet: '#teachers_count'
                 },
                 {
                   field: 'students_count',
                   title: '学生数',
+                    totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                   width: 100
                 },
                 {

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

@@ -1,14 +1,20 @@
+teachers_count = 0
 json.data do
   json.array! @activities do |d|
     json.id d.id
     json.name d.name
     json.days d.days
     json.teachers_count d.activity_teachers_count
+    teachers_count += d.activity_teachers_count
     json.return_rate d.return_rate
     json.students_count d.students_count || 0
     json.course_rate d.course_rate
     json.start_at d.start_at ? d.start_at.to_s(:date) : ''
   end
 end
+
+json.totalRow do
+  json.teachers_count teachers_count.to_s
+end
 json.code 0
 json.count @activities.total_count

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

@@ -17,9 +17,9 @@
     <br>
     <div class="layui-inline">
       <label class="layui-form-label required">项目类型</label>
-      <%if  EducodeSales::FollowUp.where(business_id: @follow_up.business.id,clazz_id: EducodeSales::Common.find_by(name: "O类").id).count >= 2 %>
+      <%if  EducodeSales::FollowUp.where(business_id: @follow_up.business.id,clazz_id: EducodeSales::Common.find_by(name: @o_name).id).count >= 2 %>
         <div class="layui-input-inline">
-          <%= select_tag "clazz_id", options_for_select([['O类',EducodeSales::Common.find_by(name: "O类").id]]),:disabled => true, class: 'required' %>
+          <%= select_tag "clazz_id", options_for_select([[@o_name,EducodeSales::Common.find_by(name: @o_name).id]]),:disabled => true, class: 'required' %>
         </div>
       <%else %>
         <div class="layui-input-inline">
@@ -56,9 +56,9 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">实额</label>
+      <label class="layui-form-label">合同额</label>
       <div class="layui-input-inline">
-         <input name="actual_amount" type="number" class="layui-input" value="<%= @follow_up.actual_amount %>">
+         <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
       </div>
     </div>
     <br>
@@ -69,11 +69,10 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">分成</label>
+      <label class="layui-form-label">渠道分成</label>
       <div class="layui-input-inline">
-        <input name="divide_rate" class="layui-input" value="<%= @follow_up.divide_rate%>">
+        <input name="divide_amount" class="layui-input" value="<%= @follow_up.divide_amount%>">
       </div>
-      <span style="margin-top: 10px; float:left;">%</span>
     </div>
     <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
@@ -82,7 +81,7 @@
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label required">商机说明</label>
+      <label class="layui-form-label required">最新进展</label>
       <div class="layui-input-block">
         <textarea name="description" lay-verify="required" placeholder="此处可以填写：
 1、有无预算；

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

@@ -68,6 +68,8 @@
     <% if can? :create, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加商机</button>
     <% end %>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="mine"> 我的商机</button>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="all"> 全部商机</button>
   </div>
 </script>
 <script type="text/html" id="currentTableBar">
@@ -113,6 +115,7 @@
           url: '/missions/businesses',
           where: {q: form.val('search_form')},
           toolbar: '#bussinessBar',
+          totalRow: true,//开启合并行
           defaultToolbar: [],
           cols: [
             [
@@ -120,6 +123,7 @@
                 field: 'id',
                 width: 60,
                 title:'序号',type: 'numbers',
+                  totalRowText: '合计',
               },
               {
                 field: 'name',
@@ -139,8 +143,9 @@
               {
                 field: 'follow_ups_count',
                 title: '跟进',
-                width: 60,
-                templet: '#show_follow'
+                width: 100,
+                templet: '#show_follow',
+                  totalRow: true,
               },
               // {
               //   field: 'teachers_count',
@@ -150,7 +155,7 @@
               // },
               {
                 field: 'clazz',
-                width: 60,
+                width: 120,
                 title: '类型'
               },
               {
@@ -174,13 +179,15 @@
                 field: 'total_amount',
                 width: 100,
                 title: '总额',
+                  totalRow: true,
                 sort: true
               },
               {
                 field: 'return_money',
                 width: 100,
                 title: '回款',
-                sort: true
+                sort: true,
+                  totalRow: true
               },
               {
                 field: 'place',
@@ -195,7 +202,12 @@
               {
                 field: 'last_follow_person',
                 width: 120,
-                title: '跟进人'
+                title: '最新跟进人'
+              },
+              {
+                field: 'latest_time',
+                width: 200,
+                title: '最新跟进时间'
               },
               {
                 title: '操作',
@@ -361,7 +373,35 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
-            } else if (obj.event === 'delete') { // 监听删除操作
+            } else if (obj.event === 'all') {
+                search = {"all":"1"}
+                table.reload('businesses_table', {
+                    page: {
+                        curr: 1
+                    },
+                    where: {q: search, sort: sort}
+                }, 'data');
+                form.val('search_form', {
+                    name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                    place_id: '', date: '', area: ''
+                })
+                return false;
+            }
+            else if (obj.event === 'mine') {
+                search = {"mine":"1"}
+                table.reload('businesses_table', {
+                    page: {
+                        curr: 1
+                    },
+                    where: {q: search, sort: sort}
+                }, 'data');
+                form.val('search_form', {
+                    name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                    place_id: '', date: '', area: ''
+                })
+                return false;
+            }
+            else if (obj.event === 'delete') {
                 var checkStatus = table.checkStatus('currentTableId'),
                     data = checkStatus.data;
                 layer.alert(JSON.stringify(data));

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

@@ -1,3 +1,4 @@
+follow_ups_count = 0
 json.data do
   json.array! @businesses do |d|
     json.id d.id
@@ -5,6 +6,7 @@ json.data do
     json.department d.department.name
     json.school d.department.school.name
     json.follow_ups_count d.follow_ups_count
+    follow_ups_count += d.follow_ups_count
     json.follow_up_id d.last_follow_up_id
     # json.teachers_count d.follow_ups.sum(:key_people_count)
     # json.teachers_count EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).present? ? EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).key_people_count : 0
@@ -15,13 +17,18 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.return_money d.return_money
     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 : ''
+    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
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
   end
 end
+
+json.totalRow do
+  json.follow_ups_count follow_ups_count.to_s
+end
 json.code 0
 json.count @businesses.total_count
 json.msg 'succcess'