educode_sales 0.5.8 → 0.5.9

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

@@ -1,11 +1,10 @@
 <div class="section">
-  <form class="layui-form" action="">
+  <form class="layui-form select_year" action="">
     <span>销售人员列表</span>
-    <div style="float:right;">年度
-    <div class="layui-input-inline">
+    <div class="layui-input-inline" style="float: right">
       <%= select_tag "years", options_for_select(@years,@year), {'lay-filter': 'year' } %>
     </div>
-    </div>
+    <span style="float: right;padding-right: 10px">年度</span>
   </form>
   <hr>
   <table class="layui-hide" id="table" lay-filter="table" ></table>
@@ -123,12 +122,43 @@
             title: '中标金额',
             totalRow:true,sort:true,
             width: 120
-          }, {
+          },
+            {
             field: 'return_money',
             title: '回款金额',
             totalRow:true,sort:true,
             width: 120
-          }
+          },
+            {
+            field: 'school_count',
+            title: '负责学校数',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_school_count',
+            title: '跟进学校数',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_school_counts',
+            title: '跟进学校次数',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_school_rate',
+            title: '学校覆盖率',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_department_rate',
+            title: '学院覆盖率',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
         ]
       ],
       limit: 20,
@@ -136,19 +166,13 @@
       page: true
     });
 
-      // var sort = {}, search = {};
-      // table.on('sort(table)', function (obj) {
-      //     sort.field = obj.field;
-      //     sort.order = obj.type;
-      //     table.reload('table', {
-      //         initSort: obj,
-      //         where: {
-      //             sort: sort,
-      //             q: search
-      //         }
-      //     });
-      // })
-
 
   });
-</script>
+</script>
+<style>
+    .select_year .layui-form-select .layui-input {
+        padding-right: 30px;
+        cursor: pointer;
+        height: 22px;
+    }
+</style>

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

@@ -34,7 +34,8 @@ json.data do
       business_e = @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 = ?", @e_clazz&.id).count
       business_o = @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 = ?", @o_clazz&.id).count
       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.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 EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
     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
@@ -42,15 +43,16 @@ json.data do
       business_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 = ?", @d_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
       business_e = @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 = ?", @e_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
       business_o = @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 = ?", @o_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
-      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.year = ?", @year).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).where("educode_sales_follow_ups.year = ?", @year).sum("educode_sales_businesses.return_money").round(2)
+      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 EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
     end
 
     json.business_a business_a
     json.business_b business_b
     json.business_c business_c
-    json.business_d business_b
-    json.business_e business_b
+    json.business_d business_d
+    json.business_e business_e
     json.business_o business_o
 
     json.a_clazz_id @a_clazz&.id

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

@@ -4,8 +4,8 @@ json.data do
   json.array! @teachers do |d|
     json.id d.id
     json.name d.name
-    json.department d.department&.name
-    json.school d.department&.school&.name
+    json.department d.department&.name || ""
+    json.school d.department&.school&.name || ""
     json.professional_title d.professional_title
     json.job d.job
     json.user_id d.user_id

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

@@ -42,7 +42,7 @@
                     [
                         {
                             field: 'id',
-                            width: 100,
+                            width: 60,
                             title:'序号',type: 'numbers',
                         },
                         {
@@ -53,26 +53,31 @@
                         },
                         {
                             field: 'teacher_attitude',
-                            width: 120,
+                            width: 100,
                             title: '教师态度',
                         },
                         {
                             field: 'contact',
-                            width: 120,
+                            width: 100,
                             title: '跟进手段',
                             // templet: '#showchance'
                         },
                         {
                             field: 'course_plan',
-                            width: 150,
+                            width: 100,
                             title: '开课计划',
                             // templet: '#add_keys'
                         },
                         {
                             field: 'course_build',
-                            width: 120,
+                            width: 100,
                             title: '课堂建设',
                         },
+                        {
+                            field: 'content',
+                            width: 200,
+                            title: '跟进小结',
+                        },
                         {
                             field: 'students_count',
                             width: 120,

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

@@ -15,6 +15,7 @@ json.data do
     json.course_shixuns_count d.course_shixuns_count
     json.shixuns_count d.shixuns_count
     json.is_latest d.id == @latest.id
+    json.content d.description
   end
 end
 

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

@@ -13,10 +13,13 @@
 <body class="" id="body">
 <div class="layui-layout layui-layout-admin " >
   <div class="layui-header">
-    <div class="layui-hide-xs layui-bg-black layuimini-logo layui-logo">
+    <a href="/missions">
+      <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>
+    </a>
+
 
     <ul class="layui-nav i_class" style="left: 200px">
       <li class="layui-nav-item layui-show-xs-inline-block " lay-header-event="menuLeft">
@@ -63,6 +66,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::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>
+            <% end %>
             <% if can? :read, EducodeSales::Place %>
               <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 %>

data/config/routes.rb

@@ -16,6 +16,31 @@ EducodeSales::Engine.routes.draw do
   resources :sessions do
   end
 
+  resources :customer_extensions do
+  end
+  resources :customer_follows do
+  end
+
+  resources :customers do
+    collection do
+      get :show_follow
+      get :show_department
+      get :new_follow_record
+      get :show_follow_record
+      get :edit_follow_record
+      get :new_department
+      get :edit_department
+      get :give
+    end
+
+    member do
+      post :create_follow_up
+      put :update_follow_up
+      post :create_department
+      put :update_department
+    end
+  end
+
   resources :operation_reports do
     member do
       get :plans

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -7,6 +7,21 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       t.timestamps
     end
     if EducodeSales::Permission.last.nil?
+
+      #客户管理权限
+      EducodeSales::Permission.create(name: '查看客户', subject: 'Customer', action: 'read', clazz: 'customer')
+      EducodeSales::Permission.create(name: '添加客户', subject: 'Customer', action: 'create', clazz: 'customer')
+      EducodeSales::Permission.create(name: '编辑客户', subject: 'Customer', action: 'update', clazz: 'customer')
+      EducodeSales::Permission.create(name: '分配/移交', subject: 'Customer', action: 'give', clazz: 'customer')
+      EducodeSales::Permission.create(name: '查看部门', subject: 'Customer', action: 'read_department', clazz: 'customer')
+      EducodeSales::Permission.create(name: '添加部门', subject: 'Customer', action: 'create_department', clazz: 'customer')
+      EducodeSales::Permission.create(name: '编辑部门', subject: 'Customer', action: 'update_department', clazz: 'customer')
+      EducodeSales::Permission.create(name: '查看跟进记录', subject: 'Customer', action: 'read_follow', clazz: 'customer')
+      EducodeSales::Permission.create(name: '添加跟进记录', subject: 'Customer', action: 'create_follow', clazz: 'customer')
+      EducodeSales::Permission.create(name: '编辑跟进记录', subject: 'Customer', action: 'update_follow', clazz: 'customer')
+      EducodeSales::Permission.create(name: '删除跟进记录', subject: 'Customer', action: 'destroy_follow', clazz: 'customer')
+
+
       EducodeSales::Permission.create(name: '查看数据', subject: 'SaleTrend', action: 'trends', clazz: 'market')
       EducodeSales::Permission.create(name: '编辑目标', subject: 'SaleTrend', action: 'sale_trends', clazz: 'market')
 

data/db/migrate/20211214100803_create_customer_extensions.rb

@@ -0,0 +1,9 @@
+class CreateCustomerExtensions < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_customer_extensions do |t|
+      t.references :staff
+      t.references :school
+      t.integer :customer_staff_id
+    end
+  end
+end

data/db/migrate/20211215025029_create_educode_sales_customer_follows.rb

@@ -0,0 +1,12 @@
+class CreateEducodeSalesCustomerFollows < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_customer_follows do |t|
+      t.integer :school_id
+      t.integer :department_id
+      t.references :staff
+      t.text :content
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -110,6 +110,7 @@ files:
 - app/assets/images/educode_sales/loginbg.png
 - app/assets/images/educode_sales/logo.png
 - app/assets/images/educode_sales/回收站.png
+- app/assets/images/educode_sales/客户管理.png
 - app/assets/javascripts/educode_sales/application.js
 - app/assets/javascripts/educode_sales/extent/miniPage.js
 - app/assets/javascripts/educode_sales/extent/request.js
@@ -137,6 +138,9 @@ files:
 - app/controllers/educode_sales/application_controller.rb
 - app/controllers/educode_sales/businesses_controller.rb
 - app/controllers/educode_sales/commons_controller.rb
+- app/controllers/educode_sales/customer_extensions_controller.rb
+- app/controllers/educode_sales/customer_follows_controller.rb
+- app/controllers/educode_sales/customers_controller.rb
 - app/controllers/educode_sales/follow_ups_controller.rb
 - app/controllers/educode_sales/home_controller.rb
 - app/controllers/educode_sales/import_teachers_controller.rb
@@ -173,6 +177,9 @@ files:
 - app/models/educode_sales/business.rb
 - app/models/educode_sales/common.rb
 - app/models/educode_sales/course_subject.rb
+- app/models/educode_sales/customer.rb
+- app/models/educode_sales/customer_extension.rb
+- app/models/educode_sales/customer_follow.rb
 - app/models/educode_sales/follow_up.rb
 - app/models/educode_sales/key_person.rb
 - app/models/educode_sales/market_area.rb
@@ -220,6 +227,19 @@ files:
 - app/views/educode_sales/commons/index.json.jbuilder
 - app/views/educode_sales/commons/new.html.erb
 - app/views/educode_sales/commons/show.json.jbuilder
+- app/views/educode_sales/customers/edit.html.erb
+- app/views/educode_sales/customers/edit_department.html.erb
+- app/views/educode_sales/customers/edit_follow_record.html.erb
+- app/views/educode_sales/customers/give.html.erb
+- app/views/educode_sales/customers/index.html.erb
+- app/views/educode_sales/customers/index.json.jbuilder
+- app/views/educode_sales/customers/new.html.erb
+- app/views/educode_sales/customers/new_department.html.erb
+- app/views/educode_sales/customers/new_follow_record.html.erb
+- app/views/educode_sales/customers/show_department.json.jbuilder
+- app/views/educode_sales/customers/show_follow.html.erb
+- app/views/educode_sales/customers/show_follow.json.jbuilder
+- app/views/educode_sales/customers/show_follow_record.html.erb
 - app/views/educode_sales/follow_ups/index.json.jbuilder
 - app/views/educode_sales/follow_ups/money_plans.json.jbuilder
 - app/views/educode_sales/follow_ups/teachers.json.jbuilder
@@ -383,6 +403,8 @@ files:
 - db/migrate/20211109015617_create_educode_sales_recycles.rb
 - db/migrate/20211201023750_create_educode_sales_teacher_assign_follows.rb
 - 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
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb