educode_sales 0.3.5 → 0.3.9

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 (100) hide show
  1. checksums.yaml +5 -5
  2. data/app/assets/javascripts/educode_sales/extent/xm-select.js +8 -0
  3. data/app/assets/stylesheets/educode_sales/public.css +2 -1
  4. data/app/controllers/educode_sales/businesses_controller.rb +26 -10
  5. data/app/controllers/educode_sales/follow_ups_controller.rb +10 -1
  6. data/app/controllers/educode_sales/home_controller.rb +10 -1
  7. data/app/controllers/educode_sales/import_teachers_controller.rb +68 -0
  8. data/app/controllers/educode_sales/key_person_controller.rb +1 -1
  9. data/app/controllers/educode_sales/places_controller.rb +1 -0
  10. data/app/controllers/educode_sales/plans_controller.rb +1 -1
  11. data/app/controllers/educode_sales/sale_trends_controller.rb +8 -6
  12. data/app/controllers/educode_sales/sales_controller.rb +1 -0
  13. data/app/controllers/educode_sales/teachers_controller.rb +17 -5
  14. data/app/models/educode_sales/assign_follow_up.rb +6 -0
  15. data/app/models/educode_sales/follow_up.rb +1 -0
  16. data/app/models/educode_sales/key_person.rb +1 -1
  17. data/app/views/educode_sales/activities/edit.html.erb +1 -2
  18. data/app/views/educode_sales/activities/index.html.erb +38 -18
  19. data/app/views/educode_sales/activities/new.html.erb +1 -1
  20. data/app/views/educode_sales/activities/show_teachers.html.erb +12 -12
  21. data/app/views/educode_sales/businesses/edit.html.erb +15 -4
  22. data/app/views/educode_sales/businesses/edit_follow_record.html.erb +54 -6
  23. data/app/views/educode_sales/businesses/edit_plan.html.erb +4 -4
  24. data/app/views/educode_sales/businesses/index.html.erb +169 -23
  25. data/app/views/educode_sales/businesses/index.json.jbuilder +4 -0
  26. data/app/views/educode_sales/businesses/new.html.erb +13 -3
  27. data/app/views/educode_sales/businesses/new_follow_record.html.erb +53 -16
  28. data/app/views/educode_sales/businesses/show_follow.html.erb +25 -19
  29. data/app/views/educode_sales/businesses/show_follow_record.html.erb +7 -1
  30. data/app/views/educode_sales/businesses/show_keys.html.erb +1 -1
  31. data/app/views/educode_sales/commons/edit.html.erb +3 -4
  32. data/app/views/educode_sales/commons/index.html.erb +4 -4
  33. data/app/views/educode_sales/commons/new.html.erb +1 -1
  34. data/app/views/educode_sales/follow_ups/teachers.json.jbuilder +3 -2
  35. data/app/views/educode_sales/home/sales_staff.json.jbuilder +9 -0
  36. data/app/views/educode_sales/operation_plans/_monthPlan.html.erb +9 -9
  37. data/app/views/educode_sales/operation_plans/_monthly.html.erb +10 -9
  38. data/app/views/educode_sales/operation_plans/_weekPlan.html.erb +9 -8
  39. data/app/views/educode_sales/operation_plans/_weekly.html.erb +11 -9
  40. data/app/views/educode_sales/operation_plans/edit_month.html.erb +1 -1
  41. data/app/views/educode_sales/operation_plans/edit_week.html.erb +2 -1
  42. data/app/views/educode_sales/operation_plans/new_month.html.erb +1 -1
  43. data/app/views/educode_sales/operation_plans/new_monthly.html.erb +7 -7
  44. data/app/views/educode_sales/operation_plans/new_week.html.erb +1 -1
  45. data/app/views/educode_sales/operation_plans/new_weekly.html.erb +7 -7
  46. data/app/views/educode_sales/operation_reports/audit.html.erb +3 -3
  47. data/app/views/educode_sales/operation_reports/edit.html.erb +34 -8
  48. data/app/views/educode_sales/operation_reports/show.html.erb +6 -6
  49. data/app/views/educode_sales/operations/trends.html.erb +2 -2
  50. data/app/views/educode_sales/places/edit.html.erb +1 -3
  51. data/app/views/educode_sales/places/index.html.erb +6 -6
  52. data/app/views/educode_sales/places/index.json.jbuilder +3 -3
  53. data/app/views/educode_sales/places/new.html.erb +1 -2
  54. data/app/views/educode_sales/plans/_monthPlan.html.erb +9 -9
  55. data/app/views/educode_sales/plans/_monthly.html.erb +9 -8
  56. data/app/views/educode_sales/plans/_weekPlan.html.erb +9 -8
  57. data/app/views/educode_sales/plans/_weekly.html.erb +10 -8
  58. data/app/views/educode_sales/plans/edit_month.html.erb +1 -1
  59. data/app/views/educode_sales/plans/edit_week.html.erb +1 -1
  60. data/app/views/educode_sales/plans/edit_weekly.html.erb +7 -7
  61. data/app/views/educode_sales/plans/new_month.html.erb +3 -3
  62. data/app/views/educode_sales/plans/new_monthly.html.erb +7 -7
  63. data/app/views/educode_sales/plans/new_week.html.erb +1 -1
  64. data/app/views/educode_sales/plans/new_weekly.html.erb +7 -7
  65. data/app/views/educode_sales/roles/edit.html.erb +2 -3
  66. data/app/views/educode_sales/roles/index.html.erb +6 -7
  67. data/app/views/educode_sales/roles/new.html.erb +1 -1
  68. data/app/views/educode_sales/sale_reports/audit.html.erb +3 -3
  69. data/app/views/educode_sales/sale_reports/edit.html.erb +33 -7
  70. data/app/views/educode_sales/sale_reports/show.html.erb +2 -2
  71. data/app/views/educode_sales/sale_trends/trends.html.erb +2 -2
  72. data/app/views/educode_sales/sales/index.html.erb +4 -4
  73. data/app/views/educode_sales/sales/index.json.jbuilder +2 -2
  74. data/app/views/educode_sales/sales/operations.html.erb +4 -4
  75. data/app/views/educode_sales/sales/school.html.erb +1 -1
  76. data/app/views/educode_sales/sales/trends.html.erb +2 -6
  77. data/app/views/educode_sales/sales/xschool.html.erb +1 -1
  78. data/app/views/educode_sales/sessions/login.html.erb +2 -2
  79. data/app/views/educode_sales/staffs/edit.html.erb +1 -1
  80. data/app/views/educode_sales/staffs/index.html.erb +6 -6
  81. data/app/views/educode_sales/staffs/new.html.erb +2 -2
  82. data/app/views/educode_sales/teachers/add_courses.html.erb +4 -5
  83. data/app/views/educode_sales/teachers/add_event.html.erb +1 -1
  84. data/app/views/educode_sales/teachers/add_keys.html.erb +58 -13
  85. data/app/views/educode_sales/teachers/edit.html.erb +6 -4
  86. data/app/views/educode_sales/teachers/edit_follow_record.html.erb +1 -1
  87. data/app/views/educode_sales/teachers/import.html.erb +40 -0
  88. data/app/views/educode_sales/teachers/index.html.erb +151 -38
  89. data/app/views/educode_sales/teachers/new.html.erb +4 -4
  90. data/app/views/educode_sales/teachers/new_follow_record.html.erb +1 -1
  91. data/app/views/educode_sales/teachers/search_new.html.erb +1 -1
  92. data/app/views/educode_sales/teachers/show_class.html.erb +1 -1
  93. data/app/views/educode_sales/teachers/show_follow.html.erb +14 -14
  94. data/app/views/layouts/educode_sales/application.html.erb +14 -14
  95. data/config/routes.rb +5 -0
  96. data/db/migrate/20211009031109_add_tel_key_peoples.rb +5 -0
  97. data/db/migrate/20211009063423_add_source_businesses.rb +5 -0
  98. data/db/migrate/20211013060712_create_educode_sales_assign_follow_ups.rb +10 -0
  99. data/lib/educode_sales/version.rb +1 -1
  100. metadata +15 -8
@@ -9,7 +9,7 @@
9
9
  <div class="layui-inline">
10
10
  <label class="layui-form-label required">商机</label>
11
11
  <div class="layui-input-inline">
12
- <%= select_tag "business_id", options_for_select(@businesses, @business&.id), class: 'required' %>
12
+ <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
13
13
  </div>
14
14
  </div>
15
15
  <div class="layui-form-item layui-form-text">
@@ -64,7 +64,7 @@
64
64
  var parentIndex = layer.index;
65
65
 
66
66
  form.on('submit(add_month_plan)', function (data) {
67
- request.authPost("educode_sales/plans", data.field, function (res) {
67
+ request.authPost("missions/plans", data.field, function (res) {
68
68
  if (res.success == false) {
69
69
  layer.alert(res.msg)
70
70
  } else {
@@ -76,7 +76,7 @@
76
76
  parent.table.reload('newmonthlyTable')
77
77
  } else if (parent.from_monthly) {
78
78
  parent.table.reload('monthlyTable')
79
- }
79
+ }
80
80
  else {
81
81
  parent.table.reload('businesses_table')
82
82
  }
@@ -71,7 +71,7 @@
71
71
 
72
72
  form.on('submit(add_monthly_report)', function (data) {
73
73
  data.field.month = true;
74
- request.authPost("educode_sales/sale_reports", data.field, function (res) {
74
+ request.authPost("missions/sale_reports", data.field, function (res) {
75
75
  if (res.success == false) {
76
76
  layer.alert(res.msg)
77
77
  } else {
@@ -86,7 +86,7 @@
86
86
 
87
87
  table.render({
88
88
  elem: '#newmonthlyTable',
89
- url: '/educode_sales/plans/my_month',
89
+ url: '/missions/plans/my_month',
90
90
  toolbar: '#newMonthlyToolbar',
91
91
  defaultToolbar: [],
92
92
  cols: [
@@ -153,7 +153,7 @@
153
153
  table.on('toolbar(newmonthlyTable)', function (obj) {
154
154
  if (obj.event === 'add') { // 监听添加操作
155
155
  from_weekly = true;
156
- var content = miniPage.getHrefContent('/educode_sales/plans/new_month');
156
+ var content = miniPage.getHrefContent('/missions/plans/new_month');
157
157
  var openWH = miniPage.getOpenWidthHeight();
158
158
  from_new_monthly = true
159
159
  sindex = layer.open({
@@ -180,13 +180,13 @@
180
180
  id = data.id
181
181
  if (obj.event === 'delete') {
182
182
  layer.confirm('确定删除ID为' + id +" 的月计划", function (index) {
183
- request.delete('educode_sales/plans/' + id, {}, function (res) {
183
+ request.delete('missions/plans/' + id, {}, function (res) {
184
184
  layer.close(index);
185
185
  table.reload("newmonthlyTable")
186
186
  })
187
187
  });
188
188
  } else if (obj.event === 'show') {
189
- content = miniPage.getHrefContent('/educode_sales/plans/show_month?id='+ id);
189
+ content = miniPage.getHrefContent('/missions/plans/show_month?id='+ id);
190
190
  openWH = miniPage.getOpenWidthHeight();
191
191
  index = layer.open({
192
192
  title: '查看',
@@ -205,7 +205,7 @@
205
205
  } else if (obj.event === 'edit') {
206
206
  plan_id = id;
207
207
  from_monthly = true;
208
- content = miniPage.getHrefContent('/educode_sales/plans/edit_month?id='+ id);
208
+ content = miniPage.getHrefContent('/missions/plans/edit_month?id='+ id);
209
209
  openWH = miniPage.getOpenWidthHeight();
210
210
  sindex = layer.open({
211
211
  title: '编辑',
@@ -223,7 +223,7 @@
223
223
  return false;
224
224
  } else if (obj.event === 'show_follow') {
225
225
  id = data.business_id
226
- content = miniPage.getHrefContent('/educode_sales/businesses/show_follow?id=' + data.business_id);
226
+ content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
227
227
  openWH = miniPage.getOpenWidthHeight();
228
228
  index = layer.open({
229
229
  title: '商机列表/'+ data.business_name + '的跟进记录',
@@ -73,7 +73,7 @@
73
73
  var parentIndex = layer.index;
74
74
 
75
75
  form.on('submit(add_week_plan)', function (data) {
76
- request.authPost("educode_sales/plans", data.field, function (res) {
76
+ request.authPost("missions/plans", data.field, function (res) {
77
77
  if (res.success == false) {
78
78
  layer.alert(res.msg)
79
79
  } else {
@@ -92,7 +92,7 @@
92
92
 
93
93
 
94
94
  form.on('submit(add_weekly_report)', function (data) {
95
- request.authPost("educode_sales/sale_reports", data.field, function (res) {
95
+ request.authPost("missions/sale_reports", data.field, function (res) {
96
96
  if (res.success == false) {
97
97
  layer.alert(res.msg)
98
98
  } else {
@@ -108,7 +108,7 @@
108
108
 
109
109
  table.render({
110
110
  elem: '#newWeeklyTable',
111
- url: '/educode_sales/plans/my_week',
111
+ url: '/missions/plans/my_week',
112
112
  toolbar: '#newWeeklyToolbar',
113
113
  defaultToolbar: [],
114
114
  cols: [
@@ -180,7 +180,7 @@
180
180
  table.on('toolbar(newWeeklyTable)', function (obj) {
181
181
  if (obj.event === 'add') { // 监听添加操作
182
182
  from_weekly = true;
183
- var content = miniPage.getHrefContent('/educode_sales/plans/new_week');
183
+ var content = miniPage.getHrefContent('/missions/plans/new_week');
184
184
  var openWH = miniPage.getOpenWidthHeight();
185
185
  sindex = layer.open({
186
186
  title: '添加计划',
@@ -206,13 +206,13 @@
206
206
  id = data.id
207
207
  if (obj.event === 'delete') {
208
208
  layer.confirm('确定删除ID为' + id +" 的周计划", function (index) {
209
- request.delete('educode_sales/plans/' + id, {}, function (res) {
209
+ request.delete('missions/plans/' + id, {}, function (res) {
210
210
  layer.close(index);
211
211
  table.reload("newWeeklyTable")
212
212
  })
213
213
  });
214
214
  } else if (obj.event === 'show') {
215
- content = miniPage.getHrefContent('/educode_sales/plans/show_week?id='+ id);
215
+ content = miniPage.getHrefContent('/missions/plans/show_week?id='+ id);
216
216
  openWH = miniPage.getOpenWidthHeight();
217
217
  index = layer.open({
218
218
  title: '查看',
@@ -231,7 +231,7 @@
231
231
  } else if (obj.event === 'edit') {
232
232
  plan_id = id;
233
233
  from_sales = true;
234
- content = miniPage.getHrefContent('/educode_sales/plans/edit_week?id='+ id);
234
+ content = miniPage.getHrefContent('/missions/plans/edit_week?id='+ id);
235
235
  openWH = miniPage.getOpenWidthHeight();
236
236
  sindex = layer.open({
237
237
  title: '编辑',
@@ -249,7 +249,7 @@
249
249
  return false;
250
250
  } else if (obj.event === 'show_follow') {
251
251
  id = data.business_id
252
- content = miniPage.getHrefContent('/educode_sales/businesses/show_follow?id=' + data.business_id);
252
+ content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
253
253
  openWH = miniPage.getOpenWidthHeight();
254
254
  index = layer.open({
255
255
  title: '商机列表/'+ data.business_name + '的跟进记录',
@@ -81,7 +81,7 @@
81
81
  form.render();
82
82
  form.on('submit(role)', function (data) {
83
83
  Rails.ajax({
84
- url: '/educode_sales/roles/'+ parent.role_id,
84
+ url: '/missions/roles/'+ parent.role_id,
85
85
  type: 'PUT',
86
86
  headers: {
87
87
  'Content-Type': 'application/json',
@@ -101,9 +101,8 @@
101
101
  return false;
102
102
  })
103
103
  form.on('submit(data)', function (data) {
104
- console.log('data', data)
105
104
  Rails.ajax({
106
- url: '/educode_sales/roles/'+ parent.role_id + "/view",
105
+ url: '/missions/roles/'+ parent.role_id + "/view",
107
106
  type: 'PUT',
108
107
  headers: {
109
108
  'Content-Type': 'application/json',
@@ -22,7 +22,7 @@
22
22
 
23
23
  table.render({
24
24
  elem: '#role',
25
- url: '/educode_sales/roles',
25
+ url: '/missions/roles',
26
26
  cellMinWidth: 80,
27
27
  toolbar: '#role_tab',
28
28
  defaultToolbar: [],
@@ -47,8 +47,8 @@
47
47
  align: "center"
48
48
  }]
49
49
  ],
50
- height: 700,
51
50
  limit: 20,
51
+ limits: [10,15,20,30,40,50,60,70,80,90],
52
52
  page: true
53
53
  })
54
54
 
@@ -61,8 +61,7 @@
61
61
  var value = obj.value //得到修改后的值
62
62
  ,data = obj.data //得到所在行所有键值
63
63
  ,field = obj.field; //得到字段
64
- console.log(obj.data);
65
- request.authPut('educode_sales/roles/' + data.id + '/update_role/', data,
64
+ request.authPut('missions/roles/' + data.id + '/update_role/', data,
66
65
  function(res) {
67
66
  if (res.success) {
68
67
  // table.reload('role');
@@ -80,7 +79,7 @@
80
79
 
81
80
  table.on('toolbar(role_filter)', function (obj) {
82
81
  if (obj.event === 'add') { // 监听添加操作
83
- var content = miniPage.getHrefContent('/educode_sales/roles/new');
82
+ var content = miniPage.getHrefContent('/missions/roles/new');
84
83
  var openWH = miniPage.getOpenWidthHeight();
85
84
 
86
85
  index = layer.open({
@@ -108,7 +107,7 @@
108
107
  role_id = data.id;
109
108
  if (obj.event === 'edit') {
110
109
 
111
- var content = miniPage.getHrefContent('/educode_sales/roles/' + data.id + '/edit');
110
+ var content = miniPage.getHrefContent('/missions/roles/' + data.id + '/edit');
112
111
  var openWH = miniPage.getOpenWidthHeight();
113
112
 
114
113
  index = layer.open({
@@ -127,7 +126,7 @@
127
126
  return false;
128
127
  } else if (obj.event === 'delete') {
129
128
  layer.confirm('确定删除' + data.name, function (index) {
130
- request.delete('educode_sales/roles/'+ data.id, {}, function(res) {
129
+ request.delete('missions/roles/'+ data.id, {}, function(res) {
131
130
  layer.close(index);
132
131
  table.reload("role")
133
132
  })
@@ -35,7 +35,7 @@
35
35
 
36
36
  //监听提交
37
37
  form.on('submit(saveBtn)', function (data) {
38
- request.authPost("educode_sales/roles", data.field, function (res) {
38
+ request.authPost("missions/roles", data.field, function (res) {
39
39
  if (res.success == false) {
40
40
  layer.alert(res.msg)
41
41
  } else {
@@ -104,7 +104,7 @@
104
104
  res.field.level2_score = level2_score;
105
105
  res.field.level3_score = level3_score;
106
106
  console.log(res.field, 444)
107
- request.authPut("educode_sales/sale_reports/" + parent.report_id + "/update_audit", res.field, function (res) {
107
+ request.authPut("missions/sale_reports/" + parent.report_id + "/update_audit", res.field, function (res) {
108
108
  if (res.success == false) {
109
109
  layer.alert(res.msg)
110
110
  } else {
@@ -126,7 +126,7 @@
126
126
  var data = obj.data;
127
127
  if (obj.event === 'show_follow') {
128
128
  id = data.business_id
129
- content = miniPage.getHrefContent('/educode_sales/businesses/show_follow?id=' + data.business_id);
129
+ content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
130
130
  openWH = miniPage.getOpenWidthHeight();
131
131
  index = layer.open({
132
132
  title: '商机列表/' + data.business_name + '的跟进记录',
@@ -146,7 +146,7 @@
146
146
 
147
147
  table.render({
148
148
  elem: '#showWeeklyTable',
149
- url: '/educode_sales/sale_reports/' + "<%= @sale_report.id%>" + '/plans',
149
+ url: '/missions/sale_reports/' + "<%= @sale_report.id%>" + '/plans',
150
150
  defaultToolbar: [],
151
151
  cols: [
152
152
  [{
@@ -1,7 +1,12 @@
1
1
  <script type="text/html" id="newWeeklyToolbar">
2
2
  <div class="layui-btn-container">
3
+ {{# if(parent.from_edit_monthly){ }}
4
+ <span class="table-label">本月计划列表</span>
5
+ <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add_month"> 添加计划</button>
6
+ {{# } else { }}
3
7
  <span class="table-label">本周计划列表</span>
4
8
  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
9
+ {{# } }}
5
10
  </div>
6
11
  </script>
7
12
  <form class="layui-form layui-form-pane">
@@ -58,7 +63,7 @@
58
63
 
59
64
 
60
65
  form.on('submit(update_weekly_report)', function (data) {
61
- request.authPut("educode_sales/sale_reports/<%= @sale_report.id%>", data.field, function (res) {
66
+ request.authPut("missions/sale_reports/<%= @sale_report.id%>", data.field, function (res) {
62
67
  if (res.success == false) {
63
68
  layer.alert(res.msg)
64
69
  } else {
@@ -78,7 +83,7 @@
78
83
 
79
84
  table.render({
80
85
  elem: '#newWeeklyTable',
81
- url: '/educode_sales/sale_reports/' + "<%= @sale_report.id%>" + '/plans',
86
+ url: '/missions/sale_reports/' + "<%= @sale_report.id%>" + '/plans',
82
87
  toolbar: '#newWeeklyToolbar',
83
88
  defaultToolbar: [],
84
89
  cols: [
@@ -149,7 +154,7 @@
149
154
  table.on('toolbar(newWeeklyTable)', function (obj) {
150
155
  if (obj.event === 'add') { // 监听添加操作
151
156
  from_weekly = true;
152
- var content = miniPage.getHrefContent('/educode_sales/plans/new_week');
157
+ var content = miniPage.getHrefContent('/missions/plans/new_week');
153
158
  var openWH = miniPage.getOpenWidthHeight();
154
159
  sindex = layer.open({
155
160
  title: '添加计划',
@@ -168,6 +173,27 @@
168
173
  $(window).on("resize", function () {
169
174
  layer.full(sindex);
170
175
  });
176
+ }else if (obj.event === 'add_month') { // 监听添加操作
177
+ from_weekly = true;
178
+ var content = miniPage.getHrefContent('/missions/plans/new_month');
179
+ var openWH = miniPage.getOpenWidthHeight();
180
+ sindex = layer.open({
181
+ title: '添加计划',
182
+ type: 1,
183
+ shade: 0.2,
184
+ maxmin: true,
185
+ shadeClose: true,
186
+ area: [openWH[0] + 'px', openWH[1] + 'px'],
187
+ offset: [openWH[2] + 'px', openWH[3] + 'px'],
188
+ content: content,
189
+ success: function (layero, index) {
190
+ // 重新渲染弹层中的下拉选择框select
191
+ form.render('select');
192
+ }
193
+ });
194
+ $(window).on("resize", function () {
195
+ layer.full(sindex);
196
+ });
171
197
  }
172
198
  });
173
199
  table.on('tool(newWeeklyTable)', function (obj) {
@@ -175,13 +201,13 @@
175
201
  id = data.id
176
202
  if (obj.event === 'delete') {
177
203
  layer.confirm('确定删除ID为' + id + " 的周计划", function (index) {
178
- request.delete('educode_sales/plans/' + id, {}, function (res) {
204
+ request.delete('missions/plans/' + id, {}, function (res) {
179
205
  layer.close(index);
180
206
  table.reload("newWeeklyTable")
181
207
  })
182
208
  });
183
209
  } else if (obj.event === 'show') {
184
- content = miniPage.getHrefContent('/educode_sales/plans/show_week?id=' + id);
210
+ content = miniPage.getHrefContent('/missions/plans/show_week?id=' + id);
185
211
  openWH = miniPage.getOpenWidthHeight();
186
212
  index = layer.open({
187
213
  title: '查看',
@@ -200,7 +226,7 @@
200
226
  } else if (obj.event === 'edit') {
201
227
  plan_id = id;
202
228
  from_sales = true;
203
- content = miniPage.getHrefContent('/educode_sales/plans/edit_week?id=' + id);
229
+ content = miniPage.getHrefContent('/missions/plans/edit_week?id=' + id);
204
230
  openWH = miniPage.getOpenWidthHeight();
205
231
  sindex = layer.open({
206
232
  title: '编辑',
@@ -218,7 +244,7 @@
218
244
  return false;
219
245
  } else if (obj.event === 'show_follow') {
220
246
  id = data.business_id
221
- content = miniPage.getHrefContent('/educode_sales/businesses/show_follow?id=' + data.business_id);
247
+ content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
222
248
  openWH = miniPage.getOpenWidthHeight();
223
249
  index = layer.open({
224
250
  title: '商机列表/' + data.business_name + '的跟进记录',
@@ -86,7 +86,7 @@
86
86
  var data = obj.data;
87
87
  if (obj.event === 'show_follow') {
88
88
  id = data.business_id
89
- content = miniPage.getHrefContent('/educode_sales/businesses/show_follow?id=' + data.business_id);
89
+ content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
90
90
  openWH = miniPage.getOpenWidthHeight();
91
91
  index = layer.open({
92
92
  title: '商机列表/'+ data.business_name + '的跟进记录',
@@ -106,7 +106,7 @@
106
106
 
107
107
  table.render({
108
108
  elem: '#showWeeklyTable',
109
- url: '/educode_sales/sale_reports/' + "<%= @sale_report.id%>"+ '/plans',
109
+ url: '/missions/sale_reports/' + "<%= @sale_report.id%>"+ '/plans',
110
110
  defaultToolbar: [],
111
111
  cols: [
112
112
  [
@@ -193,7 +193,7 @@
193
193
  data[el] = this.value;
194
194
  var self = this;
195
195
  data['year'] = year;
196
- request.post( 'educode_sales/sale_trends/sale_trends',
196
+ request.post( 'missions/sale_trends/sale_trends',
197
197
  data,
198
198
  function(res) {
199
199
  $("#" + el + "_field").addClass("layui-hide");
@@ -208,7 +208,7 @@
208
208
  form.on('select(year)', function(data){
209
209
  console.log(data, )
210
210
  year = data.value
211
- window.location.href = "/educode_sales/sale_trends/trends?year=" + data.value
211
+ window.location.href = "/missions/sale_trends/trends?year=" + data.value
212
212
  })
213
213
 
214
214
  editForm("chance_money");
@@ -10,12 +10,12 @@
10
10
  </script>
11
11
  <script type="text/html" id="business_a">
12
12
  <div class="layui-text">
13
- <a href="/educode_sales/businesses?clazz_id={{d.a_clazz_id}}&staff_id={{d.id}}">{{d.business_a}}</a>
13
+ <a href="/missions/businesses?clazz_id={{d.a_clazz_id}}&staff_id={{d.id}}">{{d.business_a}}</a>
14
14
  </div>
15
15
  </script>
16
16
  <script type="text/html" id="business_b">
17
17
  <div class="layui-text">
18
- <a href="/educode_sales/businesses?clazz_id={{d.b_clazz_id}}&staff_id={{d.id}}">{{d.business_b}}</a>
18
+ <a href="/missions/businesses?clazz_id={{d.b_clazz_id}}&staff_id={{d.id}}">{{d.business_b}}</a>
19
19
  </div>
20
20
  </script>
21
21
  <script>
@@ -24,7 +24,7 @@
24
24
 
25
25
  table.render({
26
26
  elem: '#table',
27
- url: '/educode_sales/sales',
27
+ url: '/missions/sales',
28
28
  cellMinWidth: 80,
29
29
  cols: [
30
30
  [{
@@ -59,8 +59,8 @@
59
59
  }
60
60
  ]
61
61
  ],
62
- height: 700,
63
62
  limit: 20,
63
+ limits: [10,15,20,30,40,50,60,70,80,90],
64
64
  page: true
65
65
  });
66
66
  });
@@ -6,8 +6,8 @@ json.data do
6
6
  json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
7
7
  json.business_a 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 = ?", @a_clazz&.id).count
8
8
  json.business_b 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 = ?", @b_clazz&.id).count
9
- json.goal 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.stage_id in (?)", @step_ids).sum(:total_amount)
10
- json.return_money d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").sum("educode_sales_businesses.return_money")
9
+ json.goal 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 != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
10
+ json.return_money 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 != ?", @x).sum("educode_sales_businesses.return_money").round(2)
11
11
  json.a_clazz_id @a_clazz&.id
12
12
  json.b_clazz_id @b_clazz&.id
13
13
  end
@@ -30,7 +30,7 @@
30
30
 
31
31
  table.render({
32
32
  elem: '#oper_table',
33
- url: '/educode_sales/sales/operations',
33
+ url: '/missions/sales/operations',
34
34
  defaultToolbar: [],
35
35
  cols: [
36
36
  [{
@@ -61,8 +61,8 @@
61
61
  },
62
62
  ]
63
63
  ],
64
- height: 700,
65
64
  limit: 20,
65
+ limits: [10,15,20,30,40,50,60,70,80,90],
66
66
  page: true
67
67
  });
68
68
 
@@ -72,7 +72,7 @@
72
72
  id = data.id
73
73
  if (obj.event === 'school') {
74
74
  console.log("aa");
75
- var content = miniPage.getHrefContent('/educode_sales/sales/school');
75
+ var content = miniPage.getHrefContent('/missions/sales/school');
76
76
  var openWH = miniPage.getOpenWidthHeight();
77
77
  staff_id = data.id
78
78
  sindex = layer.open({
@@ -90,7 +90,7 @@
90
90
  });
91
91
  return false;
92
92
  } else if (obj.event === 'xschool') {
93
- var content = miniPage.getHrefContent('/educode_sales/sales/xschool');
93
+ var content = miniPage.getHrefContent('/missions/sales/xschool');
94
94
  var openWH = miniPage.getOpenWidthHeight();
95
95
  staff_id = data.id;
96
96
  sindex = layer.open({
@@ -5,7 +5,7 @@
5
5
  table = layui.table
6
6
  table.render({
7
7
  elem: '#follow_up_schoolTable',
8
- url: '/educode_sales/staffs/' + parent.staff_id + "/follow_up_schools",
8
+ url: '/missions/staffs/' + parent.staff_id + "/follow_up_schools",
9
9
  defaultToolbar: [],
10
10
  cols: [
11
11
  [
@@ -177,7 +177,6 @@
177
177
  }
178
178
  })
179
179
  $("#" + el).blur(function () {
180
- console.log(this.value)
181
180
  if (this.value == '') {
182
181
  layer.msg("不能为空")
183
182
  } else {
@@ -185,13 +184,11 @@
185
184
  data[el] = this.value;
186
185
  var self = this;
187
186
  data['year'] = year;
188
- console.log(data, $("#years").value, year)
189
- request.post( '/educode_sales/sales/sale_trends',
187
+ request.post( '/missions/sales/sale_trends',
190
188
  data,
191
189
  function(res) {
192
190
  $("#" + el + "_field").addClass("layui-hide");
193
191
  $("#" + el + "_value").removeClass("layui-hide");
194
- console.log(self.value)
195
192
  $("#" + el + "_value")[0].innerText = self.value + "万";
196
193
  }
197
194
  )
@@ -200,9 +197,8 @@
200
197
  }
201
198
 
202
199
  form.on('select(year)', function(data){
203
- console.log(data, )
204
200
  year = data.value
205
- window.location.href = "/educode_sales/sales/trends?year=" + data.value
201
+ window.location.href = "/missions/sales/trends?year=" + data.value
206
202
  })
207
203
 
208
204
  editForm("chance_money");
@@ -7,7 +7,7 @@
7
7
  miniPage = layui.miniPage;
8
8
  table.render({
9
9
  elem: '#follow_up_departmentsTable',
10
- url: '/educode_sales/staffs/' + parent.staff_id + "/follow_up_departments",
10
+ url: '/missions/staffs/' + parent.staff_id + "/follow_up_departments",
11
11
  defaultToolbar: [],
12
12
  cols: [
13
13
  [
@@ -67,7 +67,7 @@
67
67
  }
68
68
 
69
69
  $.ajax({
70
- url: '/educode_sales/sessions',
70
+ url: '/missions/sessions',
71
71
  method: 'POST',
72
72
  dataType: 'json',
73
73
  headers: {
@@ -75,7 +75,7 @@
75
75
  },
76
76
  data: { account: data.username, password: data.password},
77
77
  success: function(data){
78
- window.location = '/educode_sales';
78
+ window.location = '/missions';
79
79
  },
80
80
  error: function(res){
81
81
  layer.msg(res.responseJSON.msg);
@@ -97,7 +97,7 @@
97
97
  return false;
98
98
  }
99
99
  data.field['area_ids'] = area_ids;
100
- request.authPut("educode_sales/staffs/" + parent.staff_id, data.field, function (res) {
100
+ request.authPut("missions/staffs/" + parent.staff_id, data.field, function (res) {
101
101
  console.log(res.success == false)
102
102
  if (res.success == false) {
103
103
  layer.alert(res.msg)
@@ -24,7 +24,7 @@
24
24
  table = layui.table
25
25
  table.render({
26
26
  elem: '#staff_filter',
27
- url: '/educode_sales/staffs',
27
+ url: '/missions/staffs',
28
28
  toolbar: '#staff_topbar',
29
29
  defaultToolbar: [],
30
30
  cols: [
@@ -72,15 +72,15 @@
72
72
  }
73
73
  ]
74
74
  ],
75
- height: 700,
76
75
  limit: 20,
76
+ limits: [10,15,20,30,40,50,60,70,80,90],
77
77
  page: true,
78
78
  skin: 'line'
79
79
  });
80
80
 
81
81
  table.on('toolbar(staff_filter)', function (obj) {
82
82
  if (obj.event === 'add') { // 监听添加操作
83
- var content = miniPage.getHrefContent('/educode_sales/staffs/new');
83
+ var content = miniPage.getHrefContent('/missions/staffs/new');
84
84
  var openWH = miniPage.getOpenWidthHeight();
85
85
  index = layer.open({
86
86
  title: '添加人员',
@@ -102,7 +102,7 @@
102
102
  staff_id = data.id;
103
103
  if (obj.event === 'edit') {
104
104
 
105
- var content = miniPage.getHrefContent('/educode_sales/staffs/' + data.id + '/edit');
105
+ var content = miniPage.getHrefContent('/missions/staffs/' + data.id + '/edit');
106
106
  var openWH = miniPage.getOpenWidthHeight();
107
107
 
108
108
  index = layer.open({
@@ -121,14 +121,14 @@
121
121
  return false;
122
122
  } else if (obj.event === 'disable') {
123
123
  layer.confirm('确定禁用' + data.name, function (index) {
124
- request.delete('educode_sales/staffs/'+ data.id + "/disable", {}, function(res) {
124
+ request.delete('missions/staffs/'+ data.id + "/disable", {}, function(res) {
125
125
  layer.close(index);
126
126
  table.reload("staff_filter")
127
127
  })
128
128
  });
129
129
  } else if (obj.event === 'delete') {
130
130
  layer.confirm('确定删除' + data.name, function (index) {
131
- request.delete('educode_sales/staffs/'+ data.id, {}, function(res) {
131
+ request.delete('missions/staffs/'+ data.id, {}, function(res) {
132
132
  layer.close(index);
133
133
  table.reload("staff_filter")
134
134
  })
@@ -43,7 +43,7 @@
43
43
  if (!value) {
44
44
  return cb([]);
45
45
  }
46
- request.get('educode_sales/search_users?q=' + value, {}, function(res) {
46
+ request.get('missions/search_users?q=' + value, {}, function(res) {
47
47
  return cb(res)
48
48
  })
49
49
  }
@@ -58,7 +58,7 @@
58
58
  if (ins.getValue() == "") {
59
59
  return layer.alert("请选择平台用户")
60
60
  }
61
- request.authPost("educode_sales/staffs", {id: ins.getValue()}, function (res) {
61
+ request.authPost("missions/staffs", {id: ins.getValue()}, function (res) {
62
62
  if (res.success == false) {
63
63
  layer.alert(res.msg)
64
64
  } else {