educode_sales 0.4.6 → 0.4.7

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 (42) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/educode_sales/home_controller.rb +4 -0
  3. data/app/controllers/educode_sales/operation_plans_controller.rb +4 -0
  4. data/app/controllers/educode_sales/operation_reports_controller.rb +6 -0
  5. data/app/controllers/educode_sales/operations_controller.rb +1 -1
  6. data/app/controllers/educode_sales/plans_controller.rb +12 -4
  7. data/app/controllers/educode_sales/sale_reports_controller.rb +6 -0
  8. data/app/controllers/educode_sales/sale_trends_controller.rb +6 -5
  9. data/app/views/educode_sales/activities/show_teachers.html.erb +16 -16
  10. data/app/views/educode_sales/businesses/index.html.erb +9 -9
  11. data/app/views/educode_sales/businesses/show_follow.html.erb +1 -1
  12. data/app/views/educode_sales/home/search_operation_teacher.json.jbuilder +12 -0
  13. data/app/views/educode_sales/operation_plans/_monthPlan.html.erb +7 -7
  14. data/app/views/educode_sales/operation_plans/_monthly.html.erb +4 -4
  15. data/app/views/educode_sales/operation_plans/_weekPlan.html.erb +8 -8
  16. data/app/views/educode_sales/operation_plans/_weekly.html.erb +5 -5
  17. data/app/views/educode_sales/operation_plans/new_month.html.erb +34 -3
  18. data/app/views/educode_sales/operation_plans/new_monthly.html.erb +12 -0
  19. data/app/views/educode_sales/operation_plans/new_week.html.erb +32 -4
  20. data/app/views/educode_sales/operation_plans/new_weekly.html.erb +12 -0
  21. data/app/views/educode_sales/operation_reports/audit.html.erb +12 -0
  22. data/app/views/educode_sales/operation_reports/edit.html.erb +12 -0
  23. data/app/views/educode_sales/operation_reports/show.html.erb +12 -0
  24. data/app/views/educode_sales/plans/_monthPlan.html.erb +8 -8
  25. data/app/views/educode_sales/plans/_monthly.html.erb +3 -3
  26. data/app/views/educode_sales/plans/_weekPlan.html.erb +7 -7
  27. data/app/views/educode_sales/plans/_weekly.html.erb +4 -4
  28. data/app/views/educode_sales/plans/edit_month.html.erb +1 -1
  29. data/app/views/educode_sales/plans/edit_week.html.erb +1 -1
  30. data/app/views/educode_sales/plans/new_month.html.erb +1 -1
  31. data/app/views/educode_sales/plans/new_monthly.html.erb +12 -0
  32. data/app/views/educode_sales/plans/new_week.html.erb +1 -1
  33. data/app/views/educode_sales/plans/new_weekly.html.erb +12 -0
  34. data/app/views/educode_sales/sale_reports/audit.html.erb +12 -0
  35. data/app/views/educode_sales/sale_reports/edit.html.erb +12 -0
  36. data/app/views/educode_sales/sale_reports/show.html.erb +12 -0
  37. data/app/views/educode_sales/teachers/index.html.erb +2 -2
  38. data/app/views/educode_sales/teachers/show_follow.html.erb +1 -1
  39. data/app/views/layouts/educode_sales/application.html.erb +4 -1
  40. data/config/routes.rb +1 -0
  41. data/lib/educode_sales/version.rb +1 -1
  42. metadata +3 -2
data/app/views/educode_sales/operation_plans/new_week.html.erb CHANGED
@@ -14,10 +14,7 @@
14
14
  </div>
15
15
  <div class="layui-inline">
16
16
  <label class="layui-form-label required">教师</label>
17
- <div class="layui-input-inline">
18
-
19
- <%= select_tag "teacher_id", options_for_select(@teachers, @teacher&.id), {"lay-verify": "required", include_blank: true} %>
20
- </div>
17
+ <div class="layui-input-block" id="add_teacher" style="width: 400px"></div>
21
18
  </div>
22
19
  <div class="layui-form-item layui-form-text">
23
20
  <label class="layui-form-label required">计划内容</label>
@@ -62,9 +59,39 @@
62
59
  request = layui.request,
63
60
  laydate = layui.laydate,
64
61
  $ = layui.$;
62
+ selectInput = layui.selectInput;
65
63
 
66
64
  form.render();
