educode_sales 0.9.70 → 0.9.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 502334cc54a23143806d433d2f8049c0e9ae8961652b6af811d2225e6dfd4ece
-  data.tar.gz: 884955d1facd79b398128fa275ca71edfc18802101c1baa1d35a7233f94c768a
+  metadata.gz: c3ce2eed15225b67592420332087c3ca7284c2908a17643d6199ac829859196f
+  data.tar.gz: eec810ee5dd968d2c0b6af7053138a1ea8649fe57986dd054a91c15aa1f9afc6
 SHA512:
-  metadata.gz: 29ec5ea6847c23689ed1587710fbbde53b0bf4e71717a9c8cb232808e315fd881dfc17d3072c053d2d83329e0cfef801a31f9c5e51379eb0c7102594d456e31d
-  data.tar.gz: 89cbc11577607d7e2bc16acb0b74044955b3b33fbefadd3fdb2352f35f3912a2ebaed880112c267bfea3a5732291b077972ea7180427b3a7427b8c9cbfa20d56
+  metadata.gz: 2dfefa8e8e30235cdbd3ff7c0e17044788cf76d3d62698455da06d77fe0007571a16ff0dd39cc2e4b60faccede54df20da14dd1cbce40eecc6ebf48c4a87c7b2
+  data.tar.gz: b6765899a3cbeda621f0fa85940e1fec3702b74c88685a90bacff2ac57fdd6b9701fb5f89aaab13e577b5b2bb764ac4050a5a681b56ccf2d1006f381f8e5cb30

data/app/controllers/educode_sales/businesses_controller.rb

@@ -67,6 +67,7 @@ module EducodeSales
             # gon.menus << { title: '添加团队建议', event: 'suggest' }
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
+            gon.menus << { title: '添加年计划', event: 'year' }
           end
 
           gon.menus << { title: '关注', event: 'following' }
@@ -177,8 +178,21 @@ module EducodeSales
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:department].present?
-            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:department]}%").pluck(:id)
-            @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
+            if params[:q][:department].include?("---")
+              # 从客户管理进来按部门显示商机
+              school_name, department = params[:q][:department].split("---")
+              if department
+                departments_ids = Department.joins(:school).where("schools.name = ? AND departments.name = ?", school_name, department).pluck(:id)
+                @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
+              else
+                school = School.find_by(name: school_name)
+                @businesses = @businesses.where("educode_sales_businesses.school_id = ?", school&.id)
+              end
+            else
+              departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:department]}%").pluck(:id)
+              @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
+            end
+           
           end
           if params[:q].present? && params[:q][:staff_id].present?
             part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND educode_sales_businesses.staff_id = ?",params[:q][:staff_id]).ids
@@ -285,6 +299,22 @@ module EducodeSales
             @businesses = @businesses.joins("JOIN educode_sales_business_clazz_changes ON educode_sales_business_clazz_changes.business_id = educode_sales_businesses.id").where("educode_sales_business_clazz_changes.clazz_changed in (?)", clazz_changes)
           end
 
+         if params[:q].present? && params[:q][:property].present?
+            # 客户类型
+            @businesses = @businesses.joins(department: [school: :school_tags]).where("school_tags.id = ?", params[:q][:property])
+            # @businesses = @businesses.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id
+            #                                  JOIN schools ON departments.school_id = schools.id").where("schools.school_property_id = ?", params[:q][:property])
+          end 
+
+          if params[:q].present? && params[:q][:staff_manages].present?
+            # 销售经理
+            @businesses = @businesses.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             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[:sort].present? && params[:sort][:field]
             if params[:sort][:field] == "service_end_time"
               @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
@@ -1174,6 +1204,17 @@ module EducodeSales
       end
     end
 
+    def key_person
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          @teachers = EducodeSales::KeyPerson.where(follow_up_id: params[:follow_up_id]).page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
     private
 
     def load_business

data/app/controllers/educode_sales/customers_controller.rb

@@ -27,6 +27,11 @@ module EducodeSales
       render layout: false
     end
 
+    def show_majors
+      @department = Department.find(params[:id])
+      render layout: false
+    end
+
     def update_department
       department = Department.find(params[:id])
       department.update(name: params[:department_name])
@@ -165,36 +170,41 @@ module EducodeSales
           gon.school_tags = SchoolTag.where(for_missions: true).map { |d| {value: d.id, name: d.name } }
         end
         format.json do
+          @customers = School.from("(
+            SELECT schools.id, departments.id AS department_id, COUNT(department_majors.id) AS major_count
+            FROM schools
+            LEFT JOIN departments ON schools.id = departments.school_id
+            LEFT JOIN department_majors ON department_majors.department_id = departments.id
+            GROUP BY schools.id, departments.id
+          ) AS s")
           if @current_admin.is_admin?
-            @customers = School.all
+            # @customers = School.all
           else
             level = @current_admin.role.role_areas.find_by(clazz: '客户管理').level
             case level
             when '自己'
               school_ids = CustomerExtension.where(customer_staff_id: @current_admin.id).pluck(:school_id)
-              @customers = School.where(id: school_ids)
+              @customers = @customers.where(id: school_ids)
             when '区域'
               a_school_ids = School.where(province: @current_admin.areas.pluck(:name)).ids
               b_school_ids = CustomerExtension.where(customer_staff_id: @current_admin.id).pluck(:school_id)
               school_ids = a_school_ids + b_school_ids + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
-              @customers = School.where(id: school_ids)
+              @customers = @customers.where(id: school_ids)
             else
-              @customers = School.all
+              # @customers = School.all
             end
           end
 
           @customers = @customers.select("
             schools.*,
-            departments.id AS department_id,
-            departments.name AS department_name,
-            department_majors.name AS major,
-            department_majors.id AS major_id
-          ")
-          
-          @customers = @customers.joins("
-            LEFT JOIN departments ON schools.id = departments.school_id
-            LEFT JOIN department_majors ON department_majors.department_id = departments.id
+            s.major_count,
+            s.department_id,
+            departments.name AS department_name
+          ").joins("
+            JOIN schools ON s.id = schools.id
+            LEFT JOIN departments ON s.department_id = departments.id
           ")
+
           part_a_ids = CustomerFollow.all.pluck(:school_id)
           part_b_ids = Business.where(id: EducodeSales::FollowUp.pluck(:business_id)).pluck(:school_id)
           ids = part_a_ids + part_b_ids + CustomerAdd.all.pluck(:school_id)
@@ -290,6 +300,28 @@ module EducodeSales
       end
     end
 
+    def show_customer_follow
+      respond_to do |format|
+        format.html do
+          @school_name = School.find(params[:id]).name
+          @area = School.find(params[:id]).province
+          @staff = EducodeSales::CustomerExtension.where(school_id: params[:id]).map { |d| d.customer_staff&.user&.real_name}.join("、")
+          render layout: false
+        end
+        format.json do
+          if params[:department_id].present?
+            @follow_ups = EducodeSales::CustomerFollow.where(department_id: params[:department_id])
+          else
+            @follow_ups = EducodeSales::CustomerFollow.where(school_id: params[:id])
+          end
+          
+          @latest = @follow_ups.order(created_at: :desc).first
+          @follow_ups = @follow_ups.order("created_at desc")
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
     def show_department
       @departments = School.find(params[:id]).departments
       @departments = @departments.order("created_at desc")

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -12,19 +12,34 @@ module EducodeSales
           if @current_admin.is_admin?
             @follow_ups = FollowUp.all
           else
+            permissions = @current_admin.permissions.pluck(:name)
+            area_business_ids = []
+            if permissions.include?("专项管理商机")
+              # 按客户类型查看商机下跟进记录
+              school_tag_ids  = EducodeSales::StaffSchoolTag.where(staff_id: 10009).pluck :school_tag_id
+              school_ids = SchoolTagMiddle.where(school_tag_id: school_tag_ids).pluck :school_id
+              area_business_ids = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id)
+            end
+           
             level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
             case level
             when '自己'
+              if permissions.include?("区域管理商机")
+                # 按负责区域查看商机下跟进记录
+                school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+                area_business_ids += Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id)
+              end
+              
               business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
               @businesses = Business.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
               business_ids = @businesses.pluck(:id)
-              @follow_ups = FollowUp.where(business_id: business_ids)
+              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids)
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
               business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
               @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids)
               business_ids = @businesses.pluck(:id)
-              @follow_ups = FollowUp.where(business_id: business_ids)
+              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids)
             else
               @follow_ups = FollowUp.all
             end
@@ -110,7 +125,7 @@ module EducodeSales
           end
 
         end
-        @business.update(last_follow_up_id: follow_up.id, clazz_id: follow_up.clazz_id)
+        @business.update(last_follow_up_id: follow_up.id, clazz_id: follow_up.clazz_id, p_deploy_time: params[:deploy_time])
         # 增加o商机编号
         add_business_number
         update_department
@@ -154,7 +169,7 @@ module EducodeSales
       if follow_up.save
         # 增加o类商机
         @business = follow_up.business
-        @business.update(clazz_id: follow_up.clazz_id)
+        @business.update(clazz_id: follow_up.clazz_id, p_deploy_time: params[:deploy_time])
         add_business_number
         update_department
         render_success
@@ -284,7 +299,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment, :deploy_time, :rival)
     end
 
     # 更新部门和部门下老师用户的状态

data/app/controllers/educode_sales/plans_controller.rb

@@ -82,7 +82,7 @@ module EducodeSales
 
     def create_business_info
       business = Business.find_by(id: params[:business_id])
-      info = @current_admin.business_infos.build(year: params[:year], business_id: business.id, clazz: params[:clazz])
+      info = @current_admin.business_infos.find_or_initialize_by(year: params[:year], business_id: business.id, clazz: params[:clazz])
       if info.save
         render_success
       else
@@ -104,7 +104,7 @@ module EducodeSales
       end
       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} #{b.department&.name})" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       render layout: false
     end
 
@@ -132,18 +132,36 @@ module EducodeSales
       @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)
-      @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} #{b.department&.name})" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       render layout: false
     end
 
     def new_year
+      @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)
-      @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} #{b.department&.name})" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       @clazz = EducodeSales::SalePlan::CLAZZ_NAME
       render layout: false
     end
 
+    # 暂时不用
+    def staff_businesses
+      if params[:q].present?
+        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)
+        if params[:q].present?
+          @businesses =  @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q]}%")
+        else
+          @businesses =  @businesses.limit(10)
+        end
+        @businesses =  @businesses.order(created_at: :desc)
+       
+        @businesses = @businesses.map { |b| {name: 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), value: b.id} }
+        render json: { data: @businesses, code: 0, msg: "success" }
+      end
+    end
+
     def new_monthly
       d = @current_admin
       area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
@@ -232,6 +250,7 @@ module EducodeSales
           EducodeSales::Recycle.create(source: d, deleter_id: @current_admin.id)
         end
         sale_plans.update_all(deleted_at: Time.now)
+        sale_plans.business_infos.delete_all
         render_success
       else
         sale_plan = SalePlan.find(params[:id])
@@ -282,30 +301,46 @@ module EducodeSales
     end
 
     def years_plan
+      @sale_plans = SalePlan.from("(
+                                    SELECT SUM(last_follow.budget_amount) AS budget_amounts, educode_sales_sale_plans.*, ss.annual,
+                                           SUM(IF(educode_sales_sale_plans.clazz = 1 AND educode_sales_business_infos.plan_sign_on IS NOT NULL, last_follow.budget_amount, 0)) AS clazz_1,
+                                           SUM(IF(educode_sales_sale_plans.clazz = 18 and plan_bid_on IS NOT NULL, last_follow.budget_amount, 0)) AS clazz_18,
+
+                                           (SUM(IF(educode_sales_sale_plans.clazz = 2 AND prepayment_plan_on IS NOT NULL AND check_fee_plan_on IS NOT NULL AND qa_plan_on IS NOT NULL, prepayment_amount, 0)) +
+                                           SUM(IF(educode_sales_sale_plans.clazz = 2 AND prepayment_plan_on IS NOT NULL AND check_fee_plan_on IS NOT NULL AND qa_plan_on IS NOT NULL, check_fee, 0)) +
+                                           SUM(IF(educode_sales_sale_plans.clazz = 2 AND prepayment_plan_on IS NOT NULL AND check_fee_plan_on IS NOT NULL AND qa_plan_on IS NOT NULL, qa_amount, 0)) ) AS clazz_2,
+                                           SUM(IF(educode_sales_sale_plans.clazz = 7, last_follow.budget_amount, 0)) AS clazz_7,
+
+                                           SUM(IF(last_follow.bidded_date IS NOT NULL, last_follow.actual_amount, 0)) AS finish_bid,
+                                           SUM(IF(last_follow.signed_date IS NOT NULL, last_follow.actual_amount, 0)) AS finish_sign,
+                                           SUM(educode_sales_businesses.return_money) AS finish_return_money
+
+                                    FROM educode_sales_sale_plans
+                                    JOIN educode_sales_businesses ON educode_sales_businesses.id = educode_sales_sale_plans.business_id
+                                    LEFT JOIN educode_sales_business_infos ON educode_sales_business_infos.sale_plan_id = educode_sales_sale_plans.id
+                                    LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id AND last_follow.deleted_at IS NULL
+                                    LEFT JOIN educode_sales_assessments_settings AS ss ON ss.staff_id = educode_sales_sale_plans.staff_id
+                                         AND YEAR(ss.assessment_year) = educode_sales_sale_plans.year AND ss.assessment = educode_sales_sale_plans.clazz
+                                    WHERE educode_sales_sale_plans.deleted_at IS NULL
+                                    GROUP BY educode_sales_sale_plans.staff_id, educode_sales_sale_plans.clazz, educode_sales_sale_plans.year
+                                  ) AS educode_sales_sale_plans
+      ")
       if @current_admin.is_admin?
