educode_sales 1.10.23 → 1.10.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac157bfbdbc5c1aceeef3b0d0af4b81e74b6835ddda09a5beae4188f23720391
-  data.tar.gz: a4f7c4077fc9af0f5374fc3efec8bf42e5c3a57a27dc78090a5727cabe2f5510
+  metadata.gz: 96a6775767542fb19b07af8d6e33230a59840d0de8cebe92fce6d415a6709b98
+  data.tar.gz: b67442d07ea5b753f6f617553b43685916ab979e30d6a6b5574aadd7ed3dfdcd
 SHA512:
-  metadata.gz: 804531ab845025fe61054b79b248a5f1f83e4194d0c23cad2f0fb4c49978db71eb695815723d50e7255fa35a4aa0b0154babb156fdd5cd953808bb2a1b56a9e9
-  data.tar.gz: 13484d3b014be703413f41b03938881aeb56bd1b7cf97f721f055f9a0aa869dfedc6b948ddbd57bb7b3174c2e3aa171dc7efa5823821f3e2b903e1e1ec9b2591
+  metadata.gz: 91d38ed9783a320d29546f6143ffc1e9db8583a05730b698993456b0d4038c59530d26d77b9d64519a85078166aec0fb49d29145d5c7fa60c129de4dcb40e9f1
+  data.tar.gz: 229ad3617584f13d20d2bdf058855519858dd856afeff9fda580bf0abb3d3041bb57613896ebd6d28ef8f7c3ccd8dbdc3d51000981ae201f2c461cf7a1aab54a

data/app/controllers/educode_sales/businesses_controller.rb

@@ -15,6 +15,7 @@ module EducodeSales
           # @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business) || can?(:show_file, EducodeSales::Business)
           @more = true
           gon.menus = []
+          gon.assign_menus = []
           gon.export_menus = []
           gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
 
@@ -70,18 +71,30 @@ module EducodeSales
             gon.menus << { title: '添加年计划', event: 'year' }
           end
 
+          if can?(:assign, EducodeSales::SalePlan)
+            gon.assign_menus << { title: '指派周计划', event: 'week' }
+            gon.assign_menus << { title: '指派月计划', event: 'month' }
+            gon.assign_menus << { title: '指派年计划', event: 'year' }
+          end
+
           gon.menus << { title: '添加回款计划', event: 'money_plan' }
+          gon.assign_menus << { title: '添加回款计划', event: 'money_plan' }
 
           gon.menus << { title: '关注', event: 'following' }
           gon.menus << { title: '跟进时间线', event: 'time_line' }
+
+          gon.assign_menus << { title: '关注', event: 'following' }
+          gon.assign_menus << { title: '跟进时间线', event: 'time_line' }
           if can?(:show_file, EducodeSales::Business)
             gon.menus << { title: '附件管理', event: 'file' }
+            gon.assign_menus << { title: '附件管理', event: 'file' }
           end
           if can?(:update, EducodeSales::Business)
             # gon.menus << { title: '编辑', event: 'edit' }
           end
           if can?(:destroy, EducodeSales::Business)
             gon.menus << { title: '删除', event: 'delete' }
+            gon.assign_menus << { title: '删除', event: 'delete' }
           end
           if can?(:export_business, EducodeSales::Business)
             gon.export_menus << { title: '导出到Csv文件', event: 'export_csv' }

data/app/controllers/educode_sales/contracts_controller.rb

@@ -328,6 +328,17 @@ module EducodeSales
     def add_follow_ups
       @business = Business.find(params[:business_id])
       last_follow_up = @business.last_follow_up
+
+      # 计划交货时间
+      current_1_plan = nil
+      # 计划验收时间
+      current_2_plan = nil
+      # 实际交货时间
+      current_1_actual = nil
+      # 实际验收时间
+      current_2_actual = nil
+
+
       
       data = []
       6.times do |i|
@@ -340,9 +351,20 @@ module EducodeSales
         end
         params["#{i+1}_plan_date"].each do |d, v|
           data[i][d.to_i] << v
