educode_sales 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41b7c2e662fd724e27b8a995fe3f8fe5733384fe5454ffff038a22fe7526b6ad
-  data.tar.gz: '09abc1d2d95817c2fc4e1dbc73beb1a31beb24239e2401b25c41125bf7864130'
+  metadata.gz: adf1decc8062d60eb1c994f86443c226fbfe87df6f26979d1aaabc383afcc7e4
+  data.tar.gz: 5caca5f6b198d0da54fbff9130afec3a89ad783419d8963c092c88410e86648e
 SHA512:
-  metadata.gz: 7305c066cefb80249560e179eee5f84caedde9e223cb45311ebca66462251be8280cfb5c577da14d3c946ed485fadcca6342160e571203f0d25ccb987fca0f7b
-  data.tar.gz: 3896cf2a1252a590053116ceac804abbc6cdae787b8f055a4258cfc388b8832aea623d561e5fe3ae4ce76e22347aa606f3e0f40e138c4747d535b5d75e2070c3
+  metadata.gz: a889734085111c320d172c56d375336c1837e3eb6e978870992e35729078cb4faf16f79afc4ec7215757fb6a20a70e231d5b946625a8bb801e2e28d6719dc5b0
+  data.tar.gz: 0bac8b724cd76f787fa9b16105d705621afbaa62b8a928b8e7bd20433bce4404f04428d6c3f172d04a9ecb8768d52307647145b85ac9c5778ed7602520d2c7b4

data/app/controllers/educode_sales/businesses_controller.rb

@@ -200,7 +200,7 @@ module EducodeSales
 
           @business_count = @businesses.count
 
-          @businesses_exports = @businesses.select("
+          @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.reception_at,
@@ -211,9 +211,8 @@ module EducodeSales
             (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
-          ")
+          ").page(params[:page]).per(params[:limit])
 
-          @businesses = @businesses_exports.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -388,6 +387,185 @@ module EducodeSales
       end
     end
 
+    def get_export_data
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          if @current_admin.is_admin?
+            @businesses = Business
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+            case level
+            when '自己'
+              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)
+            when '区域'
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(: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)
+            else
+              @businesses = Business
+            end
+          end
+
+          if params[:name].present?
+            @year = params[:name].split("-")[1].present? ? params[:name].split("-")[1] : ''
+          end
+
+          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-现有商机)"
+            ids = Common.where(extras: %w[a_class b_class c_class d_class e_class o_class]).pluck(:id)
+            if @year == '全部'
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.clazz_id in (?)",ids)
+            else
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.clazz_id in (?)",ids).where("educode_sales_follow_ups.year = ?",@year)
+            end
+
+          end
+
+          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已中标商机)"
+            stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+            if @year == '全部'
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id IN (?)",stage_ids)
+            else
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.bidded_date > ? AND educode_sales_follow_ups.bidded_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids)
+            end
+
+          end
+
+          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已签单商机)"
+            s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+            if @year == '全部'
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id IN (?)",s_stage_ids)
+            else
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.signed_date > ? AND educode_sales_follow_ups.signed_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids)
+            end
+          end
+
+          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已回款商机)"
+            x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+            year_time = "#{@year}-01-01 00:00:00"
+            year_over_time = "#{@year}-12-31 23:59:59"
+            if @year == '全部'
+              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).distinct
+            else
+              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).distinct
+            end
+          end
+
+          if params[:all].present?
+            @businesses = @businesses
+          end
+
+          if params[:mine].present?
+            ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+            ids1 = FollowUp.where(id: ids).pluck(:business_id)
+            @businesses =@businesses.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
+          end
+
+          @businesses = @businesses
+          if params[:name].present? && params[:name] != "(销售态势-" + @year + "-已中标商机)" && params[:name] != "(销售态势-" + @year + "-已签单商机)" && params[:name] != "(销售态势-" + @year + "-已回款商机)" && params[:name] != "(销售态势-" + @year + "-现有商机)"
+            @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:name]}%")
+          end
+          if params[:department].present?
+            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:department]}%").pluck(:id)
+            @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
+          end
+          if params[:staff_id].present?
+            part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND educode_sales_businesses.staff_id = ?",params[:staff_id]).ids
+            part_b_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is not null").joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.staff_id = ?", params[:staff_id]).ids
+            business_ids = part_a_ids + part_b_ids
+            @businesses = EducodeSales::Business.where(id:business_ids)
+          end
+          if params[:business_type].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.clazz_id in (?)", params[:business_type].split(",").map(&:to_i))
+          end
+          if params[:business_step].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id in (?)", params[:business_step].split(",").map(&:to_i))
+          end
+          if  params[:place_id].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.place_id = ?", params[:place_id])
+          end
+
+          if params[:area].present?
+            p = EducodeSales::Common.find(params[:area]).name
+            if @current_admin.is_admin?
+              @businesses = @businesses.joins("
+              JOIN departments ON educode_sales_businesses.department_id = departments.id
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+            else
+              level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+              if level == "区域"
+                @businesses = @businesses.joins("
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+              else
+                @businesses = @businesses.joins("
+              JOIN departments ON educode_sales_businesses.department_id = departments.id
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+              end
+            end
+          end
+
+          if params[:date].present?
+            date = params[:date].split(" - ")
+            @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1] + '23:59:59')
+          end
+
+          if params[:invitation_at].present?
+            date = params[:invitation_at].split(" - ")
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.invitation_at > ? AND educode_sales_follow_ups.invitation_at < ?", date[0] + '00:00:00', date[1] + '23:59:59')
+          end
+
+          if params[:sort].present? && params[:sort][:field]
+            @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @businesses = @businesses.order("educode_sales_businesses.created_at desc")
+          end
+
+          @business_count = @businesses.count
+
+          @businesses = @businesses.select("
+            educode_sales_businesses.*,
+            last_follow.invitation_at,
+            last_follow.reception_at,
+            last_follow.bidded_date,
+            last_follow.signed_date,
+            last_follow.created_at as latest_time,
+            last_follow.actual_amount,
+            (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
+            last_follow.total_amount").joins("
+            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
+          ")
+
+        end
+      end
+    end
+
     private
 
     def load_business

data/app/controllers/educode_sales/customers_controller.rb

@@ -57,7 +57,10 @@ module EducodeSales
               @customers = School.all
             end
           end
-
+          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)
+          @customers = @customers.where(id: ids)
           if params[:q].present? && params[:q][:name].present?
             @customers = @customers.where("schools.name like ?", "%#{params[:q][:name]}%")
           end
@@ -68,6 +71,30 @@ module EducodeSales
             school_ids = EducodeSales::CustomerExtension.where(customer_staff_id: params[:q][:staff_id]).pluck(:school_id)
             @customers = @customers.where(id: school_ids)
           end
+          if params[:q].present? && params[:q][:property].present?
+            school_property_ids = []
+            property = params[:q][:property].split(",").map(&:to_i)
+            property.each do |p|
+              case p
+              when 0
+                school_property_ids += SchoolProperty.where( project_985: true ).ids
+              when 1
+                school_property_ids += SchoolProperty.where( project_211: true ).ids
+              when 2
+                school_property_ids += SchoolProperty.where( regular_college: true ).ids
+              when 3
+                school_property_ids += SchoolProperty.where( junior_college: true ).ids
+              when 4
+                school_property_ids += SchoolProperty.where( secondary_school: true ).ids
+              when 5
+                school_property_ids += SchoolProperty.where( military_school: true ).ids
+              when 6
+                school_property_ids += SchoolProperty.where( enterprise: true ).ids
+              else
+              end
+            end
+            @customers = @customers.where(school_property_id: school_property_ids)
+          end
 
           if params[:q].present? && params[:q][:date].present?
             ids = EducodeSales::CustomerFollow.all.pluck(:school_id)
@@ -149,20 +176,26 @@ module EducodeSales
       render layout: false
     end
 
+    # def create
+    #   ActiveRecord::Base.transaction do
+    #     property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
+    #                                                  project_211: params[:project_211].present? ? 1 : 0,
+    #                                                  regular_college: params[:regular_college].present? ? 1 : 0,
+    #                                                  junior_college: params[:junior_college].present? ? 1 : 0,
+    #                                                  secondary_school: params[:secondary_school].present? ? 1 : 0,
+    #                                                  military_school: params[:military_school].present? ? 1 : 0,
+    #                                                  enterprise: params[:enterprise].present? ? 1 : 0)
+    #     @school = School.new
+    #     @school.attributes = school_params
+    #     @school.school_property = property
+    #     @school.save!
+    #     EducodeSales::CustomerExtension.create(customer_staff_id: @current_admin.id, school_id: @school.id)
+    #   end
+    #   render_success
+    # end
     def create
-      ActiveRecord::Base.transaction do
-        property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
-                                                     project_211: params[:project_211].present? ? 1 : 0,
-                                                     regular_college: params[:regular_college].present? ? 1 : 0,
-                                                     junior_college: params[:junior_college].present? ? 1 : 0,
-                                                     secondary_school: params[:secondary_school].present? ? 1 : 0,
-                                                     military_school: params[:military_school].present? ? 1 : 0,
-                                                     enterprise: params[:enterprise].present? ? 1 : 0)
-        @school = School.new
-        @school.attributes = school_params
-        @school.school_property = property
-        @school.save!
-        EducodeSales::CustomerExtension.create(customer_staff_id: @current_admin.id, school_id: @school.id)
+      params[:school_ids].each do |d|
+        CustomerAdd.create(school_id: d)
       end
       render_success
     end

data/app/controllers/educode_sales/home_controller.rb

@@ -57,6 +57,12 @@ module EducodeSales
         @staffs = @staffs.where(is_admin: false).where.not(id: @current_admin.id).where(job_type: common.id).page(params[:page]).per(10)
       end
     end
+    def staff_schools
+      @schools = School.all
+      if params[:q].present?
+        @schools = @schools.where("name like :q OR province like :q",q: "%#{params[:q]}%").page(params[:page]).per(10)
+      end
+    end
 
     def sales_place
       @places = EducodeSales::Place

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -162,10 +162,12 @@ module EducodeSales
       when 'diy'
         if params[:customer_date].present?
           date = params[:customer_date].split(" - ")
-          begin_time = date[0]
-          end_time = date[1]
+          begin_time = date[0] + "00:00:00"
+          end_time = date[1] + "23:59:59"
         end
       end
+      100.times{p begin_time}
+      100.times{p end_time}
       common = Common.find_by(clazz: 'staff_type', name: '销售')
       staff_names = Staff.joins(:user).where(job_type: common.id).map { |d| d.user.real_name}
       staff_ids = Staff.joins(:user).where(job_type: common.id).pluck(:id)

data/app/controllers/educode_sales/staffs_controller.rb

@@ -46,6 +46,10 @@ module EducodeSales
       @staff = Staff.find(params[:id])
       gon.area_ids = @staff.area_ids
       gon.areas = Common.where(clazz: 'area').map { |d| { value: d.id, title: d.name } } #.unshift({value: -1, title: '全国'})
+      gon.school_ids = @staff.staff_schools.ids
+      gon.schools = @staff.staff_schools.pluck(:school_id).map { |d| { value: d, name: "#{School.find(d)&.name}-#{School.find(d)&.province}" } } #.unshift({value: -1, title: '全国'})
+      # gon.school_ids = School.all.ids
+      # gon.schools = School.all.first(100).map { |d| { value: d.id, title: d.name } } #.unshift({value: -1, title: '全国'})
       @staff_types = Common.where(clazz: 'staff_type').pluck(:name, :id)
       render layout: false
     end
@@ -77,6 +81,12 @@ module EducodeSales
         commons << Common.find(d)
       end
       staff.areas = commons
+      if params[:school_ids].present?
+        staff.staff_schools.destroy_all
+        params[:school_ids].each do |d|
+          staff.staff_schools.create(school_id: d)
+        end
+      end
       if staff.save
         render_success
       else

data/app/models/educode_sales/customer_add.rb

@@ -0,0 +1,4 @@
+module EducodeSales
+  class CustomerAdd < ApplicationRecord
+  end
+end

data/app/models/educode_sales/staff.rb

@@ -14,6 +14,7 @@ module EducodeSales
     has_many :businesses, dependent: :destroy
     has_many :activities, dependent: :destroy
     has_many :sale_plans, dependent: :destroy
+    has_many :staff_schools, dependent: :destroy
 
     has_many :areas, through: :market_areas
     validates :user_id, uniqueness: { message: '已存在' }

data/app/models/educode_sales/staff_school.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class StaffSchool < ApplicationRecord
+    belongs_to :school
+    belongs_to :staff
+  end
+end

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

@@ -0,0 +1,30 @@
+json.data do
+  json.array! @businesses do |d|
+    json.id d.id
+    json.name d.name
+    json.department d.department.name
+    json.school d.department.school.name
+    json.school_id d.department.school.id
+    follow_ups_count = d.follow_ups.where(deleted_at: nil).size
+    json.follow_ups_count follow_ups_count
+    json.follow_up_id d.last_follow_up_id
+    json.clazz d.last_follow_up&.clazz&.name || ""
+    json.stage d.last_follow_up&.stage&.name
+    json.invitation_at d.last_follow_up&.invitation_at.to_s
+    json.reception_at d.last_follow_up&.reception_at.to_s
+    json.bidded_date d.last_follow_up&.bidded_date.to_s
+    json.signed_date d.last_follow_up&.signed_date.to_s
+    json.total_amount d.last_follow_up&.total_amount
+    json.actual_amount d.last_follow_up&.actual_amount
+    json.return_money d.return_money
+    json.wait_return_money d.wait_return_money.to_i.round(2)
+    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '已完成').present? ? (d.last_follow_up.money_plans.where(clazz: '已完成').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
+    json.place d.last_follow_up&.place&.name
+    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
+    json.source d.source
+    json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
+    json.current_staff_id @current_admin.id
+    json.staff_id d.staff_id
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
+  end
+end

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

@@ -88,7 +88,7 @@
 <script type="text/html" id="bussinessBar">
   <div class="layui-btn-container">
     <span class="table-label">商机列表</span>
-    <a class="layui-btn-xs data-count-edit export_more-btn pull-right" style="color: #0000FF;" data-name="export" data-id="export">导出<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm data-count-edit export_more-btn pull-right" style="color: #0000FF;" data-name="export" data-id="export">导出<i class="layui-icon layui-icon-down layui-nav-more"></i></button>
     <% if can? :create, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加商机</button>
     <% end %>
@@ -332,7 +332,7 @@
               },
               {
                 field: 'return_money_days',
-                width: 120,
+                width: 150,
                 title: '首次回款周期(天)',
               },
               {
@@ -340,6 +340,11 @@
                 width: 160,
                 title: '渠道',
               },
+              {
+                field: 'year',
+                width: 105,
+                title: '所属年度',
+              },
               {
                 title: '操作',
                 minWidth: 170,
@@ -355,7 +360,7 @@
           page: true,
           skin: 'line',
           done: function (res) {
-              exportData=res.data1;
+              exportData=res.data;
               console.log(exportData);
               drowpdwonRender()
             export_drowpdwonRender()
@@ -420,14 +425,76 @@
       }
 
         function export_csv() {
-                table.exportFile(business_table.config.id,exportData, 'csv');
-            request.get('/missions/businesses/add_export_records?type=csv', {}, function (res) {
+            var data = form.val("search_form");
+            var business_type = [];
+            business_type_list.getValue().forEach(function(d) {
+                business_type.push(d.value);
+            })
+            var business_step = [];
+            business_step_list.getValue().forEach(function(d) {
+                business_step.push(d.value);
+            })
+            data.place_id = index_place_list.getValue('valueStr');
+            data.business_type = business_type.toString();
+            data.business_step = business_step.toString();
+            layer.load(0, {});
+            console.log(data);
+            request.authPost("/missions/businesses/get_export_data", {
+                name: data.name,
+                area: data.area,
+                business_step: data.business_step,
+                business_type: data.business_type,
+                date: data.date,
+                department: data.department,
+                invitation_at: data.invitation_at,
+                place_id: data.place_id,
+                select: data.select,
+                staff_id: data.staff_id
+            }, function (res) {
+                console.log(res.data);
+                data = res.data
+                table.exportFile(business_table.config.id,data, 'csv');
+                layer.closeAll('loading');
+                request.get('/missions/businesses/add_export_records?type=csv', {}, function (res) {
+                })
             })
+
         }
         function export_excel() {
-                table.exportFile(business_table.config.id,exportData, 'xls');
-            request.get('/missions/businesses/add_export_records?type=excel', {}, function (res) {
+            var data = form.val("search_form");
+            var business_type = [];
+            business_type_list.getValue().forEach(function(d) {
+                business_type.push(d.value);
+            })
+            var business_step = [];
+            business_step_list.getValue().forEach(function(d) {
+                business_step.push(d.value);
             })
+            data.place_id = index_place_list.getValue('valueStr');
+            data.business_type = business_type.toString();
+            data.business_step = business_step.toString();
+            layer.load(0, {});
+            console.log(data);
+            request.authPost("/missions/businesses/get_export_data", {
+                name: data.name,
+                area: data.area,
+                business_step: data.business_step,
+                business_type: data.business_type,
+                date: data.date,
+                department: data.department,
+                invitation_at: data.invitation_at,
+                place_id: data.place_id,
+                select: data.select,
+                staff_id: data.staff_id
+            }, function (res) {
+                console.log(res.data);
+                data = res.data
+                table.exportFile(business_table.config.id,data, 'xls');
+                layer.closeAll('loading');
+                request.get('/missions/businesses/add_export_records?type=xls', {}, function (res) {
+                })
+            })
+
         }
         function export_records() {
             var content = miniPage.getHrefContent('/missions/businesses/export_records')

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

@@ -16,35 +16,7 @@ json.data do
     json.reception_at d.last_follow_up&.reception_at.to_s
     json.bidded_date d.last_follow_up&.bidded_date.to_s
     json.signed_date d.last_follow_up&.signed_date.to_s
-    json.total_amount d.last_follow_up&.total_amount
-    json.actual_amount d.last_follow_up&.actual_amount
-    json.return_money d.return_money
-    json.wait_return_money d.wait_return_money.to_i.round(2)
-    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '已完成').present? ? (d.last_follow_up.money_plans.where(clazz: '已完成').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
-    json.place d.last_follow_up&.place&.name
-    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
-    json.source d.source
-    json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
-    json.current_staff_id @current_admin.id
-    json.staff_id d.staff_id
-    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
-  end
-end
-json.data1 do
-  json.array! @businesses_exports do |d|
-    json.id d.id
-    json.name d.name
-    json.department d.department.name
-    json.school d.department.school.name
-    json.school_id d.department.school.id
-    json.follow_ups_count d.follow_ups.where(deleted_at: nil).size
-    json.follow_up_id d.last_follow_up_id
-    json.clazz d.last_follow_up&.clazz&.name || ""
-    json.stage d.last_follow_up&.stage&.name
-    json.invitation_at d.last_follow_up&.invitation_at.to_s
-    json.reception_at d.last_follow_up&.reception_at.to_s
-    json.bidded_date d.last_follow_up&.bidded_date.to_s
-    json.signed_date d.last_follow_up&.signed_date.to_s
+    json.year d.last_follow_up&.year.to_s
     json.total_amount d.last_follow_up&.total_amount
     json.actual_amount d.last_follow_up&.actual_amount
     json.return_money d.return_money

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

@@ -25,7 +25,12 @@
 <!--          <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">-->
 <!--        </div>-->
 <!--      </div>-->
-
+      <div class="layui-inline">
+        <label class="layui-form-label">性质</label>
+        <div class="layui-input-inline">
+          <div id="property" style="width: 190px;"></div>
+        </div>
+      </div>
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
         </button>
@@ -94,6 +99,19 @@
         //     window.onload=hn;
         // });
 
+        var property_list = xmSelect.render({
+            el: '#property',
+            data: [
+                {value: 0, name: '985工程'},
+                {value: 1, name: '211工程'},
+                {value: 2, name: '本科院校'},
+                {value: 3, name: '大专院校'},
+                {value: 4, name: '中专学校'},
+                {value: 5, name: '军事院校'},
+                {value: 6, name: '企业'}
+            ]
+        })
+
         laydate.render({
             elem: '#date',
             range: true
@@ -129,6 +147,11 @@
                         width: 100,
                         title: '区域',
                     },
+                    {
+                        field: 'property',
+                        width: 200,
+                        title: '性质',
+                    },
                     {
                         field: 'department',
                         width: 100,
@@ -238,6 +261,11 @@
 
         // 监听搜索操作
         form.on('submit(search_teachers)', function (data) {
+            var property = [];
+            property_list.getValue().forEach(function(d) {
+                property.push(d.value);
+            })
+            data.field.property = property.toString();
             search = data.field
             table.reload('customers_table', {
                 page: {
@@ -263,6 +291,7 @@
                 assist: "",
                 teacher_source: ""
             });
+            property_list.setValue([])
             return false;
         });
         /**

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

@@ -14,6 +14,18 @@ json.data do
     json.id d.id
     json.name d.name
     json.area d.province
+    school_property = d.school_property
+    property = []
+    if school_property.present?
+    property << '985工程' if school_property.project_985
+    property << '211工程' if school_property.project_211
+    property << '本科院校' if school_property.regular_college
+    property << '大专院校' if school_property.junior_college
+    property << '中专学校' if school_property.secondary_school
+    property << '军事院校' if school_property.military_school
+    property << '企业' if school_property.enterprise
+    end
+    json.property property.join("、")
     json.department d.departments.size
     json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
     json.follow follow_ups.size + customer_follows.size

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

@@ -1,53 +1,67 @@
+<!--<form class="layui-form  layuimini-form" id="custom_data" data-required="true" action="">-->
+<!--  <div class="layui-form-item" style="padding: 25px">-->
+<!--    <div class="layui-inline">-->
+<!--      <label class="layui-form-label required">客户：</label>-->
+<!--      <div class="layui-input-block" style="width: 500px;">-->
+<!--        <input type="text" name="name"  lay-verify="required"  placeholder="请输入客户" autocomplete="off"-->
+<!--               class="layui-input" id="inputFocus">-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <br>-->
+<!--    <div class="layui-inline city_input">-->
+<!--      <label class="layui-form-label ">省：</label>-->
+<!--      <div class="layui-input-block" style="width: 500px;">-->
+<!--        <select id="province" class="province layui-input"></select>-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <br>-->
+<!--    <div class="layui-inline city_input">-->
+<!--      <label class="layui-form-label ">市：</label>-->
+<!--      <div class="layui-input-block" style="width: 500px;">-->
+<!--        <select id="city" class="city layui-input"></select>-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <br>-->
+<!--    <div class="layui-inline">-->
+<!--      <label class="layui-form-label ">地址：</label>-->
+<!--      <div class="layui-input-block" style="width: 500px;">-->
+<!--        <input type="text" name="address"   autocomplete="off"-->
+<!--               class="layui-input" placeholder="请输入地址" >-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <br>-->
+<!--    <div class="layui-form-item">-->
+<!--      <label class="layui-form-label">学校性质：</label>-->
+<!--      <div class="layui-input-block">-->
+<!--        <input type="checkbox" name="project_985" lay-skin="primary" value="1"  title="985工程">-->
+<!--        <input type="checkbox" name="project_211" lay-skin="primary" value="1" title="211工程" >-->
+<!--        <input type="checkbox" name="regular_college" lay-skin="primary" value="1" title="本科院校">-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <div class="layui-form-item">-->
+<!--      <div class="layui-input-block">-->
+<!--        <input type="checkbox" name="junior_college" lay-skin="primary" value="1" title="大专院校">-->
+<!--        <input type="checkbox" name="secondary_school" lay-skin="primary" value="1" title="中专院校" >-->
+<!--        <input type="checkbox" name="military_school" lay-skin="primary" value="1" title="军事院校">-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <div class="layui-form-item">-->
+<!--      <div class="layui-input-block">-->
+<!--        <input type="checkbox" name="enterprise" lay-skin="primary" value="1" title="企业">-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <div class="layui-inline" style="padding-left: 120px">-->
+<!--      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交-->
+<!--      </button>-->
+<!--    </div>-->
+<!--  </div>-->
+<!--</form>-->
 <form class="layui-form  layuimini-form" id="custom_data" data-required="true" action="">
   <div class="layui-form-item" style="padding: 25px">
-    <div class="layui-inline">
-      <label class="layui-form-label required">客户：</label>
-      <div class="layui-input-block" style="width: 500px;">
-        <input type="text" name="name"  lay-verify="required"  placeholder="请输入客户" autocomplete="off"
-               class="layui-input" id="inputFocus">
-      </div>
-    </div>
-    <br>
-    <div class="layui-inline city_input">
-      <label class="layui-form-label ">省：</label>
-      <div class="layui-input-block" style="width: 500px;">
-        <select id="province" class="province layui-input"></select>
-      </div>
-    </div>
-    <br>
-    <div class="layui-inline city_input">
-      <label class="layui-form-label ">市：</label>
-      <div class="layui-input-block" style="width: 500px;">
-        <select id="city" class="city layui-input"></select>
-      </div>
-    </div>
-    <br>
-    <div class="layui-inline">
-      <label class="layui-form-label ">地址：</label>
-      <div class="layui-input-block" style="width: 500px;">
-        <input type="text" name="address"   autocomplete="off"
-               class="layui-input" placeholder="请输入地址" >
-      </div>
-    </div>
-    <br>
-    <div class="layui-form-item">
-      <label class="layui-form-label">学校性质：</label>
-      <div class="layui-input-block">
-        <input type="checkbox" name="project_985" lay-skin="primary" value="1"  title="985工程">
-        <input type="checkbox" name="project_211" lay-skin="primary" value="1" title="211工程" >
-        <input type="checkbox" name="regular_college" lay-skin="primary" value="1" title="本科院校">
-      </div>
-    </div>
-    <div class="layui-form-item">
-      <div class="layui-input-block">
-        <input type="checkbox" name="junior_college" lay-skin="primary" value="1" title="大专院校">
-        <input type="checkbox" name="secondary_school" lay-skin="primary" value="1" title="中专院校" >
-        <input type="checkbox" name="military_school" lay-skin="primary" value="1" title="军事院校">
-      </div>
-    </div>
-    <div class="layui-form-item">
-      <div class="layui-input-block">
-        <input type="checkbox" name="enterprise" lay-skin="primary" value="1" title="企业">
+    <div class="layui-form-item" >
+      <label class="layui-form-label">学校</label>
+      <div class="layui-input-inline" style="">
+        <div id="edit_assign_follow" style="width: 1140px;"></div>
       </div>
     </div>
     <div class="layui-inline" style="padding-left: 120px">
@@ -56,10 +70,7 @@
     </div>
   </div>
 </form>
-
-
 <script>
-    document.getElementById("inputFocus").focus();
 
     layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
         var form = layui.form,
@@ -75,6 +86,39 @@
         // 当前弹出层，防止ID被覆盖
         var parentIndex = layer.index;
 
+        var sales_list = xmSelect.render({
+            el: '#edit_assign_follow',
+            remoteSearch: true,
+            autoRow: true,
+            // clickClose: true,
+            delay: 1000,
+            tips: '支持名称/省份搜索,请至少输入一个字符',
+            searchTips: '支持名称/省份搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                if(!val){
+                    return cb([]);
+                }
+                $.ajax( '/missions/staff_schools', {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        if (res.code == 0) {
+                            cb(res.data, res.count);
+                        } else {
+                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                        }
+                    }
+                })
+            }
+        })
 
         var dataCustom = [
             {
@@ -338,8 +382,17 @@
         });
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
-            data.field.province = $("#province option:selected").text(); //获取选中的项
-            data.field.city = $("#city option:selected").text(); //获取选中的项
+            var schools = [];
+            sales_list.getValue().forEach(function(d) {
+                schools.push(d.value);
+            })
+            if (schools.length == 0) {
+                layer.alert("请选择学校");
+                return false;
+            }
+            data.field['school_ids'] = schools;
+            // data.field.province = $("#province option:selected").text(); //获取选中的项
+            // data.field.city = $("#city option:selected").text(); //获取选中的项
             console.log(data.field);
             request.authPost("missions/customers", data.field, function (res) {
                 if (res.success === false) {

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

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @schools do |d|
+    json.value d.id
+    json.name "#{d.name}-#{d.province}"
+  end
+end
+json.count @schools.size
+json.code 0
+json.msg "success"

data/app/views/educode_sales/roles/edit.html.erb

@@ -3,9 +3,9 @@
     <li class="layui-this">操作权限</li>
     <li>数据浏览权限</li>
   </ul>
-  <div class="layui-tab-content">
-    <div class="layui-tab-item layui-show">
-      <form class="layui-form line" action="">
+  <div class="layui-tab-content caozuo">
+    <div class="layui-tab-item layui-show" style="height: 800px;!important;">
+      <form class="layui-form " action="">
         <% id = 0 %>
         <% EducodeSales::Permission.all.order(position: :asc).group_by{ |d| d.clazz}.each do |k, d| %>
          <div class="layui-form-item">
@@ -139,4 +139,10 @@
     })
     //…
   });
-</script>
+</script>
+<style>
+    .caozuo .layui-tab-item {
+        width: 100% !important;
+        height: 900px !important;
+    }
+</style>

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -621,7 +621,7 @@
             });
             $(".customer_bt").click(function () {
                 layer.load(0, {});
-                $.get('/missions/sale_trends/trends.json?customer_count_type=' + $("#customer_count_type").val() + '&customer_time_range=' + $("#customer_time_range").val()).done(function(res) {
+                $.get('/missions/sale_trends/trends.json?customer_count_type=' + $("#customer_count_type").val() + '&customer_time_range=' + $("#customer_time_range").val() + '&customer_date=' + $("#customer_date").val()).done(function(res) {
                     layer.closeAll('loading');
                     var data4 = res.data4;
                     myChart4.data = data4

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

@@ -60,7 +60,7 @@ json.data do
       json.school_count school_count
       follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").where(staff_id: d.id).pluck(:business_id).uniq).pluck(:school_id)).uniq.size
       json.follow_school_count follow_school_count
-      json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size + EducodeSales::FollowUp.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size
+      json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").size + EducodeSales::FollowUp.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").size
       follow_school_rate = (follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0).round(2)
       json.follow_school_rate follow_school_rate.to_s + '%'
       follow_department_rate = (follow_school_count!=0 ? school_count.to_f * 110 / follow_school_count : 0).round(2)

data/app/views/educode_sales/staffs/edit.html.erb

@@ -30,6 +30,12 @@
         <div id="area" class="demo-transfer"></div>
       </div>
     </div>
+    <div class="layui-form-item" >
+      <label class="layui-form-label">监管学校</label>
+      <div class="layui-input-inline" style="">
+        <div id="edit_assign_follow" style="width: 1140px;"></div>
+      </div>
+      </div>
     <div class="layui-form-item">
       <label class="layui-form-label required">生效日期</label>
       <div class="layui-input-block">
@@ -85,6 +91,40 @@
                 return false
             }
         })
+        var sales_list = xmSelect.render({
+            el: '#edit_assign_follow',
+            remoteSearch: true,
+            autoRow: true,
+            // clickClose: true,
+            delay: 1000,
+            tips: '支持名称/省份搜索,请至少输入一个字符',
+            searchTips: '支持名称/省份搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                if(!val){
+                    return cb([]);
+                }
+                $.ajax( '/missions/staff_schools', {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        if (res.code == 0) {
+                            cb(res.data, res.count);
+                        } else {
+                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                        }
+                    }
+                })
+            }
+        })
+        sales_list.setValue(gon.schools)
 
         //监听提交
         form.on('submit(saveBtn)', function (data) {
@@ -92,10 +132,15 @@
             layui.each(transfer.getData('area_list'), function (i, v) {
                 area_ids.push(v.value)
             })
+            var schools = [];
+            sales_list.getValue().forEach(function(d) {
+                schools.push(d.value);
+            })
             if (area_ids.length == 0) {
                 layer.alert("请选择负责区域");
                 return false;
             }
+            data.field['school_ids'] = schools;
             data.field['area_ids'] = area_ids;
             request.authPut("missions/staffs/" + parent.staff_id, data.field, function (res) {
                 console.log(res.success == false)

data/config/routes.rb

@@ -12,6 +12,7 @@ EducodeSales::Engine.routes.draw do
   get :no_permission, to: "home#no_permission"
   get :sales_staff, to: "home#sales_staff"
   get :sales_place, to: "home#sales_place"
+  get :staff_schools, to: "home#staff_schools"
 
   resources :sessions do
   end
@@ -83,6 +84,7 @@ EducodeSales::Engine.routes.draw do
   resources :businesses do
     collection do
       get :export_records
+      post :get_export_data
       get :add_export_records
       get :show_keys
       get :add_keys

data/db/migrate/20220125013811_create_educode_sales_staff_schools.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesStaffSchools < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_staff_schools do |t|
+      t.references :staff
+      t.references :school
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220125033552_create_educode_sales_customer_adds.rb

@@ -0,0 +1,9 @@
+class CreateEducodeSalesCustomerAdds < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_customer_adds do |t|
+      t.references :school
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -181,6 +181,7 @@ files:
 - app/models/educode_sales/common.rb
 - app/models/educode_sales/course_subject.rb
 - app/models/educode_sales/customer.rb
+- app/models/educode_sales/customer_add.rb
 - app/models/educode_sales/customer_extension.rb
 - app/models/educode_sales/customer_follow.rb
 - app/models/educode_sales/follow_up.rb
@@ -201,6 +202,7 @@ files:
 - app/models/educode_sales/sale_report.rb
 - app/models/educode_sales/sale_trend.rb
 - app/models/educode_sales/staff.rb
+- app/models/educode_sales/staff_school.rb
 - app/models/educode_sales/teacher.rb
 - app/models/educode_sales/teacher_assign_follow.rb
 - app/models/educode_sales/teacher_follow.rb
@@ -216,6 +218,7 @@ files:
 - app/views/educode_sales/businesses/export_records.html.erb
 - app/views/educode_sales/businesses/export_records.json.jbuilder
 - app/views/educode_sales/businesses/file.html.erb
+- app/views/educode_sales/businesses/get_export_data.json.jbuilder
 - app/views/educode_sales/businesses/index.html.erb
 - app/views/educode_sales/businesses/index.json.jbuilder
 - app/views/educode_sales/businesses/new.html.erb
@@ -257,6 +260,7 @@ files:
 - app/views/educode_sales/home/search_operation_teacher.json.jbuilder
 - app/views/educode_sales/home/search_teacher.json.jbuilder
 - app/views/educode_sales/home/search_users.json.jbuilder
+- app/views/educode_sales/home/staff_schools.json.jbuilder
 - app/views/educode_sales/home/statistics.html.erb
 - app/views/educode_sales/money_plans/index.html.erb
 - app/views/educode_sales/money_plans/index.json.jbuilder
@@ -415,6 +419,8 @@ files:
 - db/migrate/20211220102720_add_position_to_commons.rb
 - db/migrate/20211221075146_add_school_id_to_educode_sales_businesses.rb
 - db/migrate/20220121060006_create_educode_sales_business_export_records.rb
+- db/migrate/20220125013811_create_educode_sales_staff_schools.rb
+- db/migrate/20220125033552_create_educode_sales_customer_adds.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb