educode_sales 0.6.0 → 0.6.4

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 (47) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/educode_sales/money_plans.png +0 -0
  3. data/app/controllers/educode_sales/businesses_controller.rb +7 -4
  4. data/app/controllers/educode_sales/customers_controller.rb +45 -34
  5. data/app/controllers/educode_sales/follow_ups_controller.rb +1 -1
  6. data/app/controllers/educode_sales/money_plans_controller.rb +64 -0
  7. data/app/controllers/educode_sales/places_controller.rb +5 -1
  8. data/app/controllers/educode_sales/roles_controller.rb +4 -1
  9. data/app/controllers/educode_sales/sale_trends_controller.rb +44 -1
  10. data/app/controllers/educode_sales/staffs_controller.rb +3 -4
  11. data/app/controllers/educode_sales/teachers_controller.rb +13 -2
  12. data/app/models/educode_sales/permission.rb +3 -2
  13. data/app/models/educode_sales/role_area.rb +1 -0
  14. data/app/views/educode_sales/businesses/_follows.html.erb +18 -15
  15. data/app/views/educode_sales/businesses/edit.html.erb +3 -0
  16. data/app/views/educode_sales/businesses/index.html.erb +28 -18
  17. data/app/views/educode_sales/businesses/index.json.jbuilder +1 -0
  18. data/app/views/educode_sales/businesses/show_follow.html.erb +2 -1
  19. data/app/views/educode_sales/businesses/time_line.html.erb +1 -1
  20. data/app/views/educode_sales/customers/edit.html.erb +732 -22
  21. data/app/views/educode_sales/customers/index.html.erb +19 -19
  22. data/app/views/educode_sales/customers/index.json.jbuilder +3 -3
  23. data/app/views/educode_sales/customers/new.html.erb +710 -27
  24. data/app/views/educode_sales/customers/new_department.html.erb +1 -0
  25. data/app/views/educode_sales/customers/show_follow.html.erb +5 -2
  26. data/app/views/educode_sales/customers/show_follow_record.html.erb +5 -4
  27. data/app/views/educode_sales/follow_ups/index.json.jbuilder +1 -0
  28. data/app/views/educode_sales/money_plans/index.html.erb +183 -0
  29. data/app/views/educode_sales/money_plans/index.json.jbuilder +20 -0
  30. data/app/views/educode_sales/places/index.html.erb +64 -0
  31. data/app/views/educode_sales/plans/_monthPlan.html.erb +2 -1
  32. data/app/views/educode_sales/plans/_weekPlan.html.erb +2 -1
  33. data/app/views/educode_sales/roles/edit.html.erb +9 -1
  34. data/app/views/educode_sales/sale_trends/trends.html.erb +93 -13
  35. data/app/views/educode_sales/sale_trends/trends.json.jbuilder +3 -14
  36. data/app/views/educode_sales/sales/index.html.erb +25 -17
  37. data/app/views/educode_sales/sales/index.json.jbuilder +20 -2
  38. data/app/views/educode_sales/sales/operations.json.jbuilder +2 -2
  39. data/app/views/educode_sales/teachers/index.html.erb +4 -11
  40. data/app/views/educode_sales/teachers/index.json.jbuilder +1 -1
  41. data/app/views/layouts/educode_sales/application.html.erb +13 -2
  42. data/config/routes.rb +2 -0
  43. data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb +3 -0
  44. data/db/migrate/20211220102720_add_position_to_commons.rb +12 -0
  45. data/db/migrate/20211221075146_add_school_id_to_educode_sales_businesses.rb +8 -0
  46. data/lib/educode_sales/version.rb +1 -1
  47. metadata +8 -2
data/app/views/educode_sales/businesses/show_follow.html.erb CHANGED
@@ -12,7 +12,7 @@
12
12
  <span class="table-label pull-right" style="padding-right: 20px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
13
13
  </div>
14
14
  </script>
15
- <div class="edit-table tool">
15
+ <div class=" tool">
16
16
  <div class="z-index">
17
17
  <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
18
18
  </div>
@@ -121,6 +121,7 @@
121
121
  field: 'description',
122
122
  width: 120,
123
123
  title: '最新进展',
124
+ templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
124
125
  },
125
126
  {
126
127
  field: 'invitation_at',
data/app/views/educode_sales/businesses/time_line.html.erb CHANGED
@@ -43,7 +43,7 @@
43
43
  function demo(){
44
44
  layer.closeAll()
45
45
  business_id = parent.business_id
46
- var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + parent.business_id);
46
+ var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + business_id);
47
47
  var openWH = miniPage.getOpenWidthHeight();
48
48
  sindex = layer.open({
49
49
  title: '商机列表/'+ parent.business_name +'的跟进记录',