educode_sales 0.6.4 → 0.6.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/educode_sales/activities_controller.rb +0 -2
  3. data/app/controllers/educode_sales/businesses_controller.rb +103 -47
  4. data/app/controllers/educode_sales/money_plans_controller.rb +8 -7
  5. data/app/controllers/educode_sales/sale_trends_controller.rb +105 -18
  6. data/app/controllers/educode_sales/staffs_controller.rb +19 -0
  7. data/app/controllers/educode_sales/teacher_follows_controller.rb +1 -93
  8. data/app/models/educode_sales/business_export_record.rb +5 -0
  9. data/app/views/educode_sales/activities/index.html.erb +7 -1
  10. data/app/views/educode_sales/activities/new.html.erb +1 -1
  11. data/app/views/educode_sales/businesses/edit_follow_record.html.erb +13 -4
  12. data/app/views/educode_sales/businesses/edit_plan.html.erb +5 -2
  13. data/app/views/educode_sales/businesses/export_records.html.erb +53 -0
  14. data/app/views/educode_sales/businesses/export_records.json.jbuilder +11 -0
  15. data/app/views/educode_sales/businesses/file.html.erb +8 -4
  16. data/app/views/educode_sales/businesses/index.html.erb +119 -16
  17. data/app/views/educode_sales/businesses/index.json.jbuilder +37 -7
  18. data/app/views/educode_sales/businesses/new_follow_record.html.erb +10 -5
  19. data/app/views/educode_sales/commons/index.html.erb +7 -1
  20. data/app/views/educode_sales/customers/edit.html.erb +3 -0
  21. data/app/views/educode_sales/customers/edit_follow_record.html.erb +1 -1
  22. data/app/views/educode_sales/customers/new.html.erb +3 -0
  23. data/app/views/educode_sales/customers/new_follow_record.html.erb +1 -1
  24. data/app/views/educode_sales/customers/show_follow.html.erb +1 -1
  25. data/app/views/educode_sales/money_plans/index.html.erb +47 -8
  26. data/app/views/educode_sales/money_plans/index.json.jbuilder +2 -1
  27. data/app/views/educode_sales/places/index.html.erb +16 -2
  28. data/app/views/educode_sales/places/index.json.jbuilder +3 -1
  29. data/app/views/educode_sales/recycles/business.json.jbuilder +2 -2
  30. data/app/views/educode_sales/roles/index.html.erb +7 -1
  31. data/app/views/educode_sales/sale_trends/trends.html.erb +96 -44
  32. data/app/views/educode_sales/sale_trends/trends.json.jbuilder +2 -1
  33. data/app/views/educode_sales/sales/index.json.jbuilder +2 -2
  34. data/app/views/educode_sales/staffs/index.html.erb +68 -2
  35. data/app/views/educode_sales/teachers/index.html.erb +15 -7
  36. data/app/views/layouts/educode_sales/application.html.erb +6 -1
  37. data/config/routes.rb +2 -0
  38. data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb +7 -0
  39. data/db/migrate/20220121060006_create_educode_sales_business_export_records.rb +10 -0
  40. data/lib/educode_sales/version.rb +1 -1
  41. metadata +6 -2
@@ -25,6 +25,7 @@
25
25
 
26
26
 
27
27
  <ul class="layui-nav i_class" style="left: 200px">
28
+ <%= image_tag "educode_sales/logo.png", class: 'header-logo tubiao layui-hide-sm layui-hide-xs' %>
28
29
  <li class="layui-nav-item layui-show-xs-inline-block " lay-header-event="menuLeft">
29
30
  <a href="javascript:;"> <i id="leftEnumIcon" class="layui-icon layui-icon-shrink-right"></i></a>
30
31
  </li>
@@ -70,7 +71,7 @@
70
71
  </dd>
71
72
  <% end %>
72
73
  <% if can? :read, EducodeSales::MoneyPlan %>
73
- <dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i style="font-size: 25px; padding-right: 15px"></i>回款管理</a>
74
+ <dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i style="font-size: 25px; padding-right: 15px"></i>回款计划</a>
74
75
  </dd>
75
76
  <% end %>
76
77
  <% if can? :read, EducodeSales::Customer %>
@@ -214,6 +215,8 @@
214
215
  $("#logout").removeClass('layui-nav-itemed')
215
216
  $("#head_b").removeClass('layui-hide-xs')
216
217
  $("#head_a").removeClass('layui-hide-xs')
218
+ $(".tubiao").addClass('layui-hide')
219
+ $(".tubiao").addClass('layui-hide-xs')
217
220
  }
218
221
 
219
222
  function menuHide(btn) {
@@ -223,6 +226,8 @@
223
226
  $(".i_class").animate({left: '60px'});
224
227
  $("#head_b").addClass('layui-hide-xs')
225
228
  $("#head_a").addClass('layui-hide-xs')
229
+ $(".tubiao").removeClass('layui-hide')
230
+ $(".tubiao").removeClass('layui-hide-xs')
226
231
  }
227
232
  }
228
233
  });
data/config/routes.rb CHANGED
@@ -82,6 +82,8 @@ EducodeSales::Engine.routes.draw do
82
82
 
83
83
  resources :businesses do
84
84
  collection do
85
+ get :export_records
86
+ get :add_export_records
85
87
  get :show_keys
86
88
  get :add_keys
87
89
  get :show_follow
@@ -7,7 +7,14 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
7
7
  t.timestamps
8
8
  end
9
9
  if EducodeSales::Permission.last.nil?
10
+ EducodeSales::Permission.create(name: '导出商机', subject: 'Business', action: 'export_business', clazz: 'business', position: '11')
10
11
 
12
+
13
+ #附件管理权限
14
+ EducodeSales::Permission.create(name: '查看附件', subject: 'Business', action: 'show_file', clazz: 'business', position: '11')
15
+ EducodeSales::Permission.create(name: '上传附件', subject: 'Business', action: 'upload_file', clazz: 'business', position: '11')
16
+ EducodeSales::Permission.create(name: '下载附件', subject: 'Business', action: 'download_file', clazz: 'business', position: '11')
17
+ EducodeSales::Permission.create(name: '删除附件', subject: 'Business', action: 'delete_file', clazz: 'business', position: '11')
11
18
  #回款管理权限
12
19
  EducodeSales::Permission.create(name: '查看回款列表', subject: 'MoneyPlan', action: 'read', clazz: 'money_plan', position: '15')
13
20
 
@@ -0,0 +1,10 @@
1
+ class CreateEducodeSalesBusinessExportRecords < ActiveRecord::Migration[5.2]
2
+ def change
3
+ create_table :educode_sales_business_export_records do |t|
4
+ t.string :name
5
+ t.references :staff
6
+
7
+ t.timestamps
8
+ end
9
+ end
10
+ end
@@ -1,3 +1,3 @@
1
1
  module EducodeSales
2
- VERSION = '0.6.4'
2
+ VERSION = '0.6.8'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: educode_sales
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.4
4
+ version: 0.6.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - anke1460
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-01-07 00:00:00.000000000 Z
11
+ date: 2022-01-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -177,6 +177,7 @@ files:
177
177
  - app/models/educode_sales/application_record.rb
178
178
  - app/models/educode_sales/assign_follow_up.rb
179
179
  - app/models/educode_sales/business.rb
180
+ - app/models/educode_sales/business_export_record.rb
180
181
  - app/models/educode_sales/common.rb
181
182
  - app/models/educode_sales/course_subject.rb
182
183
  - app/models/educode_sales/customer.rb
@@ -212,6 +213,8 @@ files:
212
213
  - app/views/educode_sales/businesses/edit.html.erb
213
214
  - app/views/educode_sales/businesses/edit_follow_record.html.erb
214
215
  - app/views/educode_sales/businesses/edit_plan.html.erb
216
+ - app/views/educode_sales/businesses/export_records.html.erb
217
+ - app/views/educode_sales/businesses/export_records.json.jbuilder
215
218
  - app/views/educode_sales/businesses/file.html.erb
216
219
  - app/views/educode_sales/businesses/index.html.erb
217
220
  - app/views/educode_sales/businesses/index.json.jbuilder
@@ -411,6 +414,7 @@ files:
411
414
  - db/migrate/20211215025029_create_educode_sales_customer_follows.rb
412
415
  - db/migrate/20211220102720_add_position_to_commons.rb
413
416
  - db/migrate/20211221075146_add_school_id_to_educode_sales_businesses.rb
417
+ - db/migrate/20220121060006_create_educode_sales_business_export_records.rb
414
418
  - lib/educode_sales.rb
415
419
  - lib/educode_sales/engine.rb
416
420
  - lib/educode_sales/version.rb