educode_sales 0.4.4 → 0.4.8

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -1,5 +1,12 @@
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
 <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
-  <div class="layui-form-item">
+  <div class="layui-form-item" style="margin-bottom: 0">
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label>负责区域:</label>
+      <span><%= @area%></span>
+    </div>
+  </div>
+  <div class="layui-form-item" style="margin-bottom: 0">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
       <span><%= @sale_report.finish_rate %>%</span>
@@ -12,6 +19,11 @@
       <label style="margin-left: 100px">项目金额:</label>
       <span><%= @sale_report.amount %>万</span>
     </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= @sale_report.created_at %></span>
+      <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">
@@ -119,43 +131,42 @@
         },
         {
           field: 'staff',
-          width: 120,
+          width: 80,
           title: '姓名'
         },
         {
             field: 'business_name',
-            width: 270,
+            width: 150,
             title: '商机名称',
         },
         {
             field: 'school',
-            width: 200,
+            width: 120,
             title: '单位'
         },
         {
             field: 'department',
-            width: 190,
+            width: 170,
             title: '部门'
         },
         {
           field: 'weekly',
-          width: 100,
+          width: 80,
           title: '周次',
         },
         {
           field: 'follow_ups_count',
-          width: 100,
+          width: 80,
           title: '跟进',
           templet: '#show_follow'
         },
         {
           field: 'finish_rate',
-          width: 100,
+          width: 80,
           title: '完成率',
         },
         {
           field: 'content',
-          width: 300,
           title: '计划内容',
         },
         {

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

@@ -26,10 +26,12 @@
       elem: '#table',
       url: '/missions/sales',
       cellMinWidth: 80,
+        totalRow:true,
       cols: [
         [{
             field: 'id',
             title:'序号',type: 'numbers',
+            totalRowText:'合计',
             width: 80
           }, {
             field: 'name',
@@ -42,19 +44,23 @@
             field: 'business_a',
             title: 'A类商机',
             templet: "#business_a",
+            totalRow:true,
             width: 120
           }, {
             field: 'business_b',
             title: 'B类商机',
             templet: "#business_b",
+            totalRow:true,
             width: 120
           }, {
             field: 'goal',
             title: '中标金额',
+            totalRow:true,
             width: 120
           }, {
             field: 'return_money',
             title: '回款',
+            totalRow:true,
             width: 120
           }
         ]

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

@@ -1,17 +1,33 @@
+businesses_a_count = 0
+businesses_b_count = 0
 json.data do
   json.array! @staffs do |d|
+    part_a_ids = EducodeSales::Business.where("educode_sales_businesses.last_follow_up_id is null AND staff_id = ?",d.id).ids
+    part_b_ids = EducodeSales::Business.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 = ?", d.id).pluck(:business_id)
+    business_ids = part_a_ids + part_b_ids
+    @businesses = EducodeSales::Business.where(id:business_ids)
     json.id d.id
     json.name d.user.real_name
     json.role d.role&.name
     json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
-    json.business_a d.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).count
-    json.business_b d.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).count
-    json.goal d.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  d.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 != ?", @x).sum("educode_sales_businesses.return_money").round(2)
+    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).count
+    businesses_a_count += business_a
+    json.business_a business_a
+    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).count
+    businesses_b_count += business_b
+    json.business_b business_b
+    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("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 != ?", @x).sum("educode_sales_businesses.return_money").round(2)
     json.a_clazz_id @a_clazz&.id
     json.b_clazz_id @b_clazz&.id
   end
 end
 
+json.totalRow do
+  json.business_a businesses_a_count.to_s
+  json.business_b businesses_b_count.to_s
+end
 json.code 0
 json.count @staffs.total_count

data/app/views/educode_sales/sales/operations.html.erb

@@ -11,14 +11,10 @@
 <script type="text/html" id="currentTableBar">
 </script>
 <script type="text/html" id="school">
-  <div class="layui-text">
     <a href="javascript:void(0);" lay-event="school" class="layui-table-link">{{d.schools}}</a>
-  </div>
 </script>
 <script type="text/html" id="xschool">
-  <div class="layui-text">
     <a href="javascript:void(0);" lay-event="xschool" class="layui-table-link">{{d.departments}}</a>
-  </div>
 </script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element'], function () {
