educode_sales 0.3.5 → 0.3.9

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

@@ -69,7 +69,7 @@
 
         form.on('submit(add_follow_up)', function (data) {
             data.field.teacher_id = "<%= @teacher.id %>";
-            request.authPost("educode_sales/teacher_follows", data.field, function (res) {
+            request.authPost("missions/teacher_follows", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {

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

@@ -117,7 +117,7 @@
         //     if (add_department.getValue() == "") {
         //         return layer.alert("请选择单位部门")
         //     }
-        //     request.authPost("educode_sales/businesses", {
+        //     request.authPost("missions/businesses", {
         //         department_id: add_department.getValue(),
         //         name: data.field.name
         //     }, function (res) {

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

@@ -11,7 +11,7 @@
 
         table.render({
             elem: '#class_T',
-            url: '/educode_sales/teachers/course_list?user_id=' + parent.user_id,
+            url: '/missions/teachers/course_list?user_id=' + parent.user_id,
             defaultToolbar: [],
             cols: [
               [

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

@@ -34,7 +34,7 @@
         table = layui.table;
             table.render({
                 elem: '#sale_plan_follow_table',
-                url: '/educode_sales/teachers/show_follow?id=' + parent.id ,
+                url: '/missions/teachers/show_follow?id=' + parent.id ,
                 toolbar: '#toolbarDemo_follow',
                 defaultToolbar: [],
                 cols: [
@@ -123,7 +123,7 @@
          */
         table.on('toolbar(sale_plan_follow_table)', function (obj) {
             if (obj.event === 'add') { // 监听添加操作
-                var content = miniPage.getHrefContent('/educode_sales/teachers/new_follow_record?id=' +parent.id);
+                var content = miniPage.getHrefContent('/missions/teachers/new_follow_record?id=' +parent.id);
                 var openWH = miniPage.getOpenWidthHeight();
                 sale_plan_index = layer.open({
                     title: '添加教师跟进记录',
@@ -150,7 +150,7 @@
             var id = data.id
             if (obj.event === 'delete') {
                 layer.confirm('确定删除ID为' + data.id + "的跟进记录", function (index) {
-                    request.authDelete("educode_sales/teacher_follows/" + data.id, {}, function() {
+                    request.authDelete("missions/teacher_follows/" + data.id, {}, function() {
                         obj.del();
                         layer.close(index);
                         parent.table.reload('sale_plan_follow_table')
@@ -160,7 +160,7 @@
                     })
                 });
             } else if (obj.event === 'show') { // 监听添加操作
-                var content = miniPage.getHrefContent('/educode_sales/teachers/show_follow_record?id=' + id);
+                var content = miniPage.getHrefContent('/missions/teachers/show_follow_record?id=' + id);
                 var openWH = miniPage.getOpenWidthHeight();
                 sale_plan_index1 = layer.open({
                     title: '查看教师跟进记录',
@@ -180,7 +180,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'edit') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/edit_follow_record?id='+ obj.data.id);
+                content = miniPage.getHrefContent('/missions/teachers/edit_follow_record?id='+ obj.data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 edit_index1 = layer.open({
                     title: '编辑教师跟进记录',
@@ -200,7 +200,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'add_keys') { // 监听添加操作
-                content = miniPage.getHrefContent('/educode_sales/businesses/add_keys');
+                content = miniPage.getHrefContent('/missions/businesses/add_keys');
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '关键人',
@@ -220,7 +220,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'edit_plan') {
-                content = miniPage.getHrefContent('/educode_sales/businesses/edit_plan');
+                content = miniPage.getHrefContent('/missions/businesses/edit_plan');
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '回款计划',
@@ -287,7 +287,7 @@
 
         table.render({
             elem: '#unfinish_table',
-            url: '/educode_sales/teachers/' + parent.id + "/unfinish_plans",
+            url: '/missions/teachers/' + parent.id + "/unfinish_plans",
             toolbar: '#unfinish_toolbar',
             defaultToolbar: [],
             cols: [
@@ -366,7 +366,7 @@
         table.on('toolbar(unfinish_table)', function (obj) {
             if (obj.event === 'addWeekPlan') { // 监听添加操作
 
-                var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_week');
+                var content = miniPage.getHrefContent('/missions/operation_plans/new_week');
                 var openWH = miniPage.getOpenWidthHeight();
                 var index = layer.open({
                     title: '添加周计划',
@@ -386,7 +386,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'addMonthPlan') { // 监听添加操作
-                var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_month')
+                var content = miniPage.getHrefContent('/missions/operation_plans/new_month')
                 var openWH = miniPage.getOpenWidthHeight();
                 var index = layer.open({
                     title: '添加月计划',
@@ -422,14 +422,14 @@
             var id = data.id
             if (obj.event === 'delete') {
                 layer.confirm('确定删除ID为' + data.id + "的计划", function (index) {
-                    request.authDelete("educode_sales/operation_plans/" + data.id, {}, function() {
+                    request.authDelete("missions/operation_plans/" + data.id, {}, function() {
                         obj.del();
                         layer.close(index);
                     })
 
                 });
             } else if (obj.event === 'show') {
-                content = miniPage.getHrefContent('/educode_sales/operation_plans/show_week?id=' + data.id);
+                content = miniPage.getHrefContent('/missions/operation_plans/show_week?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '查看计划',
@@ -446,7 +446,7 @@
                 });
                 return false;
             } else if (obj.event === 'edit') {
-                content = miniPage.getHrefContent('/educode_sales/operation_plans/edit_week?id=' + data.id);
+                content = miniPage.getHrefContent('/missions/operation_plans/edit_week?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index10 = layer.open({
                     title: '编辑',
@@ -467,7 +467,7 @@
                 });
                 return false;
             }  else if (obj.event === 'show_follow') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow');
+                content = miniPage.getHrefContent('/missions/teachers/show_follow');
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: 'xxxx/跟进记录',

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

@@ -24,7 +24,7 @@
           <%= @current_admin.user.real_name %>
         </a>
         <dl class="layui-nav-child">
-          <dd><a href="/educode_sales/logout">退出</a></dd>
+          <dd><a href="/missions/logout">退出</a></dd>
         </dl>
       </li>
 
@@ -45,22 +45,22 @@
           <dl class="layui-nav-child">
             <% if can? :trends, EducodeSales::SaleTrend %>
             <dd>
-              <a href="/educode_sales/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>">市场态势</a>
+              <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>">市场态势</a>
             </dd>
             <% end %>
             <% if can? :sales, EducodeSales::Staff %>
-            <dd><a href="/educode_sales/sales" class="<%= current?('layui-this', sales_path) %>">销售分工</a>
+            <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>">销售分工</a>
             </dd>
             <% end %>
             <% if can? :read, EducodeSales::Business %>
-            <dd><a href="/educode_sales/businesses" class="<%= current?('layui-this', businesses_path) %>">商机管理</a>
+            <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>">商机管理</a>
             </dd>
             <% end %>
             <% if can? :read, EducodeSales::Place %>
-            <dd><a href="/educode_sales/places" class="<%= current?('layui-this', places_path) %>">渠道管理</a></dd>
+            <dd><a href="/missions/places" class="<%= current?('layui-this', places_path) %>">渠道管理</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::SalePlan %>
-            <dd><a href="/educode_sales/plans" class="<%= current?('layui-this', plans_path) %>">销售计划</a></dd>
+            <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>">销售计划</a></dd>
             <% end %>
           </dl>
         </li>
@@ -69,23 +69,23 @@
           <dl class="layui-nav-child">
              <% if can? :read, EducodeSales::OperationTrend %>
             <dd>
-              <a href="/educode_sales/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>">运营态势</a>
+              <a href="/missions/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>">运营态势</a>
             </dd>
              <% end %>
              <% if can? :operations, EducodeSales::Staff %>
             <dd>
-              <a href="/educode_sales/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>">运营分工</a>
+              <a href="/missions/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>">运营分工</a>
             </dd>
             <% end %>
             <% if can? :read, EducodeSales::Teacher %>
-            <dd><a href="/educode_sales/teachers" class="<%= current?('layui-this', teachers_path) %>">教师运营</a></dd>
+            <dd><a href="/missions/teachers" class="<%= current?('layui-this', teachers_path) %>">教师运营</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::Activity %>
-            <dd><a href="/educode_sales/activities" class="<%= current?('layui-this', activities_path) %>">活动运营</a></dd>
+            <dd><a href="/missions/activities" class="<%= current?('layui-this', activities_path) %>">活动运营</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::OperationPlan %>
             <dd>
-              <a href="/educode_sales/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>">运营计划</a>
+              <a href="/missions/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>">运营计划</a>
             </dd>
             <% end %>
           </dl>
@@ -94,9 +94,9 @@
         <li class="layui-nav-item layui-nav-itemed">
           <a class="" href="javascript:;"><b>系统设置</b></a>
           <dl class="layui-nav-child">
-            <dd><a href="/educode_sales/roles" class="<%= current?('layui-this', roles_path) %>">角色管理</a></dd>
-            <dd><a href="/educode_sales/staffs" class="<%= current?('layui-this', staffs_path) %>">人员管理</a></dd>
-            <dd><a href="/educode_sales/commons" class="<%= current?('layui-this', commons_path) %>">字典列表</a></dd>
+            <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>
         <% end %>

data/config/routes.rb

@@ -9,6 +9,7 @@ EducodeSales::Engine.routes.draw do
   get :search_edu_teacher,to: "home#search_edu_teacher"
   get :search, to: "home#search"
   get :no_permission, to: "home#no_permission"
+  get :sales_staff, to: "home#sales_staff"
 
   resources :sessions do
   end
@@ -110,8 +111,12 @@ EducodeSales::Engine.routes.draw do
     end
   end
 
+
+  resources :import_teachers
+
   resources :teachers do
     collection do
+      get :import
       get :add_keys
       get :search_new
       get :add_courses

data/db/migrate/20211009031109_add_tel_key_peoples.rb

@@ -0,0 +1,5 @@
+class AddTelKeyPeoples < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_key_people, :tel, :string
+  end
+end

data/db/migrate/20211009063423_add_source_businesses.rb

@@ -0,0 +1,5 @@
+class AddSourceBusinesses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :source, :string
+  end
+end

data/db/migrate/20211013060712_create_educode_sales_assign_follow_ups.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesAssignFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_assign_follow_ups do |t|
+      t.references :staff
+      t.references :follow_up
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.3.5'
+  VERSION = '0.3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.9
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,7 @@ files:
 - app/assets/javascripts/educode_sales/extent/miniPage.js
 - app/assets/javascripts/educode_sales/extent/request.js
 - app/assets/javascripts/educode_sales/extent/select_input.js
+- app/assets/javascripts/educode_sales/extent/xm-select.js
 - app/assets/javascripts/educode_sales/layui.js
 - app/assets/stylesheets/educode_sales/app.css
 - app/assets/stylesheets/educode_sales/application.css
@@ -120,6 +121,7 @@ files:
 - app/controllers/educode_sales/commons_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
 - app/controllers/educode_sales/key_person_controller.rb
 - app/controllers/educode_sales/operation_plans_controller.rb
 - app/controllers/educode_sales/operation_reports_controller.rb
@@ -146,6 +148,7 @@ files:
 - app/models/educode_sales/activity.rb
 - app/models/educode_sales/activity_teacher.rb
 - app/models/educode_sales/application_record.rb
+- app/models/educode_sales/assign_follow_up.rb
 - app/models/educode_sales/business.rb
 - app/models/educode_sales/common.rb
 - app/models/educode_sales/course_subject.rb
@@ -194,6 +197,7 @@ files:
 - 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_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_teacher.json.jbuilder
@@ -285,6 +289,7 @@ files:
 - app/views/educode_sales/teachers/course_subject.json.jbuilder
 - app/views/educode_sales/teachers/edit.html.erb
 - app/views/educode_sales/teachers/edit_follow_record.html.erb
+- app/views/educode_sales/teachers/import.html.erb
 - app/views/educode_sales/teachers/index.html.erb
 - app/views/educode_sales/teachers/index.json.jbuilder
 - app/views/educode_sales/teachers/new.html.erb
@@ -325,6 +330,9 @@ files:
 - db/migrate/20210913070728_create_educode_sales_activity_teachers.rb
 - db/migrate/20210913071607_create_educode_sales_course_subjects.rb
 - db/migrate/20210915061738_add_students_count_teacher_follow_ups.rb
+- 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
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -348,8 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14
+rubygems_version: 3.0.0
 signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.