educode_sales 0.4.2 → 0.4.6

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,84 +139,89 @@
             url: '/missions/teachers',
             where: {q: form.val('search_form')},
             toolbar: '#toolbarDemo',
+            totalRow:true,
             defaultToolbar: [],
             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"
                 },
                 {
                     field: 'teacher_used',
-                    width: 120,
+                    width: 100,
                     title: '学院渗透率',
                 },
                 {
                     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/layouts/educode_sales/application.html.erb

@@ -10,15 +10,21 @@
   <%= stylesheet_link_tag "educode_sales/application", media: "all" %>
   <%= javascript_include_tag "educode_sales/application" %>
 </head>
-<body>
-<div class="layui-layout layui-layout-admin">
+<body class="" id="body">
+<div class="layui-layout layui-layout-admin " >
   <div class="layui-header">
-    <div class="layui-logo layui-hide-xs layui-bg-black">
+    <div class="layui-hide-xs layui-bg-black layuimini-logo layui-logo">
       <%= image_tag "educode_sales/logo.png", class: 'header-logo' %>
       <span class="app-title">营销系统</span>
     </div>
+
+    <ul class="layui-nav i_class" style="left: 200px">
+      <li class="layui-nav-item layui-show-xs-inline-block " lay-header-event="menuLeft">
+        <a href="javascript:;"> <i id="leftEnumIcon" class="layui-icon layui-icon-shrink-right"></i></a>
+      </li>
+    </ul>
     <ul class="layui-nav layui-layout-right">
-      <li class="layui-nav-item layui-hide layui-show-md-inline-block">
+      <li class="layui-nav-item layui-hide layui-show-md-inline-block" id="logout">
         <a href="javascript:;">
           <%= image_tag "/images/#{url_to_avatar(@current_admin.user)}", class: 'layui-nav-img' %>
           <%= @current_admin.user.real_name %>
@@ -37,68 +43,69 @@
   </div>
 
   <div class="layui-side layui-bg-black">
-    <div class="layui-side-scroll">
+    <div class="layui-side-scroll ">
       <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
-      <ul class="layui-nav layui-nav-tree" lay-filter="test">
-        <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;"><b>销售活动</b></a>
+      <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) %>">市场态势</a>
-            </dd>
+              <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>
+              </dd>
             <% end %>
             <% if can? :sales, EducodeSales::Staff %>
-            <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>">销售分工</a>
-            </dd>
+              <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/3.销售分工.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售分工</a>
+              </dd>
             <% end %>
             <% if can? :read, EducodeSales::Business %>
-            <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>">商机管理</a>
-            </dd>
+              <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::Place %>
-            <dd><a href="/missions/places" class="<%= current?('layui-this', places_path) %>">渠道管理</a></dd>
+              <dd><a href="/missions/places" class="<%= current?('layui-this', places_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/5.渠道管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>渠道管理</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::SalePlan %>
-            <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>">销售计划</a></dd>
+              <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/6.销售计划.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售计划</a></dd>
             <% end %>
           </dl>
         </li>
-        <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;"><b>运营活动</b></a>
+        <li class="layui-nav-item layui-nav-itemed menu-li">
+          <a class="" href="javascript:;"><b><%= image_tag "educode_sales/7.运营活动.png",size:"15"%><i  style="font-size: 25px;  padding-right: 25px"></i>运营活动</b></a>
           <dl class="layui-nav-child">
-             <% if can? :read, EducodeSales::OperationTrend %>
-            <dd>
-              <a href="/missions/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>">运营态势</a>
-            </dd>
-             <% end %>
-             <% if can? :operations, EducodeSales::Staff %>
-            <dd>
-              <a href="/missions/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>">运营分工</a>
-            </dd>
+            <% if can? :read, EducodeSales::OperationTrend %>
+              <dd>
+                <a href="/missions/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/8.运营态势.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营态势</a>
+              </dd>
+            <% end %>
+            <% if can? :operations, EducodeSales::Staff %>
+              <dd>
+                <a href="/missions/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/9.运营分工.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营分工</a>
+              </dd>
             <% end %>
             <% if can? :read, EducodeSales::Teacher %>
-            <dd><a href="/missions/teachers" class="<%= current?('layui-this', teachers_path) %>">教师运营</a></dd>
+              <dd><a href="/missions/teachers" class="<%= current?('layui-this', teachers_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/10.教师运营.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>教师运营</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::Activity %>
-            <dd><a href="/missions/activities" class="<%= current?('layui-this', activities_path) %>">活动运营</a></dd>
+              <dd><a href="/missions/activities" class="<%= current?('layui-this', activities_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/11.活动运营.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>活动运营</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::OperationPlan %>
-            <dd>
-              <a href="/missions/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>">运营计划</a>
-            </dd>
+              <dd>
+                <a href="/missions/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/12.运营计划.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营计划</a>
+              </dd>
             <% end %>
           </dl>
         </li>
         <% if @current_admin.is_admin %>
-        <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;"><b>系统设置</b></a>
-          <dl class="layui-nav-child">
-            <dd><a href="/missions/roles" class="<%= current?('layui-this', roles_path) %>">角色管理</a></dd>
-            <dd><a href="/missions/staffs" class="<%= current?('layui-this', staffs_path) %>">人员管理</a></dd>
-            <dd><a href="/missions/commons" class="<%= current?('layui-this', commons_path) %>">字典列表</a></dd>
-          </dl>
-        </li>
+          <li class="layui-nav-item layui-nav-itemed menu-li">
+            <a class="" href="javascript:;"><b><%= image_tag "educode_sales/13.系统设置.png",size:"15"%><i  style="font-size: 25px;  padding-right: 25px"></i>系统设置</b></a>
+            <dl class="layui-nav-child">
+              <dd><a href="/missions/roles" class="<%= current?('layui-this', roles_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/14.角色管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>角色管理</a></dd>
+              <dd><a href="/missions/staffs" class="<%= current?('layui-this', staffs_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/15.人员管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>人员管理</a></dd>
+              <dd><a href="/missions/commons" class="<%= current?('layui-this', commons_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/16.字典列表.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>字典列表</a></dd>
+            </dl>
+          </li>
         <% end %>
       </ul>
     </div>
@@ -120,3 +127,134 @@
 
 </body>
 </html>
+<script type="text/javascript" charset="utf-8">
+
+//  if(true){
+//      var $ = layui.jquery;
+//      var body = $("#body");
+//      var btn = $("#leftEnumIcon");
+//      $(".layui-nav-item").removeClass('layui-nav-itemed')
+//      btn.removeClass('layui-icon-shrink-right').addClass('layui-icon-spread-left');
+//      body.addClass('layuimini-mini');
+//      $(".i_class").animate({left: '60px'});
+//  }
+
+    //头部事件
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            util = layui.util,
+            layer = layui.layer,
+            miniMenu = layui.miniMenu,
+            miniTheme = layui.miniTheme,
+            element = layui.element ,
+            miniTab = layui.miniTab;
+        miniPage = layui.miniPage;
+            $ = layui.jquery;
+        util.event('lay-header-event', {  //util 记得 声明 var util = layui.util
+            //左侧菜单事件
+            menuLeft: function (othis) {
+                var li = $(".li")
+                var body = $("#body");
+                var btn = $("#leftEnumIcon");
+                if (btn.hasClass('layui-icon-shrink-right')) {
+                    menuHide(btn);
+                    btn.addClass('btn-index');
+                } else if (btn.has('layui-icon-spread-left')) {
+                    btn.removeClass('btn-index');
+                    menuShow(btn);
+
+                }
+
+                $(window).resize(function () {
+                    var width = $(document.body).width();
+                    var btn = $("leftEnumIcon");
+                    if (width < 1000) {
+                        if (btn.hasClass('layui-icon-shrink-right')) {
+                            menuShow(btn);
+                        }
+                    } else {
+                        if (!btn.hasClass('btn-index')) {
+                            if (btn.hasClass('layui-icon-spread-left')) {
+                                menuHide(btn);
+                            }
+                        }
+                    }
+                });
+
+                function menuShow(btn) {
+                    try {
+                        layer.close(window.openTips);
+                    } catch (e) {
+                        console.log(e.message);
+                    }
+                    btn.removeClass('layui-icon-spread-left').addClass('layui-icon-shrink-right');
+                    body.removeClass('layuimini-mini')
+                    $(".i_class").animate({left: '200px'},"fast");
+                    $(".layui-nav-item").addClass('layui-nav-itemed')
+                    $("#logout").removeClass('layui-nav-itemed')
+                }
+
+                function menuHide(btn) {
+                    $(".layui-nav-item").removeClass('layui-nav-itemed')
+                    btn.removeClass('layui-icon-shrink-right').addClass('layui-icon-spread-left');
+                    body.addClass('layuimini-mini');
+                    $(".i_class").animate({left: '60px'});
+                }
+            }
+        });
+
+
+
+
+        $(document).ready(function() {
+            var btn = $("#leftEnumIcon");
+            $("body").on("mouseenter", ".menu-li", function () {
+                    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>" ;
+                    window.openTips = layer.tips(tips, $(this), {
+                        tips: [2, '#2f4056'],
+                        time: 300000,
+                        skin:"popup-tips",
+                        success:function (el) {
+                            var left = $(el).position().left - 150 ;
+                            $(el).css({ left:left});
+                            element.render();
+                        }
+                    });
+                }
+            });
+
+            $("body").on("mouseleave", ".layui-nav-child", function () {
+                    try {
+                        layer.close(window.openTips);
+                    } catch (e) {
+                        console.log(e.message);
+                    }
+            });
+
+            $("body").on("mouseenter", ".layui-body", function () {
+                    try {
+                        layer.close(window.openTips);
+                    } catch (e) {
+                        console.log(e.message);
+                    }
+            });
+
+
+
+        })
+    });
+
+
+
+</script>
+<style>
+    .layuimini-mini .ul .layui-nav-child{
+        display: none;!important;
+    }
+</style>

data/db/migrate/20211018054256_add_extras_to_commons.rb

@@ -0,0 +1,6 @@
+class AddExtrasToCommons < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_commons, :extras, :string
+    add_column :educode_sales_follow_ups, :divide_amount, :float
+  end
+end

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.2'
+  VERSION = '0.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.6
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,11 +82,28 @@ files:
 - app/assets/fonts/iconfont.ttf
 - app/assets/fonts/iconfont.woff
 - app/assets/fonts/iconfont.woff2
+- app/assets/images/educode_sales/1.销售活动.png
+- app/assets/images/educode_sales/10.教师运营.png
+- app/assets/images/educode_sales/11.活动运营.png
+- app/assets/images/educode_sales/12.运营计划.png
+- app/assets/images/educode_sales/13.系统设置.png
+- app/assets/images/educode_sales/14.角色管理.png
+- app/assets/images/educode_sales/15.人员管理.png
+- app/assets/images/educode_sales/16.字典列表.png
+- app/assets/images/educode_sales/2.市场态势.png
+- app/assets/images/educode_sales/3.销售分工.png
+- app/assets/images/educode_sales/4.商机管理.png
+- app/assets/images/educode_sales/5.渠道管理.png
+- app/assets/images/educode_sales/6.销售计划.png
+- app/assets/images/educode_sales/7.运营活动.png
+- app/assets/images/educode_sales/8.运营态势.png
+- app/assets/images/educode_sales/9.运营分工.png
+- app/assets/images/educode_sales/a.png
 - app/assets/images/educode_sales/favicon.ico
 - 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
@@ -333,6 +350,8 @@ files:
 - db/migrate/20211009031109_add_tel_key_peoples.rb
 - 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