educode_sales 0.9.69 → 0.9.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5de22a63054e2a25d82a48c86687b07143302a4216d3690cb5431fcf17ca7672
-  data.tar.gz: b375afaa7854500c9bc3a7dbc6a8f83ef3c86e89bc9d5cf826280fde12102c98
+  metadata.gz: f06396ccf8dbcf15c84aecaa042d4c444335c9ef3a09c82d5ccced165beb429a
+  data.tar.gz: 1bbace4be30f8d50b507d9174b40cfec77073ff74e79188443359bdf1f146281
 SHA512:
-  metadata.gz: 015b587adf4090852c386117efff6d8fd7ea39a3a0bb6191d806cc96a68cb2c83e8cd487de8bcc7a221052fb4ebbe1eb0a67660865ddaadaf8746f4e309273f7
-  data.tar.gz: aae61faba2cf647fa61460ba958c89d761d8321a9eaa0bdc66855a8336bdc6552387f7d48f86fb9cd400a6e478ae58c7153e7311c5c85adc3de51f39a95fbc01
+  metadata.gz: 6034bfe4baf04919a142b18d57cdf9a8489fc9af2ec55597d36556a5ab69b6a9d1749d2c1271556a489f7d4907144e3c0b9db3769b7573cb967291fe3fb04b0b
+  data.tar.gz: 40edd2d1d9f49c081dad0251a573fadf67de0592755c54279d22518a80d2c3dea2777cb7d1daca05c7544f09a915078d79b3a63a9e94e4c2e025371f2a392e16

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

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")
@@ -392,8 +424,13 @@ module EducodeSales
     def update
       @school = School.find(params[:id])
       if params[:department_id].present?
-        department = @school.departments.find(params[:department_id]).update(name: params[:department])
+        department = @school.departments.find_by(id: params[:department_id])
+        if department
+          department.update(name: params[:department])
+          department.department_majors.find_by(id: params[:major_id])&.update(name: params[:major]) if params[:major_id].present?
+        end
       end
+      
      
       ActiveRecord::Base.transaction do
         property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,

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/projects_controller.rb

@@ -143,6 +143,9 @@ module EducodeSales
           if params[:q].present? && params[:q][:p_staff_id].present?
             @businesses = @businesses.where(p_staff_id: params[:q][:p_staff_id])
           end
+          if params[:q].present? && params[:q][:p_sale_staff_id].present?
+            @businesses = @businesses.where(p_sale_staff_id: params[:q][:p_sale_staff_id])
+          end
           if params[:q].present? && params[:q][:p_special].present?
             @businesses = @businesses.where(p_special: "#{params[:q][:p_special]}")
           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
@@ -85,6 +92,9 @@ module EducodeSales
           if params[:q].present? && params[:q][:name].present?
             @teachers = @teachers.where("educode_sales_teachers.name like ?", "%#{params[:q][:name]}%")
           end
+          if params[:q].present? && params[:q][:realname].present?
+            @teachers = @teachers.where("educode_sales_teachers.realname like ?", "%#{params[:q][:realname]}%")
+          end
           if params[:q].present? && params[:q][:professional_title].present?
             @teachers = @teachers.where("educode_sales_teachers.professional_title = ?", "#{params[:q][:professional_title]}")
           end
@@ -393,7 +403,7 @@ module EducodeSales
 
     private
     def teacher_params
-      params.permit(:name, :professional_title, :job, :source_id, :wechat, :mobile)
+      params.permit(:name, :professional_title, :job, :source_id, :wechat, :mobile, :realname)
     end
 
     def load_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/eco_staff.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class EcoStaff < ApplicationRecord
+    belongs_to :staff
+    belongs_to :sourcable, :polymorphic => 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/index.html.erb

@@ -390,12 +390,6 @@
                     fixed: 'left',
                     hide: gon.filter.name
                 },
