educode_sales 0.1.3 → 0.1.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 (85) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/educode_sales/app.css +1 -0
  3. data/app/controllers/educode_sales/activities_controller.rb +1 -1
  4. data/app/controllers/educode_sales/businesses_controller.rb +14 -9
  5. data/app/controllers/educode_sales/commons_controller.rb +1 -1
  6. data/app/controllers/educode_sales/follow_ups_controller.rb +3 -3
  7. data/app/controllers/educode_sales/operation_plans_controller.rb +7 -7
  8. data/app/controllers/educode_sales/operation_reports_controller.rb +2 -2
  9. data/app/controllers/educode_sales/places_controller.rb +1 -1
  10. data/app/controllers/educode_sales/plans_controller.rb +6 -6
  11. data/app/controllers/educode_sales/roles_controller.rb +1 -1
  12. data/app/controllers/educode_sales/sale_reports_controller.rb +2 -2
  13. data/app/controllers/educode_sales/sales_controller.rb +2 -2
  14. data/app/controllers/educode_sales/sessions_controller.rb +1 -0
  15. data/app/controllers/educode_sales/staffs_controller.rb +3 -3
  16. data/app/controllers/educode_sales/teacher_follows_controller.rb +2 -2
  17. data/app/controllers/educode_sales/teachers_controller.rb +5 -5
  18. data/app/models/educode_sales/common.rb +4 -0
  19. data/app/models/educode_sales/follow_up.rb +1 -1
  20. data/app/models/educode_sales/operation_plan.rb +0 -1
  21. data/app/models/educode_sales/sale_plan.rb +0 -1
  22. data/app/models/educode_sales/teacher.rb +11 -2
  23. data/app/views/educode_sales/activities/index.html.erb +24 -10
  24. data/app/views/educode_sales/activities/index.json.jbuilder +1 -1
  25. data/app/views/educode_sales/activities/show_teachers.html.erb +13 -7
  26. data/app/views/educode_sales/businesses/edit_follow_record.html.erb +3 -2
  27. data/app/views/educode_sales/businesses/edit_plan.html.erb +2 -1
  28. data/app/views/educode_sales/businesses/index.json.jbuilder +1 -0
  29. data/app/views/educode_sales/businesses/show_follow.html.erb +1 -0
  30. data/app/views/educode_sales/businesses/show_follow.json.jbuilder +1 -1
  31. data/app/views/educode_sales/businesses/unfinish_plans.json.jbuilder +1 -1
  32. data/app/views/educode_sales/commons/index.json.jbuilder +1 -1
  33. data/app/views/educode_sales/follow_ups/money_plans.json.jbuilder +1 -1
  34. data/app/views/educode_sales/follow_ups/teachers.json.jbuilder +1 -1
  35. data/app/views/educode_sales/operation_plans/_monthPlan.html.erb +5 -4
  36. data/app/views/educode_sales/operation_plans/_monthly.html.erb +4 -4
  37. data/app/views/educode_sales/operation_plans/_weekPlan.html.erb +9 -4
  38. data/app/views/educode_sales/operation_plans/_weekly.html.erb +4 -5
  39. data/app/views/educode_sales/operation_plans/edit_month.html.erb +3 -1
  40. data/app/views/educode_sales/operation_plans/index.html.erb +35 -5
  41. data/app/views/educode_sales/operation_plans/index.json.jbuilder +1 -1
  42. data/app/views/educode_sales/operation_plans/my_month.json.jbuilder +2 -2
  43. data/app/views/educode_sales/operation_plans/my_week.json.jbuilder +1 -1
  44. data/app/views/educode_sales/operation_plans/new_month.html.erb +3 -1
  45. data/app/views/educode_sales/operation_plans/new_monthly.html.erb +136 -30
  46. data/app/views/educode_sales/operation_plans/new_week.html.erb +4 -3
  47. data/app/views/educode_sales/operation_plans/new_weekly.html.erb +173 -81
  48. data/app/views/educode_sales/operation_reports/audit.html.erb +1 -1
  49. data/app/views/educode_sales/operation_reports/edit.html.erb +1 -1
  50. data/app/views/educode_sales/operation_reports/index.json.jbuilder +1 -1
  51. data/app/views/educode_sales/operation_reports/plans.json.jbuilder +1 -1
  52. data/app/views/educode_sales/operation_reports/show.html.erb +1 -1
  53. data/app/views/educode_sales/places/index.json.jbuilder +1 -1
  54. data/app/views/educode_sales/plans/_monthPlan.html.erb +10 -7
  55. data/app/views/educode_sales/plans/_monthly.html.erb +2 -2
  56. data/app/views/educode_sales/plans/_weekPlan.html.erb +7 -2
  57. data/app/views/educode_sales/plans/_weekly.html.erb +1 -1
  58. data/app/views/educode_sales/plans/edit_week.html.erb +1 -1
  59. data/app/views/educode_sales/plans/index.json.jbuilder +1 -1
  60. data/app/views/educode_sales/plans/my_month.json.jbuilder +1 -1
  61. data/app/views/educode_sales/plans/my_week.json.jbuilder +1 -1
  62. data/app/views/educode_sales/plans/new_monthly.html.erb +1 -1
  63. data/app/views/educode_sales/plans/new_week.html.erb +3 -1
  64. data/app/views/educode_sales/plans/new_weekly.html.erb +2 -1
  65. data/app/views/educode_sales/roles/index.json.jbuilder +1 -1
  66. data/app/views/educode_sales/sale_reports/audit.html.erb +1 -1
  67. data/app/views/educode_sales/sale_reports/edit.html.erb +1 -1
  68. data/app/views/educode_sales/sale_reports/index.json.jbuilder +1 -1
  69. data/app/views/educode_sales/sale_reports/plans.json.jbuilder +1 -1
  70. data/app/views/educode_sales/sale_reports/show.html.erb +1 -1
  71. data/app/views/educode_sales/sale_trends/trends.html.erb +1 -1
  72. data/app/views/educode_sales/sales/index.json.jbuilder +1 -1
  73. data/app/views/educode_sales/sales/operations.json.jbuilder +1 -1
  74. data/app/views/educode_sales/staffs/follow_up_departments.json.jbuilder +1 -1
  75. data/app/views/educode_sales/staffs/index.json.jbuilder +1 -1
  76. data/app/views/educode_sales/teachers/course_list.json.jbuilder +1 -0
  77. data/app/views/educode_sales/teachers/index.html.erb +3 -3
  78. data/app/views/educode_sales/teachers/index.json.jbuilder +4 -2
  79. data/app/views/educode_sales/teachers/new.html.erb +3 -5
  80. data/app/views/educode_sales/teachers/new_follow_record.html.erb +2 -0
  81. data/app/views/educode_sales/teachers/show_class.html.erb +6 -0
  82. data/app/views/educode_sales/teachers/show_follow.json.jbuilder +1 -1
  83. data/app/views/educode_sales/teachers/unfinish_plans.json.jbuilder +1 -1
  84. data/lib/educode_sales/version.rb +1 -1
  85. metadata +2 -2
data/app/views/educode_sales/operation_plans/new_weekly.html.erb CHANGED
@@ -8,7 +8,7 @@
8
8
  <div class="layui-form-item">
9
9
  <div class="layui-inline" style="margin:18px; font-weight: bold">
10
10
  <label>完成率:</label>
11
- <span><%= @rate %></span>
11
+ <span><%= @rate %>%</span>
12
12
  <%= hidden_field_tag 'finish_rate', @rate, {id: 'weekly_rate_hide'} %>
13
13
  </div>
14
14
  <div class="layui-inline" style="margin:18px; font-weight: bold">
@@ -35,13 +35,16 @@
35
35
  </form>
36
36
 
37
37
  <!--表格-->
38
- <table class="layui-hide" id="newWeeklyTable" lay-filter="currentWeekly"></table>
38
+ <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyToolbar"></table>
39
39
 
40
40
  <script type="text/html" id="currentWeekly">
41
41
  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
42
42
  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
43
43
  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
44
44
  </script>
45
+ <script type="text/html" id="show_follow_newWeekly">
46
+ <a href="javascript:void(0);" lay-event="show_follow_newWeekly" class="layui-table-link">{{ d.count }}</a>
47
+ </script>
45
48
  <script>
46
49
  layui.use(['rate', 'table', 'request', 'form', 'miniPage', 'jquery'], function () {
47
50
  var rate = layui.rate,
@@ -56,7 +59,7 @@
56
59
  if (res.success == false) {
57
60
  layer.alert(res.msg)
58
61
  } else {
59
- // layer.closeAll();
62
+ layer.closeAll();
60
63
  parent.table.reload('weeklyTable');
61
64
  layer.alert('添加成功')
62
65
  }
@@ -67,62 +70,63 @@
67
70
 
68
71
  table.render({
69
72
  elem: '#newWeeklyTable',
70
- // url: 'api/table.json',
73
+ url: '/educode_sales/operation_plans/my_week',
71
74
  toolbar: '#newWeeklyToolbar',
72
75
  defaultToolbar: [],
73
- cols: [
74
- [
75
- {
76
- field: 'id',
77
- width: 80,
78
- title: '序号'
79
- },
80
- {
81
- field: 'username',
82
- width: 100,
83
- title: '姓名'
84
- },
85
- {
86
- field: 'chance',
87
- width: 100,
88
- title: '教师姓名',
89
- },
90
- {
91
- field: 'company',
92
- width: 100,
93
- title: '单位'
94
- },
95
- {
96
- field: 'dep',
97
- width: 100,
98
- title: '部门'
99
- },
100
- {
101
- field: 'week',
102
- width: 100,
103
- title: '周次',
104
- },
105
- {
106
- field: 'plan',
107
- width: 300,
108
- title: '计划内容',
109
- },
110
- {
111
- field: 'follow',
112
- width: 100,
113
- title: '跟进',
114
- },
115
- {
116
- field: 'rate',
117
- width: 100,
118
- title: '完成率',
119
- },
120
- {
121
- field: 'updateTime',
122
- width: 150,
123
- title: '更新时间',
124
- sort: true,
125
- },
76
+ cols: [
77
+ [
78
+ {
79
+ field: 'id',
80
+ width: 80,
81
+ title: '序号'
82
+ },
83
+ {
84
+ field: 'staff',
85
+ width: 100,
86
+ title: '姓名'
87
+ },
88
+ {
89
+ field: 'teacher_name',
90
+ width: 100,
91
+ title: '教师姓名',
92
+ },
93
+ {
94
+ field: 'school',
95
+ width: 190,
96
+ title: '单位'
97
+ },
98
+ {
99
+ field: 'department',
100
+ width: 190,
101
+ title: '部门'
102
+ },
103
+ {
104
+ field: 'week',
105
+ width: 100,
106
+ title: '周次',
107
+ },
108
+ {
109
+ field: 'content',
110
+ width: 300,
111
+ title: '计划内容',
112
+ },
113
+ {
114
+ field: 'count',
115
+ width: 100,
116
+ title: '跟进',
117
+ templet: '#show_follow_newWeekly'
118
+ },
119
+ {
120
+ field: 'rate',
121
+ width: 100,
122
+ title: '完成率',
123
+ },
124
+ {
125
+ field: 'updated_at',
126
+ width: 150,
127
+ title: '更新时间',
128
+ sort: true,
129
+ },
126
130
  {
127
131
  title: '操作',
128
132
  minWidth: 150,
@@ -131,18 +135,6 @@
131
135
  }
132
136
  ]
133
137
  ],
134
- data: [{
135
- "id": "1",
136
- "username": "丁亚莲",
137
- "chance": "人工智能实验室建设",
138
- "company": "中南大学",
139
- "dep": "计算机学院",
140
- "week": "2021-33周",
141
- "plan": "对接决策人",
142
- "follow": "120",
143
- "rate": "100%",
144
- "updateTime": "2021-07-27",
145
- }],
146
138
  limits: [10, 15, 20, 25, 50, 100],
147
139
  limit: 15,
148
140
  page: true,
@@ -150,18 +142,118 @@
150
142
  });
151
143
 
152
144
 
145
+ /**
146
+ * toolbar事件监听
147
+ */
148
+ table.on('toolbar(newWeeklyToolbar)', function (obj) {
149
+ var data = obj.data;
150
+ if (obj.event === 'add') { // 监听添加操作
151
+ var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_week');
152
+ var openWH = miniPage.getOpenWidthHeight();
153
+ add_new_weeklyIndex = layer.open({
154
+ title: '添加计划',
155
+ type: 1,
156
+ shade: 0.2,
157
+ maxmin: true,
158
+ shadeClose: true,
159
+ area: [openWH[0] + 'px', openWH[1] + 'px'],
160
+ offset: [openWH[2] + 'px', openWH[3] + 'px'],
161
+ content: content,
162
+ success: function (layero, index) {
163
+ // 重新渲染弹层中的下拉选择框select
164
+ form.render('select');
165
+ }
166
+ });
167
+ $(window).on("resize", function () {
168
+ layer.full(index);
169
+ });
170
+ }
171
+ });
172
+
173
+
174
+
175
+
176
+
177
+
178
+ table.on('tool(newWeeklyToolbar)', function (obj) {
179
+ var data = obj.data;
180
+ id = data.id
181
+ if (obj.event === 'delete') {
182
+ layer.confirm('确定删除' + data.id, function (index) {
183
+ request.delete('educode_sales/operation_plans/' + data.id, {}, function (res) {
184
+ layer.close(index);
185
+ table.reload("weekPlanTable1")
186
+ table.reload("newWeeklyTable")
187
+ })
188
+ });
189
+ }
190
+ else if (obj.event === 'show') {
191
+ console.log("a");
192
+ content = miniPage.getHrefContent('/educode_sales/operation_plans/show_week?id='+id);
193
+ openWH = miniPage.getOpenWidthHeight();
194
+ index = layer.open({
195
+ title: '查看',
196
+ type: 1,
197
+ shade: 0.2,
198
+ maxmin: true,
199
+ shadeClose: true,
200
+ area: [openWH[0] + 'px', openWH[1] + 'px'],
201
+ offset: [openWH[2] + 'px', openWH[3] + 'px'],
202
+ content: content,
203
+ success: function (layero, index) {
204
+ form.render('select');
205
+ },
206
+ });
207
+ $(window).on("resize", function () {
208
+ layer.full(index);
209
+ });
210
+ return false;
211
+ } else if (obj.event === 'edit') {
212
+ content = miniPage.getHrefContent('/educode_sales/operation_plans/edit_week?id='+id);
213
+ openWH = miniPage.getOpenWidthHeight();
214
+ editWeek_index = layer.open({
215
+ title: '编辑',
216
+ type: 1,
217
+ shade: 0.2,
218
+ maxmin: true,
219
+ shadeClose: true,
220
+ area: [openWH[0] + 'px', openWH[1] + 'px'],
221
+ offset: [openWH[2] + 'px', openWH[3] + 'px'],
222
+ content: content,
223
+ success: function (layero, index) {
224
+ form.render('select');
225
+ },
226
+ });
227
+ $(window).on("resize", function () {
228
+ layer.full(index);
229
+ });
230
+ return false;
231
+ }
232
+ else if (obj.event === 'show_follow_newWeekly') {
233
+ id = data.teacher_id
234
+ content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.teacher_id);
235
+ openWH = miniPage.getOpenWidthHeight();
236
+ index = layer.open({
237
+ title: data.teacher_name + '/跟进记录',
238
+ type: 1,
239
+ shade: 0.2,
240
+ maxmin: true,
241
+ shadeClose: true,
242
+ area: [openWH[0] + 'px', openWH[1] + 'px'],
243
+ offset: [openWH[2] + 'px', openWH[3] + 'px'],
244
+ content: content,
245
+ success: function (layero, index) {
246
+ // 重新渲染弹层中的下拉选择框select
247
+ // form.render('select');
248
+ }
249
+ });
250
+ $(window).on("resize", function () {
251
+ layer.full(index);
252
+ });
253
+ }
254
+ });
255
+
256
+
153
257
 
154
- // form.on('submit(add_weekly_report)', function (data) {
155
- // request.authPost("educode_sales/operation_reports", data.field, function (res) {
156
- // if (res.success == false) {
157
- // layer.alert(res.msg)
158
- // } else {
159
- // layer.closeAll()
160
- // table.reload('newWeeklyTable');
161
- // layer.alert('添加成功')
162
- // }
163
- // })
164
- // return false;
165
- // });
166
258
  })
167
259
  </script>
data/app/views/educode_sales/operation_reports/audit.html.erb CHANGED
@@ -2,7 +2,7 @@
2
2
  <div class="layui-form-item">
3
3
  <div class="layui-inline" style="margin:18px; font-weight: bold">
4
4
  <label>完成率:</label>
5
- <span><%= @sale_report.finish_rate %></span>
5
+ <span><%= @sale_report.finish_rate %>%</span>
6
6
  <%= hidden_field_tag :id, @sale_report.id, {id: 'sale_report_audito'} %>
7
7
  </div>
8
8
  <div class="layui-inline" style="margin:18px; font-weight: bold">
data/app/views/educode_sales/operation_reports/edit.html.erb CHANGED
@@ -8,7 +8,7 @@
8
8
  <div class="layui-form-item">
9
9
  <div class="layui-inline" style="margin:18px; font-weight: bold">
10
10
  <label>完成率:</label>
11
- <span><%= @sale_report.finish_rate %></span>
11
+ <span><%= @sale_report.finish_rate %>%</span>
12
12
  </div>
13
13
  <div class="layui-inline" style="margin:18px; font-weight: bold">
14
14
  <label style="margin-left: 100px">运营教师:</label>
data/app/views/educode_sales/operation_reports/index.json.jbuilder CHANGED
@@ -15,4 +15,4 @@ json.data do
15
15
  end
16
16
 
17
17
  json.code 0
18
- json.count @sale_reports.count
18
+ json.count @sale_reports.total_count
data/app/views/educode_sales/operation_reports/plans.json.jbuilder CHANGED
@@ -16,4 +16,4 @@ json.data do
16
16
  end
17
17
 
18
18
  json.code 0
19
- json.count @sale_plans.count
19
+ json.count @sale_plans.total_count
data/app/views/educode_sales/operation_reports/show.html.erb CHANGED
@@ -2,7 +2,7 @@
2
2
  <div class="layui-form-item">
3
3
  <div class="layui-inline" style="margin:18px; font-weight: bold">
4
4
  <label>完成率:</label>
5
- <span><%= @sale_report.finish_rate %></span>
5
+ <span><%= @sale_report.finish_rate %>%</span>
6
6
  </div>
7
7
  <div class="layui-inline" style="margin:18px; font-weight: bold">
8
8
  <label style="margin-left: 100px">运营教师:</label>
data/app/views/educode_sales/places/index.json.jbuilder CHANGED
@@ -10,4 +10,4 @@ json.data do
10
10
  end
11
11
 
12
12
  json.code 0
13
- json.count @places.size
13
+ json.count @places.total_count
data/app/views/educode_sales/plans/_monthPlan.html.erb CHANGED
@@ -7,7 +7,7 @@
7
7
  </div>
8
8
  </script>
9
9
  <!--搜索-->
10
- <div class="layuimini-main" id="month_table_wraper">
10
+ <div class="layuimini-main min-height-table" id="month_table_wraper">
11
11
  <form class="layui-form layui-form-pane" lay-filter="month_plan_search_form">
12
12
  <div class="layui-form-item">
13
13
  <div class="layui-inline">
@@ -201,12 +201,7 @@
201
201
 
202
202
  table.on('tool(monthPlanTable)', function (obj) {
203
203
  var data = obj.data;
204
- if (obj.event === 'delete') {
205
- layer.confirm('真的删除行么', function (index) {
206
- obj.del();
207
- layer.close(index);
208
- });
209
- } else if (obj.event === 'show') {
204
+ if (obj.event === 'show') {
210
205
  content = miniPage.getHrefContent('/educode_sales/plans/show_month?id=' + data.id);
211
206
  openWH = miniPage.getOpenWidthHeight();
212
207
  index = layer.open({
@@ -259,6 +254,14 @@
259
254
  $(window).on("resize", function () {
260
255
  layer.full(index);
261
256
  });
257
+ } else if (obj.event === 'delete') {
258
+ layer.confirm('确定删除' + data.id, function (index) {
259
+ console.log("aaaaa");
260
+ request.delete('educode_sales/plans/' + data.id, {}, function (res) {
261
+ layer.close(index);
262
+ table.reload("monthPlanTable")
263
+ })
264
+ });
262
265
  }
263
266
  });
264
267
 
data/app/views/educode_sales/plans/_monthly.html.erb CHANGED
@@ -7,8 +7,8 @@
7
7
  </div>
8
8
  </script>
9
9
  <!--搜索-->
10
- <div class="layuimini-main min-height-table" id="monthly_table_wraper">
11
- <form class="layui-form layui-form-pane edit-table" lay-filter="monthly_form_fiter">
10
+ <div class="layuimini-main min-height-table" id="monthly_table_wraper">
11
+ <form class="layui-form layui-form-pane" lay-filter="monthly_form_fiter">
12
12
  <div class="layui-form-item">
13
13
  <div class="layui-inline">
14
14
  <label class="layui-form-label">人员</label>
data/app/views/educode_sales/plans/_weekPlan.html.erb CHANGED
@@ -7,8 +7,8 @@
7
7
  </div>
8
8
  </script>
9
9
  <!--搜索-->
10
- <div class="layuimini-main min-height-table" id="week_table_wraper">
11
- <div class="layui-form layui-form-pane edit-table" lay-filter="week_plan_form_filter">
10
+ <div class="layuimini-main min-height-table" id="week_table_wraper">
11
+ <div class="layui-form layui-form-pane" lay-filter="week_plan_form_filter">
12
12
  <div class="layui-form-item">
13
13
  <div class="layui-inline">
14
14
  <label class="layui-form-label">人员</label>
@@ -104,6 +104,11 @@
104
104
  width: 170,
105
105
  title: '部门'
106
106
  },
107
+ {
108
+ field: 'month',
109
+ width: 100,
110
+ title: '月份',
111
+ },
107
112
  {
108
113
  field: 'weekly',
109
114
  width: 100,
data/app/views/educode_sales/plans/_weekly.html.erb CHANGED
@@ -8,7 +8,7 @@
8
8
  </script>
9
9
  <!--搜索-->
10
10
  <div class="layuimini-main min-height-table" id="sales_weelky_table">
11
- <form class="layui-form layui-form-pane edit-table" lay-filter="weekly_form_search">
11
+ <form class="layui-form layui-form-pane" lay-filter="weekly_form_search">
12
12
  <div class="layui-form-item">
13
13
  <div class="layui-inline">
14
14
  <label class="layui-form-label">人员</label>
data/app/views/educode_sales/plans/edit_week.html.erb CHANGED
@@ -73,7 +73,7 @@
73
73
  } else {
74
74
  parent.table.reload('unfinish_table')
75
75
  }
76
-
76
+ parent.table.reload('newWeeklyTable')
77
77
  }
78
78
  })
79
79
  return false;
data/app/views/educode_sales/plans/index.json.jbuilder CHANGED
@@ -16,4 +16,4 @@ json.data do
16
16
  end
17
17
 
18
18
  json.code 0
19
- json.count @sale_plans.count
19
+ json.count @sale_plans.total_count
data/app/views/educode_sales/plans/my_month.json.jbuilder CHANGED
@@ -15,4 +15,4 @@ json.data do
15
15
  end
16
16
 
17
17
  json.code 0
18
- json.count @sale_plans.count
18
+ json.count @sale_plans.total_count
data/app/views/educode_sales/plans/my_week.json.jbuilder CHANGED
@@ -16,4 +16,4 @@ json.data do
16
16
  end
17
17
 
18
18
  json.code 0
19
- json.count @sale_plans.count
19
+ json.count @sale_plans.total_count
data/app/views/educode_sales/plans/new_monthly.html.erb CHANGED
@@ -10,7 +10,7 @@
10
10
  <div class="layui-form-item">
11
11
  <div class="layui-inline" style="margin:18px; font-weight: bold">
12
12
  <label>完成率:</label>
13
- <span><%= @rate %></span>
13
+ <span><%= @rate %>%</span>
14
14
  <%= hidden_field_tag 'finish_rate', @rate, {id: 'monthly_rate_hide'} %>
15
15
  </div>
16
16
  <div class="layui-inline" style="margin:18px; font-weight: bold">
data/app/views/educode_sales/plans/new_week.html.erb CHANGED
@@ -87,7 +87,9 @@
87
87
  else {
88
88
  parent.table.reload('businesses_table')
89
89
  }
90
-
90
+ parent.table.reload('newWeeklyTable')
91
+
92
+
91
93
  }
92
94
  })
93
95
  return false;
data/app/views/educode_sales/plans/new_weekly.html.erb CHANGED
@@ -8,7 +8,7 @@
8
8
  <div class="layui-form-item">
9
9
  <div class="layui-inline" style="margin:18px; font-weight: bold">
10
10
  <label>完成率:</label>
11
- <span><%= @rate %></span>
11
+ <span><%= @rate %>%</span>
12
12
  <%= hidden_field_tag 'finish_rate', @rate, {id: 'weekly_rate_hide'} %>
13
13
  </div>
14
14
  <div class="layui-inline" style="margin:18px; font-weight: bold">
@@ -97,6 +97,7 @@
97
97
  layer.close(parent.sindex);
98
98
  parent.layer.close(parent.layer.getFrameIndex(window.name))
99
99
  parent.table.reload('newWeeklyTable');
100
+ table.reload('weeklyTable');
100
101
  layer.alert('添加成功')
