educode_sales 0.6.5 → 0.6.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/educode_sales/activities_controller.rb +0 -2
- data/app/controllers/educode_sales/businesses_controller.rb +257 -41
- data/app/controllers/educode_sales/customers_controller.rb +47 -14
- data/app/controllers/educode_sales/home_controller.rb +6 -0
- data/app/controllers/educode_sales/money_plans_controller.rb +2 -2
- data/app/controllers/educode_sales/sale_trends_controller.rb +107 -18
- data/app/controllers/educode_sales/staffs_controller.rb +29 -0
- data/app/controllers/educode_sales/teacher_follows_controller.rb +1 -93
- data/app/models/educode_sales/business_export_record.rb +5 -0
- data/app/models/educode_sales/customer_add.rb +4 -0
- data/app/models/educode_sales/staff.rb +1 -0
- data/app/models/educode_sales/staff_school.rb +6 -0
- data/app/views/educode_sales/activities/index.html.erb +7 -1
- data/app/views/educode_sales/activities/new.html.erb +1 -1
- data/app/views/educode_sales/businesses/edit_follow_record.html.erb +4 -4
- data/app/views/educode_sales/businesses/edit_plan.html.erb +5 -2
- data/app/views/educode_sales/businesses/export_records.html.erb +53 -0
- data/app/views/educode_sales/businesses/export_records.json.jbuilder +11 -0
- data/app/views/educode_sales/businesses/get_export_data.json.jbuilder +30 -0
- data/app/views/educode_sales/businesses/index.html.erb +138 -49
- data/app/views/educode_sales/businesses/index.json.jbuilder +8 -7
- data/app/views/educode_sales/businesses/new_follow_record.html.erb +6 -6
- data/app/views/educode_sales/commons/index.html.erb +7 -1
- data/app/views/educode_sales/customers/index.html.erb +30 -1
- data/app/views/educode_sales/customers/index.json.jbuilder +12 -0
- data/app/views/educode_sales/customers/new.html.erb +106 -53
- data/app/views/educode_sales/home/staff_schools.json.jbuilder +9 -0
- data/app/views/educode_sales/money_plans/index.html.erb +2 -2
- data/app/views/educode_sales/places/index.json.jbuilder +1 -1
- data/app/views/educode_sales/roles/edit.html.erb +10 -4
- data/app/views/educode_sales/roles/index.html.erb +7 -1
- data/app/views/educode_sales/sale_trends/trends.html.erb +96 -44
- data/app/views/educode_sales/sale_trends/trends.json.jbuilder +2 -1
- data/app/views/educode_sales/sales/index.json.jbuilder +1 -1
- data/app/views/educode_sales/staffs/edit.html.erb +45 -0
- data/app/views/educode_sales/staffs/index.html.erb +68 -2
- data/app/views/educode_sales/teachers/index.html.erb +2 -2
- data/app/views/layouts/educode_sales/application.html.erb +6 -1
- data/config/routes.rb +4 -0
- data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb +2 -0
- data/db/migrate/20220121060006_create_educode_sales_business_export_records.rb +10 -0
- data/db/migrate/20220125013811_create_educode_sales_staff_schools.rb +10 -0
- data/db/migrate/20220125033552_create_educode_sales_customer_adds.rb +9 -0
- data/lib/educode_sales/version.rb +1 -1
- metadata +12 -2
|
@@ -18,7 +18,7 @@ json.data do
|
|
|
18
18
|
json.businesses_count business_count
|
|
19
19
|
all_businesses_count += business_count
|
|
20
20
|
# json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("actual_amount - divide_amount").round(2)
|
|
21
|
-
json.total_amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("
|
|
21
|
+
json.total_amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("total_amount").round(2)
|
|
22
22
|
json.divide_amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("divide_amount").round(2)
|
|
23
23
|
json.return_mount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").sum(:return_money).round(2)
|
|
24
24
|
end
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
<li class="layui-this">操作权限</li>
|
|
4
4
|
<li>数据浏览权限</li>
|
|
5
5
|
</ul>
|
|
6
|
-
<div class="layui-tab-content">
|
|
7
|
-
<div class="layui-tab-item layui-show">
|
|
8
|
-
<form class="layui-form
|
|
6
|
+
<div class="layui-tab-content caozuo">
|
|
7
|
+
<div class="layui-tab-item layui-show" style="height: 800px;!important;">
|
|
8
|
+
<form class="layui-form " action="">
|
|
9
9
|
<% id = 0 %>
|
|
10
10
|
<% EducodeSales::Permission.all.order(position: :asc).group_by{ |d| d.clazz}.each do |k, d| %>
|
|
11
11
|
<div class="layui-form-item">
|
|
@@ -139,4 +139,10 @@
|
|
|
139
139
|
})
|
|
140
140
|
//…
|
|
141
141
|
});
|
|
142
|
-
</script>
|
|
142
|
+
</script>
|
|
143
|
+
<style>
|
|
144
|
+
.caozuo .layui-tab-item {
|
|
145
|
+
width: 100% !important;
|
|
146
|
+
height: 900px !important;
|
|
147
|
+
}
|
|
148
|
+
</style>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
<h5>商机目标</h5>
|
|
21
21
|
</div>
|
|
22
22
|
<div class="panel-content y-t-10">
|
|
23
|
-
<h1 class="no-margins" id="chance_money_value"
|
|
23
|
+
<h1 class="no-margins" id="chance_money_value"><%=@sale_trend.present? ? @sale_trend.chance_money : EducodeSales::SaleTrend.sum(:chance_money)%>万</h1>
|
|
24
24
|
<div id="chance_money_field" class="layui-hide">
|
|
25
25
|
<input type="text" name="chance_money" autocomplete="off"
|
|
26
26
|
class="layui-input" id="chance_money">
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
<h5>中标目标</h5>
|
|
40
40
|
</div>
|
|
41
41
|
<div class="panel-content y-t-10">
|
|
42
|
-
<h1 class="no-margins" id="ballot_money_value"
|
|
42
|
+
<h1 class="no-margins" id="ballot_money_value"><%=@sale_trend.present? ? @sale_trend.ballot_money : EducodeSales::SaleTrend.sum(:ballot_money)%>万</h1>
|
|
43
43
|
<div id="ballot_money_field" class="layui-hide">
|
|
44
44
|
<input type="text" name="ballot_money" autocomplete="off" class="layui-input" id="ballot_money">
|
|
45
45
|
</div>
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
<h5>签单目标</h5>
|
|
58
58
|
</div>
|
|
59
59
|
<div class="panel-content y-t-10">
|
|
60
|
-
<h1 class="no-margins" id="sign_money_value"
|
|
60
|
+
<h1 class="no-margins" id="sign_money_value"><%=@sale_trend.present? ? @sale_trend.sign_money : EducodeSales::SaleTrend.sum(:sign_money)%>万</h1>
|
|
61
61
|
<div id="sign_money_field" class="layui-hide">
|
|
62
62
|
<input type="text" name="sign_money" autocomplete="off" class="layui-input" id="sign_money">
|
|
63
63
|
</div>
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
<h5>回款目标</h5>
|
|
76
76
|
</div>
|
|
77
77
|
<div class="panel-content y-t-10">
|
|
78
|
-
<h1 class="no-margins" id="returned_money_value"
|
|
78
|
+
<h1 class="no-margins" id="returned_money_value"><%=@sale_trend.present? ? @sale_trend.returned_money : EducodeSales::SaleTrend.sum(:returned_money)%>万</h1>
|
|
79
79
|
<div id="returned_money_field" class="layui-hide">
|
|
80
80
|
<input type="text" name="returned_money" autocomplete="off" class="layui-input" id="returned_money">
|
|
81
81
|
</div>
|
|
@@ -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>现有商机<a href="/missions/businesses?name=(
|
|
91
|
+
<h5>现有商机<a href="/missions/businesses?name=(销售态势-<%=@year %>-现有商机)" 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>
|
|
@@ -195,12 +195,12 @@
|
|
|
195
195
|
</div>
|
|
196
196
|
</form>
|
|
197
197
|
<br>
|
|
198
|
-
<div class="
|
|
198
|
+
<div class="" id="商机跟进数">
|
|
199
199
|
<ul class="layui-tab-title">
|
|
200
200
|
<li class="layui-this">商机跟进数</li>
|
|
201
201
|
</ul>
|
|
202
|
-
<div class="
|
|
203
|
-
<div class="
|
|
202
|
+
<div class="" style="padding-right: 50px">
|
|
203
|
+
<div class=" layui-show " style="padding-left: 20px">
|
|
204
204
|
<div style="margin: 10px 10px 10px 10px">
|
|
205
205
|
<form class="layui-form layui-form-pane" lay-filter="search_form">
|
|
206
206
|
<div class="layui-form-item">
|
|
@@ -213,10 +213,10 @@
|
|
|
213
213
|
<div class="layui-inline">
|
|
214
214
|
<label class="layui-form-label">时间范围</label>
|
|
215
215
|
<div class="layui-input-inline">
|
|
216
|
-
<input type="text" class="layui-input month layui-hide" id="date_month" name="date_month" placeholder=" - " value="<%=params[:date_month] %>" >
|
|
217
|
-
<input type="text" class="layui-input year layui-hide" id="date_year" name="date_year" placeholder=" - " value="<%=params[:date_year] %>">
|
|
218
|
-
<input type="text" class="layui-input week " id="date_week" name="date_week" placeholder=" - " value="<%=params[:date_week].present? ? params[:date_week] : (Time.now - 30.days).beginning_of_week.to_s(:date) + ' - ' + Time.now.end_of_week.to_s(:date) %>">
|
|
219
|
-
<input type="text" class="layui-input day layui-hide" id="date" name="date" placeholder=" - " value="<%=params[:date] %>">
|
|
216
|
+
<input type="text" class="layui-input month layui-hide" id="date_month" name="date_month" placeholder=" - " value="<%=params[:date_month] %>" autocomplete="off" >
|
|
217
|
+
<input type="text" class="layui-input year layui-hide" id="date_year" name="date_year" placeholder=" - " value="<%=params[:date_year] %>" autocomplete="off">
|
|
218
|
+
<input type="text" class="layui-input week " id="date_week" name="date_week" placeholder=" - " value="<%=params[:date_week].present? ? params[:date_week] : (Time.now - 30.days).beginning_of_week.to_s(:date) + ' - ' + Time.now.end_of_week.to_s(:date) %>" autocomplete="off">
|
|
219
|
+
<input type="text" class="layui-input day layui-hide" id="date" name="date" placeholder=" - " value="<%=params[:date] %>" autocomplete="off">
|
|
220
220
|
</div>
|
|
221
221
|
</div>
|
|
222
222
|
<div class="layui-inline">
|
|
@@ -232,12 +232,12 @@
|
|
|
232
232
|
</div>
|
|
233
233
|
<br>
|
|
234
234
|
<br>
|
|
235
|
-
<div class="
|
|
235
|
+
<div class=" " id="销售额分析" lay-filter="test1">
|
|
236
236
|
<ul class="layui-tab-title">
|
|
237
237
|
<li class="layui-this">销售额分析</li>
|
|
238
238
|
</ul>
|
|
239
|
-
<div class="
|
|
240
|
-
<div class="
|
|
239
|
+
<div class="" style="padding-right: 50px">
|
|
240
|
+
<div class=" layui-show" style="padding-left: 20px">
|
|
241
241
|
<div style="margin: 10px 10px 10px 10px">
|
|
242
242
|
<form class="layui-form layui-form-pane" lay-filter="search_form">
|
|
243
243
|
<div class="layui-form-item">
|
|
@@ -256,8 +256,8 @@
|
|
|
256
256
|
<div class="layui-inline">
|
|
257
257
|
<label class="layui-form-label">时间范围</label>
|
|
258
258
|
<div class="layui-input-inline">
|
|
259
|
-
<input type="text" class="layui-input goal_month " id="goal_date_month" name="goal_date_month" placeholder=" - " value="<%=params[:goal_date_month].present? ? params[:goal_date_month] : Time.now.year.to_s + "-01" + " - " + Time.now.strftime("%Y-%m") %>">
|
|
260
|
-
<input type="text" class="layui-input goal_year layui-hide" id="goal_date_year" name="goal_date_year" placeholder=" - " value="<%=params[:goal_date_year] %>">
|
|
259
|
+
<input type="text" class="layui-input goal_month " id="goal_date_month" name="goal_date_month" placeholder=" - " value="<%=params[:goal_date_month].present? ? params[:goal_date_month] : Time.now.year.to_s + "-01" + " - " + Time.now.strftime("%Y-%m") %>" autocomplete="off">
|
|
260
|
+
<input type="text" class="layui-input goal_year layui-hide" id="goal_date_year" name="goal_date_year" placeholder=" - " value="<%=params[:goal_date_year] %>" autocomplete="off">
|
|
261
261
|
</div>
|
|
262
262
|
</div>
|
|
263
263
|
<div class="layui-inline">
|
|
@@ -274,12 +274,12 @@
|
|
|
274
274
|
</div>
|
|
275
275
|
<br>
|
|
276
276
|
<br>
|
|
277
|
-
<div class="
|
|
277
|
+
<div class=" " id="销售额分析" lay-filter="test1">
|
|
278
278
|
<ul class="layui-tab-title">
|
|
279
279
|
<li class="layui-this">商机区域分布</li>
|
|
280
280
|
</ul>
|
|
281
|
-
<div class="
|
|
282
|
-
<div class="
|
|
281
|
+
<div class="" style="padding-right: 50px">
|
|
282
|
+
<div class=" layui-show" style="padding-left: 20px">
|
|
283
283
|
<div style="margin: 10px 10px 10px 10px">
|
|
284
284
|
<form class="layui-form layui-form-pane" lay-filter="search_form">
|
|
285
285
|
<div class="layui-form-item">
|
|
@@ -307,6 +307,46 @@
|
|
|
307
307
|
|
|
308
308
|
</div>
|
|
309
309
|
</div>
|
|
310
|
+
<div class=" " id="销售人员跟进分析" lay-filter="test1">
|
|
311
|
+
<ul class="layui-tab-title">
|
|
312
|
+
<li class="layui-this">销售人员跟进分析</li>
|
|
313
|
+
</ul>
|
|
314
|
+
<div class="" style="padding-right: 50px">
|
|
315
|
+
<div class=" layui-show" style="padding-left: 20px">
|
|
316
|
+
<div style="margin: 10px 10px 10px 10px">
|
|
317
|
+
<form class="layui-form layui-form-pane" lay-filter="search_form">
|
|
318
|
+
<div class="layui-form-item">
|
|
319
|
+
<div class="layui-inline m-t-10">
|
|
320
|
+
<label class="layui-form-label">维度</label>
|
|
321
|
+
<div class="layui-input-inline">
|
|
322
|
+
<%= select_tag "customer_count_type", options_for_select([['按跟进客户数统计','money'],['按跟进客户次数统计','count']],params[:goal_count_range]), {'lay-filter': 'goal_count'}%>
|
|
323
|
+
</div>
|
|
324
|
+
</div>
|
|
325
|
+
<div class="layui-inline m-t-10">
|
|
326
|
+
<label class="layui-form-label">时间范围</label>
|
|
327
|
+
<div class="layui-input-inline">
|
|
328
|
+
<% options = [['上周','last_week'],['本周','this_week'],['上月','last_month'],['本月','this_month'],['去年','last_year'],['今年','this_year'],['全部','all'],['自定义','diy']]%>
|
|
329
|
+
<%= select_tag "customer_time_range", options_for_select(options,'this_year'), { 'lay-filter': 'customer_time_range'} %>
|
|
330
|
+
</div>
|
|
331
|
+
</div>
|
|
332
|
+
<div class="layui-inline m-t-10 layui-hide diy_range" id="diy_range">
|
|
333
|
+
<label class="layui-form-label">自定义范围</label>
|
|
334
|
+
<div class="layui-input-inline">
|
|
335
|
+
<input type="text" class="layui-input" id="customer_date" name="customer_date" placeholder=" - " autocomplete="off">
|
|
336
|
+
</div>
|
|
337
|
+
</div>
|
|
338
|
+
<div class="layui-inline">
|
|
339
|
+
<button type="button" id="search_bt" class="customer_bt layui-btn layui-btn-primary" lay-submit lay-filter="customer_chart">确定
|
|
340
|
+
</button>
|
|
341
|
+
</div>
|
|
342
|
+
</div>
|
|
343
|
+
</form>
|
|
344
|
+
</div>
|
|
345
|
+
<canvas id="myChart4" width="960" height="200"></canvas>
|
|
346
|
+
</div>
|
|
347
|
+
|
|
348
|
+
</div>
|
|
349
|
+
</div>
|
|
310
350
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.css">
|
|
311
351
|
<script src="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.js"></script>
|
|
312
352
|
<script>
|
|
@@ -329,6 +369,15 @@
|
|
|
329
369
|
var element = layui.element;
|
|
330
370
|
laydate = layui.laydate;
|
|
331
371
|
|
|
372
|
+
form.on('select(customer_time_range)', function(data){
|
|
373
|
+
const value = data.value;
|
|
374
|
+
if(value == "diy"){
|
|
375
|
+
$(".diy_range").removeClass("layui-hide")
|
|
376
|
+
}else {
|
|
377
|
+
$(".diy_range").addClass('layui-hide')
|
|
378
|
+
}
|
|
379
|
+
})
|
|
380
|
+
|
|
332
381
|
if(follow_type == "day"){
|
|
333
382
|
$(".year").addClass('layui-hide')
|
|
334
383
|
$(".month").addClass('layui-hide')
|
|
@@ -394,6 +443,10 @@
|
|
|
394
443
|
elem: '#date',
|
|
395
444
|
range: true
|
|
396
445
|
});
|
|
446
|
+
laydate.render({
|
|
447
|
+
elem: '#customer_date',
|
|
448
|
+
range: true
|
|
449
|
+
});
|
|
397
450
|
laydate.render({
|
|
398
451
|
elem: '#date_week',
|
|
399
452
|
range: true
|
|
@@ -530,24 +583,21 @@
|
|
|
530
583
|
options: opt
|
|
531
584
|
});
|
|
532
585
|
|
|
586
|
+
var ctx = document.getElementById('myChart4');
|
|
587
|
+
var myChart4 = new Chart(ctx, {
|
|
588
|
+
type: 'bar',
|
|
589
|
+
data: <%=raw @customer_data.to_json %>,
|
|
590
|
+
options: opt
|
|
591
|
+
});
|
|
592
|
+
|
|
533
593
|
$(document).ready(function () {
|
|
534
594
|
$(".follow_count_bt").click(function () {
|
|
535
595
|
layer.load(0, {});
|
|
536
596
|
$.get('/missions/sale_trends/trends.json?follow_count_range=' + $("#follow_count_range").val() + '&date_month=' + $("#date_month").val() + '&date_week=' + $("#date_week").val() + '&date_year=' + $("#date_year").val() + '&date=' + $("#date").val()).done(function(res) {
|
|
537
597
|
layer.closeAll('loading');
|
|
538
598
|
var data1 = res.data1;
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
type: 'line',
|
|
542
|
-
data: data1,
|
|
543
|
-
options: {
|
|
544
|
-
elements: {
|
|
545
|
-
line: {
|
|
546
|
-
tension: 0
|
|
547
|
-
}
|
|
548
|
-
}
|
|
549
|
-
}
|
|
550
|
-
});
|
|
599
|
+
myChart.data = data1
|
|
600
|
+
myChart.update()
|
|
551
601
|
});
|
|
552
602
|
});
|
|
553
603
|
$(".goal_count_bt").click(function () {
|
|
@@ -555,12 +605,9 @@
|
|
|
555
605
|
$.get('/missions/sale_trends/trends.json?count_type=' + $("#count_type").val() + '&goal_count_range=' + $("#goal_count_range").val() + '&goal_date_month=' + $("#goal_date_month").val() + '&goal_date_year=' + $("#goal_date_year").val()).done(function(res) {
|
|
556
606
|
layer.closeAll('loading');
|
|
557
607
|
var data2 = res.data2;
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
data: data2,
|
|
562
|
-
options: opt
|
|
563
|
-
});
|
|
608
|
+
myChart2.data = data2
|
|
609
|
+
myChart2.update()
|
|
610
|
+
|
|
564
611
|
});
|
|
565
612
|
});
|
|
566
613
|
$(".business_bt").click(function () {
|
|
@@ -568,12 +615,17 @@
|
|
|
568
615
|
$.get('/missions/sale_trends/trends.json?business_count_type=' + $("#business_count_type").val() + '&business_type=' + $("#business_type").val()).done(function(res) {
|
|
569
616
|
layer.closeAll('loading');
|
|
570
617
|
var data3 = res.data3;
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
618
|
+
myChart3.data = data3
|
|
619
|
+
myChart3.update()
|
|
620
|
+
});
|
|
621
|
+
});
|
|
622
|
+
$(".customer_bt").click(function () {
|
|
623
|
+
layer.load(0, {});
|
|
624
|
+
$.get('/missions/sale_trends/trends.json?customer_count_type=' + $("#customer_count_type").val() + '&customer_time_range=' + $("#customer_time_range").val() + '&customer_date=' + $("#customer_date").val()).done(function(res) {
|
|
625
|
+
layer.closeAll('loading');
|
|
626
|
+
var data4 = res.data4;
|
|
627
|
+
myChart4.data = data4
|
|
628
|
+
myChart4.update()
|
|
577
629
|
});
|
|
578
630
|
});
|
|
579
631
|
});
|
|
@@ -60,7 +60,7 @@ json.data do
|
|
|
60
60
|
json.school_count school_count
|
|
61
61
|
follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").where(staff_id: d.id).pluck(:business_id).uniq).pluck(:school_id)).uniq.size
|
|
62
62
|
json.follow_school_count follow_school_count
|
|
63
|
-
json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size + EducodeSales::FollowUp.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size
|
|
63
|
+
json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").size + EducodeSales::FollowUp.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").size
|
|
64
64
|
follow_school_rate = (follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0).round(2)
|
|
65
65
|
json.follow_school_rate follow_school_rate.to_s + '%'
|
|
66
66
|
follow_department_rate = (follow_school_count!=0 ? school_count.to_f * 110 / follow_school_count : 0).round(2)
|
|
@@ -30,6 +30,12 @@
|
|
|
30
30
|
<div id="area" class="demo-transfer"></div>
|
|
31
31
|
</div>
|
|
32
32
|
</div>
|
|
33
|
+
<div class="layui-form-item" >
|
|
34
|
+
<label class="layui-form-label">监管学校</label>
|
|
35
|
+
<div class="layui-input-inline" style="">
|
|
36
|
+
<div id="edit_assign_follow" style="width: 1140px;"></div>
|
|
37
|
+
</div>
|
|
38
|
+
</div>
|
|
33
39
|
<div class="layui-form-item">
|
|
34
40
|
<label class="layui-form-label required">生效日期</label>
|
|
35
41
|
<div class="layui-input-block">
|
|
@@ -85,6 +91,40 @@
|
|
|
85
91
|
return false
|
|
86
92
|
}
|
|
87
93
|
})
|
|
94
|
+
var sales_list = xmSelect.render({
|
|
95
|
+
el: '#edit_assign_follow',
|
|
96
|
+
remoteSearch: true,
|
|
97
|
+
autoRow: true,
|
|
98
|
+
// clickClose: true,
|
|
99
|
+
delay: 1000,
|
|
100
|
+
tips: '支持名称/省份搜索,请至少输入一个字符',
|
|
101
|
+
searchTips: '支持名称/省份搜索,请至少输入一个字符',
|
|
102
|
+
paging: true,
|
|
103
|
+
pageRemote: true,
|
|
104
|
+
filterable: true,
|
|
105
|
+
remoteMethod: function (val, cb, show, pageIndex) {
|
|
106
|
+
if(!val){
|
|
107
|
+
return cb([]);
|
|
108
|
+
}
|
|
109
|
+
$.ajax( '/missions/staff_schools', {
|
|
110
|
+
method: 'get',
|
|
111
|
+
data: {
|
|
112
|
+
q: val,
|
|
113
|
+
page: pageIndex
|
|
114
|
+
},
|
|
115
|
+
dataType: 'json',
|
|
116
|
+
success: function (res) {
|
|
117
|
+
var data = res.data;
|
|
118
|
+
if (res.code == 0) {
|
|
119
|
+
cb(res.data, res.count);
|
|
120
|
+
} else {
|
|
121
|
+
layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
})
|
|
125
|
+
}
|
|
126
|
+
})
|
|
127
|
+
sales_list.setValue(gon.schools)
|
|
88
128
|
|
|
89
129
|
//监听提交
|
|
90
130
|
form.on('submit(saveBtn)', function (data) {
|
|
@@ -92,10 +132,15 @@
|
|
|
92
132
|
layui.each(transfer.getData('area_list'), function (i, v) {
|
|
93
133
|
area_ids.push(v.value)
|
|
94
134
|
})
|
|
135
|
+
var schools = [];
|
|
136
|
+
sales_list.getValue().forEach(function(d) {
|
|
137
|
+
schools.push(d.value);
|
|
138
|
+
})
|
|
95
139
|
if (area_ids.length == 0) {
|
|
96
140
|
layer.alert("请选择负责区域");
|
|
97
141
|
return false;
|
|
98
142
|
}
|
|
143
|
+
data.field['school_ids'] = schools;
|
|
99
144
|
data.field['area_ids'] = area_ids;
|
|
100
145
|
request.authPut("missions/staffs/" + parent.staff_id, data.field, function (res) {
|
|
101
146
|
console.log(res.success == false)
|
|
@@ -4,9 +4,43 @@
|
|
|
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
|
-
|
|
7
|
+
<div class="layuimini-main min-height-table" id="week_table_wraper">
|
|
8
|
+
<div class="layui-form layui-form-pane" lay-filter="week_plan_form_filter">
|
|
9
|
+
<div class="layui-form-item">
|
|
10
|
+
<div class="layui-inline">
|
|
11
|
+
<label class="layui-form-label">用户名</label>
|
|
12
|
+
<div class="layui-input-inline large-select">
|
|
13
|
+
<input type="text" class="layui-input" id="name" autocomplete="off" name="name">
|
|
14
|
+
</div>
|
|
15
|
+
</div>
|
|
16
|
+
<div class="layui-inline">
|
|
17
|
+
<label class="layui-form-label">角色</label>
|
|
18
|
+
<div class="layui-input-inline">
|
|
19
|
+
<%= select_tag "role", options_for_select(EducodeSales::Role.all.pluck(:name, :id)), {'lay-filter': 'role', include_blank: true} %>
|
|
20
|
+
</div>
|
|
21
|
+
</div>
|
|
22
|
+
<div class="layui-inline">
|
|
23
|
+
<label class="layui-form-label">人员类型</label>
|
|
24
|
+
<div class="layui-input-inline large-select">
|
|
25
|
+
<%= select_tag "staff_type", options_for_select(EducodeSales::Common.where(clazz: 'staff_type').pluck(:name, :id)), {'lay-filter': 'staff_type', include_blank: true} %>
|
|
26
|
+
</div>
|
|
27
|
+
</div>
|
|
28
|
+
<div class="layui-inline">
|
|
29
|
+
<label class="layui-form-label">状态</label>
|
|
30
|
+
<div class="layui-input-inline large-select">
|
|
31
|
+
<%= select_tag "banned", options_for_select([["启用",0],["禁用",1]]), {'lay-filter': 'banned', include_blank: true} %>
|
|
32
|
+
</div>
|
|
33
|
+
</div>
|
|
34
|
+
<div class="layui-inline">
|
|
35
|
+
<button type="reset" lay-submit class="layui-btn layui-btn-primary" lay-filter="week_plan_reset">重置
|
|
36
|
+
</button>
|
|
37
|
+
<button type="submit" lay-submit class="layui-btn layui-btn-primary" lay-filter="week_plan_search">检索
|
|
38
|
+
</button>
|
|
39
|
+
</div>
|
|
40
|
+
</div>
|
|
41
|
+
</div>
|
|
8
42
|
<table class="layui-hide" id="staff_filter" lay-filter="staff_filter"></table>
|
|
9
|
-
|
|
43
|
+
</div>
|
|
10
44
|
<script type="text/html" id="staff_bar">
|
|
11
45
|
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
|
|
12
46
|
<a class="layui-btn layui-btn-xs layui-btn-warm data-count-delete" lay-event="disable">禁用</a>
|
|
@@ -97,6 +131,38 @@
|
|
|
97
131
|
});
|
|
98
132
|
}
|
|
99
133
|
});
|
|
134
|
+
var sort = {}, search = {};
|
|
135
|
+
// table.on('sort(weekPlanTable)', function(obj) {
|
|
136
|
+
// sort.field = obj.field;
|
|
137
|
+
// sort.order = obj.type;
|
|
138
|
+
// table.reload('weekPlanTable', {
|
|
139
|
+
// initSort: obj,
|
|
140
|
+
// where: {
|
|
141
|
+
// sort: sort,
|
|
142
|
+
// q: search
|
|
143
|
+
// }
|
|
144
|
+
// });
|
|
145
|
+
// })
|
|
146
|
+
|
|
147
|
+
// 监听搜索操作
|
|
148
|
+
form.on('submit(week_plan_search)', function (data) {
|
|
149
|
+
search = data.field
|
|
150
|
+
table.reload('staff_filter', {
|
|
151
|
+
page: {
|
|
152
|
+
curr: 1
|
|
153
|
+
},
|
|
154
|
+
where: {q: search, sort : sort}
|
|
155
|
+
}, 'data');
|
|
156
|
+
|
|
157
|
+
return false;
|
|
158
|
+
});
|
|
159
|
+
|
|
160
|
+
form.on('submit(week_plan_reset)', function(data){
|
|
161
|
+
var field = data.field;
|
|
162
|
+
form.val('week_plan_form_filter', {name: '', role: '', staff_type: '', banned: ''})
|
|
163
|
+
return false;
|
|
164
|
+
});
|
|
165
|
+
|
|
100
166
|
table.on('tool(staff_filter)', function (obj) {
|
|
101
167
|
var data = obj.data;
|
|
102
168
|
staff_id = data.id;
|
|
@@ -68,8 +68,8 @@
|
|
|
68
68
|
</button>
|
|
69
69
|
<button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_teachers">搜 索
|
|
70
70
|
</button>
|
|
71
|
-
<
|
|
72
|
-
</
|
|
71
|
+
<a style="padding-left: 20px;color: #0000FF" href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">高级搜索
|
|
72
|
+
</a>
|
|
73
73
|
</div>
|
|
74
74
|
</div>
|
|
75
75
|
</form>
|
|
@@ -25,6 +25,7 @@
|
|
|
25
25
|
|
|
26
26
|
|
|
27
27
|
<ul class="layui-nav i_class" style="left: 200px">
|
|
28
|
+
<%= image_tag "educode_sales/logo.png", class: 'header-logo tubiao layui-hide-sm layui-hide-xs' %>
|
|
28
29
|
<li class="layui-nav-item layui-show-xs-inline-block " lay-header-event="menuLeft">
|
|
29
30
|
<a href="javascript:;"> <i id="leftEnumIcon" class="layui-icon layui-icon-shrink-right"></i></a>
|
|
30
31
|
</li>
|
|
@@ -70,7 +71,7 @@
|
|
|
70
71
|
</dd>
|
|
71
72
|
<% end %>
|
|
72
73
|
<% if can? :read, EducodeSales::MoneyPlan %>
|
|
73
|
-
<dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i style="font-size: 25px; padding-right: 15px"></i
|
|
74
|
+
<dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i style="font-size: 25px; padding-right: 15px"></i>回款计划</a>
|
|
74
75
|
</dd>
|
|
75
76
|
<% end %>
|
|
76
77
|
<% if can? :read, EducodeSales::Customer %>
|
|
@@ -214,6 +215,8 @@
|
|
|
214
215
|
$("#logout").removeClass('layui-nav-itemed')
|
|
215
216
|
$("#head_b").removeClass('layui-hide-xs')
|
|
216
217
|
$("#head_a").removeClass('layui-hide-xs')
|
|
218
|
+
$(".tubiao").addClass('layui-hide')
|
|
219
|
+
$(".tubiao").addClass('layui-hide-xs')
|
|
217
220
|
}
|
|
218
221
|
|
|
219
222
|
function menuHide(btn) {
|
|
@@ -223,6 +226,8 @@
|
|
|
223
226
|
$(".i_class").animate({left: '60px'});
|
|
224
227
|
$("#head_b").addClass('layui-hide-xs')
|
|
225
228
|
$("#head_a").addClass('layui-hide-xs')
|
|
229
|
+
$(".tubiao").removeClass('layui-hide')
|
|
230
|
+
$(".tubiao").removeClass('layui-hide-xs')
|
|
226
231
|
}
|
|
227
232
|
}
|
|
228
233
|
});
|
data/config/routes.rb
CHANGED
|
@@ -12,6 +12,7 @@ EducodeSales::Engine.routes.draw do
|
|
|
12
12
|
get :no_permission, to: "home#no_permission"
|
|
13
13
|
get :sales_staff, to: "home#sales_staff"
|
|
14
14
|
get :sales_place, to: "home#sales_place"
|
|
15
|
+
get :staff_schools, to: "home#staff_schools"
|
|
15
16
|
|
|
16
17
|
resources :sessions do
|
|
17
18
|
end
|
|
@@ -82,6 +83,9 @@ EducodeSales::Engine.routes.draw do
|
|
|
82
83
|
|
|
83
84
|
resources :businesses do
|
|
84
85
|
collection do
|
|
86
|
+
get :export_records
|
|
87
|
+
post :get_export_data
|
|
88
|
+
get :add_export_records
|
|
85
89
|
get :show_keys
|
|
86
90
|
get :add_keys
|
|
87
91
|
get :show_follow
|
|
@@ -7,6 +7,8 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
|
|
|
7
7
|
t.timestamps
|
|
8
8
|
end
|
|
9
9
|
if EducodeSales::Permission.last.nil?
|
|
10
|
+
EducodeSales::Permission.create(name: '导出商机', subject: 'Business', action: 'export_business', clazz: 'business', position: '11')
|
|
11
|
+
|
|
10
12
|
|
|
11
13
|
#附件管理权限
|
|
12
14
|
EducodeSales::Permission.create(name: '查看附件', subject: 'Business', action: 'show_file', clazz: 'business', position: '11')
|