67
65
 
66
+ var add_teacher = selectInput.render({
67
+ elem: '#add_teacher',
68
+ name: 'teacher_id', // 渲染的input的name值
69
+ layFilter: 'teacher_id', //同layui form参数lay-filter
70
+ layVerify: 'required', //同layui form参数lay-verify
71
+ layVerType: 'tips', // 同layui form参数lay-verType
72
+ layReqText: '请填写文本', //同layui form参数lay-ReqText
73
+ initValue: '', // 渲染初始化默认值
74
+ hasSelectIcon: false,
75
+ placeholder: '支持姓名搜索', // 渲染的inputplaceholder值
76
+ data: [],
77
+ remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
78
+ remoteMethod: function (value, cb) { // 远程搜索的回调函数
79
+ if (!value) {
80
+ return cb([]);
81
+ }
82
+ request.get('missions/search_operation_teacher?q=' + value, {}, function (res) {
83
+ return cb(res)
84
+ })
85
+ }
86
+ });
87
+
88
+ add_teacher.on('itemSelect(add_teacher)', function (obj) {
89
+ teacher_id = obj.data;
90
+ var name = obj.textContent
91
+ add_teacher.setValue(name)
92
+ });
93
+
94
+
68
95
  laydate.render({
69
96
  elem: '#new_week_plan',
70
97
  type: 'month'
@@ -72,6 +99,7 @@
72
99
 
73
100
 
74
101
  form.on('submit(add_week_plan)', function (data) {
102
+ data.field.teacher_id = teacher_id
75
103
  request.authPost("missions/operation_plans", data.field, function (res) {
76
104
  if (res.success == false) {
77
105
  layer.alert(res.msg)
data/app/views/educode_sales/operation_plans/new_weekly.html.erb CHANGED
@@ -4,7 +4,14 @@
4
4
  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
5
5
  </div>
6
6
  </script>
7
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
7
8
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
9
+ <div class="layui-form-item">
10
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
11
+ <label>负责区域:</label>
12
+ <span><%= @area %></span>
13
+ </div>
14
+ </div>
8
15
  <div class="layui-form-item">
9
16
  <div class="layui-inline" style="margin:18px; font-weight: bold">
10
17
  <label>完成率:</label>
@@ -16,6 +23,11 @@
16
23
  <span><%= @departments_count%></span>
17
24
  <%= hidden_field_tag 'client', @departments_count, {id: 'weekly_client_hide'} %>
18
25
  </div>
26
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
27
+ <label style="margin-left: 100px">提交时间:</label>
28
+ <span><%= Time.now %></span>
29
+ <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
30
+ </div>
19
31
  </div>
20
32
  <div class="layui-form-item" style="margin-left: 18px">
21
33
  <div class="layui-form-item layui-form-text">
data/app/views/educode_sales/operation_reports/audit.html.erb CHANGED
@@ -1,4 +1,11 @@
1
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
1
2
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
3
+ <div class="layui-form-item">
4
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
5
+ <label>负责区域:</label>
6
+ <span><%= @area%></span>
7
+ </div>
8
+ </div>
2
9
  <div class="layui-form-item">
3
10
  <div class="layui-inline" style="margin:18px; font-weight: bold">
4
11
  <label>完成率:</label>
@@ -9,6 +16,11 @@
9
16
  <label style="margin-left: 100px">运营教师:</label>
10
17
  <span><%= @sale_report.client%></span>
11
18
  </div>
19
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
20
+ <label style="margin-left: 100px">提交时间:</label>
21
+ <span><%= @sale_report.created_at %></span>
22
+ <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
23
+ </div>
12
24
  </div>
13
25
  <div class="layui-form-item" style="margin-left: 18px">
14
26
  <div class="layui-form-item layui-form-text">
data/app/views/educode_sales/operation_reports/edit.html.erb CHANGED
@@ -9,7 +9,14 @@
9
9
  {{# } }}
10
10
  </div>
11
11
  </script>
12
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
12
13
  <form class="layui-form layui-form-pane" style="padding-right: 20px">
14
+ <div class="layui-form-item">
15
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
16
+ <label>负责区域:</label>
17
+ <span><%= @area%></span>
18
+ </div>
19
+ </div>
13
20
  <div class="layui-form-item">
14
21
  <div class="layui-inline" style="margin:18px; font-weight: bold">
15
22
  <label>完成率:</label>
@@ -19,6 +26,11 @@
19
26
  <label style="margin-left: 100px">运营教师:</label>
20
27
  <span><%= @sale_report.client%></span>
21
28
  </div>
29
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
30
+ <label style="margin-left: 100px">提交时间:</label>
31
+ <span><%= @sale_report.created_at %></span>
32
+ <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
33
+ </div>
22
34
  </div>
23
35
  <div class="layui-form-item" style="margin-left: 18px">
24
36
  <div class="layui-form-item layui-form-text">
data/app/views/educode_sales/operation_reports/show.html.erb CHANGED
@@ -1,4 +1,11 @@
1
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
1
2
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
3
+ <div class="layui-form-item">
4
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
5
+ <label>负责区域:</label>
6
+ <span><%= @area%></span>
7
+ </div>
8
+ </div>
2
9
  <div class="layui-form-item">
3
10
  <div class="layui-inline" style="margin:18px; font-weight: bold">
4
11
  <label>完成率:</label>
@@ -8,6 +15,11 @@
8
15
  <label style="margin-left: 100px">运营教师:</label>
9
16
  <span><%= @sale_report.client%></span>
10
17
  </div>
18
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
19
+ <label style="margin-left: 100px">提交时间:</label>
20
+ <span><%= @sale_report.created_at %></span>
21
+ <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
22
+ </div>
11
23
  </div>
12
24
  <div class="layui-form-item" style="margin-left: 18px">
13
25
  <div class="layui-form-item layui-form-text">
data/app/views/educode_sales/plans/_monthPlan.html.erb CHANGED
@@ -76,34 +76,34 @@
76
76
  elem: '#monthPlanTable',
77
77
  url: '/missions/plans?clazz=month',
78
78
  toolbar: '#monthPlanToolbar',
79
- defaultToolbar: [],
79
+ defaultToolbar: ['filter'],
80
80
  totalRow:true,
81
81
  cols: [
82
82
  [
83
83
  {
84
84
  field: 'id',
85
- width: 80,
85
+ width: 60,
86
86
  title:'序号',type: 'numbers',
87
87
  totalRowText:"合计",
88
88
  },
89
89
  {
90
90
  field: 'staff',
91
- width: 100,
91
+ width: 90,
92
92
  title: '姓名'
93
93
  },
94
94
  {
95
95
  field: 'business_name',
96
- width: 280,
96
+ width: 160,
97
97
  title: '商机名称',
98
98
  },
99
99
  {
100
100
  field: 'school',
101
- width: 190,
101
+ width: 170,
102
102
  title: '单位'
103
103
  },
104
104
  {
105
105
  field: 'department',
106
- width: 190,
106
+ width: 170,
107
107
  title: '部门'
108
108
  },
109
109
  {
@@ -118,13 +118,13 @@
118
118
  },
119
119
  {
120
120
  field: 'follow_ups_count',
121
- width: 100,
121
+ width: 60,
122
122
  title: '跟进',
123
123
  templet: '#show_follow'
124
124
  },
125
125
  {
126
126
  field: 'finish_rate',
127
- width: 100,
127
+ width: 80,
128
128
  totalRow:true,
129
129
  title: '完成率',
130
130
  },
data/app/views/educode_sales/plans/_monthly.html.erb CHANGED
@@ -78,7 +78,7 @@
78
78
  elem: '#monthlyTable',
79
79
  url: '/missions/sale_reports?clazz=month',
80
80
  toolbar: '#monthly_Toolbar',
81
- defaultToolbar: [],
81
+ defaultToolbar: ['filter'],
82
82
  totalRow:true,
83
83
  cols: [
84
84
  [{
@@ -89,7 +89,7 @@
89
89
  },
90
90
  {
91
91
  field: 'staff',
92
- width: 100,
92
+ width: 90,
93
93
  title: '姓名'
94
94
  },
95
95
  {
@@ -99,7 +99,7 @@
99
99
  },
100
100
  {
101
101
  field: 'finish_rate',
102
- width: 100,
102
+ width: 80,
103
103
  totalRow:true,
104
104
  title: '完成率',
105
105
  },
data/app/views/educode_sales/plans/_weekPlan.html.erb CHANGED
@@ -77,23 +77,23 @@
77
77
  url: '/missions/plans?clazz=week',
78
78
  toolbar: '#weekPlanToolbar',
79
79
  totalRow:true,
80
- defaultToolbar: [],
80
+ defaultToolbar: ['filter'],
81
81
  cols: [
82
82
  [
83
83
  {
84
84
  field: 'id',
85
- width: 80,
85
+ width: 60,
86
86
  title:'序号',type: 'numbers',
87
87
  totalRowText: '合计'
88
88
  },
89
89
  {
90
90
  field: 'staff',
91
- width: 100,
91
+ width: 90,
92
92
  title: '姓名'
93
93
  },
94
94
  {
95
95
  field: 'business_name',
96
- width: 180,
96
+ width: 160,
97
97
  title: '商机名称',
98
98
  },
99
99
  {
@@ -113,7 +113,7 @@
113
113
  },
114
114
  {
115
115
  field: 'weekly',
116
- width: 100,
116
+ width: 60,
117
117
  title: '周次',
118
118
  },
119
119
  {
@@ -123,13 +123,13 @@
123
123
  },
124
124
  {
125
125
  field: 'follow_ups_count',
126
- width: 100,
126
+ width: 60,
127
127
  title: '跟进',
128
128
  templet: '#show_follow'
129
129
  },
130
130
  {
131
131
  field: 'finish_rate',
132
- width: 100,
132
+ width: 80,
133
133
  title: '完成率',
134
134
  totalRow:true,
135
135
  },
data/app/views/educode_sales/plans/_weekly.html.erb CHANGED
@@ -79,7 +79,7 @@
79
79
  elem: '#weeklyTable',
80
80
  url: '/missions/sale_reports?clazz=week',
81
81
  toolbar: '#weeklyToolbar',
82
- defaultToolbar: [],
82
+ defaultToolbar: ['filter'],
83
83
  totalRow:true,
84
84
  cols: [
85
85
  [
@@ -91,17 +91,17 @@
91
91
  },
92
92
  {
93
93
  field: 'staff',
94
- width: 100,
94
+ width: 90,
95
95
  title: '姓名'
96
96
  },
97
97
  {
98
98
  field: 'weekly',
99
- width: 100,
99
+ width: 60,
100
100
  title: '周次'
101
101
  },
102
102
  {
103
103
  field: 'finish_rate',
104
- width: 100,
104
+ width: 80,
105
105
  title: '完成率',
106
106
  totalRow:true,
107
107
  },
data/app/views/educode_sales/plans/edit_month.html.erb CHANGED
@@ -8,7 +8,7 @@
8
8
  </div>
9
9
  <div class="layui-inline">
10
10
  <label class="layui-form-label">商机</label>
11
- <div class="layui-input-inline">
11
+ <div class="layui-input-inline" style="width: 500px">
12
12
  <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), class: 'required' %>
13
13
  </div>
14
14
  </div>
data/app/views/educode_sales/plans/edit_week.html.erb CHANGED
@@ -16,7 +16,7 @@
16
16
  <% end %>
17
17
  <div class="layui-inline">
18
18
  <label class="layui-form-label">商机</label>
19
- <div class="layui-input-inline">
19
+ <div class="layui-input-inline" style="width: 500px">
20
20
  <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), class: 'required' %>
21
21
  </div>
22
22
  </div>
data/app/views/educode_sales/plans/new_month.html.erb CHANGED
@@ -8,7 +8,7 @@
8
8
  </div>
9
9
  <div class="layui-inline">
10
10
  <label class="layui-form-label required">商机</label>
11
- <div class="layui-input-inline">
11
+ <div class="layui-input-inline" style="width: 500px">
12
12
  <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
13
13
  </div>
14
14
  </div>
data/app/views/educode_sales/plans/new_monthly.html.erb CHANGED
@@ -6,7 +6,14 @@
6
6
  <% end %>
7
7
  </div>
8
8
  </script>
9
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
9
10
  <form class="layui-form layui-form-pane" style="padding-right: 20px">
11
+ <div class="layui-form-item">
12
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
13
+ <label>负责区域:</label>
14
+ <span><%= @area %></span>
15
+ </div>
16
+ </div>
10
17
  <div class="layui-form-item">
11
18
  <div class="layui-inline" style="margin:18px; font-weight: bold">
12
19
  <label>完成率:</label>
@@ -23,6 +30,11 @@
23
30
  <span><%= @total_amount %>万</span>
24
31
  <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
25
32
  </div>
33
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
34
+ <label style="margin-left: 100px">提交时间:</label>
35
+ <span><%= Time.now %></span>
36
+ <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
37
+ </div>
26
38
  </div>
27
39
  <div class="layui-form-item" style="margin-left: 18px">
28
40
  <div class="layui-form-item layui-form-text">
data/app/views/educode_sales/plans/new_week.html.erb CHANGED
@@ -14,7 +14,7 @@
14
14
  </div>
15
15
  <div class="layui-inline">
16
16
  <label class="layui-form-label required">商机</label>
17
- <div class="layui-input-inline">
17
+ <div class="layui-input-inline" style="width: 500px">
18
18
  <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
19
19
  </div>
20
20
  </div>
data/app/views/educode_sales/plans/new_weekly.html.erb CHANGED
@@ -4,6 +4,13 @@
4
4
  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
5
5
  </div>
6
6
  </script>
7
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
8
+ <div class="layui-form-item">
9
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
10
+ <label>负责区域:</label>
11
+ <span><%= @area %></span>
12
+ </div>
13
+ </div>
7
14
  <form class="layui-form layui-form-pane" style="padding-right: 20px">
8
15
  <div class="layui-form-item">
9
16
  <div class="layui-inline" style="margin:18px; font-weight: bold">
@@ -21,6 +28,11 @@
21
28
  <span><%= @total_amount %>万</span>
22
29
  <%= hidden_field_tag 'amount', @total_amount, {id: 'weekly_amount_hide'} %>
23
30
  </div>
31
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
32
+ <label style="margin-left: 100px">提交时间:</label>
33
+ <span><%= Time.now %></span>
34
+ <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
35
+ </div>
24
36
  </div>
25
37
  <div class="layui-form-item" style="margin-left: 18px">
26
38
  <div class="layui-form-item layui-form-text">
data/app/views/educode_sales/sale_reports/audit.html.erb CHANGED
@@ -1,4 +1,11 @@
1
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
1
2
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
3
+ <div class="layui-form-item">
4
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
5
+ <label>负责区域:</label>
6
+ <span><%= @area%></span>
7
+ </div>
8
+ </div>
2
9
  <div class="layui-form-item">
3
10
  <div class="layui-inline" style="margin:18px; font-weight: bold">
4
11
  <label>完成率:</label>
@@ -13,6 +20,11 @@
13
20
  <label style="margin-left: 100px">项目金额:</label>
14
21
  <span><%= @sale_report.amount %>万</span>
15
22
  </div>
23
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
24
+ <label style="margin-left: 100px">提交时间:</label>
25
+ <span><%= @sale_report.created_at %></span>
26
+ <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
27
+ </div>
16
28
  </div>
17
29
  <div class="layui-form-item" style="margin-left: 18px">
18
30
  <div class="layui-form-item layui-form-text">
data/app/views/educode_sales/sale_reports/edit.html.erb CHANGED
@@ -9,7 +9,14 @@
9
9
  {{# } }}
10
10
  </div>
11
11
  </script>
12
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
12
13
  <form class="layui-form layui-form-pane" style="padding-right: 20px">
14
+ <div class="layui-form-item">
15
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
16
+ <label>负责区域:</label>
17
+ <span><%= @area%></span>
18
+ </div>
19
+ </div>
13
20
  <div class="layui-form-item">
14
21
  <div class="layui-inline" style="margin:18px; font-weight: bold">
15
22
  <label>完成率:</label>
@@ -23,6 +30,11 @@
23
30
  <label style="margin-left: 100px">项目金额:</label>
24
31
  <span><%= @sale_report.amount %>万</span>
25
32
  </div>
33
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
34
+ <label style="margin-left: 100px">提交时间:</label>
35
+ <span><%= @sale_report.created_at %></span>
36
+ <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
37
+ </div>
26
38
  </div>
27
39
  <div class="layui-form-item" style="margin-left: 18px">
28
40
  <div class="layui-form-item layui-form-text">
data/app/views/educode_sales/sale_reports/show.html.erb CHANGED
@@ -1,4 +1,11 @@
1
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
1
2
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
3
+ <div class="layui-form-item">
4
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
5
+ <label>负责区域:</label>
6
+ <span><%= @area%></span>
7
+ </div>
8
+ </div>
2
9
  <div class="layui-form-item">
3
10
  <div class="layui-inline" style="margin:18px; font-weight: bold">
4
11
  <label>完成率:</label>
@@ -12,6 +19,11 @@
12
19
  <label style="margin-left: 100px">项目金额:</label>
13
20
  <span><%= @sale_report.amount %>万</span>
14
21
  </div>
22
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
23
+ <label style="margin-left: 100px">提交时间:</label>
24
+ <span><%= @sale_report.created_at %></span>
25
+ <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
26
+ </div>
15
27
  </div>
16
28
  <div class="layui-form-item" style="margin-left: 18px">
17
29
  <div class="layui-form-item layui-form-text">
data/app/views/educode_sales/teachers/index.html.erb CHANGED
@@ -140,7 +140,7 @@
140
140
  where: {q: form.val('search_form')},
141
141
  toolbar: '#toolbarDemo',
142
142
  totalRow:true,
143
- defaultToolbar: [],
143
+ defaultToolbar: ['filter'],
144
144
  cols: [
145
145
  [
146
146
  {
@@ -203,7 +203,7 @@
203
203
  },
204
204
  {
205
205
  field: 'teacher_used',
206
- width: 100,
206
+ width: 120,
207
207
  title: '学院渗透率',
208
208
  },
209
209
  {
data/app/views/educode_sales/teachers/show_follow.html.erb CHANGED
@@ -36,7 +36,7 @@
36
36
  elem: '#sale_plan_follow_table',
37
37
  url: '/missions/teachers/show_follow?id=' + parent.id ,
38
38
  toolbar: '#toolbarDemo_follow',
39
- defaultToolbar: [],
39
+ defaultToolbar: ['filter'],
40
40
  cols: [
41
41
  [
42
42
  {
data/app/views/layouts/educode_sales/application.html.erb CHANGED
@@ -215,7 +215,7 @@
215
215
  tips = $(this).prop("innerHTML")
216
216
  flag = btn.hasClass('layui-icon-spread-left')
217
217
  if (flag && tips) {
218
- tips = "<ul class='layuimini-menu-left-zoom layui-nav layui-nav-tree layui-this' style='width: 170px'><li class='layui-nav-item layui-nav-itemed'>"+tips+"</li></ul>" ;
218
+ tips = "<ul class='ul-down layuimini-menu-left-zoom layui-nav layui-nav-tree layui-this' style='width: 170px'><li class='layui-nav-item layui-nav-itemed'>"+tips+"</li></ul>" ;
219
219
  window.openTips = layer.tips(tips, $(this), {
220
220
  tips: [2, '#2f4056'],
221
221
  time: 300000,
@@ -257,4 +257,7 @@
257
257
  .layuimini-mini .ul .layui-nav-child{
258
258
  display: none;!important;
259
259
  }
260
+ .ul-down .layui-icon-down{
261
+ display: none;!important;
262
+ }
260
263
  </style>
data/config/routes.rb CHANGED
@@ -7,6 +7,7 @@ EducodeSales::Engine.routes.draw do
7
7
  get :search_users, to: "home#search_users"
8
8
  get :search_teacher, to: "home#search_teacher"
9
9
  get :search_edu_teacher,to: "home#search_edu_teacher"
10
+ get :search_operation_teacher,to: "home#search_operation_teacher"
10
11
  get :search, to: "home#search"
11
12
  get :no_permission, to: "home#no_permission"
12
13
  get :sales_staff, to: "home#sales_staff"
data/lib/educode_sales/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EducodeSales
2
- VERSION = '0.4.6'
2
+ VERSION = '0.4.7'
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.4.6
4
+ version: 0.4.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - anke1460
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-10-27 00:00:00.000000000 Z
11
+ date: 2021-10-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -217,6 +217,7 @@ files:
217
217
  - app/views/educode_sales/home/sales_staff.json.jbuilder
218
218
  - app/views/educode_sales/home/search.json.jbuilder
219
219
  - app/views/educode_sales/home/search_edu_teacher.json.jbuilder
220
+ - app/views/educode_sales/home/search_operation_teacher.json.jbuilder
220
221
  - app/views/educode_sales/home/search_teacher.json.jbuilder
221
222
  - app/views/educode_sales/home/search_users.json.jbuilder
222
223
  - app/views/educode_sales/home/statistics.html.erb