educode_sales 0.4.6 → 0.5.0
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.
- checksums.yaml +4 -4
- data/app/controllers/educode_sales/businesses_controller.rb +74 -2
- data/app/controllers/educode_sales/follow_ups_controller.rb +1 -1
- data/app/controllers/educode_sales/home_controller.rb +4 -0
- data/app/controllers/educode_sales/operation_plans_controller.rb +16 -4
- data/app/controllers/educode_sales/operation_reports_controller.rb +6 -0
- data/app/controllers/educode_sales/operations_controller.rb +1 -1
- data/app/controllers/educode_sales/plans_controller.rb +29 -13
- data/app/controllers/educode_sales/sale_reports_controller.rb +6 -0
- data/app/controllers/educode_sales/sale_trends_controller.rb +8 -7
- data/app/controllers/educode_sales/sales_controller.rb +2 -2
- data/app/controllers/educode_sales/upload_files_controller.rb +105 -0
- data/app/models/educode_sales/common.rb +4 -0
- data/app/models/educode_sales/sale_plan.rb +1 -0
- data/app/views/educode_sales/activities/show_teachers.html.erb +16 -16
- data/app/views/educode_sales/businesses/edit_follow_record.html.erb +15 -0
- data/app/views/educode_sales/businesses/file.html.erb +154 -0
- data/app/views/educode_sales/businesses/index.html.erb +62 -10
- data/app/views/educode_sales/businesses/index.json.jbuilder +3 -1
- data/app/views/educode_sales/businesses/new_follow_record.html.erb +17 -0
- data/app/views/educode_sales/businesses/show_follow.html.erb +49 -12
- data/app/views/educode_sales/businesses/show_follow.json.jbuilder +3 -0
- data/app/views/educode_sales/businesses/show_follow_record.html.erb +80 -2
- data/app/views/educode_sales/businesses/time_line.html.erb +62 -0
- data/app/views/educode_sales/businesses/upload_file.html.erb +43 -0
- data/app/views/educode_sales/home/search_operation_teacher.json.jbuilder +12 -0
- data/app/views/educode_sales/operation_plans/_monthPlan.html.erb +7 -7
- data/app/views/educode_sales/operation_plans/_monthly.html.erb +8 -8
- data/app/views/educode_sales/operation_plans/_weekPlan.html.erb +8 -8
- data/app/views/educode_sales/operation_plans/_weekly.html.erb +9 -9
- data/app/views/educode_sales/operation_plans/edit_month.html.erb +6 -6
- data/app/views/educode_sales/operation_plans/edit_week.html.erb +7 -7
- data/app/views/educode_sales/operation_plans/new_month.html.erb +50 -4
- data/app/views/educode_sales/operation_plans/new_monthly.html.erb +12 -0
- data/app/views/educode_sales/operation_plans/new_week.html.erb +48 -5
- data/app/views/educode_sales/operation_plans/new_weekly.html.erb +12 -0
- data/app/views/educode_sales/operation_reports/audit.html.erb +22 -10
- data/app/views/educode_sales/operation_reports/edit.html.erb +22 -10
- data/app/views/educode_sales/operation_reports/show.html.erb +22 -10
- data/app/views/educode_sales/plans/_monthPlan.html.erb +8 -8
- data/app/views/educode_sales/plans/_monthly.html.erb +7 -7
- data/app/views/educode_sales/plans/_weekPlan.html.erb +7 -7
- data/app/views/educode_sales/plans/_weekly.html.erb +8 -8
- data/app/views/educode_sales/plans/edit_month.html.erb +7 -7
- data/app/views/educode_sales/plans/edit_week.html.erb +8 -8
- data/app/views/educode_sales/plans/new_month.html.erb +2 -2
- data/app/views/educode_sales/plans/new_monthly.html.erb +18 -6
- data/app/views/educode_sales/plans/new_week.html.erb +3 -3
- data/app/views/educode_sales/plans/new_weekly.html.erb +19 -7
- data/app/views/educode_sales/sale_reports/audit.html.erb +20 -8
- data/app/views/educode_sales/sale_reports/edit.html.erb +20 -8
- data/app/views/educode_sales/sale_reports/show.html.erb +15 -3
- data/app/views/educode_sales/sale_trends/trends.html.erb +6 -6
- data/app/views/educode_sales/teachers/index.html.erb +2 -2
- data/app/views/educode_sales/teachers/show_follow.html.erb +10 -4
- data/app/views/educode_sales/upload_files/index.json.jbuilder +13 -0
- data/app/views/layouts/educode_sales/application.html.erb +4 -1
- data/config/routes.rb +13 -0
- data/db/migrate/20211102085743_add_bidded_date_educode_sales_follow_ups.rb +6 -0
- data/lib/educode_sales/version.rb +1 -1
- metadata +9 -2
@@ -3,18 +3,18 @@
|
|
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">
|
10
10
|
<label class="layui-form-label required">周次</label>
|
11
11
|
<div class="layui-input-inline">
|
12
|
-
<%= select_tag "weekly", options_for_select(@weeks), class: 'required' %>
|
12
|
+
<%= select_tag "weekly", options_for_select(@weeks,@week), class: 'required' %>
|
13
13
|
</div>
|
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>
|
@@ -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">
|
@@ -122,38 +134,38 @@
|
|
122
134
|
},
|
123
135
|
{
|
124
136
|
field: 'staff',
|
125
|
-
width:
|
137
|
+
width: 80,
|
126
138
|
title: '姓名'
|
127
139
|
},
|
128
140
|
{
|
129
141
|
field: 'business_name',
|
130
|
-
width:
|
142
|
+
width: 170,
|
131
143
|
title: '商机名称',
|
132
144
|
},
|
133
145
|
{
|
134
146
|
field: 'school',
|
135
|
-
width:
|
147
|
+
width: 170,
|
136
148
|
title: '单位'
|
137
149
|
},
|
138
150
|
{
|
139
151
|
field: 'department',
|
140
|
-
width:
|
152
|
+
width: 170,
|
141
153
|
title: '部门'
|
142
154
|
},
|
143
155
|
{
|
144
156
|
field: 'weekly',
|
145
|
-
width:
|
157
|
+
width: 80,
|
146
158
|
title: '周次',
|
147
159
|
},
|
148
160
|
{
|
149
161
|
field: 'follow_ups_count',
|
150
|
-
width:
|
162
|
+
width: 80,
|
151
163
|
title: '跟进',
|
152
164
|
templet: '#show_follow'
|
153
165
|
},
|
154
166
|
{
|
155
167
|
field: 'finish_rate',
|
156
|
-
width:
|
168
|
+
width: 80,
|
157
169
|
title: '完成率',
|
158
170
|
},
|
159
171
|
{
|
@@ -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">
|
@@ -159,38 +171,38 @@
|
|
159
171
|
},
|
160
172
|
{
|
161
173
|
field: 'staff',
|
162
|
-
width:
|
174
|
+
width: 80,
|
163
175
|
title: '姓名'
|
164
176
|
},
|
165
177
|
{
|
166
178
|
field: 'business_name',
|
167
|
-
width:
|
179
|
+
width: 170,
|
168
180
|
title: '商机名称',
|
169
181
|
},
|
170
182
|
{
|
171
183
|
field: 'school',
|
172
|
-
width:
|
184
|
+
width: 170,
|
173
185
|
title: '单位'
|
174
186
|
},
|
175
187
|
{
|
176
188
|
field: 'department',
|
177
|
-
width:
|
189
|
+
width: 170,
|
178
190
|
title: '部门'
|
179
191
|
},
|
180
192
|
{
|
181
193
|
field: 'weekly',
|
182
|
-
width:
|
194
|
+
width: 80,
|
183
195
|
title: '周次',
|
184
196
|
},
|
185
197
|
{
|
186
198
|
field: 'follow_ups_count',
|
187
|
-
width:
|
199
|
+
width: 80,
|
188
200
|
title: '跟进',
|
189
201
|
templet: '#show_follow'
|
190
202
|
},
|
191
203
|
{
|
192
204
|
field: 'finish_rate',
|
193
|
-
width:
|
205
|
+
width: 80,
|
194
206
|
title: '完成率',
|
195
207
|
},
|
196
208
|
{
|
@@ -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">
|
@@ -96,38 +108,38 @@
|
|
96
108
|
},
|
97
109
|
{
|
98
110
|
field: 'staff',
|
99
|
-
width:
|
111
|
+
width: 80,
|
100
112
|
title: '姓名'
|
101
113
|
},
|
102
114
|
{
|
103
115
|
field: 'business_name',
|
104
|
-
width:
|
116
|
+
width: 170,
|
105
117
|
title: '商机名称',
|
106
118
|
},
|
107
119
|
{
|
108
120
|
field: 'school',
|
109
|
-
width:
|
121
|
+
width: 170,
|
110
122
|
title: '单位'
|
111
123
|
},
|
112
124
|
{
|
113
125
|
field: 'department',
|
114
|
-
width:
|
126
|
+
width: 170,
|
115
127
|
title: '部门'
|
116
128
|
},
|
117
129
|
{
|
118
130
|
field: 'weekly',
|
119
|
-
width:
|
131
|
+
width: 80,
|
120
132
|
title: '周次',
|
121
133
|
},
|
122
134
|
{
|
123
135
|
field: 'follow_ups_count',
|
124
|
-
width:
|
136
|
+
width: 80,
|
125
137
|
title: '跟进',
|
126
138
|
templet: '#show_follow'
|
127
139
|
},
|
128
140
|
{
|
129
141
|
field: 'finish_rate',
|
130
|
-
width:
|
142
|
+
width: 80,
|
131
143
|
title: '完成率',
|
132
144
|
},
|
133
145
|
{
|
@@ -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>
|
@@ -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">
|
@@ -124,12 +136,12 @@
|
|
124
136
|
},
|
125
137
|
{
|
126
138
|
field: 'business_name',
|
127
|
-
width:
|
139
|
+
width: 170,
|
128
140
|
title: '商机名称',
|
129
141
|
},
|
130
142
|
{
|
131
143
|
field: 'school',
|
132
|
-
width:
|
144
|
+
width: 170,
|
133
145
|
title: '单位'
|
134
146
|
},
|
135
147
|
{
|
@@ -88,7 +88,7 @@
|
|
88
88
|
<div class="panel layui-bg-number">
|
89
89
|
<div class="panel-body">
|
90
90
|
<div class="panel-title">
|
91
|
-
<h5
|
91
|
+
<h5>现有商机<a href="/missions/businesses?name=(销售态势-现有商机)" style="color: #0000FF;float: right">查看商机</a></h5>
|
92
92
|
</div>
|
93
93
|
<div class="panel-content y-t-10">
|
94
94
|
<h1 class="no-margins"><%= @business_amount %>万</h1>
|
@@ -101,7 +101,7 @@
|
|
101
101
|
<div class="panel layui-bg-number">
|
102
102
|
<div class="panel-body">
|
103
103
|
<div class="panel-title">
|
104
|
-
<h5
|
104
|
+
<h5>已中标<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)" style="color: #0000FF;float: right">查看商机</a></h5>
|
105
105
|
</div>
|
106
106
|
<div class="panel-content y-t-10">
|
107
107
|
<h1 class="no-margins"><%= @goal_amount %>万</h1>
|
@@ -114,7 +114,7 @@
|
|
114
114
|
<div class="panel layui-bg-number">
|
115
115
|
<div class="panel-body">
|
116
116
|
<div class="panel-title">
|
117
|
-
<h5
|
117
|
+
<h5>已签单<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)" style="color: #0000FF;float: right">查看商机</a></h5>
|
118
118
|
</div>
|
119
119
|
<div class="panel-content y-t-10">
|
120
120
|
<h1 class="no-margins"><%= @service_amount %>万</h1>
|
@@ -127,7 +127,7 @@
|
|
127
127
|
<div class="panel layui-bg-number">
|
128
128
|
<div class="panel-body">
|
129
129
|
<div class="panel-title">
|
130
|
-
<h5
|
130
|
+
<h5>已回款<a href="/missions/businesses?name=(销售态势-<%=@year %>-已回款商机)" style="color: #0000FF;float: right">查看商机</a></h5>
|
131
131
|
</div>
|
132
132
|
<div class="panel-content y-t-10">
|
133
133
|
<h1 class="no-margins"><%= @return_amount %>万</h1>
|
@@ -140,7 +140,7 @@
|
|
140
140
|
<div class="panel layui-bg-number">
|
141
141
|
<div class="panel-body">
|
142
142
|
<div class="panel-title">
|
143
|
-
<h5>A
|
143
|
+
<h5>A类商机<a href="/missions/businesses?clazz_id=<%=EducodeSales::Common.find_by(extras: EducodeSales::Common::ATYPE)&.id %>" style="color: #0000FF;float: right">查看商机</a></h5>
|
144
144
|
</div>
|
145
145
|
<div class="panel-content y-t-10">
|
146
146
|
<h1 class="no-margins"><%= @a_amount %>万</h1>
|
@@ -153,7 +153,7 @@
|
|
153
153
|
<div class="panel layui-bg-number">
|
154
154
|
<div class="panel-body">
|
155
155
|
<div class="panel-title">
|
156
|
-
<h5>B
|
156
|
+
<h5>B类商机<a href="/missions/businesses?clazz_id=<%=EducodeSales::Common.find_by(extras: EducodeSales::Common::BTYPE)&.id %>" style="color: #0000FF;float: right">查看商机</a></h5>
|
157
157
|
</div>
|
158
158
|
<div class="panel-content y-t-10">
|
159
159
|
<h1 class="no-margins"><%= @b_amount %>万</h1>
|
@@ -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:
|
206
|
+
width: 120,
|
207
207
|
title: '学院渗透率',
|
208
208
|
},
|
209
209
|
{
|
@@ -6,8 +6,9 @@
|
|
6
6
|
<% end %>
|
7
7
|
</div>
|
8
8
|
</script>
|
9
|
-
|
10
|
-
<table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
|
9
|
+
<div class="z-index">
|
10
|
+
<table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
|
11
|
+
</div>
|
11
12
|
|
12
13
|
<script type="text/html" id="currentTableBar_follow">
|
13
14
|
<% if can? :read, EducodeSales::TeacherFollow %>
|
@@ -36,7 +37,7 @@
|
|
36
37
|
elem: '#sale_plan_follow_table',
|
37
38
|
url: '/missions/teachers/show_follow?id=' + parent.id ,
|
38
39
|
toolbar: '#toolbarDemo_follow',
|
39
|
-
defaultToolbar: [],
|
40
|
+
defaultToolbar: ['filter'],
|
40
41
|
cols: [
|
41
42
|
[
|
42
43
|
{
|
@@ -490,4 +491,9 @@
|
|
490
491
|
});
|
491
492
|
|
492
493
|
});
|
493
|
-
</script>
|
494
|
+
</script>
|
495
|
+
<style>
|
496
|
+
.z-index .layui-table-tool{
|
497
|
+
z-index: 10000; !important;
|
498
|
+
}
|
499
|
+
</style>
|
@@ -0,0 +1,13 @@
|
|
1
|
+
json.data do
|
2
|
+
json.array! @files do |d|
|
3
|
+
json.id d.id
|
4
|
+
json.name d.filename
|
5
|
+
json.size d.filesize < 1000000 ? (d.filesize.to_f / 1000).round(2).to_s + 'KB' : (d.filesize.to_f / 1000000).round(2).to_s + 'MB'
|
6
|
+
json.created_on d.created_on.to_s
|
7
|
+
json.upload_person EducodeSales::Staff.find(d.author_id).user.real_name
|
8
|
+
json.disk_filename d.disk_filename
|
9
|
+
json.content_type d.content_type
|
10
|
+
end
|
11
|
+
end
|
12
|
+
json.code 0
|
13
|
+
json.count @files.total_count
|
@@ -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"
|
@@ -60,6 +61,9 @@ EducodeSales::Engine.routes.draw do
|
|
60
61
|
get :show_follow_record
|
61
62
|
get :edit_follow_record
|
62
63
|
get :edit_plan
|
64
|
+
get :file
|
65
|
+
get :time_line
|
66
|
+
get :upload_file
|
63
67
|
end
|
64
68
|
|
65
69
|
member do
|
@@ -114,6 +118,15 @@ EducodeSales::Engine.routes.draw do
|
|
114
118
|
|
115
119
|
resources :import_teachers
|
116
120
|
|
121
|
+
resources :upload_files do
|
122
|
+
collection do
|
123
|
+
get :download
|
124
|
+
end
|
125
|
+
|
126
|
+
member do
|
127
|
+
end
|
128
|
+
end
|
129
|
+
|
117
130
|
resources :teachers do
|
118
131
|
collection do
|
119
132
|
get :import
|
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
|
+
version: 0.5.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- anke1460
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-11-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -153,6 +153,7 @@ files:
|
|
153
153
|
- app/controllers/educode_sales/staffs_controller.rb
|
154
154
|
- app/controllers/educode_sales/teacher_follows_controller.rb
|
155
155
|
- app/controllers/educode_sales/teachers_controller.rb
|
156
|
+
- app/controllers/educode_sales/upload_files_controller.rb
|
156
157
|
- app/helpers/educode_sales/activities_helper.rb
|
157
158
|
- app/helpers/educode_sales/application_helper.rb
|
158
159
|
- app/helpers/educode_sales/business_helper.rb
|
@@ -196,6 +197,7 @@ files:
|
|
196
197
|
- app/views/educode_sales/businesses/edit.html.erb
|
197
198
|
- app/views/educode_sales/businesses/edit_follow_record.html.erb
|
198
199
|
- app/views/educode_sales/businesses/edit_plan.html.erb
|
200
|
+
- app/views/educode_sales/businesses/file.html.erb
|
199
201
|
- app/views/educode_sales/businesses/index.html.erb
|
200
202
|
- app/views/educode_sales/businesses/index.json.jbuilder
|
201
203
|
- app/views/educode_sales/businesses/new.html.erb
|
@@ -204,7 +206,9 @@ files:
|
|
204
206
|
- app/views/educode_sales/businesses/show_follow.json.jbuilder
|
205
207
|
- app/views/educode_sales/businesses/show_follow_record.html.erb
|
206
208
|
- app/views/educode_sales/businesses/show_keys.html.erb
|
209
|
+
- app/views/educode_sales/businesses/time_line.html.erb
|
207
210
|
- app/views/educode_sales/businesses/unfinish_plans.json.jbuilder
|
211
|
+
- app/views/educode_sales/businesses/upload_file.html.erb
|
208
212
|
- app/views/educode_sales/commons/edit.html.erb
|
209
213
|
- app/views/educode_sales/commons/index.html.erb
|
210
214
|
- app/views/educode_sales/commons/index.json.jbuilder
|
@@ -217,6 +221,7 @@ files:
|
|
217
221
|
- app/views/educode_sales/home/sales_staff.json.jbuilder
|
218
222
|
- app/views/educode_sales/home/search.json.jbuilder
|
219
223
|
- app/views/educode_sales/home/search_edu_teacher.json.jbuilder
|
224
|
+
- app/views/educode_sales/home/search_operation_teacher.json.jbuilder
|
220
225
|
- app/views/educode_sales/home/search_teacher.json.jbuilder
|
221
226
|
- app/views/educode_sales/home/search_users.json.jbuilder
|
222
227
|
- app/views/educode_sales/home/statistics.html.erb
|
@@ -317,6 +322,7 @@ files:
|
|
317
322
|
- app/views/educode_sales/teachers/show_follow.json.jbuilder
|
318
323
|
- app/views/educode_sales/teachers/show_follow_record.html.erb
|
319
324
|
- app/views/educode_sales/teachers/unfinish_plans.json.jbuilder
|
325
|
+
- app/views/educode_sales/upload_files/index.json.jbuilder
|
320
326
|
- app/views/layouts/educode_sales/application.html.erb
|
321
327
|
- app/views/layouts/educode_sales/login.html.erb
|
322
328
|
- config/locales/sale.zh-CN.yml
|
@@ -352,6 +358,7 @@ files:
|
|
352
358
|
- db/migrate/20211013060712_create_educode_sales_assign_follow_ups.rb
|
353
359
|
- db/migrate/20211018054256_add_extras_to_commons.rb
|
354
360
|
- db/migrate/20211022085324_add_teacher_used_to_teachers.rb
|
361
|
+
- db/migrate/20211102085743_add_bidded_date_educode_sales_follow_ups.rb
|
355
362
|
- lib/educode_sales.rb
|
356
363
|
- lib/educode_sales/engine.rb
|
357
364
|
- lib/educode_sales/version.rb
|