educode_sales 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74ba09bc53597cf1bc110d4c32b29a405d7f4d25bb16287429327ac66799f49
-  data.tar.gz: 6a0969f7bb8afa5ea2e34670164d9fd81f45a7ca085d8987492d10643b91ca5e
+  metadata.gz: ea14dcf8c116d91d0a273c02cd36f2d064cc48fe93cfd6024de598db56b0b21b
+  data.tar.gz: 0f796a9a5a15726bf97ccd161b0144d8be7d5b6d10b11f3763047ad4253dbb67
 SHA512:
-  metadata.gz: d522ae7272dc2de4f6c9d766b0f813a1e0812d7f455e0ec6ffc228887feb4647962e679c231c0f4c06b18ec87c44e09be95b9d5a77ddcd8e5abb2440272277e5
-  data.tar.gz: 459678b2f2f085ad8eb877701637dbb8e52a72deb8fba6682ad1a99625cf0f26c276ff1fd8620342abb0d0a65c1b148220a9da56061076ce9cea61b071cf0477
+  metadata.gz: ddefae214a2fb34bd44c7d9e7a0166ec5fa353b604643d617cba26687c3e806d0617d96b0ae892e366561005e7e133ea8649618eebe44c14f2521804829dc9b7
+  data.tar.gz: 835634d2f2f94ed809a372f299da738d9e45f67ddf9461e5fa5e76a7d0eb0fda73a491f838ffeedb5c1a771ec21c813591cb5d6262d11761728c6daf5599aded

data/app/controllers/educode_sales/businesses_controller.rb

@@ -484,6 +484,9 @@ module EducodeSales
           params[:sourcable_id] = ""
         end
       end
+      if ['会议活动', '渠道代理', '客户'].include?(params[:source_way] ) && params[:sourcable_id].blank?
+        params[:sourcable_type] = ""
+      end
       if params[:sourcable_type].blank?
         params[:sourcable_id] = ""
       end

data/app/controllers/educode_sales/contracts_controller.rb

@@ -352,9 +352,8 @@ module EducodeSales
         d.select! { |d| d.delete_if{|f| f == ''}.present? }
       end
 
-    
-
       follow_up = last_follow_up.dup
+     
       follow_up.assign_attributes(follow_up_params)
       follow_up.description = params[:content]
       if params[:service_time].present?
@@ -365,7 +364,25 @@ module EducodeSales
       end
       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!
+        if last_follow_up.present?
+          last_follow_up.key_person.each do |d|
+            key_person = d.dup
+            key_person.follow_up_id = follow_up.id
+            key_person.save
+          end
+          last_follow_up.money_plans.each do |d|
+            money = d.dup
+            money.staff = @current_admin
+            money.follow_up_id = follow_up.id
+            money.save
+          end
+        end
+
         contract_lists = EducodeSales::ContractDateList.clazzs.invert
         data.each_with_index do |s, i|
           if s.present?

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -234,22 +234,23 @@ module EducodeSales
         # 从教师列表里选择的用户
         teacher = Teacher.find(names[1])
         key_peprson = KeyPerson.new(teacher_params)
+        key_peprson.name = teacher.name
         key_peprson.teacher = teacher
-      else
+      elsif names[0] == 'u'
         # 从头歌平台选择的用户
         user = User.find(names[1])
-        teacher = Teacher.new(staff: @current_admin,
-          professional_title: params[:professional_title],
-          job: params[:job],
-          user_id: user.id,
-          is_key: true,
-          department_id: user.department_id,
-          name: user.real_name
-        )
+        key_peprson = KeyPerson.new(teacher_params)
+        teacher = EducodeSales::Teacher.find_or_initialize_by(name: user.real_name, department_id: user.department_id, user_id: user.id)
+        
+        teacher.staff = @current_admin
+        teacher.professional_title = params[:professional_title]
+        teacher.job = params[:job]
+        teacher.is_key = true
         teacher.save
+        key_peprson.name = teacher.name
+        key_peprson.teacher_id = teacher.id
+      else
         key_peprson = KeyPerson.new(teacher_params)
-        teacher_id = EducodeSales::Teacher.find_by(name: user.real_name, department_id: user.department_id).id
-        key_peprson.teacher_id = teacher_id
       end
 
       follow_up.key_person << key_peprson
@@ -318,7 +319,7 @@ module EducodeSales
     end
 
     def teacher_params
-      params.permit(:professional_title, :job, :attitude_id, :sex, :birth_date, :remark, :tel)
+      params.permit(:professional_title, :job, :attitude_id, :sex, :birth_date, :remark, :tel, :name)
     end
   end
 end

data/app/controllers/educode_sales/home_controller.rb

@@ -77,6 +77,13 @@ module EducodeSales
       end
     end
 
+    def search_contracts
+      @data = Business
+      if params[:q].present?
+        @data = @data.where("name like :q ", q: "%#{params[:q]}%").limit(20)
+      end
+    end
+
     def staff_departments
       @departments = Department.where(school_id: params[:school_id])
       if params[:q].present?
@@ -111,5 +118,12 @@ module EducodeSales
       end
     end
 
+    def search_money_plans
+      @data = MoneyPlan.joins(business: :school)
+      if params[:q].present?
+        @data = @data.where("educode_sales_businesses.name like :q OR educode_sales_businesses.number like :q OR schools.name like :q ", q: "%#{params[:q]}%").limit(20)
+      end
+    end
+
   end
 end

data/app/controllers/educode_sales/key_person_controller.rb

@@ -23,7 +23,7 @@ module EducodeSales
 
     private
     def key_params
-      params.permit(:attitude_id, :sex, :birth_date, :remark, :tel)
+      params.permit(:attitude_id, :sex, :birth_date, :remark, :tel, :name)
     end
   end
 end

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -0,0 +1,103 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class MoneyPlanRecordsController < ApplicationController
+
+    def index
+      respond_to do |format|
+        format.html do
+        end
+        format.js do
+        end
+        format.json do
+          @money_plan_records = MoneyPlanRecord.left_joins(:money_plan_claims).group("educode_sales_money_plan_records.id").select("educode_sales_money_plan_records.*, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
+          if @current_admin.is_admin?
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level
+            case level
+            when '自己'
+              @money_plan_records = @money_plan_records.where(staff_id: @current_admin.id)
+            when '区域'
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+              b_ids = Business.where(school_id: school_ids).pluck(:id)
+              @money_plan_records = @money_plan_records.joins(:business).where("educode_sales_businesses.id in (?) OR educode_sales_money_plans.staff_id = ?", b_ids, @current_admin.id)
+            end
+          end
+
+          if params[:q].present? && params[:q][:payer_name].present?
+            @money_plan_records = @money_plan_records.where("payer_name like ?", "%#{params[:q][:payer_name]}%")
+          end
+
+          if params[:q].present? && params[:q][:date_at].present?
+            date = params[:q][:date_at].split(" - ")
+            @money_plan_records = @money_plan_records.where("date_at BETWEEN ? AND ?", date[0], date[1])
+          end
+          if params[:q].present? && params[:q][:state].present?
+            if params[:q][:state] == '已认领'
+              @money_plan_records = @money_plan_records.having("claim_num > 0")
+            elsif params[:q][:state] == '待认领'
+              @money_plan_records = @money_plan_records.having("claim_num = 0 AND business_id IS NOT NULL")
+            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][:amount].present?
+            @money_plan_records = @money_plan_records.where(amount: params[:q][:amount])
+          end
+
+          if params[:sort].present? && params[:sort][:field]
+            @money_plan_records = @money_plan_records.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @money_plan_records = @money_plan_records.order(created_at: :desc)
+          end
+          @money_plan_records = @money_plan_records.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def add
+      render layout: false
+    end
+
+    def confirm_plan
+      @money_plan_record = MoneyPlanRecord.find(params[:id])
+      gon.money_plan_records = []
+      gon.money_plan_ids = []
+      gon.money_plan_claim_amount = []
+      @money_plan_claim = nil
+      @money_plan_claims = @money_plan_record.money_plan_claims.each_with_index do |d, i|
+        if i == 0
+          @money_plan_claim = d
+        end
+        gon.money_plan_records << [{value: d.money_plan_id.to_s, name: "#{d.money_plan.business&.number}/#{d.money_plan.business&.name}/#{d.money_plan.business&.school&.name}/ #{d.money_plan.business.last_follow_up&.actual_amount}万 / #{d.money_plan.date_at.to_s(:date)}"}]
+        gon.money_plan_ids << d.money_plan_id.to_s
+        gon.money_plan_claim_amount << [d.amount]
+      end
+      render layout: false
+    end
+
+    def create
+      business_id = Business.find_by(id: params[:business_id])&.id
+      record = MoneyPlanRecord.new(amount: params[:amount], payer_name: params[:payer_name], date_at: params[:date_at], staff_id: @current_admin.id, business_id: business_id)
+      if record.save
+        render_success
+      else
+        render_failure record
+      end
+    end
+
+    def confirm
+      money_plan_record = MoneyPlanRecord.find(params[:id])
+      money_plan_record.money_plan_claims.where.not(money_plan_id: params[:money_plan_ids]).delete_all
+      (params[:num].to_i + 1).times do |i|
+        claim = money_plan_record.money_plan_claims.find_or_initialize_by(money_plan_id: params[:money_plan_ids][i])
+        claim.amount = params["amount[#{i}]"]
+        claim.staff =  @current_admin
+        claim.save
+      end
+      
+      render_success
+    end
+  end
+end

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -4,51 +4,30 @@ module EducodeSales
   class MoneyPlansController < ApplicationController
 
     def index
-      follow_up_ids = Business.pluck(:last_follow_up_id)
       authorize! :read, MoneyPlan
       respond_to do |format|
         format.html do
-          common = Common.find_by(clazz: 'staff_type', name: '销售')
-          @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
         end
         format.json do
-          x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+          @money_plans = MoneyPlan.joins(:business).left_joins(:money_plan_claims).group("educode_sales_money_plans.id").select("educode_sales_money_plans.*, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
           if @current_admin.is_admin?
-            @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
           else
             level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level
             case level
             when '自己'
-              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id)
+              @money_plans = @money_plans.where(staff_id: @current_admin.id)
             when '区域'
-              a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id).pluck(:follow_up_id)
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
-              b_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
-              ids = a_ids + b_ids
-              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: ids)
-            else
-              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
+              b_ids = Business.where(school_id: school_ids).pluck(:id)
+              @money_plans = @money_plans.where("educode_sales_businesses.id in (?) OR educode_sales_money_plans.staff_id = ?", b_ids, @current_admin.id)
             end
           end
 
           if params[:q].present? && params[:q][:business].present?
-            follow_up_ids = Business.where("name like ?", "%#{params[:q][:business]}%").pluck(:last_follow_up_id)
-            @money_plans = @money_plans.where(follow_up_id: follow_up_ids)
+            @money_plans = @money_plans.where("educode_sales_businesses.name like ?", "%#{params[:q][:business]}%")
           end
           if params[:q].present? && params[:q][:school].present?
-            school_ids = School.where("name like ?", "%#{params[:q][:school]}%").pluck(:id)
-            follow_up_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
-            @money_plans = @money_plans.where(follow_up_id: follow_up_ids)
-          end
-          if params[:q].present? && params[:q][:staff_id].present?
-            @money_plans = @money_plans.where(staff_id: params[:q][:staff_id])
-          end
-          if params[:q].present? && params[:q][:clazz].present?
-            @money_plans = @money_plans.where(clazz: params[:q][:clazz])
-          end
-          if params[:q].present? && params[:q][:date].present?
-            date = params[:q][:date].split(" - ")
-            @money_plans = @money_plans.where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at < ?", date[0], date[1] + '23:59:59')
+            @money_plans = @money_plans.joins(business: :school).where("schools.name like ?", "%#{params[:q][:school]}%")
           end
 
           if params[:sort].present? && params[:sort][:field]
@@ -56,10 +35,35 @@ module EducodeSales
           else
             @money_plans = @money_plans.order(date_at: :desc)
           end
-          @total_amount = @money_plans.sum(:amount)
           @money_plans = @money_plans.page(params[:page]).per(params[:limit])
         end
       end
     end
+
+    def list
+      follow_up_ids = Business.pluck(:last_follow_up_id)
+      authorize! :read, MoneyPlan
+      respond_to do |format|
+        format.html do
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+        end
+  
+      end
+    end
+
+    def add
+      render layout: false
+    end
+
+    def create
+      business = Business.find(params[:business_id])
+      data = []
+      (params[:num].to_i+1).times do |i|
+        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
+      render_success
+    end
+
   end
 end

data/app/controllers/educode_sales/sales_details_controller.rb

@@ -157,7 +157,7 @@ module EducodeSales
     private
 
     def sales_detail_params
-      params.permit(:amount, :price, :total_price, :custom_clazz, :delivery_date, :product_catalog_id)
+      params.permit(:amount, :price, :total_price, :custom_clazz, :delivery_date, :product_catalog_id, :proprietorship)
     end
 
   end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -9,8 +9,13 @@ module EducodeSales
         last_follow = follow_up.business.follow_ups.where.not(id: follow_up.id).order("id desc").first
         if last_follow.present? && last_follow.key_people_count > 0
           @person = last_follow.key_person.last
-          gon.teacher = "t-#{@person.teacher_id}"
-          gon.teachers = { value: "t-#{@person.teacher_id}", name: @person.teacher.name }
+          if @person&.teacher.present?
+            gon.teacher = "t-#{@person.teacher_id}"
+            gon.teachers = { value: "t-#{@person.teacher_id}", name: @person.name }
+          else
+            gon.teacher = ""
+            gon.teachers = {}
+          end
         end
       end
       @attitudes = Common.where(clazz: 'key_attitude').order("position").pluck(:name, :id)

data/app/models/educode_sales/business.rb

@@ -18,6 +18,9 @@ module EducodeSales
     has_many :business_levels, dependent: :destroy
     has_many :business_watches, dependent: :destroy
     has_many :business_histories, dependent: :destroy
+    has_many :money_plans
+
+    belongs_to :school
 
     belongs_to :sourcable, :polymorphic => true, optional: true
 

data/app/models/educode_sales/key_person.rb

@@ -1,6 +1,6 @@
 module EducodeSales
   class KeyPerson < ApplicationRecord
-    belongs_to :teacher
+    belongs_to :teacher, optional: true
     belongs_to :attitude, class_name: 'Common', optional: true
     belongs_to :follow_up, counter_cache: true
 

data/app/models/educode_sales/money_plan.rb

@@ -1,15 +1,42 @@
 module EducodeSales
   class MoneyPlan < ApplicationRecord
     belongs_to :staff
+    belongs_to :business
     belongs_to :follow_up, counter_cache: true
 
+    has_many :money_plan_claims
+
     # todo 1 :实际回款 0:计划回款
     enum clazz: ['计划回款', '实际回款']
+    enum category: ['预收款', '交付款', '验收款', '质保金']
 
     after_save :update_return_money
     after_destroy :update_return_money
 
 
+    def return_period
+      if self.date_at && self.business&.last_follow_up&.signed_date
+        signed_date = self.business&.last_follow_up&.signed_date
+        month = (self.date_at.year - signed_date.year) * 12 + self.date_at.month - signed_date.month - (self.date_at.day >= signed_date.day ? 0 : 1)
+        if month <= 3
+          '3个月内'
+        elsif month <= 6
+          '4-6个月内'
+        elsif month <= 9
+          '7-9个月'
+        elsif month <= 12
+          '10-12个月'
+        elsif month <= 24
+          '1-2年'
+        elsif month <= 36
+          '2-3年'
+        end
+      else
+        ''
+      end
+    end
+
+
     private
 
     def update_return_money

data/app/models/educode_sales/money_plan_claim.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class MoneyPlanClaim < ApplicationRecord
+    belongs_to :money_plan
+    belongs_to :money_plan_record
+    belongs_to :staff
+  end
+end

data/app/models/educode_sales/money_plan_record.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class MoneyPlanRecord < ApplicationRecord
+    belongs_to :staff
+    belongs_to :business, optional: true
+    has_many :money_plan_claims
+  end
+end

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

@@ -1,6 +1,6 @@
 <%= Gon::Base.render_data %>
 <div class="layuimini-main edit-table">
-  <div class="layui-form layuimini-form" lay-filter="teacher_form" id="show_plan_box">
+  <div class="layui-form layuimini-form" lay-filter="teacher_form" id="show_plan_box" style="display:none;">
     <fieldset class="table-search-fieldset">
       <legend>添加回款计划</legend>
       <div class="layui-form-item">

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

@@ -1,7 +1,7 @@
 json.data do
   json.array! @teachers do |d|
     json.id d.id
-    json.name d.teacher.name
+    json.name d.name
     json.professional_title d.professional_title
     json.job d.job
     json.attitude_id d.attitude_id.present? ? d.attitude_id : ''

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

@@ -15,7 +15,7 @@ json.data do
     json.staff_manages d.business.last_follow_up&.assign_follow_ups.present? ? (d.business.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.business.staff&.user&.real_name
     # teacher_ids = d.key_person.pluck(:teacher_id)
     json.tel d.key_person.pluck(:tel).select { |d| d.present?  }.join("、")
-    json.key_people d.key_person.map { |d| d.teacher.name }.join("、")# key_people(teacher_ids)
+    json.key_people d.key_person.map { |d| d.name }.join("、")# key_people(teacher_ids)
 
   end
 end

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

@@ -1,7 +1,7 @@
 json.data do
   json.array! @teachers do |d|
     json.id d.id
-    json.name d.teacher.name
+    json.name d.name
     json.professional_title d.professional_title
     json.job d.job
     json.attitude_id d.attitude_id.present? ? d.attitude_id : ''

data/app/views/educode_sales/home/search_contracts.json.jbuilder

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @data do |d|
+    json.value d.id
+    json.name "#{d.number} / #{d.department&.school&.name.to_s}#{d.department&.name.to_s} / #{d.name} / #{d.last_follow_up&.actual_amount}万"
+  end
+end
+json.count @data.size
+json.code 0
+json.msg "success"

data/app/views/educode_sales/home/search_money_plans.json.jbuilder

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @data do |d|
+    json.value d.id
+    json.name "#{d.business.number} / #{d.business.department&.school&.name.to_s}#{d.business.department&.name.to_s} / #{d.business.name} / #{d.business.last_follow_up&.actual_amount}万 / #{d.date_at.to_s(:date)}"
+  end
+end
+json.count @data.size
+json.code 0
+json.msg "success"