-                {
-                    field: 'area',
-                    width: 100,
-                    title: '地域',
-                    hide: gon.filter.area
-                },
                 {
                     field: 'school',
                     width: 150,
@@ -403,12 +397,6 @@
                     templet: '#school_name',
                     hide: gon.filter.school
                 },
-                {
-                    field: 'property',
-                    width: 150,
-                    title: '客户类型',
-                    hide: gon.filter.property
-                },
                 {
                     field: 'department',
                     width: 150,
@@ -421,6 +409,18 @@
                   width: 160,
                   title: '专业',
                 },
+                {
+                  field: 'area',
+                  width: 100,
+                  title: '地域',
+                  hide: gon.filter.area
+                },
+                {
+                  field: 'property',
+                  width: 150,
+                  title: '客户类型',
+                  hide: gon.filter.property
+                },
                 {
                     field: 'follow_ups_count',
                     title: '跟进',
@@ -528,6 +528,14 @@
                     sort: true,
                     hide: gon.filter.o_business_deployment
                 },
+                {
+                    field: 'p_deploy_time',
+                    width: 150,
+                    title: '部署时间',
+                    sort: true,
+                    hide: gon.filter.p_deploy_time
+                },
+                
                 {
                     field: 'budget_amount',
                     width: 105,
@@ -697,6 +705,9 @@
             case 'month':
               month(id);
               break;
+            case 'year':
+              year(id);
+              break;
             case 'edit':
               edit(id);
               break;
@@ -729,6 +740,9 @@
                       case 'month':
                           month(id);
                           break;
+                      case 'year':
+                         year(id);
+                         break;
                       case 'edit':
                           edit(id);
                           break;
@@ -853,6 +867,25 @@
           layer.full(sindex);
         });
       }
+
+      function year(id) {
+        var content = miniPage.getHrefContent('/missions/plans/new_year?business_id=' + id);
+        var openWH = miniPage.getOpenWidthHeight();
+
+        yindex = layer.open({
+          title: '添加年计划',
+          type: 1,
+          shade: 0.2,
+          maxmin: true,
+          shadeClose: true,
+          area: [openWH[0] + 'px', openWH[1] + 'px'],
+          offset: [openWH[2] + 'px', openWH[3] + 'px'],
+          content: content
+        });
+        $(window).on("resize", function () {
+          layer.full(sindex);
+        });
+      }
         function following(id) {
             $.ajax({
                 type: "get",

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

@@ -67,7 +67,8 @@ json.data do
     json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
     json.self_flag (d.staff_id == @current_admin.id) || (d.last_follow_up_id.in? follow_up_ids)
     json.followed  d.users.pluck(:user_id).include?(@current_admin.user.id) ? 1 : 0 # d.users.where(user_id:@current_admin.user.id).first ? 1 : 0
-    end
+    json.p_deploy_time d.p_deploy_time
+  end
 end
 
 json.totalRow do

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

@@ -101,6 +101,7 @@
       });
      
     })
+    });
     function demo(){
         layer.closeAll()
         business_id = parent.business_id
@@ -120,5 +121,5 @@
             layer.full(sindex);
         });
     }
-    });
+
 </script>

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

@@ -8,14 +8,17 @@
       </div>
     </div>
     <br>
+    <% if @department.present? %>
     <div class="layui-inline">
       <label class="layui-form-label">部门：</label>
       <div class="layui-input-block" style="width: 500px;">
         <input type="text" name="department" value="<%= @department&.name %>" placeholder="请输入部门" autocomplete="off"  class="layui-input">
-        <%= hidden_field_tag "department_id", @@department.id %>
+        <%= hidden_field_tag "department_id", @department.id %>
       </div>
     </div>
     <br>
+    <% end %>
+    <% if @major.present? %>
     <div class="layui-inline">
       <label class="layui-form-label">专业：</label>
       <div class="layui-input-block" style="width: 500px;">
@@ -24,6 +27,7 @@
       </div>
     </div>
     <br>
+    <% end %>
     <div class="layui-inline city_input">
       <label class="layui-form-label ">省：</label>
       <div class="layui-input-block" style="width: 500px;">