+          if i == 0 && v.present?
+            current_1_plan = v.to_date
+          elsif i == 1 && v.present?
+            current_2_plan = v
+          end
         end
         params["#{i+1}_actual_date"].each do |d, v|
           data[i][d.to_i] << v
+          if i == 0 && v.present?
+            current_1_actual = v.to_date
+          elsif i == 1 && v.present?
+            current_2_actual = v
+          end
+
           if i == 1 && last_follow_up
             # 验收时间
             last_follow_up.reception_at = v
@@ -357,6 +379,39 @@ module EducodeSales
       # data.each do |d|
       #   d.select! { |d| d.delete_if{|f| f == ''}.present? }
       # end
+      current_week = Time.now.strftime('%W')
+      staff_manage_ids = @business&.last_follow_up&.assign_follow_ups.present? ? @business.last_follow_up.assign_follow_ups.pluck(:staff_id) : [@business.staff_id]
+      if current_1_plan && current_1_plan.to_date.strftime('%W') == current_week
+        unless EducodeSales::SalePlan.where(weekly: current_week, content: "提醒：请补充交付计划内容！", business: @business, staff_id: staff_manage_ids, finish_rate: 0).exists?
+          common_id = EducodeSales::Common.find_by(clazz: '计划类型', name: '交付计划')&.id
+          staff_manage_ids.each do |staff_id|
+            EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, weekly: current_week, content: "提醒：请补充交付计划内容！", business: @business, staff_id: staff_id, finish_rate: '0', common_id: common_id )
+            EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, content: "提醒：请补充交付计划内容！", business: @business, staff_id: staff_id, finish_rate: '0', common_id: common_id )
+          end
+        end
+      end
+
+      if current_2_plan && current_2_plan.to_date.strftime('%W') == current_week
+        unless EducodeSales::SalePlan.where(weekly: current_week, content: "提醒：请补充验收计划内容！", business: @business, staff_id: staff_manage_ids, finish_rate: 0).exists?
+          common_id = EducodeSales::Common.find_by(clazz: '计划类型', name: '验收计划')&.id
+          staff_manage_ids.each do |staff_id|
+            EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, weekly: current_week, content: "提醒：请补充验收计划内容！", business: @business, staff_id: staff_id, finish_rate: '0', common_id: common_id )
+            EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, content: "提醒：请补充验收计划内容！", business: @business, staff_id: staff_id, finish_rate: '0', common_id: common_id )
+          end
+        end
+      end
+
+      # 更新对应的计划完成度
+      if current_2_plan.present? && current_2_plan.to_date.strftime('%W') == current_week
+        common_id = EducodeSales::Common.find_by(clazz: '计划类型', name: '交付计划')&.id
+        EducodeSales::SalePlan.where(month: Time.now.beginning_of_month, business: @business, staff_id: staff_manage_ids, finish_rate: 0, common_id: common_id).update_all(finish_rate: 100)
+      end
+
+      if current_2_actual.present? && current_2_actual.to_date.strftime('%W') == current_week
+        common_id = EducodeSales::Common.find_by(clazz: '计划类型', name: '验收计划')&.id
+        EducodeSales::SalePlan.where(month: Time.now.beginning_of_month, business: @business, staff_id: staff_manage_ids, finish_rate: 0, common_id: common_id).update_all(finish_rate: 100)
+      end
+
 
       follow_up = last_follow_up.dup
      

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -119,6 +119,17 @@ module EducodeSales
           business_clazz_change.save unless business_clazz_change.persisted?
         end
       end
+
+      # 计划投标时间有变化且是当前周的话，添加当周/当月的销售计划
+      current_week = Time.now.strftime('%W').to_i
+      if follow_up.invitation_at&.strftime('%W').to_i == current_week
+        if last_follow_up && last_follow_up.invitation_at&.strftime('%W').to_i == current_week
+          current_week = nil
+        end
+      else
+        current_week = nil
+      end
+    
       if follow_up.save
         if last_follow_up.present?
           last_follow_up.key_person.each do |d|
@@ -136,6 +147,29 @@ module EducodeSales
           last_follow_up.contract_date_lists.update_all(follow_up_id: follow_up.id)
         end
         @business.update(last_follow_up_id: follow_up.id, clazz_id: follow_up.clazz_id, p_deploy_time: params[:deploy_time])
+
+        if current_week.present?
+          staff_manage_ids = @business&.last_follow_up&.assign_follow_ups.present? ? @business.last_follow_up.assign_follow_ups.pluck(:staff_id) : [@business.staff_id]
+          common_id = EducodeSales::Common.find_by(clazz: '计划类型', name: '中标计划')&.id
+          staff_manage_ids.each do |staff_id|
+            EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, weekly: current_week, content: "提醒：请补充中标计划内容！", business: @business, staff_id: staff_id, finish_rate: '0', common_id: common_id )
+            EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, content: "提醒：请补充中标计划内容！", business: @business, staff_id: staff_id, finish_rate: '0', common_id: common_id )
+          end
+        end
+
+        # 更新对应的计划完成度
+        if follow_up.bidded_date.present?
+          staff_manage_ids = @business&.last_follow_up&.assign_follow_ups.present? ? @business.last_follow_up.assign_follow_ups.pluck(:staff_id) : [@business.staff_id]
+          common_id = EducodeSales::Common.find_by(clazz: '计划类型', name: '中标计划')&.id
+          if follow_up.bidded_date.strftime('%W') == Time.now.strftime('%W')
+            EducodeSales::SalePlan.where(month: Time.now.beginning_of_month, weekly: Time.now.strftime('%W').to_i, business: @business, staff_id: staff_manage_ids, finish_rate: 0, common_id: common_id).update_all(finish_rate: 100)
+          end
+          if follow_up.bidded_date.strftime('%Y-%m') == Time.now.strftime('%Y-%m')
+            EducodeSales::SalePlan.where(month: Time.now.beginning_of_month, weekly: nil, business: @business, staff_id: staff_manage_ids, finish_rate: 0, common_id: common_id).update_all(finish_rate: 100)
+          end
+        end
+
+
         # 增加o商机编号
         add_business_number
         update_department

data/app/controllers/educode_sales/idea_follows_controller.rb

