educode_sales 0.4.4 → 0.4.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 (65) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/educode_sales/indexLogo.png +0 -0
  3. data/app/controllers/educode_sales/businesses_controller.rb +6 -3
  4. data/app/controllers/educode_sales/home_controller.rb +4 -0
  5. data/app/controllers/educode_sales/operation_plans_controller.rb +6 -2
  6. data/app/controllers/educode_sales/operation_reports_controller.rb +9 -3
  7. data/app/controllers/educode_sales/operations_controller.rb +1 -1
  8. data/app/controllers/educode_sales/plans_controller.rb +19 -7
  9. data/app/controllers/educode_sales/sale_reports_controller.rb +9 -3
  10. data/app/controllers/educode_sales/sale_trends_controller.rb +8 -7
  11. data/app/controllers/educode_sales/sales_controller.rb +2 -2
  12. data/app/models/educode_sales/sale_plan.rb +1 -0
  13. data/app/models/educode_sales/teacher.rb +12 -19
  14. data/app/views/educode_sales/activities/index.html.erb +4 -0
  15. data/app/views/educode_sales/activities/index.json.jbuilder +6 -0
  16. data/app/views/educode_sales/activities/show_teachers.html.erb +16 -16
  17. data/app/views/educode_sales/businesses/index.html.erb +15 -10
  18. data/app/views/educode_sales/businesses/index.json.jbuilder +7 -1
  19. data/app/views/educode_sales/businesses/show_follow.html.erb +9 -4
  20. data/app/views/educode_sales/home/index.html.erb +1 -1
  21. data/app/views/educode_sales/home/search_operation_teacher.json.jbuilder +12 -0
  22. data/app/views/educode_sales/operation_plans/_monthPlan.html.erb +12 -8
  23. data/app/views/educode_sales/operation_plans/_monthly.html.erb +18 -4
  24. data/app/views/educode_sales/operation_plans/_weekPlan.html.erb +13 -9
  25. data/app/views/educode_sales/operation_plans/_weekly.html.erb +18 -4
  26. data/app/views/educode_sales/operation_plans/edit_month.html.erb +6 -6
  27. data/app/views/educode_sales/operation_plans/edit_week.html.erb +7 -7
  28. data/app/views/educode_sales/operation_plans/index.json.jbuilder +10 -2
  29. data/app/views/educode_sales/operation_plans/new_month.html.erb +36 -4
  30. data/app/views/educode_sales/operation_plans/new_monthly.html.erb +16 -2
  31. data/app/views/educode_sales/operation_plans/new_week.html.erb +33 -5
  32. data/app/views/educode_sales/operation_plans/new_weekly.html.erb +16 -2
  33. data/app/views/educode_sales/operation_reports/audit.html.erb +13 -1
  34. data/app/views/educode_sales/operation_reports/edit.html.erb +13 -1
  35. data/app/views/educode_sales/operation_reports/index.json.jbuilder +7 -0
  36. data/app/views/educode_sales/operation_reports/show.html.erb +13 -1
  37. data/app/views/educode_sales/places/index.html.erb +5 -0
  38. data/app/views/educode_sales/plans/_monthPlan.html.erb +11 -8
  39. data/app/views/educode_sales/plans/_monthly.html.erb +18 -3
  40. data/app/views/educode_sales/plans/_weekPlan.html.erb +10 -7
  41. data/app/views/educode_sales/plans/_weekly.html.erb +19 -3
  42. data/app/views/educode_sales/plans/edit_month.html.erb +7 -7
  43. data/app/views/educode_sales/plans/edit_week.html.erb +8 -8
  44. data/app/views/educode_sales/plans/index.json.jbuilder +4 -0
  45. data/app/views/educode_sales/plans/new_month.html.erb +2 -2
  46. data/app/views/educode_sales/plans/new_monthly.html.erb +16 -2
  47. data/app/views/educode_sales/plans/new_week.html.erb +2 -2
  48. data/app/views/educode_sales/plans/new_weekly.html.erb +16 -2
  49. data/app/views/educode_sales/sale_reports/audit.html.erb +13 -1
  50. data/app/views/educode_sales/sale_reports/edit.html.erb +13 -1
  51. data/app/views/educode_sales/sale_reports/index.json.jbuilder +7 -0
  52. data/app/views/educode_sales/sale_reports/show.html.erb +20 -9
  53. data/app/views/educode_sales/sales/index.html.erb +6 -0
  54. data/app/views/educode_sales/sales/index.json.jbuilder +20 -4
  55. data/app/views/educode_sales/sales/operations.html.erb +4 -4
  56. data/app/views/educode_sales/sales/operations.json.jbuilder +12 -3
  57. data/app/views/educode_sales/teachers/index.html.erb +19 -14
  58. data/app/views/educode_sales/teachers/index.json.jbuilder +12 -2
  59. data/app/views/educode_sales/teachers/show_follow.html.erb +10 -4
  60. data/app/views/layouts/educode_sales/application.html.erb +12 -4
  61. data/config/routes.rb +1 -0
  62. data/db/migrate/20211022085324_add_teacher_used_to_teachers.rb +7 -0
  63. data/lib/educode_sales/version.rb +1 -1
  64. metadata +5 -3
  65. data/app/assets/images/educode_sales/indexlogo.png +0 -0
