educode_sales 1.10.49 → 1.10.59
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/educode_sales/modules/easyeditor/easyeditor.css +1 -1
- data/app/controllers/educode_sales/application_controller.rb +10 -0
- data/app/controllers/educode_sales/business_courses_controller.rb +58 -33
- data/app/controllers/educode_sales/businesses_controller.rb +43 -7
- data/app/controllers/educode_sales/contracts_controller.rb +6 -0
- data/app/controllers/educode_sales/money_plan_records_controller.rb +6 -2
- data/app/controllers/educode_sales/money_plans_controller.rb +3 -0
- data/app/controllers/educode_sales/plans_controller.rb +392 -9
- data/app/controllers/educode_sales/sale_trends_controller.rb +1 -1
- data/app/controllers/educode_sales/shixun_dectects_controller.rb +77 -16
- data/app/controllers/educode_sales/shixuns_controller.rb +65 -4
- data/app/controllers/educode_sales/subject_trends_controller.rb +99 -892
- data/app/controllers/educode_sales/subjects_controller.rb +29 -18
- data/app/helpers/educode_sales/application_helper.rb +3 -1
- data/app/helpers/educode_sales/business_courses_helper.rb +29 -6
- data/app/helpers/educode_sales/sale_trends_helper.rb +52 -52
- data/app/helpers/educode_sales/subject_helper.rb +5 -1
- data/app/models/educode_sales/business.rb +5 -5
- data/app/models/educode_sales/business_deliver_subject.rb +3 -2
- data/app/models/educode_sales/business_subject.rb +9 -3
- data/app/models/educode_sales/business_subject_shixun.rb +37 -8
- data/app/models/educode_sales/business_subject_staff.rb +1 -0
- data/app/models/educode_sales/permission.rb +7 -0
- data/app/models/educode_sales/sales_target_history.rb +11 -0
- data/app/views/educode_sales/business_courses/edit.html.erb +30 -4
- data/app/views/educode_sales/business_courses/index.html.erb +34 -12
- data/app/views/educode_sales/business_courses/index.json.jbuilder +2 -2
- data/app/views/educode_sales/business_courses/list_shixuns.html.erb +132 -64
- data/app/views/educode_sales/business_courses/list_shixuns.json.jbuilder +12 -6
- data/app/views/educode_sales/business_courses/list_subjects.html.erb +29 -34
- data/app/views/educode_sales/business_courses/list_subjects.json.jbuilder +7 -2
- data/app/views/educode_sales/business_courses/new.html.erb +45 -20
- data/app/views/educode_sales/businesses/index.html.erb +11 -9
- data/app/views/educode_sales/contracts/_list.html.erb +16 -1
- data/app/views/educode_sales/contracts/index.html.erb +5 -2
- data/app/views/educode_sales/contracts/list.js.erb +4 -1
- data/app/views/educode_sales/money_plan_records/_index.html.erb +21 -5
- data/app/views/educode_sales/money_plan_records/index.js.erb +4 -1
- data/app/views/educode_sales/money_plans/list.html.erb +6 -2
- data/app/views/educode_sales/plans/_year_execute.html.erb +293 -0
- data/app/views/educode_sales/plans/_year_target.html.erb +677 -0
- data/app/views/educode_sales/plans/index.html.erb +104 -81
- data/app/views/educode_sales/plans/year_execute.js.erb +1 -0
- data/app/views/educode_sales/plans/year_target.js.erb +1 -0
- data/app/views/educode_sales/plans/year_target.json.jbuilder +48 -0
- data/app/views/educode_sales/plans/years_all_target.json.jbuilder +53 -0
- data/app/views/educode_sales/sale_trends/_return_money_forecast.html.erb +1 -1
- data/app/views/educode_sales/sale_trends/_user_stat.html.erb +1 -1
- data/app/views/educode_sales/sale_trends/_visit_analysis.html.erb +1 -1
- data/app/views/educode_sales/sale_trends/return_money_forecast.js.erb +1 -1
- data/app/views/educode_sales/sale_trends/trends.html.erb +6 -6
- data/app/views/educode_sales/sale_trends/user_stat.js.erb +1 -1
- data/app/views/educode_sales/sale_trends/visit_analysis.js.erb +1 -1
- data/app/views/educode_sales/shixun_dectects/index.html.erb +97 -47
- data/app/views/educode_sales/shixun_dectects/index.json.jbuilder +4 -3
- data/app/views/educode_sales/shixun_dectects/markdown.html.erb +1 -1
- data/app/views/educode_sales/shixuns/edit.html.erb +35 -13
- data/app/views/educode_sales/shixuns/index.html.erb +348 -138
- data/app/views/educode_sales/shixuns/index.json.jbuilder +9 -5
- data/app/views/educode_sales/shixuns/new.html.erb +22 -12
- data/app/views/educode_sales/subject_trends/trends.html.erb +177 -575
- data/app/views/educode_sales/subjects/edit.html.erb +4 -4
- data/app/views/educode_sales/subjects/index.html.erb +50 -12
- data/app/views/educode_sales/subjects/index.json.jbuilder +3 -3
- data/app/views/educode_sales/subjects/list_shixuns.html.erb +143 -17
- data/app/views/educode_sales/subjects/list_shixuns.json.jbuilder +9 -4
- data/app/views/educode_sales/subjects/new.html.erb +4 -4
- data/app/views/layouts/educode_sales/application.html.erb +2 -2
- data/config/routes.rb +7 -2
- data/db/migrate/20230729085359_create_educode_sales_sales_target_histories.rb +45 -0
- data/lib/educode_sales/version.rb +1 -1
- metadata +10 -4
- data/app/views/educode_sales/plans/_target_track.html.erb +0 -178
- data/app/views/educode_sales/plans/target_track.js.erb +0 -1
@@ -1,21 +1,25 @@
|
|
1
1
|
json.data do
|
2
2
|
json.array! @shixuns do |d|
|
3
3
|
json.shixun_manages handled_data d.shixun_manages
|
4
|
-
json.shixun_producer d.shixun_producer
|
5
|
-
json.shixun_staff handled_data d.
|
4
|
+
json.shixun_producer handled_data d.shixun_producer
|
5
|
+
json.shixun_staff handled_data @shixun_staffs["#{d.id}"]
|
6
6
|
json.type d.shixun_type
|
7
7
|
json.deliver_date handled_time_data d.deliver_date
|
8
8
|
json.reception_at handled_time_data d.reception_at
|
9
|
-
json.school_name d.
|
9
|
+
json.school_name handled_data d.shixun_school
|
10
10
|
json.identifier handled_data d.identifier
|
11
|
+
json.subjects_identifier d.subjects_identifier
|
11
12
|
json.subject_name handled_data(d.subject_name)
|
12
13
|
json.shixun_name handled_data d.name
|
13
14
|
json.shixun_status d.shixun_status
|
14
15
|
json.level d.level
|
16
|
+
json.s_identifier d.s_identifier
|
15
17
|
json.id d.id
|
16
18
|
json.max_manage "喻银凤"
|
17
|
-
json.dectect_feedback
|
18
|
-
json.commit_dectect_time
|
19
|
+
json.dectect_feedback handled_data d.dectects_content
|
20
|
+
json.commit_dectect_time handled_time_data_accurate d.shixun_dectects_time
|
21
|
+
json.money handled_data d.deliver_money
|
22
|
+
json.link d.link
|
19
23
|
end
|
20
24
|
end
|
21
25
|
json.code 0
|
@@ -11,7 +11,7 @@
|
|
11
11
|
<div class="layui-input-block">
|
12
12
|
<%= select_tag "category", options_for_select(
|
13
13
|
[["管培", 1], ["全职", 2], ["专职", 3]]
|
14
|
-
),
|
14
|
+
),{"lay-filter":"Add_company",include_blank: true}%>
|
15
15
|
</div>
|
16
16
|
</div>
|
17
17
|
<div>
|
@@ -37,15 +37,14 @@
|
|
37
37
|
<label class="layui-form-label">项目状态:<span style="color: red"> *</span></label>
|
38
38
|
<div class="layui-input-block">
|
39
39
|
<%= select_tag "status", options_for_select(
|
40
|
-
[["待建设", 1],
|
41
|
-
["审核中", 4], ["返修中", 5], ["已内部发布", 6], ["已公开发布", 7]]
|
40
|
+
[["待建设", 1], ["建设中", 3]]
|
42
41
|
), { include_blank: true } %>
|
43
42
|
</div>
|
44
43
|
</div>
|
45
44
|
</div>
|
46
45
|
|
47
46
|
<div class="layui-form-item">
|
48
|
-
<label class="layui-form-label" style="width:
|
47
|
+
<label class="layui-form-label" style="width: 102px">项目关联链接:</label>
|
49
48
|
<div class="layui-input-block">
|
50
49
|
<input type="text" name="link" class="layui-input" style="width: 49%;">
|
51
50
|
</div>
|
@@ -57,7 +56,7 @@
|
|
57
56
|
</div>
|
58
57
|
</div>
|
59
58
|
<div class="layui-form-item">
|
60
|
-
<label class="layui-form-label" style="width:
|
59
|
+
<label class="layui-form-label" style="width: 100px">项目制作人:<span style="color: red"> *</span></label>
|
61
60
|
<div class="layui-input-block">
|
62
61
|
<div id="producer_id" style="width: 50%;"></div>
|
63
62
|
</div>
|
@@ -69,14 +68,14 @@
|
|
69
68
|
</div>
|
70
69
|
</div>
|
71
70
|
<div class="layui-form-item">
|
72
|
-
<label class="layui-form-label" style="width:
|
73
|
-
<div class="layui-input-block">
|
71
|
+
<label class="layui-form-label" style="width: 112px;">制作完成时间:<span style="color: red"> *</span></label>
|
72
|
+
<div class="layui-input-block" style="width: 91%">
|
74
73
|
<input type="text" class="layui-input" name="time"
|
75
74
|
id="ID-laydate-demo" placeholder="yyyy-MM-dd"
|
76
75
|
style="width: 49%;">
|
77
76
|
</div>
|
78
77
|
</div>
|
79
|
-
<div class="layui-form-item">
|
78
|
+
<div class="layui-form-item" id="money">
|
80
79
|
<label class="layui-form-label">交付金额:<span style="color: red"> *</span></label>
|
81
80
|
<div class="layui-input-block">
|
82
81
|
<input type="number" class="layui-input" name="money" style="width: 50%;" >
|
@@ -179,6 +178,17 @@
|
|
179
178
|
tips: '- -',
|
180
179
|
multiple: true
|
181
180
|
})
|
181
|
+
$("#money").hide()
|
182
|
+
form.on('select(Add_company)', function (data) {
|
183
|
+
{
|
184
|
+
if(data.value === '3'){
|
185
|
+
$("#money").show()
|
186
|
+
}else{
|
187
|
+
$("#money").hide()
|
188
|
+
}
|
189
|
+
}
|
190
|
+
});
|
191
|
+
|
182
192
|
function isNull(str){
|
183
193
|
return str === "" || str === null
|
184
194
|
}
|
@@ -194,12 +204,12 @@
|
|
194
204
|
layer.msg('项目级别未选择');
|
195
205
|
return false
|
196
206
|
}
|
197
|
-
if(isNull(new_data.
|
198
|
-
layer.msg('
|
207
|
+
if(new_data.category === '3' && isNull(new_data.money)){
|
208
|
+
layer.msg('交付金额未选择');
|
199
209
|
return false
|
200
210
|
}
|
201
|
-
if(isNull(new_data.
|
202
|
-
layer.msg('
|
211
|
+
if(isNull(new_data.manage_id)){
|
212
|
+
layer.msg('课程组长未选择');
|
203
213
|
return false
|
204
214
|
}
|
205
215
|
if(isNull(new_data.name)){
|