@@ -0,0 +1,146 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class IdeaFollowsController < ApplicationController
+    def create
+      load_teacher
+      follow_up = @teacher.teacher_follows.build(follow_up_params)
+      follow_up.staff = @current_admin
+      if @teacher.user_id.present?
+        course_ids = CourseMember.joins(:course).where(user_id: @teacher.user_id, courses: { is_delete: 0 }).where.not(role: 4).pluck(:course_id)
+        follow_up.course_shixuns_count = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).pluck(:shixun_id).uniq.count
+        follow_up.shixuns_count = ShixunMember.where(user_id: @teacher.user_id).count
+        follow_up.students_count = CourseMember.where(course_id: course_ids, role: 4).count
+        follow_up.evaluates_count = Course.where(id: course_ids).inject(0) { |i, d| i += d.evaluate_count }
+        follow_up.courses_count = course_ids.size
+      end
+      if follow_up.save
+        @teacher.update(follow_up_id: follow_up.id, followup_at: Time.now)
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def destroy
+      follow_up = IdeaFollow.find(params[:id])
+      if follow_up.destroy
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def update
+      # follow_up = IdeaFollow.new(idea_id: idea.id, staff_id: @current_admin.id, money: params[:money], content: params[:content], status: params[:status], advise: params[:advise], sale_staff_id: params[:sale_staff_id], idea_staff_id: params[:idea_staff_id])
+
+      follow_up = IdeaFollow.find(params[:id])
+      follow_up.money = params[:money]
+      follow_up.content = params[:content]
+      follow_up.status = params[:status]
+      follow_up.advise = params[:advise]
+      follow_up.sale_staff_id = params[:sale_staff_id]
+      follow_up.idea_staff_id = params[:idea_staff_id]
+      if follow_up.save
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def index
+      @staff_manages = {}
+      role = EducodeSales::Role.find_by(name: '生态经理')
+      EducodeSales::Common.joins(market_areas: :staff).includes(market_areas: :staff).where(clazz: '区域').where("educode_sales_staffs.role_id = #{role.id}").each do |d|
+        @staff_manages[d.name] = d.market_areas.map { |d| d.staff&.name }.uniq.compact
+      end if role
+
+      if @current_admin.is_admin?
+        @follow_ups = TeacherFollow.all
+      else
+        level = @current_admin.role.role_areas.find_by(clazz: '教师运营').level
+        case level
+        when '自己'
+          @follow_ups = TeacherFollow.where(staff_id: @current_admin.id)
+        when '区域'
+          school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+          teacher_ids = EducodeSales::Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_teachers.staff_id = #{@current_admin.id}", school_ids).pluck(:id)
+          @follow_ups = TeacherFollow.where(teacher_id: teacher_ids)
+        else
+          @follow_ups = TeacherFollow.all
+        end
+      end
+      if params[:q].present? && params[:q][:name].present?
+        @follow_ups = @follow_ups.joins(:teacher).where("educode_sales_teachers.name LIKE ?", "%#{params[:q][:name]}%")
+      end
+
+      if params[:q].present? && params[:q][:staff_id].present?
+        staff = Staff.find(params[:q][:staff_id])
+        school_ids = School.where(province: staff.areas.pluck(:name)).pluck(:id)
+        teacher_ids = EducodeSales::Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id)
+        @follow_ups = @follow_ups.where(teacher_id: teacher_ids)
+      end
+
+      if params[:q].present? && params[:q][:department].present?
+        departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:department]}%").pluck(:id)
+        @follow_ups = @follow_ups.joins(:teacher).where("department_id in (?)", departments_ids)
+      end
+
+      if params[:q].present? && params[:q][:area].present?
+        p = EducodeSales::Common.find(params[:q][:area]).name
+        # if @current_admin.is_admin?
+        @follow_ups = @follow_ups.joins(:teacher).joins("
+            JOIN departments ON educode_sales_teachers.department_id = departments.id
+            JOIN schools ON departments.school_id = schools.id
+          ").where("province = ?", p)
+        # else
+        #   level = @current_admin.role.role_areas.find_by(clazz: '教师运营').level
+        #   if level == "区域"
+        #     school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+        #     @follow_ups = @follow_ups.joins(:teacher).joins("
+        #       JOIN departments ON educode_sales_teachers.department_id = departments.id
+        #       JOIN schools ON departments.school_id = schools.id
+        #     ").where("province = ? AND departments.school_id in (?)", p, school_ids)
+        #   else
+        #     @follow_ups = @follow_ups.joins(:teacher).joins("
+        #       JOIN departments ON educode_sales_teachers.department_id = departments.id
+        #       JOIN schools ON departments.school_id = schools.id
+        #     ").where("province = ?", p)
+        #   end
+        # end
+      end
+
+      if params[:q].present? && params[:q][:attitude_id].present?
+        @follow_ups = @follow_ups.where("educode_sales_teacher_follows.attitude_id = ?", "#{params[:q][:attitude_id]}")
+      end
+
+      if params[:q].present? && params[:q][:description].present?
+        @follow_ups = @follow_ups.where("educode_sales_teacher_follows.description LIKE ?", "%#{params[:q][:description]}%")
+      end
+
+      if params[:q].present? && params[:q][:follows_date].present?
+        date = params[:q][:follows_date].split(" - ")
+        @follow_ups = @follow_ups.where("educode_sales_teacher_follows.created_at > ? AND educode_sales_teacher_follows.created_at < ?", date[0], date[1] + ' 23:59:59')
+      end
+
+      @follow_ups = @follow_ups.includes(:teacher, :attitude, :staff)
+      if params[:sort].present? && params[:sort][:field]
+        @follow_ups = @follow_ups.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+      else
+        @follow_ups = @follow_ups.order("educode_sales_teacher_follows.created_at desc")
+      end
+      @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+    end
+
+    private
+
+    def load_teacher
+      @teacher = Teacher.find(params[:teacher_id])
+    end
+
+    def follow_up_params
+      params.permit(:attitude_id, :follow_id, :course_plan_id, :course_build_id, :description, :advise, :is_contact)
+    end
+
+  end
+end

data/app/controllers/educode_sales/ideas_controller.rb

@@ -221,6 +221,43 @@ module EducodeSales
       render layout: false
     end
 
+    def show_follow
+      @idea_follow = IdeaFollow.find(params[:id])
+      staffs = Staff.where.not(role_id: 11).includes(:user)
+      gon.sale_staffs = staffs.map { |d| { name: d.user.real_name, value: d.id, selected: d.id == @idea_follow.sale_staff_id } }
+      gon.idea_staffs = staffs.map { |d| { name: d.user.real_name, value: d.id, selected: d.id == @idea_follow.idea_staff_id } }
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+        end
+      end
+    end
+
+    def follow_list
+      @idea = Idea.find(params[:id])
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          @follow_ups = @idea.idea_follows.includes(:staff, :sale_staff, :idea_staff).order(id: :desc)
+          @latest = @follow_ups.order(id: :desc).first
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def edit_follow_record
+      @idea_follow = IdeaFollow.find(params[:id])
+      @idea = @idea_follow.idea
+      staffs = Staff.where.not(role_id: 11).includes(:user)
+      gon.sale_staffs = staffs.map { |d| { name: d.user.real_name, value: d.id, selected: d.id == @idea_follow.sale_staff_id } }
+      gon.idea_staffs = staffs.map { |d| { name: d.user.real_name, value: d.id, selected: d.id == @idea_follow.idea_staff_id } }
+      render layout: false
+    end
+
     def follow_up
       idea = Idea.find(params[:id])
       follow_up = IdeaFollow.new(idea_id: idea.id, staff_id: @current_admin.id, money: params[:money], content: params[:content], status: params[:status], advise: params[:advise], sale_staff_id: params[:sale_staff_id], idea_staff_id: params[:idea_staff_id])

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -6,7 +6,7 @@ module EducodeSales
     def index
       respond_to do |format|
         format.html do
-       
+
         end
         format.js do
           gon.edit_record = can?(:update_record, EducodeSales::MoneyPlan)
@@ -50,7 +50,7 @@ module EducodeSales
             elsif params[:q][:state] == '无对应合同'
               @money_plan_records = @money_plan_records.having("claim_num = 0 AND business_id IS NULL")
             end
-              
+
           end
 
           if params[:q].present? && params[:q][:staff_manages].present?
@@ -60,7 +60,7 @@ module EducodeSales
               LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
            where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", params[:q][:staff_manages], params[:q][:staff_manages])
           end
-          
+
           if params[:q].present? && params[:q][:amount].present?
             @money_plan_records = @money_plan_records.where(amount: params[:q][:amount])
           end
@@ -119,7 +119,7 @@ module EducodeSales
         business_id = Business.find_by(number: ods.row(r+2)[3].to_s.strip)&.id
         EducodeSales::MoneyPlanRecord.create(payer_name: ods.row(r+2)[0].to_s.strip, amount: ods.row(r+2)[1].to_s.strip, date_at: ods.row(r+2)[2].to_s.strip, business_id: business_id, staff_id: @current_admin.id) if business_id
       end
-      
+
       render json: { succcess: true}
     end
 
@@ -163,15 +163,15 @@ module EducodeSales
           # last_follow_up = business.last_follow_up
           # if last_follow_up.present?
           #   follow_up = last_follow_up.dup
-      
+
           #   follow_up.description = "认领了回款记录"
-           
+
           #   follow_up.staff = @current_admin
-      
+
           #   last_follow_up.assign_follow_ups.each do |d|
           #     follow_up.assign_follow_ups.build(staff_id: d.staff_id)
           #   end
-      
+
           #   if follow_up.save!
           #     last_follow_up.key_person.each do |d|
           #       key_person = d.dup
@@ -187,9 +187,13 @@ module EducodeSales
           # end
         end
       end
-
       businesses.uniq.each do |d|
-        d.update(return_money: d.money_plans.joins(:money_plan_claims).sum("educode_sales_money_plan_claims.amount") )
+        d.update(return_money: d.money_plans.joins(:money_plan_claims).sum("educode_sales_money_plan_claims.amount").round(6) )
+
+        # 更新对应的计划完成度
+        staff_manage_ids = d&.last_follow_up&.assign_follow_ups.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : [d.staff_id]
+        common_id = EducodeSales::Common.find_by(clazz: '计划类型', name: '回款计划')&.id
+        EducodeSales::SalePlan.where(month: Time.now.beginning_of_month, business: d, staff_id: staff_manage_ids, common_id: common_id).update_all(finish_rate: 100)
       end
       render_success
     end

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -92,16 +92,18 @@ module EducodeSales
       data = []
       week = Time.now.strftime('%W').to_i
       current_week = ""
-      staff_manage_ids = business&.last_follow_up&.assign_follow_ups.present? ? business.last_follow_up.assign_follow_ups.pluck(:staff_id) : [business.staff_id]
+      
       (params[:num].to_i+1).times do |i|
         _week = params["date_at[#{i}]"].to_date.strftime('%W').to_i
         current_week = _week if _week == week
         business.money_plans.create(category: params["category[#{i}]"], amount: params["amount[#{i}]"], payment_clause: params["payment_clause[#{i}]"], date_at: params["date_at[#{i}]"], follow_up_id: business.last_follow_up_id, staff_id: @current_admin.id )
       end
       if current_week.present?
+        staff_manage_ids = business&.last_follow_up&.assign_follow_ups.present? ? business.last_follow_up.assign_follow_ups.pluck(:staff_id) : [business.staff_id]
+        common_id = EducodeSales::Common.find_by(clazz: '计划类型', name: '回款计划')&.id
         staff_manage_ids.each do |staff_id|
-          EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, weekly: week, content: "提醒：请补充回款计划内容！", business: business, staff_id: staff_id, finish_rate: '0' )
-          EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, content: "提醒：请补充回款计划内容！", business: business, staff_id: staff_id, finish_rate: '0' )
+          EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, weekly: week, content: "提醒：请补充回款计划内容！", business: business, staff_id: staff_id, finish_rate: '0', common_id: common_id )
+          EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, content: "提醒：请补充回款计划内容！", business: business, staff_id: staff_id, finish_rate: '0', common_id: common_id )
         end
       end
       render_success

data/app/controllers/educode_sales/plans_controller.rb

@@ -61,7 +61,11 @@ module EducodeSales
     def create
       if params["year"].present?
         business = Business.find_by(id: params[:business_id])
-        plan = @current_admin.sale_plans.build(year: params[:year], business_id: business.id, clazz: params[:clazz])
+        plan = @current_admin.sale_plans.build(year: params[:year], business_id: business.id, clazz: params[:clazz], common_id: params[:common_id] )
+        if params[:assign_id].present?
+          plan.staff_id = params[:assign_id]
+          plan.assign_id = @current_admin.id
+        end
         if plan.save
           render_success
         else
@@ -71,6 +75,11 @@ module EducodeSales
         plan = @current_admin.sale_plans.build(plan_params)
         plan.month = params["month"] + "-1"
         plan.business = Business.find_by(id: params[:business_id])
+
+        if params[:assign_id].present?
+          plan.staff_id = params[:assign_id]
+          plan.assign_id = @current_admin.id
+        end
         if plan.save
           render_success
         else
@@ -93,6 +102,10 @@ module EducodeSales
 
     def new_week
       @business = Business.find_by(id: params[:business_id])
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
+
+      
       @week = Time.now.strftime('%W').to_i
       week = Time.now.strftime('%W').to_i
       if week > 3