data/app/views/educode_sales/operation_reports/audit.html.erb CHANGED
@@ -1,5 +1,12 @@
1
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
1
2
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
2
- <div class="layui-form-item">
3
+ <div class="layui-form-item" style="margin-bottom: 0">
4
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
5
+ <label>负责区域:</label>
6
+ <span><%= @area%></span>
7
+ </div>
8
+ </div>
9
+ <div class="layui-form-item" style="margin-bottom: 0">
3
10
  <div class="layui-inline" style="margin:18px; font-weight: bold">
4
11
  <label>完成率:</label>
5
12
  <span><%= @sale_report.finish_rate %>%</span>
@@ -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,8 +9,15 @@
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">
13
- <div class="layui-form-item">
14
+ <div class="layui-form-item" style="margin-bottom: 0">
15
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
16
+ <label>负责区域:</label>
17
+ <span><%= @area%></span>
18
+ </div>
19
+ </div>
20
+ <div class="layui-form-item" style="margin-bottom: 0">
14
21
  <div class="layui-inline" style="margin:18px; font-weight: bold">
15
22
  <label>完成率:</label>
16
23
  <span><%= @sale_report.finish_rate %>%</span>
@@ -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/index.json.jbuilder CHANGED
@@ -11,8 +11,15 @@ json.data do
11
11
  json.level2_score d.level2_score || 0
12
12
  json.level3_score d.level3_score || 0
13
13
  json.updated_at d.updated_at.to_s
14
+ json.weekly d.weekly
15
+ json.created_at d.created_at.to_s
16
+ json.month d.month.strftime("%Y-%m")
14
17
  end
15
18
  end
16
19
 
20
+ json.totalRow do
21
+ sum = @sale_reports.inject(0) { |score, i| score + i.finish_rate}
22
+ json.finish_rate ( @sale_reports.size > 0 ? (sum.to_f / @sale_reports.size).round(2).to_s : '0' ) + '%'
23
+ end
17
24
  json.code 0
18
25
  json.count @sale_reports.total_count
data/app/views/educode_sales/operation_reports/show.html.erb CHANGED
@@ -1,5 +1,12 @@
1
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
1
2
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
2
- <div class="layui-form-item">
3
+ <div class="layui-form-item" style="margin-bottom: 0">
4
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
5
+ <label>负责区域:</label>
6
+ <span><%= @area%></span>
7
+ </div>
8
+ </div>
9
+ <div class="layui-form-item" style="margin-bottom: 0">
3
10
  <div class="layui-inline" style="margin:18px; font-weight: bold">
4
11
  <label>完成率:</label>
5
12
  <span><%= @sale_report.finish_rate %>%</span>
@@ -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/places/index.html.erb CHANGED
@@ -34,6 +34,7 @@
34
34
  elem: '#place',
35
35
  url: '/missions/places',
36
36
  toolbar: '#toolbarDemo',
37
+ totalRow:true,
37
38
  defaultToolbar: [],
38
39
  cols: [
39
40
  [
@@ -41,6 +42,7 @@
41
42
  field: 'id',
42
43
  width: 80,
43
44
  title:'序号',type: 'numbers',
45
+ totalRowText:'合计',
44
46
  },
45
47
  {
46
48
  field: 'name',
@@ -54,16 +56,19 @@
54
56
  {
55
57
  field: 'businesses_count',
56
58
  width: 120,
59
+ totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
57
60
  title: '商机'
58
61
  },
59
62
  {
60
63
  field: 'amount',
61
64
  width: 120,
65
+ totalRow:true,
62
66
  title: '中标'
63
67
  },
64
68
  {
65
69
  field: 'return_mount',
66
70
  width: 120,
71
+ totalRow:true,
67
72
  title: '回款',
68
73
  },
69
74
  {
data/app/views/educode_sales/plans/_monthPlan.html.erb CHANGED
@@ -76,32 +76,34 @@
76
76
  elem: '#monthPlanTable',
77
77
  url: '/missions/plans?clazz=month',
78
78
  toolbar: '#monthPlanToolbar',
79
- defaultToolbar: [],
79
+ defaultToolbar: ['filter'],
80
+ totalRow:true,
80
81
  cols: [
81
82
  [
82
83
  {
83
84
  field: 'id',
84
- width: 80,
85
+ width: 60,
85
86
  title:'序号',type: 'numbers',
87
+ totalRowText:"合计",
86
88
  },
87
89
  {
88
90
  field: 'staff',
89
- width: 100,
91
+ width: 90,
90
92
  title: '姓名'
91
93
  },
92
94
  {
93
95
  field: 'business_name',
94
- width: 280,
96
+ width: 160,
95
97
  title: '商机名称',
96
98
  },
97
99
  {
98
100
  field: 'school',
99
- width: 190,
101
+ width: 170,
100
102
  title: '单位'
101
103
  },
102
104
  {
103
105
  field: 'department',
104
- width: 190,
106
+ width: 170,
105
107
  title: '部门'
106
108
  },
107
109
  {
@@ -116,13 +118,14 @@
116
118
  },
117
119
  {
118
120
  field: 'follow_ups_count',
119
- width: 100,
121
+ width: 60,
120
122
  title: '跟进',
121
123
  templet: '#show_follow'
122
124
  },
123
125
  {
124
126
  field: 'finish_rate',
125
- width: 100,
127
+ width: 80,
128
+ totalRow:true,
126
129
  title: '完成率',
127
130
  },
128
131
  {
data/app/views/educode_sales/plans/_monthly.html.erb CHANGED
@@ -78,31 +78,41 @@
78
78
  elem: '#monthlyTable',
79
79
  url: '/missions/sale_reports?clazz=month',
80
80
  toolbar: '#monthly_Toolbar',
81
- defaultToolbar: [],
81
+ defaultToolbar: ['filter'],
82
+ totalRow:true,
82
83
  cols: [
83
84
  [{
84
85
  field: 'id',
85
86
  width: 60,
86
87
  title:'序号',type: 'numbers',
88
+ totalRowText:"合计",
87
89
  },
88
90
  {
89
91
  field: 'staff',
90
- width: 100,
92
+ width: 90,
91
93
  title: '姓名'
92
94
  },
95
+ {
96
+ field: 'month',
97
+ width: 100,
98
+ title: '月份'
99
+ },
93
100
  {
94
101
  field: 'finish_rate',
95
- width: 100,
102
+ width: 80,
103
+ totalRow:true,
96
104
  title: '完成率',
97
105
  },
98
106
  {
99
107
  field: 'client',
100
108
  width: 100,
109
+ totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
101
110
  title: '覆盖客户'
102
111
  },
103
112
  {
104
113
  field: 'amount',
105
114
  width: 100,
115
+ totalRow:true,
106
116
  title: '项目金额'
107
117
  },
108
118
  {
@@ -134,6 +144,11 @@
134
144
  return '<div class="star3"></div>'
135
145
  }
136
146
  },
147
+ {
148
+ field: 'created_at',
149
+ width: 300,
150
+ title: '提交时间',
151
+ },
137
152
  {
138
153
  title: '操作',
139
154
  minWidth: 220,
data/app/views/educode_sales/plans/_weekPlan.html.erb CHANGED
@@ -76,22 +76,24 @@
76
76
  elem: '#weekPlanTable',
77
77
  url: '/missions/plans?clazz=week',
78
78
  toolbar: '#weekPlanToolbar',
79
- defaultToolbar: [],
79
+ totalRow:true,
80
+ defaultToolbar: ['filter'],
80
81
  cols: [
81
82
  [
82
83
  {
83
84
  field: 'id',
84
- width: 80,
85
+ width: 60,
85
86
  title:'序号',type: 'numbers',
87
+ totalRowText: '合计'
86
88
  },
87
89
  {
88
90
  field: 'staff',
89
- width: 100,
91
+ width: 90,
90
92
  title: '姓名'
91
93
  },
92
94
  {
93
95
  field: 'business_name',
94
- width: 280,
96
+ width: 160,
95
97
  title: '商机名称',
96
98
  },
97
99
  {
@@ -111,7 +113,7 @@
111
113
  },
112
114
  {
113
115
  field: 'weekly',
114
- width: 100,
116
+ width: 60,
115
117
  title: '周次',
116
118
  },
117
119
  {
@@ -121,14 +123,15 @@
121
123
  },
122
124
  {
123
125
  field: 'follow_ups_count',
124
- width: 100,
126
+ width: 60,
125
127
  title: '跟进',
126
128
  templet: '#show_follow'
127
129
  },
128
130
  {
129
131
  field: 'finish_rate',
130
- width: 100,
132
+ width: 80,
131
133
  title: '完成率',
134
+ totalRow:true,
132
135
  },
133
136
  {
134
137
  field: 'updated_at',
data/app/views/educode_sales/plans/_weekly.html.erb CHANGED
@@ -79,32 +79,42 @@
79
79
  elem: '#weeklyTable',
80
80
  url: '/missions/sale_reports?clazz=week',
81
81
  toolbar: '#weeklyToolbar',
82
- defaultToolbar: [],
82
+ defaultToolbar: ['filter'],
83
+ totalRow:true,
83
84
  cols: [
84
85
  [
85
86
  {
86
87
  field: 'id',
87
88
  width: 60,
88
89
  title:'序号',type: 'numbers',
90
+ totalRowText:"合计",
89
91
  },
90
92
  {
91
93
  field: 'staff',
92
- width: 100,
94
+ width: 90,
93
95
  title: '姓名'
94
96
  },
97
+ {
98
+ field: 'weekly',
99
+ width: 60,
100
+ title: '周次'
101
+ },
95
102
  {
96
103
  field: 'finish_rate',
97
- width: 100,
104
+ width: 80,
98
105
  title: '完成率',
106
+ totalRow:true,
99
107
  },
100
108
  {
101
109
  field: 'client',
102
110
  width: 100,
111
+ totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
103
112
  title: '覆盖客户'
104
113
  },
105
114
  {
106
115
  field: 'amount',
107
116
  width: 100,
117
+ totalRow:true,
108
118
  title: '项目金额'
109
119
  },
110
120
  {
@@ -135,7 +145,13 @@
135
145
  templet: function (d) {
136
146
  return '<div class="star3"></div>'
137
147
  }
148
+
138
149
  },
150
+ {
151
+ field: 'created_at',
152
+ width: 300,
153
+ title: '提交时间',
154
+ },
139
155
  {
140
156
  title: '操作',
141
157
  minWidth: 220,
data/app/views/educode_sales/plans/edit_month.html.erb CHANGED
@@ -1,28 +1,28 @@
1
1
  <form class="layui-form " action="">
2
2
  <div class="layui-form-item" style="padding: 25px">
3
3
  <div class="layui-inline">
4
- <label class="layui-form-label">月份</label>
4
+ <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
6
  <input type="text" class="layui-input" id="edit_month_plan_month" autocomplete="off" name="month">
7
7
  </div>
8
8
  </div>
9
9
  <div class="layui-inline">
10
- <label class="layui-form-label">商机</label>
11
- <div class="layui-input-inline">
12
- <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), class: 'required' %>
10
+ <label class="layui-form-label required">商机</label>
11
+ <div class="layui-input-inline" style="width: 500px">
12
+ <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), {"lay-verify": "required", include_blank: true} %>
13
13
  </div>
14
14
  </div>
15
15
  <div class="layui-form-item layui-form-text">
16
- <label class="layui-form-label">计划内容</label>
16
+ <label class="layui-form-label required">计划内容</label>
17
17
  <div class="layui-input-block">
18
- <textarea name="content" placeholder="简要填写具体的营销计划，例如：
18
+ <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
19
19
  1、推动xx老师用起来；
20
20
  2、与xx老师介绍一下我们的方案；
21
21
  3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
22
22
  </div>
23
23
  </div>
24
24
  <div class="layui-inline">
25
- <label class="layui-form-label">完成率</label>
25
+ <label class="layui-form-label required">完成率</label>
26
26
  <div class="layui-input-inline">
27
27
  <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
28
28
  </div>
data/app/views/educode_sales/plans/edit_week.html.erb CHANGED
@@ -1,36 +1,36 @@
1
1
  <div class="layui-form layuimini-form">
2
2
  <div class="layui-form-item" style="padding: 25px">
3
3
  <div class="layui-inline">
4
- <label class="layui-form-label">月份</label>
4
+ <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
6
  <input type="text" class="layui-input" id="edit_week_plan_month" autocomplete="off" name="month">
7
7
  </div>
8
8
  </div>
9
9
  <% if @sale_plan.weekly.present? %>
10
10
  <div class="layui-inline">
11
- <label class="layui-form-label">周次</label>
11
+ <label class="layui-form-label required">周次</label>
12
12
  <div class="layui-input-inline">
13
13
  <%= select_tag "weekly", options_for_select(@weeks, @sale_plan.weekly), class: 'required' %>
14
14
  </div>
15
15
  </div>
16
16
  <% end %>
17
17
  <div class="layui-inline">
18
- <label class="layui-form-label">商机</label>
19
- <div class="layui-input-inline">
20
- <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), class: 'required' %>
18
+ <label class="layui-form-label required">商机</label>
19
+ <div class="layui-input-inline" style="width: 500px">
20
+ <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), {"lay-verify": "required", include_blank: true} %>
21
21
  </div>
22
22
  </div>
23
23
  <div class="layui-form-item layui-form-text">
24
- <label class="layui-form-label">计划内容</label>
24
+ <label class="layui-form-label required">计划内容</label>
25
25
  <div class="layui-input-block">
26
- <textarea name="content" placeholder="简要填写具体的营销计划，例如：
26
+ <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
27
27
  1、推动xx老师用起来；
28
28
  2、与xx老师介绍一下我们的方案；
29
29
  3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
30
30
  </div>
31
31
  </div>
32
32
  <div class="layui-inline">
33
- <label class="layui-form-label">完成率</label>
33
+ <label class="layui-form-label required">完成率</label>
34
34
  <div class="layui-input-inline">
35
35
  <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
36
36
  </div>
data/app/views/educode_sales/plans/index.json.jbuilder CHANGED
@@ -15,5 +15,9 @@ json.data do
15
15
  end
16
16
  end
17
17
 
18
+ json.totalRow do
19
+ sum = @sale_plans.inject(0) { |score, i| score + i.finish_rate}
20
+ json.finish_rate ( @sale_plans.size > 0 ? (sum.to_f / @sale_plans.size).round(2).to_s : '0' ) + '%'
21
+ end
18
22
  json.code 0
19
23
  json.count @sale_plans.total_count
data/app/views/educode_sales/plans/new_month.html.erb CHANGED
@@ -3,12 +3,12 @@
3
3
  <div class="layui-inline">
4
4
  <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
- <input type="text" class="layui-input" id="new_month_month" autocomplete="off" name="month">
6
+ <input type="text" lay-verify="required" class="layui-input" id="new_month_month" autocomplete="off" name="month">
7
7
  </div>
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
- <form class="layui-form layui-form-pane">
9
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
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">
@@ -42,7 +54,9 @@
42
54
  </form>
43
55
 
44
56
  <!--表格-->
45
- <table class="layui-hide" id="newmonthlyTable" lay-filter="newmonthlyTable"></table>
57
+ <div style="padding: 20px">
58
+ <table class="layui-hide" id="newmonthlyTable" lay-filter="newmonthlyTable"></table>
59
+ </div>
46
60
  <script type="text/html" id="show_follow">
47
61
  <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
48
62
  </script>
data/app/views/educode_sales/plans/new_week.html.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  <div class="layui-inline">
4
4
  <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
- <input type="text" class="layui-input" id="new_week_month" autocomplete="off" name="month">
6
+ <input type="text" lay-verify="required" class="layui-input" id="new_week_month" autocomplete="off" name="month">
7
7
  </div>
8
8
  </div>
9
9
  <div class="layui-inline">
@@ -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,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
- <form class="layui-form layui-form-pane">
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>
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">
10
17
  <label>完成率:</label>
@@ -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">
@@ -40,7 +52,9 @@
40
52
  </form>
41
53
 
42
54
  <!--表格-->
43
- <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
55
+ <div style="padding: 20px">
56
+ <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
57
+ </div>
44
58
  <script type="text/html" id="show_follow">
45
59
  <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
46
60
  </script>
data/app/views/educode_sales/sale_reports/audit.html.erb CHANGED
@@ -1,5 +1,12 @@
1
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
1
2
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
2
- <div class="layui-form-item">
3
+ <div class="layui-form-item" style="margin-bottom: 0">
4
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
5
+ <label>负责区域:</label>
6
+ <span><%= @area%></span>
7
+ </div>
8
+ </div>
9
+ <div class="layui-form-item" style="margin-bottom: 0">
3
10
  <div class="layui-inline" style="margin:18px; font-weight: bold">
4
11
  <label>完成率:</label>
5
12
  <span><%= @sale_report.finish_rate %>%</span>
@@ -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,8 +9,15 @@
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">
13
- <div class="layui-form-item">
14
+ <div class="layui-form-item" style="margin-bottom: 0">
15
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
16
+ <label>负责区域:</label>
17
+ <span><%= @area%></span>
18
+ </div>
19
+ </div>
20
+ <div class="layui-form-item" style="margin-bottom: 0">
14
21
  <div class="layui-inline" style="margin:18px; font-weight: bold">
15
22
  <label>完成率:</label>
16
23
  <span><%= @sale_report.finish_rate %>%</span>
@@ -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/index.json.jbuilder CHANGED
@@ -10,8 +10,15 @@ json.data do
10
10
  json.level2_score d.level2_score || 0
11
11
  json.level3_score d.level3_score || 0
12
12
  json.updated_at d.updated_at.to_s
13
+ json.weekly d.weekly
14
+ json.created_at d.created_at.to_s
15
+ json.month d.month.strftime("%Y-%m")
13
16
  end
14
17
  end
15
18
 
19
+ json.totalRow do
20
+ sum = @sale_reports.inject(0) { |score, i| score + i.finish_rate}
21
+ json.finish_rate ( @sale_reports.size > 0 ? (sum.to_f / @sale_reports.size).round(2).to_s : '0' ) + '%'
22
+ end
16
23
  json.code 0
17
24
  json.count @sale_reports.total_count