educode_sales 1.10.23 → 1.10.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac157bfbdbc5c1aceeef3b0d0af4b81e74b6835ddda09a5beae4188f23720391
-  data.tar.gz: a4f7c4077fc9af0f5374fc3efec8bf42e5c3a57a27dc78090a5727cabe2f5510
+  metadata.gz: 3b89143c3577e56b16967098a24f73fe1b7d3b1a0906047bb1b70a5f403442d2
+  data.tar.gz: 75cfa41097af3a67fc4e74d0a64203cc34d2e551bee15097a5c310b5e78382d4
 SHA512:
-  metadata.gz: 804531ab845025fe61054b79b248a5f1f83e4194d0c23cad2f0fb4c49978db71eb695815723d50e7255fa35a4aa0b0154babb156fdd5cd953808bb2a1b56a9e9
-  data.tar.gz: 13484d3b014be703413f41b03938881aeb56bd1b7cf97f721f055f9a0aa869dfedc6b948ddbd57bb7b3174c2e3aa171dc7efa5823821f3e2b903e1e1ec9b2591
+  metadata.gz: 14a3554944e927b9536e035ddd17906aa836f48c5715cf8f6966a986af517cd8fb9e37847d26fae97ffd2b2f7e596ecf3104f1ac43069ff7290c2561ed9dbae1
+  data.tar.gz: 125797df83bf24579f5c5100649aa47659580c84968bc9d06edb309c6ae2274095c809142905f065f856370afa6112920a5a6eff12dcf62eca52c7b09f0d4bf5

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,24 @@ 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? && follow_up.bidded_date.strftime('%W') == 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]
+          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
+
+
         # 增加o商机编号
         add_business_number
         update_department

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

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

@@ -218,9 +218,9 @@
   <% end %>
   <% if @more %>
     {{# if(d.followed==0){}}
-    <a class="layui-btn-xs data-count-edit more-btn more-btn1" data-name={{d.name}} data-id={{d.id}} data-clazz="{{d.extras_clazz}}">更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
+    <a class="layui-btn-xs data-count-edit more-btn more-btn1" data-name={{d.name}} lay-event="more" data-id={{d.id}} data-clazz="{{d.extras_clazz}}">更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
     {{# }else{}}
-    <a class="layui-btn-xs data-count-edit more-btn more-btn2" data-name={{d.name}} data-id={{d.id}} data-clazz="{{d.extras_clazz}}">更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
+    <a class="layui-btn-xs data-count-edit more-btn more-btn2" data-name={{d.name}} lay-event="more" data-id={{d.id}} data-clazz="{{d.extras_clazz}}">更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
     {{# }}}
   <% end %>
  
@@ -635,7 +635,7 @@
           skin: 'line',
           done: function (res, curr, coun) {
             exportData=res.data;
-            drowpdwonRender();
+            // drowpdwonRender();
             export_drowpdwonRender();
             // let headerTop = $('.layui-table-header').offset().top; //获取表格头到文档顶部的距离
             // $(".layuimini-content-page").scroll(function () {
@@ -654,84 +654,85 @@
       dropmenu2[dropmenu2.findIndex(function (elem)
       {return elem.title.includes("关注")})].title="取消关注";
 
-      drowpdwonRender = function() {
-        dropdown.render({
-          elem: '.more-btn1',
-          data: dropmenu,//dropmenu,
-          click: function(data, othis){
-            var elem = $(this.elem);
-            id = elem.data('id');
+      // 删除，不需要重复定义两次一样的下拉菜单
+      // drowpdwonRender = function(is) {
+      //   dropdown.render({
+      //     elem: '.more-btn1',
+      //     data: dropmenu,
+      //     click: function(data, othis){
+      //       var elem = $(this.elem);
+      //       id = elem.data('id');
 
-            switch (data.event) {
-            case 'week':
-              week(id);
-              break;
-            case 'month':
-              month(id);
-              break;
-            case 'year':
-              year(id);
-              break;
-            case 'edit':
-              edit(id);
-              break;
-            case 'file':
-              file(id, elem.data('name'));
-              break;
-            case 'time_line':
-              time_line(id, elem.data('name'));
-              break;
-            case 'delete':
-              deleteBusiness(id, elem.data('name'), elem.data('clazz'));
-              break;
-            case 'following':
-               following(id);
-                break;
-            case 'money_plan':
-                    money_plan(id);
-                    break;
-            }
-          }
-        });
-          dropdown.render({
-              elem: '.more-btn2',
-              data: dropmenu2,//dropmenu,
-              click: function(data, othis){
-                  var elem = $(this.elem);
-                  id = elem.data('id');
+      //       switch (data.event) {
+      //       case 'week':
+      //         week(id);
+      //         break;
+      //       case 'month':
+      //         month(id);
+      //         break;
+      //       case 'year':
+      //         year(id);
+      //         break;
+      //       case 'edit':
+      //         edit(id);
+      //         break;
+      //       case 'file':
+      //         file(id, elem.data('name'));
+      //         break;
+      //       case 'time_line':
+      //         time_line(id, elem.data('name'));
+      //         break;
+      //       case 'delete':
+      //         deleteBusiness(id, elem.data('name'), elem.data('clazz'));
+      //         break;
+      //       case 'following':
+      //          following(id);
+      //           break;
+      //       case 'money_plan':
+      //               money_plan(id);
+      //               break;
+      //       }
+      //     }
+      //   });
+      //   dropdown.render({
+      //       elem: '.more-btn2',
+      //       data: dropmenu2,//dropmenu,
+      //       click: function(data, othis){
+      //           var elem = $(this.elem);
+      //           id = elem.data('id');
 
-                  switch (data.event) {
-                      case 'week':
-                          week(id);
-                          break;
-                      case 'month':
-                          month(id);
-                          break;
-                      case 'year':
-                         year(id);
-                         break;
-                      case 'edit':
-                          edit(id);
-                          break;
-                      case 'file':
-                          file(id, elem.data('name'));
-                          break;
-                      case 'time_line':
-                          time_line(id, elem.data('name'));
-                          break;
-                      case 'delete':
-                          deleteBusiness(id, elem.data('name'), elem.data('clazz'));
-                          break;
-                      case 'following':
-                          following(id);
-                          break;
-                      case 'money_plan':
-                        money_plan(id);
-                        break;
-                  }
-              }
-          });
-      }
+      //           switch (data.event) {
+      //               case 'week':
+      //                   week(id);
+      //                   break;
+      //               case 'month':
+      //                   month(id);
+      //                   break;
+      //               case 'year':
+      //                   year(id);
+      //                   break;
+      //               case 'edit':
+      //                   edit(id);
+      //                   break;
+      //               case 'file':
+      //                   file(id, elem.data('name'));
+      //                   break;
+      //               case 'time_line':
+      //                   time_line(id, elem.data('name'));
+      //                   break;
+      //               case 'delete':
+      //                   deleteBusiness(id, elem.data('name'), elem.data('clazz'));
+      //                   break;
+      //               case 'following':
+      //                   following(id);
+      //                   break;
+      //               case 'money_plan':
+      //                 money_plan(id);
+      //                 break;
+        //         }
+        //     }
+        // });
+      // }
 
       export_drowpdwonRender = function() {
         dropdown.render({
@@ -1257,6 +1258,7 @@
 
         table.on('tool(businesses_table)', function (obj) {
             var data = obj.data;
+            var that = this;
             id = data.id
              if (obj.event === 'add_event') { // 监听添加操作
               business_id = data.id
@@ -1454,8 +1456,49 @@
                     layer.close(index)
                   }
               });
+            } else if (obj.event == 'more') {
+              dropdown.render({
+                elem: that,
+                show: true,
+                data: data.staff_id == data.current_staff_id ? dropmenu2 : gon.assign_menus,//dropmenu,
+                click: function(data, othis){
+                    var elem = $(this.elem);
+                    id = elem.data('id');
+
+                    switch (data.event) {
+                        case 'week':
+                            week(id);
+                            break;
+                        case 'month':
+                            month(id);
+                            break;
+                        case 'year':
+                            year(id);
+                            break;
+                        case 'edit':
+                            edit(id);
+                            break;
+                        case 'file':
+                            file(id, elem.data('name'));
+                            break;
+                        case 'time_line':
+                            time_line(id, elem.data('name'));
+                            break;
+                        case 'delete':
+                            deleteBusiness(id, elem.data('name'), elem.data('clazz'));
+                            break;
+                        case 'following':
+                            following(id);
+                            break;
+                        case 'money_plan':
+                          money_plan(id);
+                          break;
+                    }
+                }
+              });
+              // drowpdwonRender(data.staff_id == data.current_staff_id)
             }
-            drowpdwonRender()
+           
         });
     });
 </script>

data/app/views/educode_sales/ideas/_index.html.erb

@@ -97,7 +97,7 @@
 </div>
 <script type="text/html" id="currentTableBar">
   {{# if(d.is_deleted){}}
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>
+  <!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>-->
   <% if can? :recycle, EducodeSales::Idea %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_recycle_s">恢复</a>
   <% end %>
@@ -107,7 +107,7 @@
   <% if can? :add_follow, EducodeSales::Idea %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-add_follow" lay-event="add_follows">添加跟进</a>
   <% end %>
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>
+  <!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>-->
   <% if can? :update, EducodeSales::Idea %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_edit">编辑</a>
   <% end %>

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

@@ -1,12 +1,13 @@
 json.data do
   json.array! @data do |d|
     json.(d, *d.attributes.keys)
+    json.status d.idea&.status
     json.name d.idea&.business&.name || d.idea&.name
     json.school_name d.idea&.business&.department&.school&.name
     json.created_at d.created_at.strftime("%Y-%m-%d %H:%M:%S")
     json.staff d.staff&.user&.real_name
     json.sale_staff d.sale_staff&.user&.real_name
-    json.idea_staff d.idea_staff&.user&.real_name
+    json.idea_staff d.idea&.staff&.user&.real_name
   end
 end
 

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

@@ -34,8 +34,8 @@ json.data do
     end
     json.claim_num d['claim_num']
 
-    json.return_money d['return_money'] || 0
-    json.residue_money (d.amount - d['return_money'].to_f) > 0 ? d.amount - d['return_money'].to_f : 0
+    json.return_money (d['return_money'] || 0).round(6)
+    json.residue_money ((d.amount - d['return_money'].to_f) > 0 ? d.amount - d['return_money'].to_f : 0).round(6)
     if d['claim_num'] > 0
       json.accounts_state ''
     else
@@ -53,10 +53,10 @@ json.data do
       when '已开票'
         json.accounts_state '开票应收款'
       end
-      
+
     end
     json.created_at d.created_at.to_s
-    
+
   end
 end
 

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

@@ -115,6 +115,11 @@
                 width: 100,
                 title: '月份',
               },
+              {
+                field: 'assign',
+                width: 100,
+                title: '指定者',
+              },
               {
                 field: 'content',
                 width: 300,

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

@@ -120,6 +120,11 @@
                 width: 60,
                 title: '周次',
               },
+              {
+                field: 'assign',
+                width: 100,
+                title: '指定者',
+              },
               {
                 field: 'content',
                 width: 300,

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

@@ -23,9 +23,9 @@
        </div>
      </div>
     <div class="layui-inline">
-      <button type="reseet" class="layui-btn layui-btn-primary" lay-submit lay-filter="month_plan_reset_btn">重置
+      <button type="reseet" class="layui-btn layui-btn-primary" lay-submit lay-filter="year_plan_reset_btn">重置
       </button>
-      <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="month_plan_seach_btn">检索
+      <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="year_plan_seach_btn">检索
       </button>
     </div>
   </div>
@@ -149,7 +149,7 @@
         })
 
         // 监听搜索操作
-        form.on('submit(month_plan_seach_btn)', function (data) {
+        form.on('submit(year_plan_seach_btn)', function (data) {
           search = data.field
           table.reload('yearPlanTable', {
             page: {
@@ -161,7 +161,7 @@
           return false;
         });
 
-        form.on('submit(month_plan_reset_btn)', function(data){
+        form.on('submit(year_plan_reset_btn)', function(data){
           var field = data.field;
             form.val('month_plan_search_form', {  staff_id: '', year: '', month: '', year: ''})
            return false;

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

@@ -6,6 +6,12 @@
         <input type="text" class="layui-input" id="edit_month_plan_month" autocomplete="off" name="month">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required">计划类型</label>
+      <div class="layui-input-inline">
+        <%= select_tag "common_id", options_for_select(@commons, @sale_plan.common_id), class: 'required' %>
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
       <div class="layui-input-inline" style="width: 500px">

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

@@ -14,6 +14,12 @@
       </div>
     </div>
     <% end %>
+    <div class="layui-inline">
+      <label class="layui-form-label required">计划类型</label>
+      <div class="layui-input-inline">
+        <%= select_tag "common_id", options_for_select(@commons,  @sale_plan.common_id),  class: 'required' %>
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
       <div class="layui-input-inline" style="width: 500px">

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

@@ -12,6 +12,7 @@ json.data do
     json.follow_ups_count d.business.follow_ups_count
     json.finish_rate "#{d.finish_rate}%"
     json.updated_at d.updated_at.to_s
+    json.assign d.assign&.user&.real_name
   end
 end
 

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

@@ -6,6 +6,20 @@
         <input type="text" lay-verify="required" class="layui-input" id="new_month_month" autocomplete="off" name="month">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required">计划类型</label>
+      <div class="layui-input-inline">
+        <%= select_tag "common_id", options_for_select(@commons), include_blank: true,  class: 'required' %>
+      </div>
+    </div>
+    <% if can?(:assign, EducodeSales::SalePlan) && @business && @business.staff_id != @current_admin.id %>
+      <div class="layui-inline">
+        <label class="layui-form-label required">指派给</label>
+        <div class="layui-input-inline">
+          <%= select_tag "assign_id", options_for_select(@staffs), include_blank: true,  class: 'required' %>
+        </div>
+      </div>
+    <% end %>
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
       <div class="layui-input-inline" style="width: 500px">

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

@@ -12,6 +12,20 @@
         <%= select_tag "weekly", options_for_select(@weeks,@week), class: 'required' %>
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required">计划类型</label>
+      <div class="layui-input-inline">
+        <%= select_tag "common_id", options_for_select(@commons),include_blank: true,  class: 'required' %>
+      </div>
+    </div>
+    <% if can?(:assign, EducodeSales::SalePlan) && @business && @business.staff_id != @current_admin.id %>
+      <div class="layui-inline">
+        <label class="layui-form-label required">指派给</label>
+        <div class="layui-input-inline">
+          <%= select_tag "assign_id", options_for_select(@staffs), include_blank: true,  class: 'required' %>
+        </div>
+      </div>
+    <% end %>
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
       <div class="layui-input-inline" style="width: 500px">

data/db/migrate/20230629130033_add_clazz_to_money_plans.rb

@@ -0,0 +1,6 @@
+class AddClazzToMoneyPlans < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_money_plans, :common_id, :integer
+    add_column :educode_sales_money_plans, :assign_id, :integer, comment: "指定者"
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.23'
+  VERSION = '1.10.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.23
+  version: 1.10.24
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -741,6 +740,7 @@ files:
 - db/migrate/20230614141225_create_educode_sales_tags.rb
 - db/migrate/20230614141628_create_educode_sales_follow_up_tags.rb
 - db/migrate/20230614142145_create_educode_sales_watch_follow_ups.rb
+- db/migrate/20230629130033_add_clazz_to_money_plans.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -749,7 +749,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -764,8 +764,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []