educode_sales 0.6.0 → 0.6.4

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

@@ -5,6 +5,8 @@ businesses_d_count = 0
 businesses_e_count = 0
 businesses_o_count = 0
 school_counts = 0
+follow_school_rates = 0
+follow_department_rates = 0
 area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @staffs do |d|
@@ -38,7 +40,13 @@ json.data do
       json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
       json.return_money @businesses.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", @x).where.not("educode_sales_money_plans.clazz!= ?", 1).sum(:amount).round(2)
       json.school_count school_count
-      # json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).size + EducodeSales::FollowUp.where(staff_id: d.id).size
+      follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.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).size + EducodeSales::FollowUp.where(staff_id: d.id).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)
+      json.follow_department_rate follow_department_rate.to_s + '%'
     else
       business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
       business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
@@ -50,7 +58,13 @@ json.data do
       json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", "#{@year}-01-01", "#{@year}-12-31").sum(:total_amount).round(2)
       json.return_money @businesses.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", @x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").sum(:amount).round(2)
       json.school_count school_count
-      # json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).size + EducodeSales::FollowUp.where(staff_id: d.id).size
+      follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").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
+      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)
+      json.follow_department_rate follow_department_rate.to_s + '%'
     end
 
     json.business_a business_a
@@ -73,6 +87,8 @@ json.data do
     businesses_e_count += business_e
     businesses_o_count += business_o
     school_counts += school_count
+    follow_school_rates += follow_school_rate
+    follow_department_rates += follow_department_rate
   end
 end
 
@@ -84,6 +100,8 @@ json.totalRow do
   json.business_e businesses_e_count.to_s
   json.business_o businesses_o_count.to_s
   json.school_count school_counts.to_s
+  json.follow_school_rate (follow_school_rates.to_f / @staffs.size).round(2).to_s + '%'
+  json.follow_department_rate (follow_department_rates.to_f / @staffs.size).round(2).to_s + '%'
 end
 json.code 0
 json.count @staffs.total_count

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

@@ -17,9 +17,9 @@ json.data do
     else
       json.area  ''
     end
-    departments = EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(educode_sales_follow_ups.staff_id) AS count")[0]&.send('count') + EducodeSales::Teacher.joins(:follow_up).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(educode_sales_teacher_follows.staff_id) AS count")[0]&.send('count') || 0
+    departments = (EducodeSales::Business.joins(:follow_ups, [department: :school]).where("educode_sales_follow_ups.staff_id = #{d.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_follow_ups.updated_at") + EducodeSales::Teacher.joins(:follow_up, [department: :school]).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_teacher_follows.updated_at")).uniq{|s| s.id}.size
     json.departments departments
-    schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count'] + EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count']
+    schools = EducodeSales::Business.joins(:follow_ups, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count'] + EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count']
     json.schools schools
     departments_count += departments
     schools_count += schools

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

@@ -88,16 +88,6 @@
 <table class="layui-hide" id="teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
 </div>
 <script type="text/html" id="currentTableBar">
-  <%# if can? :create, EducodeSales::OperationPlan %>
-<!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addWeek">添加周计划</a>-->
-<!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addMonth">添加月计划</a>-->
-  <%# end %>
-  <%# if can? :update, EducodeSales::Teacher %>
-<!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>-->
-  <%# end %>
-  <%# if can? :destroy, EducodeSales::Teacher %>
-<!--  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>-->
-   <%# end %>
   <% if can? :create, EducodeSales::TeacherFollow %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
   <% end %>
@@ -243,19 +233,22 @@
                     templet: "#event"
                 },
                 {
-                    field: 'regist_at',
+                    field: 'created_on',
                     width: 120,
                     title: '注册时间',
+                    sort: true,
                 },
                 {
                     field: 'last_login_on',
                     width: 120,
                     title: '最近登录',
+                    sort: true,
                 },
                 {
                     field: 'created_at',
                     width: 120,
                     title: '添加时间',
+                    sort: true,
                 },
                 {
                     field: 'wechat',

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

@@ -18,7 +18,7 @@ json.data do
     json.courses_count d.courses_count
     json.actives d.actives
     json.students d.students_count
-    json.regist_at d.user.present? ? d.user.created_on.to_s(:date) : ''
+    json.created_on d.user.present? ? d.user.created_on.to_s(:date) : ''
     json.last_login_on (d.user.present? && d.user.last_login_on.present?) ? d.user.last_login_on.to_s(:date) : ''
     json.teacher_used d.teacher_used
     json.wechat d.wechat

data/app/views/layouts/educode_sales/application.html.erb

@@ -9,12 +9,15 @@
   <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
   <%= stylesheet_link_tag "educode_sales/application", media: "all" %>
   <%= javascript_include_tag "educode_sales/application" %>
+  <script src="https://cdn.jsdelivr.net/npm/cxselect@1.4.0/js/jquery.cxselect.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/cxselect@1.4.0/js/jquery.cxselect.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.js"></script>
 </head>
 <body class="" id="body">
 <div class="layui-layout layui-layout-admin " >
   <div class="layui-header">
     <a href="/missions">
-      <div class="layui-hide-xs layui-bg-black layuimini-logo layui-logo">
+      <div class="layui-bg-black layuimini-logo layui-logo" id="head_a">
       <%= image_tag "educode_sales/logo.png", class: 'header-logo' %>
       <span class="app-title">营销系统</span>
     </div>
@@ -45,7 +48,7 @@
     </ul>
   </div>
 
-  <div class="layui-side layui-bg-black">
+  <div class="layui-side layui-bg-black" id="head_b">
     <div class="layui-side-scroll ">
       <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
       <ul class="layui-nav layui-nav-tree ul"
@@ -66,6 +69,10 @@
               <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>商机管理</a>
               </dd>
             <% end %>
+            <% if can? :read, EducodeSales::MoneyPlan %>
+              <dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>回款管理</a>
+              </dd>
+            <% end %>
             <% if can? :read, EducodeSales::Customer %>
               <dd><a href="/missions/customers" class="<%= current?('layui-this', customers_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/客户管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>客户管理</a>
               </dd>
@@ -205,6 +212,8 @@
                     $(".i_class").animate({left: '200px'},"fast");
                     $(".layui-nav-item").addClass('layui-nav-itemed')
                     $("#logout").removeClass('layui-nav-itemed')
+                    $("#head_b").removeClass('layui-hide-xs')
+                    $("#head_a").removeClass('layui-hide-xs')
                 }
 
                 function menuHide(btn) {
@@ -212,6 +221,8 @@
                     btn.removeClass('layui-icon-shrink-right').addClass('layui-icon-spread-left');
                     body.addClass('layuimini-mini');
                     $(".i_class").animate({left: '60px'});
+                    $("#head_b").addClass('layui-hide-xs')
+                    $("#head_a").addClass('layui-hide-xs')
                 }
             }
         });

data/config/routes.rb

@@ -20,6 +20,8 @@ EducodeSales::Engine.routes.draw do
   end
   resources :customer_follows do
   end
+  resources :money_plans do
+  end
 
   resources :customers do
     collection do

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -8,6 +8,9 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
     end
     if EducodeSales::Permission.last.nil?
 
+      #回款管理权限
+      EducodeSales::Permission.create(name: '查看回款列表', subject: 'MoneyPlan', action: 'read', clazz: 'money_plan', position: '15')
+
       #客户管理权限
       EducodeSales::Permission.create(name: '查看客户', subject: 'Customer', action: 'read', clazz: 'customer')
       EducodeSales::Permission.create(name: '添加客户', subject: 'Customer', action: 'create', clazz: 'customer')

data/db/migrate/20211220102720_add_position_to_commons.rb

@@ -0,0 +1,12 @@
+class AddPositionToCommons < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_permissions, :position, :integer
+    EducodeSales::Permission.all.each_with_index do |d,index|
+      if d.clazz == '销售态势' || d.clazz == '销售分工' || d.clazz == '商机管理' || d.clazz == '客户管理'
+        d.update(position: index)
+      else
+        d.update(position: index * 10)
+      end
+    end
+  end
+end

data/db/migrate/20211221075146_add_school_id_to_educode_sales_businesses.rb

@@ -0,0 +1,8 @@
+class AddSchoolIdToEducodeSalesBusinesses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :school_id, :integer
+    EducodeSales::Business.all.each do |business|
+      business.update(school_id: business.department.school.id)
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.6.0'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.4
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ files:
 - app/assets/images/educode_sales/loading-2.gif
 - app/assets/images/educode_sales/loginbg.png
 - app/assets/images/educode_sales/logo.png
+- app/assets/images/educode_sales/money_plans.png
 - app/assets/images/educode_sales/回收站.png
 - app/assets/images/educode_sales/客户管理.png
 - app/assets/javascripts/educode_sales/application.js
@@ -145,6 +146,7 @@ files:
 - app/controllers/educode_sales/home_controller.rb
 - app/controllers/educode_sales/import_teachers_controller.rb
 - app/controllers/educode_sales/key_person_controller.rb
+- app/controllers/educode_sales/money_plans_controller.rb
 - app/controllers/educode_sales/operation_plans_controller.rb
 - app/controllers/educode_sales/operation_reports_controller.rb
 - app/controllers/educode_sales/operations_controller.rb
@@ -253,6 +255,8 @@ files:
 - app/views/educode_sales/home/search_teacher.json.jbuilder
 - app/views/educode_sales/home/search_users.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
 - app/views/educode_sales/operation_plans/_monthPlan.html.erb
 - app/views/educode_sales/operation_plans/_monthly.html.erb
 - app/views/educode_sales/operation_plans/_weekPlan.html.erb
@@ -405,6 +409,8 @@ files:
 - db/migrate/20211206054756_add_year_to_follow_ups.rb
 - db/migrate/20211214100803_create_customer_extensions.rb
 - db/migrate/20211215025029_create_educode_sales_customer_follows.rb
+- db/migrate/20211220102720_add_position_to_commons.rb
+- db/migrate/20211221075146_add_school_id_to_educode_sales_businesses.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb