educode_sales 0.5.5 → 0.5.9

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
@@ -19,8 +19,11 @@ json.data do
     json.actives d.actives
     json.students d.students_count
     json.regist_at 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
+    json.created_at d.created_at.to_s(:date)
+    json.teacher_assist d.teacher_assign_follows.map{|t| t.staff.user.real_name}.join(',')
     teacher_follows_count += d.teacher_follows_count
     courses_counts += d.courses_count
   end

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

@@ -5,6 +5,8 @@
         <label class="layui-form-label required">姓名</label>
         <div class="layui-input-block" id="add_teacher" style="width: 400px"></div>
       </div>
+      </div>
+      <div class="layui-block">
       <div class="layui-inline">
         <label class="layui-form-label required">单位/部门</label>
         <div class="layui-input-block" id="add_department" style="width: 400px"></div>
@@ -12,34 +14,38 @@
     </div>
     <div class="layui-block">
       <div class="layui-inline">
-        <label class="layui-form-label required">职称</label>
+        <label class="layui-form-label ">职称</label>
         <div class="layui-input-block">
-          <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @person&.professional_title), { include_blank: true, "lay-verify": "required"} %>
+          <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @person&.professional_title), { include_blank: true} %>
         </div>
       </div>
-      </div>
-      <div class="layui-block">
       <div class="layui-inline">
-        <label class="layui-form-label required">职务</label>
+        <label class="layui-form-label ">职务</label>
         <div class="layui-input-block" style="width: 188px;">
-          <input type="text" name="job" autocomplete="off" lay-verify="required" class="layui-input" placeholder="请输入职务">
+          <input type="text" name="job" autocomplete="off"  class="layui-input" placeholder="请输入职务">
         </div>
       </div>
       </div>
       <div class="layui-block">
        <div class="layui-inline">
-         <label class="layui-form-label required">来源</label>
+         <label class="layui-form-label ">来源</label>
+         <div class="layui-input-block">
+           <%= select_tag "source_id", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id)), { include_blank: true } %>
+         </div>
+       </div>
+       <div class="layui-inline">
+         <label class="layui-form-label ">微信号</label>
          <div class="layui-input-block">
-           <%= select_tag "source_id", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id)), { include_blank: true, "lay-verify": "required" } %>
+           <input type="text" name="wechat" autocomplete="off"  class="layui-input" placeholder="请输入微信号">
          </div>
        </div>
     </div>
-   
-    <!-- <br>
-    <div class="layui-inline">
-      <label class="layui-form-label ">账号</label>
-      <div class="layui-input-block" id="search_teachers" style="width: 300px;"></div>
-    </div> -->
+    <div class="layui-form-item">
+      <label class="layui-form-label">教研助理</label>
+      <div class="layui-input-inline" style="z-index: 100">
+        <div id="teacher_assist" style="width: 400px;"></div>
+      </div>
+    </div>
     <div class="layui-form-item m-t-20">
       <div class="layui-input-block">
         <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="create_teachers"
@@ -47,9 +53,6 @@
         </button>
       </div>
     </div>
-    <!-- <div class="layui-block">
-      <button class="layui-btn layui-btn-normal" lay-submit lay-filter="create_teachers">提交</button>
-    </div> -->
   </div>
 </div>
 <script>
@@ -58,12 +61,42 @@
             layer = layui.layer,
             table = layui.table,
             laytpl = layui.laytpl,
+            xmSelect = layui.xmSelect,
             request = layui.request,
             $ = layui.$;
         selectInput = layui.selectInput;
 
         form.render();
 
+        var teacher_assist_list = xmSelect.render({
+            el: '#teacher_assist',
+            remoteSearch: true,
+            clickClose: true,
+            delay: 1000,
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                $.ajax( '/missions/sales_staff?teacher_assist=true', {
+                    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 add_teacher = selectInput.render({
             elem: '#add_teacher',
             name: 'name', // 渲染的input的name值
@@ -141,6 +174,11 @@
 
         //监听提交
         form.on('submit(create_teachers)', function (data) {
+            var teacher_assist = [];
+            teacher_assist_list.getValue().forEach(function(d) {
+                teacher_assist.push(d.value);
+            })
+            data.field.teacher_assist = teacher_assist;
           data.field.user_id = user_id;
           data.field.department_id = department_id;
           data.field.activity_id = parent.activity_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

@@ -11,10 +11,36 @@ EducodeSales::Engine.routes.draw do
   get :search, to: "home#search"
   get :no_permission, to: "home#no_permission"
   get :sales_staff, to: "home#sales_staff"
+  get :sales_place, to: "home#sales_place"
 
   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/20211201023750_create_educode_sales_teacher_assign_follows.rb

@@ -0,0 +1,11 @@
+class CreateEducodeSalesTeacherAssignFollows < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_teacher_assign_follows do |t|
+      t.references :staff
+      t.references :teacher
+
+      t.timestamps
+    end
+    add_column :educode_sales_teachers, :wechat, :string
+  end
+end

data/db/migrate/20211206054756_add_year_to_follow_ups.rb

@@ -0,0 +1,5 @@
+class AddYearToFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :year, :integer
+  end
+end

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.5'
+  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.5
+  version: 0.5.9
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-26 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
@@ -192,12 +199,14 @@ files:
 - app/models/educode_sales/sale_trend.rb
 - app/models/educode_sales/staff.rb
 - app/models/educode_sales/teacher.rb
+- app/models/educode_sales/teacher_assign_follow.rb
 - app/models/educode_sales/teacher_follow.rb
 - app/views/educode_sales/activities/edit.html.erb
 - app/views/educode_sales/activities/index.html.erb
 - app/views/educode_sales/activities/index.json.jbuilder
 - app/views/educode_sales/activities/new.html.erb
 - app/views/educode_sales/activities/show_teachers.html.erb
+- app/views/educode_sales/businesses/_follows.html.erb
 - app/views/educode_sales/businesses/edit.html.erb
 - app/views/educode_sales/businesses/edit_follow_record.html.erb
 - app/views/educode_sales/businesses/edit_plan.html.erb
@@ -218,10 +227,25 @@ 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
 - app/views/educode_sales/home/index.html.erb
 - app/views/educode_sales/home/no_permission.html.erb
+- app/views/educode_sales/home/sales_place.json.jbuilder
 - 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
@@ -377,6 +401,10 @@ files:
 - db/migrate/20211022085324_add_teacher_used_to_teachers.rb
 - db/migrate/20211102085743_add_bidded_date_educode_sales_follow_ups.rb
 - 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