101
102
  }
102
103
  })
data/app/views/educode_sales/roles/index.json.jbuilder CHANGED
@@ -7,4 +7,4 @@ json.data do
7
7
  end
8
8
 
9
9
  json.code 0
10
- json.count @roles.size
10
+ json.count @roles.total_count
data/app/views/educode_sales/sale_reports/audit.html.erb CHANGED
@@ -2,7 +2,7 @@
2
2
  <div class="layui-form-item">
3
3
  <div class="layui-inline" style="margin:18px; font-weight: bold">
4
4
  <label>完成率:</label>
5
- <span><%= @sale_report.finish_rate %></span>
5
+ <span><%= @sale_report.finish_rate %>%</span>
6
6
  <%= hidden_field_tag :id, @sale_report.id, {id: 'sale_report_audito'} %>
7
7
  </div>
8
8
  <div class="layui-inline" style="margin:18px; font-weight: bold">
data/app/views/educode_sales/sale_reports/edit.html.erb CHANGED
@@ -8,7 +8,7 @@
8
8
  <div class="layui-form-item">
9
9
  <div class="layui-inline" style="margin:18px; font-weight: bold">
10
10
  <label>完成率:</label>
11
- <span><%= @sale_report.finish_rate %></span>
11
+ <span><%= @sale_report.finish_rate %>%</span>
12
12
  </div>
13
13
  <div class="layui-inline" style="margin:18px; font-weight: bold">
14
14
  <label style="margin-left: 100px">覆盖客户:</label>
data/app/views/educode_sales/sale_reports/index.json.jbuilder CHANGED
@@ -14,4 +14,4 @@ json.data do
14
14
  end
15
15
 
16
16
  json.code 0
17
- json.count @sale_reports.count
17
+ json.count @sale_reports.total_count
data/app/views/educode_sales/sale_reports/plans.json.jbuilder CHANGED
@@ -16,4 +16,4 @@ json.data do
16
16
  end
17
17
 
18
18
  json.code 0
19
- json.count @sale_plans.count
19
+ json.count @sale_plans.total_count
data/app/views/educode_sales/sale_reports/show.html.erb CHANGED
@@ -2,7 +2,7 @@
2
2
  <div class="layui-form-item">
3
3
  <div class="layui-inline" style="margin:18px; font-weight: bold">
4
4
  <label>完成率:</label>
5
- <span><%= @sale_report.finish_rate %></span>
5
+ <span><%= @sale_report.finish_rate %>%</span>
6
6
  </div>
7
7
  <div class="layui-inline" style="margin:18px; font-weight: bold">
8
8
  <label style="margin-left: 100px">覆盖客户:</label>
data/app/views/educode_sales/sale_trends/trends.html.erb CHANGED
@@ -65,7 +65,7 @@
65
65
  </div>
66
66
  </div>
67
67
  </div>
68
- <div class="layui-col-xs3">
68
+ <div class="layui-col-xs3" >
69
69
  <div class="panel layui-bg-number">
70
70
  <div class="panel-body">
71
71
  <div class="panel-title">
data/app/views/educode_sales/sales/index.json.jbuilder CHANGED
@@ -14,4 +14,4 @@ json.data do
14
14
  end
15
15
 
16
16
  json.code 0
17
- json.count @staffs.count
17
+ json.count @staffs.total_count
data/app/views/educode_sales/sales/operations.json.jbuilder CHANGED
@@ -11,4 +11,4 @@ json.data do
11
11
  end
12
12
 
13
13
  json.code 0
14
- json.count @staffs.count
14
+ json.count @staffs.total_count
data/app/views/educode_sales/staffs/follow_up_departments.json.jbuilder CHANGED
@@ -10,4 +10,4 @@ json.data do
10
10
  end
11
11
 
12
12
  json.code 0
13
- json.count @schools.count
13
+ json.count @schools.total_count
data/app/views/educode_sales/staffs/index.json.jbuilder CHANGED
@@ -12,4 +12,4 @@ json.data do
12
12
  end
13
13
 
14
14
  json.code 0
15
- json.count @staffs.count
15
+ json.count @staffs.total_count
data/app/views/educode_sales/teachers/course_list.json.jbuilder CHANGED
@@ -19,4 +19,5 @@ json.data do
19
19
  end
20
20
  end
21
21
  json.code 0
22
+ json.count @courses.total_count
22
23
  json.msg 'succcess'
data/app/views/educode_sales/teachers/index.html.erb CHANGED
@@ -151,7 +151,7 @@
151
151
  },
152
152
  {
153
153
  field: 'department',
154
- width: 190,
154
+ width: 250,
155
155
  title: '部门'
156
156
  },
157
157
  {
@@ -225,7 +225,7 @@
225
225
  }
226
226
  ]
227
227
  ],
228
- page: true
228
+ page: true,
229
229
  });
230
230
 
231
231
 
@@ -260,7 +260,7 @@
260
260
  form.val('search_teachers', {
261
261
  area: "",
262
262
  date: "",
263
- key_attitude: "",
263
+ attitude: "",
264
264
  name: "",
265
265
  professional_title: "",
266
266
  regist_at: "",