-        @sale_plans = SalePlan
+        # @sale_plans = SalePlan
       else
         level = @current_admin.role.role_areas.find_by(clazz: '销售计划').level
         case level
         when '自己'
-          @sale_plans = SalePlan.where(staff_id: @current_admin.id)
+          @sale_plans = @sale_plans.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)
           business_ids = Business.where(school_id: StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)).pluck(:id)
-          @sale_plans = SalePlan.where("educode_sales_sale_plans.staff_id in (?) OR educode_sales_sale_plans.staff_id = ? OR educode_sales_sale_plans.business_id in (?)", staff_ids, @current_admin.id,business_ids)
+          @sale_plans = @sale_plans.where("educode_sales_sale_plans.staff_id in (?) OR educode_sales_sale_plans.staff_id = ? OR educode_sales_sale_plans.business_id in (?)", staff_ids, @current_admin.id,business_ids)
         else
-          @sale_plans = SalePlan
+          # @sale_plans = SalePlan
         end
       end
       @sale_plans = @sale_plans.where.not(year: nil)
-      @sale_plans = @sale_plans.select("SUM(last_follow.budget_amount) AS budget_amounts, educode_sales_sale_plans.*, ss.annual")
-      @sale_plans = @sale_plans.joins("
-        JOIN educode_sales_businesses ON educode_sales_businesses.id = educode_sales_sale_plans.business_id
-        LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id AND last_follow.deleted_at IS NULL
-        LEFT JOIN educode_sales_assessments_settings AS ss ON ss.staff_id = educode_sales_sale_plans.staff_id
-            AND YEAR(ss.assessment_year) = educode_sales_sale_plans.year AND ss.assessment = educode_sales_sale_plans.clazz")
-
-      @sale_plans = @sale_plans.group("educode_sales_sale_plans.staff_id, clazz, year")
 
       @sale_plans = @sale_plans.where(deleted_at: nil)
 
@@ -345,12 +380,26 @@ module EducodeSales
     end
 
     def edit_bussiness_info_extra
-      @business_info = @current_admin.business_infos.find(params[:id])
+      @business_info = EducodeSales::BusinessInfo.find(params[:id])
       render layout: false
     end
 
     def plan_business_infos
-      @data = @current_admin.business_infos.where(year: params[:year])
+      if params[:q] && params[:q][:year_search].present?
+        @data = EducodeSales::BusinessInfo.where(year: params[:q][:year_search], staff_id: params[:staff_id])
+      else
+        @data = EducodeSales::BusinessInfo.where(year: params[:year], staff_id: params[:staff_id])
+      end
+
+      @data = @data.where.not(sale_plan_id: nil)
+
+      if params[:q] && params[:q][:clazz].present?
+        @data = @data.where(clazz: params[:q][:clazz])
+      end
+
+      if params[:q] && params[:q][:department].present?
+        @data = @data.joins(business: [department: :school]).where("schools.name like ?", "%#{params[:q][:department]}%")
+      end
 
       if params[:sort].present? && params[:sort][:field]
         @data = @data.order("#{params[:sort][:field]} #{params[:sort][:order]}")
@@ -370,7 +419,7 @@ module EducodeSales
     end
 
     def update_business_info_extra
-      business_info = @current_admin.business_infos.find(params[:id])
+      business_info = EducodeSales::BusinessInfo.find(params[:id])
       if business_info.update(update_business_info_extra_params)
         render_success
       else
@@ -392,6 +441,7 @@ module EducodeSales
     end
 
     def edit_year_plan
+      @clazz = EducodeSales::SalePlan::CLAZZ_NAME
       render layout: false
     end
 

data/app/controllers/educode_sales/staffs_controller.rb

@@ -137,5 +137,40 @@ module EducodeSales
       @schools = (EducodeSales::Business.joins(:follow_ups, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_follow_ups.updated_at") + EducodeSales::Teacher.joins(:follow_up, [department: :school]).where("educode_sales_teacher_follows.staff_id = #{staff.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_teacher_follows.updated_at")).uniq { |s| s.id }
     end
 
+    def list
+      @staffs = EducodeSales::Staff.where.not(id: params[:id]).map { |d| [d.user.real_name, d.id ]}
+      gon.trans_staffs = @staffs.to_h.invert
+      render layout: false
+    end
+
+    def transfer
+      if @current_admin.is_admin?
+        staff = Staff.find(params[:id])
+        to = Staff.find(params[:to_id])
+        staff.businesses.update_all(staff_id: to.id)
+        # 商机
+        staff.follow_ups.update_all(staff_id: to.id)
+        # 销售动态
+        staff.sale_plans.update_all(staff_id: to.id)
+        # 销售计划
+        staff.places.update_all(staff_id: to.id)
+        # 渠道
+        staff.activities.update_all(staff_id: to.id)
+        # 活动
+        staff.teachers.update_all(staff_id: to.id)
+        # 教师
+        staff.teacher_follows.update_all(staff_id: to.id)
+        # 教师动态
+        staff.operation_plans.update_all(staff_id: to.id)
+        # 活动计划
+
+        EducodeSales::Activity.where(sales_id: staff.id).update_all(sales_id: to.id)
+        CustomerExtension.where(staff_id: staff.id).update_all(staff_id: to.id)
+        # 回款计划
+        MoneyPlan.where(staff_id: staff.id).update_all(staff_id: to.id)
+        # 客户
+      end
+      render_success
+    end
   end
 end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -28,6 +28,7 @@ module EducodeSales
           else
             @staff_manage = Staff.none
           end
+
           @follow_upers = Staff.includes(:user).map { |d| [d.user.real_name, d.id]}
           @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
           @more = can?(:create, EducodeSales::OperationPlan) || can?(:update, EducodeSales::Teacher) || can?(:destroy, EducodeSales::Teacher)
@@ -45,10 +46,16 @@ module EducodeSales
         end
         format.json do
           @staff_manages = {}
+          @sales_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&.user&.real_name }.uniq.compact
           end if role
+
+          sales_common = EducodeSales::Common.find_by(clazz: 'staff_type', name: '销售')
+          EducodeSales::Common.joins(market_areas: :staff).includes(market_areas: :staff).where(clazz: '区域').where("educode_sales_staffs.job_type = ?", sales_common.id).each do |d|
+            @sales_manages[d.name] = d.market_areas.map { |d| d.staff&.user&.real_name }.uniq.compact
+          end
           
           if @current_admin.is_admin?
             @teachers = Teacher

data/app/models/educode_sales/customer_follow.rb

@@ -2,5 +2,6 @@ module EducodeSales
   class CustomerFollow < ApplicationRecord
     belongs_to :staff
     belongs_to :school
+    belongs_to :department, optional: true
   end
 end

data/app/models/educode_sales/sale_plan.rb

@@ -5,6 +5,8 @@ module EducodeSales
     belongs_to :staff
     validates :business_id, presence: true
 
+    has_many :business_infos
+
     # validates :month, presence: true
 
     CLAZZ_NAME = {'商机目标' => 7, '中标目标' => 18, '签单目标' => 1, '回款目标' => 2}

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

@@ -141,10 +141,20 @@
                     },
                     {
                         field: 'key_people',
-                        width: 90,
+                        width: 100,
                         title: '关键人',
                         templet:'<div><span title="{{d.key_people}}">{{d.key_people}}</span></div>'
                     },
+                    {
+                      field: 'rival',
+                      width: 100,
+                      title: '竞争对手',
+                    },    
+                    {
+                        field: 'staff_manages',
+                        width: 120,
+                        title: '销售经理',
+                    },
                     {
                         field: 'tel',
                         width: 90,

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

@@ -63,6 +63,14 @@
                id="reception_at_edit" placeholder="请选择日期">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">部署时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" value="<%= @follow_up.business.p_deploy_time %>" name="deploy_time"
+               id="p_deploy_time" placeholder="请选择日期">
+      </div>
+    </div>
+    
     <br>
     <div class="layui-inline service_show layui-hide">
       <label class="layui-form-label required">服务期</label>
@@ -133,6 +141,14 @@
         </div>
       </div>
     </div>
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">竞争对手</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" name="rival" autocomplete="off"  value="<%= @follow_up&.rival%>">
+        </div>
+      </div>
+    </div>
     <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
       <div class="layui-input-inline" style="">
@@ -209,6 +225,9 @@
         laydate.render({
             elem: '#invitation_at_edit'
         })
+        laydate.render({
+            elem: '#p_deploy_time'
+        })
         laydate.render({
             elem: '#service_time',
             range: true