@@ -102,6 +115,7 @@ module EducodeSales
       else
         @weeks = [[week.to_s + '  本周',week]]
       end
+      @commons = Common.where(clazz: '计划类型').pluck(:name, :id)
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
       @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
       @businesses = @businesses.map { |b| [b.name + "(#{b.department&.school&.name} #{b.department&.name})" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
@@ -129,6 +143,10 @@ module EducodeSales
     end
 
     def new_month
+      @commons = Common.where(clazz: '计划类型').pluck(:name, :id)
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
+      
       @business = Business.find_by(id: params[:business_id])
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
       @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
@@ -201,10 +219,14 @@ module EducodeSales
     end
 
     def edit_week
+      @commons = Common.where(clazz: '计划类型').pluck(:name, :id)
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
-      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
-      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       @sale_plan = SalePlan.find(params[:id])
+      # 加入指派的商机id
+      business_ids << @sale_plan.business_id
+      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department&.school&.name.to_s + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
+  
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
         if week > 3
@@ -267,9 +289,10 @@ module EducodeSales
     end
 
     def edit_month
+      @commons = Common.where(clazz: '计划类型').pluck(:name, :id)
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
       @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
-      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department&.school&.name.to_s + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       @sale_plan = SalePlan.find(params[:id])
       @finish_rates = []
       11.times { |d| @finish_rates << ["#{d*10}%", d * 10]}
@@ -448,7 +471,7 @@ module EducodeSales
     private
 
     def plan_params
-      params.permit(:month, :weekly, :content, :finish_rate, :business_id)
+      params.permit(:month, :weekly, :content, :finish_rate, :business_id, :common_id, :assign_id)
     end
 
     def business_info_params

data/app/helpers/educode_sales/sale_trends_helper.rb

@@ -248,7 +248,17 @@ module EducodeSales
     end
 
     def visit_analysis_charts(visit_count_year, visit_count_season, visit_count_month, visit_count_week, visit_type, title_names)
-      names =  visit_count_year.map{|d| d[0]}
+      if visit_type.present? && visit_type.include?("1")
+        names =  visit_count_year.map{|d| d[0]}
+      elsif visit_type.present? && visit_type.include?("2")
+        names =  visit_count_season.map{|d| d[0]}
+      elsif visit_type.present? && visit_type.include?("3")
+        names =  visit_count_month.map{|d| d[0]}
+      elsif visit_type.present? && visit_type.include?("4")
+        names =  visit_count_week.map{|d| d[0]}
+      else
+        names =  visit_count_year.map{|d| d[0]}
+      end
 
       visit_count_season_data = []
       names.each do |name|

data/app/models/educode_sales/common.rb

@@ -3,6 +3,7 @@ module EducodeSales
     acts_as_list scope: [:clazz]
 
     has_many :market_areas, class_name: 'MarketArea', foreign_key: 'area_id'
+    has_many :sale_plans,  dependent: :nullify
 
     XTYPE = "x_class"
     OTYPE = 'o_class'
@@ -24,7 +25,8 @@ module EducodeSales
       '跟进手段': 'contact',
       '人员类型': 'staff_type',
       '开课计划': 'course_plan',
-      '区域': 'area'
+      '区域': 'area',
+      '计划类型': 'plan_type'
     }
 
     def self.job_type_name

data/app/models/educode_sales/money_plan_claim.rb

@@ -11,7 +11,7 @@ module EducodeSales
 
     def update_return_money
       amount = self.money_plan.business.money_plans.joins(:money_plan_claims).sum("educode_sales_money_plan_claims.amount")
-      self.money_plan.business.update(return_money: amount)
+      self.money_plan.business.update(return_money: amount.round(6))
     end
   end
 end

data/app/models/educode_sales/permission.rb

@@ -16,7 +16,8 @@ module EducodeSales
       '绩效考核': 'assessments_setting',
       '方案管理': 'idea',
       '项目管理': 'project',
-      '合同管理': 'contract'
+      '合同管理': 'contract',
+      '产品目录': 'product_category'
     }
   end
 end

data/app/models/educode_sales/sale_plan.rb

@@ -3,6 +3,8 @@ module EducodeSales
     include ::Deletable
     belongs_to :business
     belongs_to :staff
+    belongs_to :common, optional: true
+    belongs_to :assign, class_name: "Staff", optional: true
     validates :business_id, presence: true
 
     has_many :business_infos