@@ -32,10 +28,12 @@
             elem: '#oper_table',
             url: '/missions/sales/operations',
             defaultToolbar: [],
+            totalRow:true,
             cols: [
                 [{
                     field: 'id',
                     title:'序号',type: 'numbers',
+                    totalRowText:'合计',
                     width: 80
                 }, {
                     field: 'name',
@@ -52,11 +50,13 @@
                     field: 'schools',
                     title: '跟进学校',
                     templet: "#school",
+                    totalRow:true,
                     width: 120
                 }, {
                     field: 'departments',
                     title: '跟进二级学院',
                     templet: "#xschool",
+                    totalRow:true,
                     width: 120
                 },
                 ]

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

@@ -1,3 +1,5 @@
+departments_count = 0
+schools_count = 0
 json.data do
   json.array! @staffs do |d|
     json.id d.id
@@ -5,11 +7,18 @@ json.data do
     json.role d.role&.name
     json.job_type EducodeSales::Common.job_type_name[d.job_type]
     json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
-    json.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
-    json.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']
-
+    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
+    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']
+    json.schools schools
+    departments_count += departments
+    schools_count += schools
   end
 end
 
+json.totalRow do
+  json.departments departments_count.to_s
+  json.schools schools_count.to_s
+end
 json.code 0
 json.count @staffs.total_count

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

@@ -139,63 +139,66 @@
             url: '/missions/teachers',
             where: {q: form.val('search_form')},
             toolbar: '#toolbarDemo',
-            defaultToolbar: [],
+            totalRow:true,
+            defaultToolbar: ['filter'],
             cols: [
               [
                 {
                     field: 'id',
-                    width: 120,
+                    width: 60,
                     title:'序号',type: 'numbers',
+                    totalRowText:'合计',
                 },
                 {
                     field: 'name',
-                    width: 120,
+                    width: 80,
                     title: '姓名',
                     templet: "#name"
                 },
                 {
                     field: 'school',
-                    width: 250,
+                    width: 160,
                     title: '单位',
                 },
                 {
                     field: 'department',
-                    width: 250,
+                    width: 130,
                     title: '部门'
                 },
                 {
                     field: 'professional_title',
                     title: '职称',
-                    width: 120,
+                    width: 80,
                     templet: '#show_follow'
                 },
                 {
                     field: 'job',
-                    width: 120,
+                    width: 80,
                     title: '职务',
                     templet: '#show_keys'
 
                 },
                 {
                   field: 'source',
-                  width: 120,
+                  width: 90,
                   title: '来源',
                 },
                 {
                     field: 'attitude',
-                    width: 120,
+                    width: 60,
                     title: '态度',
                 },
                 {
                     field: 'course_subjects_count',
-                    width: 120,
+                    width: 90,
                     title: '课程方向',
                     templet: "#courses"
                 },
                 {
                     field: 'teacher_follows_count',
-                    width: 120,
+                    width: 90,
                     title: '跟进情况',
+                    totalRow:true,
                     templet: "#follow"
                 },
                 {
@@ -205,18 +208,20 @@
                 },
                 {
                     field: 'students',
-                    width: 120,
+                    width: 60,
+                    totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                     title: '学生',
                 },
                 {
                     field: 'courses_count',
-                    width: 120,
+                    width: 60,
                     title: '课堂',
+                    totalRow:true,
                     templet: "#class"
                 },
                 {
                     field: 'activities_count',
-                    width: 120,
+                    width: 100,
                     title: '参与活动',
                     templet: "#event"
                 },

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

@@ -1,3 +1,5 @@
+teacher_follows_count = 0
+courses_counts = 0
 json.data do
   json.array! @teachers do |d|
     json.id d.id
@@ -13,12 +15,20 @@ json.data do
     json.activities_count d.activity_teachers_count
     json.source EducodeSales::Common.teacher_source_name[d.source_id]
     json.attitude d.follow_up&.attitude&.name
-    json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).where("is_delete = 0 and role != 4  and excellent = 0 and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct(:course_id).count : 0
+    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.teacher_used d.teacher_used_of_department
+    json.teacher_used d.teacher_used
+
+    teacher_follows_count += d.teacher_follows_count
+    courses_counts += d.courses_count
   end
 end
+
+json.totalRow do
+  json.teacher_follows_count teacher_follows_count.to_s
+  json.courses_count courses_counts.to_s
+end
 json.code 0
 json.count @teachers.total_count

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

@@ -6,8 +6,9 @@
     <% end %>
   </div>
 </script>
-
-<table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
+<div class="z-index">
+  <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
+</div>
 
 <script type="text/html" id="currentTableBar_follow">
   <% if can? :read, EducodeSales::TeacherFollow %>
@@ -36,7 +37,7 @@
                 elem: '#sale_plan_follow_table',
                 url: '/missions/teachers/show_follow?id=' + parent.id ,
                 toolbar: '#toolbarDemo_follow',
-                defaultToolbar: [],
+                defaultToolbar: ['filter'],
                 cols: [
                     [
                         {
@@ -490,4 +491,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .z-index .layui-table-tool{
+        z-index: 10000; !important;
+    }
+</style>

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

@@ -45,14 +45,14 @@
   <div class="layui-side layui-bg-black">
     <div class="layui-side-scroll ">
       <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
-      <ul class="layui-nav layui-nav-tree"
+      <ul class="layui-nav layui-nav-tree ul"
           lay-filter="test">
         <li class="layui-nav-item layui-nav-itemed menu-li" >
           <a class="" href="javascript:;"><b><%= image_tag "educode_sales/1.销售活动.png",size:"15"%><i style="padding-right: 25px"></i>销售活动</b></a>
           <dl class="layui-nav-child">
             <% if can? :trends, EducodeSales::SaleTrend %>
               <dd>
-                <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/2.市场态势.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>市场态势</a>
+                <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/2.市场态势.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>销售态势</a>
               </dd>
             <% end %>
             <% if can? :sales, EducodeSales::Staff %>
@@ -215,7 +215,7 @@
                     tips = $(this).prop("innerHTML")
                     flag = btn.hasClass('layui-icon-spread-left')
                 if (flag && tips) {
-                    tips = "<ul class='layuimini-menu-left-zoom layui-nav layui-nav-tree layui-this' style='width: 170px'><li class='layui-nav-item layui-nav-itemed'>"+tips+"</li></ul>" ;
+                    tips = "<ul class='ul-down layuimini-menu-left-zoom layui-nav layui-nav-tree layui-this' style='width: 170px'><li class='layui-nav-item layui-nav-itemed'>"+tips+"</li></ul>" ;
                     window.openTips = layer.tips(tips, $(this), {
                         tips: [2, '#2f4056'],
                         time: 300000,
@@ -252,4 +252,12 @@
 
 
 
-</script>
+</script>
+<style>
+    .layuimini-mini .ul .layui-nav-child{
+        display: none;!important;
+    }
+    .ul-down .layui-icon-down{
+        display: none;!important;
+    }
+</style>

data/config/routes.rb

@@ -7,6 +7,7 @@ EducodeSales::Engine.routes.draw do
   get :search_users, to: "home#search_users"
   get :search_teacher, to: "home#search_teacher"
   get :search_edu_teacher,to: "home#search_edu_teacher"
+  get :search_operation_teacher,to: "home#search_operation_teacher"
   get :search, to: "home#search"
   get :no_permission, to: "home#no_permission"
   get :sales_staff, to: "home#sales_staff"

data/db/migrate/20211022085324_add_teacher_used_to_teachers.rb

@@ -0,0 +1,7 @@
+class AddTeacherUsedToTeachers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_teachers, :teacher_used, :integer, default: 0
+    add_column :educode_sales_teachers, :students_count, :integer, default: 0
+    add_column :educode_sales_teachers, :courses_count, :integer, default: 0
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.4.4'
+  VERSION = '0.4.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.8
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -103,7 +103,7 @@ files:
 - app/assets/images/educode_sales/icon-ext.png
 - 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
@@ -217,6 +217,7 @@ files:
 - app/views/educode_sales/home/sales_staff.json.jbuilder
 - app/views/educode_sales/home/search.json.jbuilder
 - app/views/educode_sales/home/search_edu_teacher.json.jbuilder
+- 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/statistics.html.erb
@@ -351,6 +352,7 @@ files:
 - db/migrate/20211009063423_add_source_businesses.rb
 - db/migrate/20211013060712_create_educode_sales_assign_follow_ups.rb
 - db/migrate/20211018054256_add_extras_to_commons.rb
+- db/migrate/20211022085324_add_teacher_used_to_teachers.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb