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,5 +1,12 @@
|
|
1
1
|
module EducodeSales
|
2
2
|
class Permission < ApplicationRecord
|
3
|
+
# EducodeSales::Permission.create(name: '查看数据', subject: 'SalePlan', action: 'new_index', clazz: 'sale_plan')
|
4
|
+
# EducodeSales::Permission.create(name: '分类查看', subject: 'SalePlan', action: 'new_type_index', clazz: 'sale_plan')
|
5
|
+
# EducodeSales::Permission.create(name: '添加目标', subject: 'SalePlan', action: 'new_create', clazz: 'sale_plan')
|
6
|
+
# EducodeSales::Permission.create(name: '编辑目标', subject: 'SalePlan', action: 'new_update', clazz: 'sale_plan')
|
7
|
+
# EducodeSales::Permission.create(name: '审核目标', subject: 'SalePlan', action: 'new_audit', clazz: 'sale_plan')
|
8
|
+
# EducodeSales::Permission.create(name: '查看记录', subject: 'SalePlan', action: 'new_record_index', clazz: 'sale_plan')
|
9
|
+
default_scope { where(hidden: false) }
|
3
10
|
enum clazz: {
|
4
11
|
'销售态势': 'market',
|
5
12
|
'销售分工': 'sale_job',
|
@@ -0,0 +1,11 @@
|
|
1
|
+
module EducodeSales
|
2
|
+
class SalesTargetHistory < ApplicationRecord
|
3
|
+
belongs_to :staff
|
4
|
+
belongs_to :reviewer, class_name: 'Staff', optional: true
|
5
|
+
belongs_to :school_tag
|
6
|
+
|
7
|
+
enum clazz: { '中标': 18, '回款': 2, '商机': 7 }
|
8
|
+
TARGET_CLAZZ_NAME = { 'bidder': '中标', 'money': '回款', 'business': '商机' }
|
9
|
+
enum state: %w[待审核 已通过 已驳回]
|
10
|
+
end
|
11
|
+
end
|
@@ -11,9 +11,9 @@
|
|
11
11
|
</div>
|
12
12
|
</div>
|
13
13
|
<div class="layui-form-item" >
|
14
|
-
<label class="layui-form-label"
|
15
|
-
<div class="layui-input-block"
|
16
|
-
<div id="subject_ids" style="width:
|
14
|
+
<label class="layui-form-label" style="width: 112px">实践课程名称:<span style="color: red"> *</span></label>
|
15
|
+
<div class="layui-input-block">
|
16
|
+
<div id="subject_ids" style="width: 48%;margin-left: 20px"></div>
|
17
17
|
</div>
|
18
18
|
</div>
|
19
19
|
|
@@ -30,7 +30,7 @@
|
|
30
30
|
</div>
|
31
31
|
</div>
|
32
32
|
<div class="layui-form-item">
|
33
|
-
<label class="layui-form-label"
|
33
|
+
<label class="layui-form-label">课程经理:<span style="color: red"> *</span></label>
|
34
34
|
<div class="layui-input-block">
|
35
35
|
<div id="manage_id" style="width: 50%;"></div>
|
36
36
|
</div>
|
@@ -113,7 +113,33 @@
|
|
113
113
|
manage_id.setValue(<%=@value_list %>)
|
114
114
|
<% end %>
|
115
115
|
|
116
|
+
function isNull(str){
|
117
|
+
return str === "" || str === null
|
118
|
+
}
|
119
|
+
|
116
120
|
form.on('submit(saveBtn)', function (data) {
|
121
|
+
|
122
|
+
console.log(form.val())
|
123
|
+
let new_data = form.val();
|
124
|
+
|
125
|
+
if(isNull(new_data.business_id)){
|
126
|
+
layer.msg('请选商机');
|
127
|
+
return false
|
128
|
+
}
|
129
|
+
if(isNull(new_data.subject_ids)){
|
130
|
+
layer.msg('请选实践课程');
|
131
|
+
return false
|
132
|
+
}
|
133
|
+
if(isNull(new_data.manage_id)){
|
134
|
+
layer.msg('请选课堂经理');
|
135
|
+
return false
|
136
|
+
}
|
137
|
+
if(isNull(new_data.state)){
|
138
|
+
layer.msg('请选状态');
|
139
|
+
return false
|
140
|
+
}
|
141
|
+
|
142
|
+
|
117
143
|
var business = data.field
|
118
144
|
$.ajax('/missions/business_courses/'+business.id, {
|
119
145
|
method: 'PATCH',
|
@@ -54,11 +54,11 @@
|
|
54
54
|
</div>
|
55
55
|
</script>
|
56
56
|
<script type="text/html" id="show_phone_number">
|
57
|
-
<span type="text" id="{{= d.p_sale_staff1 + d.id}}"
|
58
|
-
onmouseover="show('手机号:13711111111'+'{{= d.id}}','{{=d.p_sale_staff1 + d.id}}')"
|
59
|
-
onmouseleave="close_tips()"
|
57
|
+
<!-- <span type="text" id="{{= d.p_sale_staff1 + d.id}}"-->
|
58
|
+
<!-- onmouseover="show('手机号:13711111111'+'{{= d.id}}','{{=d.p_sale_staff1 + d.id}}')"-->
|
59
|
+
<!-- onmouseleave="close_tips()">-->
|
60
60
|
{{= d.subject_manages }}
|
61
|
-
</span
|
61
|
+
<!-- </span>-->
|
62
62
|
</script>
|
63
63
|
|
64
64
|
<!-- constructed:待建设, signed: 已签协议,construction: 建设中,completed: 已完成,delivered: 已交付, accepted: 已验收-->
|
@@ -178,9 +178,10 @@
|
|
178
178
|
}
|
179
179
|
]
|
180
180
|
]
|
181
|
-
|
181
|
+
var tableDataCount = 0
|
182
182
|
table.render({
|
183
183
|
elem: '#table',
|
184
|
+
title: '商机交付课程列表',
|
184
185
|
where: {q: form.val()},
|
185
186
|
url: '/missions/business_courses',
|
186
187
|
// data: temp_data,
|
@@ -190,7 +191,10 @@
|
|
190
191
|
cols: cols_table,
|
191
192
|
limit: 10,
|
192
193
|
limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
|
193
|
-
page: true
|
194
|
+
page: true,
|
195
|
+
done: function(res, curr, count){
|
196
|
+
tableDataCount = count;//记录所有数据数量
|
197
|
+
}
|
194
198
|
})
|
195
199
|
var sort = {}, search = {};
|
196
200
|
// 监听搜索操作
|
@@ -214,7 +218,7 @@
|
|
214
218
|
},
|
215
219
|
where: {q: {}}
|
216
220
|
}, 'data');
|
217
|
-
$(".layui-form").reset();
|
221
|
+
$(".layui-form")[0].reset();
|
218
222
|
form.render()
|
219
223
|
return false;
|
220
224
|
});
|
@@ -231,7 +235,7 @@
|
|
231
235
|
type: 1,
|
232
236
|
shade: 0.2,
|
233
237
|
maxmin: true,
|
234
|
-
shadeClose:
|
238
|
+
shadeClose: false,
|
235
239
|
area: [openWH[0] + 'px', openWH[1] + 'px'],
|
236
240
|
offset: [openWH[2] + 'px', openWH[3] + 'px'],
|
237
241
|
content: content
|
@@ -249,7 +253,7 @@
|
|
249
253
|
type: 1,
|
250
254
|
shade: 0.2,
|
251
255
|
maxmin: true,
|
252
|
-
shadeClose:
|
256
|
+
shadeClose: false,
|
253
257
|
area: [openWH[0] + 'px', openWH[1] + 'px'],
|
254
258
|
offset: [openWH[2] + 'px', openWH[3] + 'px'],
|
255
259
|
content: content,
|
@@ -258,7 +262,7 @@
|
|
258
262
|
});
|
259
263
|
return false;
|
260
264
|
} else if (obj.event === 'show_list_shixuns') {
|
261
|
-
localStorage.setItem("
|
265
|
+
localStorage.setItem("business_delvier_subject_id_shixuns",data.id)
|
262
266
|
var content = miniPage.getHrefContent('/missions/business_courses/list_shixuns?id='+data.id);
|
263
267
|
var openWH = miniPage.getOpenWidthHeight();
|
264
268
|
list_projects = layer.open({
|
@@ -266,7 +270,7 @@
|
|
266
270
|
type: 1,
|
267
271
|
shade: 0.2,
|
268
272
|
maxmin: true,
|
269
|
-
shadeClose:
|
273
|
+
shadeClose: false,
|
270
274
|
area: [openWH[0] + 'px', openWH[1] + 'px'],
|
271
275
|
offset: [openWH[2] + 'px', openWH[3] + 'px'],
|
272
276
|
content: content,
|
@@ -290,7 +294,7 @@
|
|
290
294
|
type: 1,
|
291
295
|
shade: 0.2,
|
292
296
|
maxmin: true,
|
293
|
-
shadeClose:
|
297
|
+
shadeClose: false,
|
294
298
|
area: [openWH[0] + 'px', openWH[1] + 'px'],
|
295
299
|
offset: [openWH[2] + 'px', openWH[3] + 'px'],
|
296
300
|
content: content,
|
@@ -298,6 +302,24 @@
|
|
298
302
|
$(window).on("resize", function () {
|
299
303
|
});
|
300
304
|
return false;
|
305
|
+
}else if(obj.event === 'list'){
|
306
|
+
table.reload('table',{
|
307
|
+
page: 1,
|
308
|
+
limit:tableDataCount, //加载所有数据
|
309
|
+
done:function (){
|
310
|
+
//导出所有数据
|
311
|
+
table.exportFile("table",false,"xls");
|
312
|
+
//恢复数据分页显示
|
313
|
+
table.reload('table',{
|
314
|
+
page: 1,
|
315
|
+
limit:20,
|
316
|
+
done:function (res, curr, count){
|
317
|
+
tableDataCount = count;
|
318
|
+
}
|
319
|
+
})
|
320
|
+
|
321
|
+
}
|
322
|
+
})
|
301
323
|
}
|
302
324
|
});
|
303
325
|
|
@@ -6,10 +6,10 @@ json.data do
|
|
6
6
|
json.state deliver.status
|
7
7
|
json.time handled_time_data deliver.delvier_date
|
8
8
|
json.id deliver.id
|
9
|
-
json.staff_name handled_data b.staff_name
|
9
|
+
json.staff_name handled_data handled_data b.staff_name
|
10
10
|
json.subject_progress deliver.subject_competed_count
|
11
11
|
json.shixun_progress deliver.shixun_competed_count
|
12
|
-
json.subject_manages deliver.subject_manages
|
12
|
+
json.subject_manages handled_data deliver.subject_manages
|
13
13
|
end
|
14
14
|
end
|
15
15
|
json.code 0
|
@@ -1,44 +1,65 @@
|
|
1
|
+
<style>
|
2
|
+
.layui-table-cell{
|
3
|
+
height: auto !important;
|
4
|
+
width: auto;
|
5
|
+
white-space: normal;
|
6
|
+
/*line-height: 28px;*/
|
7
|
+
}
|
8
|
+
</style>
|
1
9
|
<div class="min-height-table" style="margin: 20px">
|
2
10
|
<div>
|
3
|
-
<form class="layui-form layui-form-pane" lay-filter="list_shixun_search_form">
|
4
|
-
<div
|
5
|
-
<
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
11
|
+
<form class="layui-form layui-form-pane" id="list_shixun_search" lay-filter="list_shixun_search_form">
|
12
|
+
<div>
|
13
|
+
<div class="layui-inline show_item_contract borders">
|
14
|
+
<label class="layui-form-label">任务类型</label>
|
15
|
+
<div class="layui-input-inline">
|
16
|
+
<%= select_tag "category", options_for_select(
|
17
|
+
[["全部", 0], ["管培", 1], ["全职", 2], ["专职", 3]]
|
18
|
+
), { include_blank: true } %>
|
19
|
+
</div>
|
10
20
|
</div>
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
21
|
+
<div class="layui-inline show_item_contract">
|
22
|
+
<label class="layui-form-label">项目级别</label>
|
23
|
+
<div class="layui-input-inline">
|
24
|
+
<%= select_tag "level", options_for_select(
|
25
|
+
[["全部", 0], ["不明确", 1], ["重要紧急", 2], ["重要不紧急", 3],
|
26
|
+
["不重要紧急", 4], ["不重要不紧急", 5]], selected: 0
|
27
|
+
), { include_blank: true } %>
|
28
|
+
</div>
|
19
29
|
</div>
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
30
|
+
<div class="layui-inline show_item_contract borders">
|
31
|
+
<label class="layui-form-label">项目状态</label>
|
32
|
+
<div class="layui-input-inline">
|
33
|
+
<%= select_tag "status", options_for_select(
|
34
|
+
[["全部", 0], ["待建设", 1], ["已签协议", 2], ["建设中", 3],
|
35
|
+
["审核中", 4], ["返修中", 5], ["已内部发布", 6], ["已公开发布", 7],
|
36
|
+
["已付费用",8],["审核通过",9]], selected: 0
|
37
|
+
), { include_blank: true } %>
|
38
|
+
</div>
|
28
39
|
</div>
|
40
|
+
|
29
41
|
</div>
|
30
|
-
<div
|
31
|
-
<
|
32
|
-
|
33
|
-
<
|
42
|
+
<div>
|
43
|
+
<div class="layui-inline borders">
|
44
|
+
<label class="layui-form-label" style="width: 150px">实践项目名称</label>
|
45
|
+
<div class="layui-input-inline">
|
46
|
+
<input type="text" name="shixun_name" class="layui-input">
|
47
|
+
</div>
|
48
|
+
</div>
|
49
|
+
<div class="layui-inline borders">
|
50
|
+
<label class="layui-form-label" style="width: 150px">实践课程名称</label>
|
51
|
+
<div class="layui-input-inline">
|
52
|
+
<input type="text" name="subject_name" class="layui-input">
|
53
|
+
</div>
|
54
|
+
</div>
|
55
|
+
<div class="layui-inline borders">
|
56
|
+
<button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
|
57
|
+
</button>
|
58
|
+
<button type="submit" id="search_list_shixuns_contract" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_list_shixuns_contract">搜索
|
59
|
+
</button>
|
34
60
|
</div>
|
35
61
|
</div>
|
36
|
-
|
37
|
-
<button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
|
38
|
-
</button>
|
39
|
-
<button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_list_shixuns_contract">搜索
|
40
|
-
</button>
|
41
|
-
</div>
|
62
|
+
|
42
63
|
</form>
|
43
64
|
</div>
|
44
65
|
|
@@ -49,23 +70,7 @@
|
|
49
70
|
</div>
|
50
71
|
|
51
72
|
|
52
|
-
|
53
|
-
{{# if(d.shixun_status === 1){ }}
|
54
|
-
<span>待建设</span>
|
55
|
-
{{# } else if(d.shixun_status === 2){ }}
|
56
|
-
<span>已签协议</span>
|
57
|
-
{{# } else if(d.shixun_status === 3){ }}
|
58
|
-
<span>建设中</span>
|
59
|
-
{{# } else if(d.shixun_status === 4){ }}
|
60
|
-
<span>审核中</span>
|
61
|
-
{{# } else if(d.shixun_status === 5){ }}
|
62
|
-
<span>返修中</span>
|
63
|
-
{{# } else if(d.shixun_status === 6){ }}
|
64
|
-
<span>已内部发布</span>
|
65
|
-
{{# } else if(d.shixun_status === 7){ }}
|
66
|
-
<span>已公开发布</span>
|
67
|
-
{{# } }}
|
68
|
-
</script>
|
73
|
+
|
69
74
|
<script type="text/html" id="show_level">
|
70
75
|
{{# if(d.level === 1){ }}
|
71
76
|
<span>不明确</span>
|
@@ -79,7 +84,20 @@
|
|
79
84
|
<span>不重要不紧急</span>
|
80
85
|
{{# } }}
|
81
86
|
</script>
|
82
|
-
|
87
|
+
<script type="text/html" id="aherf">
|
88
|
+
{{# if(d.identifier !== null && d.identifier !== ''){ }}
|
89
|
+
<a target="_blank" style="color:deepskyblue" href="<%= @url %>/paths/{{= d.subjects_identifier}}">{{=d.subjects_name}}</a>
|
90
|
+
{{# } else { }}
|
91
|
+
<a style="color:deepskyblue" >{{=d.subjects_name}}</a>
|
92
|
+
{{# } }}
|
93
|
+
</script>
|
94
|
+
<script type="text/html" id="shixun_name_link">
|
95
|
+
{{# if(d.identifier !== null && d.identifier !== ''){ }}
|
96
|
+
<a target="_blank" style="color:deepskyblue" href='<%=@url %>/shixuns/{{=d.s_identifier}}/challenges'>{{=d.shixun_name}}</a>
|
97
|
+
{{# } else { }}
|
98
|
+
<a style="color:deepskyblue" >{{=d.shixun_name}}</a>
|
99
|
+
{{# } }}
|
100
|
+
</script>
|
83
101
|
|
84
102
|
<script type="text/html" id="show_type">
|
85
103
|
{{# if(d.shixun_type === 1){ }}
|
@@ -92,7 +110,26 @@
|
|
92
110
|
</script>
|
93
111
|
|
94
112
|
|
113
|
+
|
95
114
|
<script>
|
115
|
+
function extractFirstTenCharsAndImage(markdownText) {
|
116
|
+
let firstTenChars = '';
|
117
|
+
let imageTag = '';
|
118
|
+
// 行内图片的正则表达式
|
119
|
+
const inlineImageRegex = /!\[.*?\]\((.*?)\)/g;
|
120
|
+
// 处理行内图片
|
121
|
+
markdownText = markdownText.replace(inlineImageRegex, (_, imagePath) => {
|
122
|
+
// 如果匹配到行内图片,则生成图片标签,并将匹配的图片部分替换为空字符串
|
123
|
+
imageTag = `<img style="max-height: 100px" src="${imagePath}" />`;
|
124
|
+
return '';
|
125
|
+
});
|
126
|
+
// 去除Markdown格式,只保留纯文本内容
|
127
|
+
const pureText = markdownText.replace(/(^|\n)(\d+\.|)\s*/g, '$1').trim();
|
128
|
+
// 获取前十个字符
|
129
|
+
firstTenChars = pureText.substring(0, 10);
|
130
|
+
// 输出结果
|
131
|
+
return `<p>${firstTenChars}</p> ${imageTag}`
|
132
|
+
}
|
96
133
|
layui.use(['form', 'table', 'miniPage', 'element', 'laydate', 'dropdown'], function () {
|
97
134
|
var laydate = layui.laydate,
|
98
135
|
form = layui.form,
|
@@ -112,29 +149,35 @@
|
|
112
149
|
{
|
113
150
|
field: 'id',
|
114
151
|
width: 60,
|
115
|
-
fixed: 'left',
|
116
152
|
title: '序号', type: 'numbers',
|
117
153
|
align: 'center'
|
118
154
|
},
|
119
155
|
{
|
120
|
-
field: '
|
156
|
+
field: 'subjects_name',
|
157
|
+
title: '实践课程名称',
|
158
|
+
width: 150,
|
159
|
+
align: 'center',
|
160
|
+
templet: "#aherf"
|
161
|
+
},
|
162
|
+
{
|
163
|
+
field: 'category',
|
121
164
|
title: '任务类型',
|
122
165
|
width: 150,
|
123
166
|
align: 'center',
|
124
|
-
templet: '#show_type'
|
125
167
|
},
|
126
168
|
{
|
127
169
|
field: 'shixun_name',
|
128
170
|
title: '实践项目名称',
|
129
171
|
width: 150,
|
130
|
-
align: 'center'
|
172
|
+
align: 'center',
|
173
|
+
templet: '#shixun_name_link'
|
131
174
|
},
|
132
175
|
{
|
133
176
|
field: 'level',
|
134
177
|
title: '项目级别',
|
135
178
|
width: 150,
|
136
179
|
align: 'center',
|
137
|
-
templet: '#show_level'
|
180
|
+
// templet: '#show_level'
|
138
181
|
},
|
139
182
|
{
|
140
183
|
field: 'deliver_date',
|
@@ -143,10 +186,9 @@
|
|
143
186
|
align: 'center'
|
144
187
|
},
|
145
188
|
{
|
146
|
-
field: '
|
189
|
+
field: 'shixun_status',
|
147
190
|
title: '项目状态',
|
148
191
|
width: 150,
|
149
|
-
templet: '#show_state',
|
150
192
|
align: 'center'
|
151
193
|
},
|
152
194
|
{
|
@@ -159,7 +201,13 @@
|
|
159
201
|
field: 'dectect_feedback',
|
160
202
|
title: '审核反馈',
|
161
203
|
width: 150,
|
162
|
-
align: 'center'
|
204
|
+
align: 'center',
|
205
|
+
templet: (d)=>{
|
206
|
+
if(d.dectect_feedback){
|
207
|
+
return extractFirstTenCharsAndImage(d.dectect_feedback)
|
208
|
+
}
|
209
|
+
return ''
|
210
|
+
},
|
163
211
|
},
|
164
212
|
{
|
165
213
|
field: 'shixun_producer',
|
@@ -184,11 +232,21 @@
|
|
184
232
|
|
185
233
|
|
186
234
|
|
187
|
-
var id = localStorage.getItem("
|
235
|
+
var id = localStorage.getItem("business_delvier_subject_id_shixuns")
|
236
|
+
localStorage.removeItem("business_delvier_subject_id_shixuns")
|
237
|
+
var subject_id = localStorage.getItem("subject_id")
|
238
|
+
localStorage.removeItem("subject_id")
|
239
|
+
var url = ""
|
240
|
+
if(id !== '' && id !== null){
|
241
|
+
url = '/missions/business_courses/list_shixuns?id='+id
|
242
|
+
}else if(subject_id !== '' && subject_id !== null){
|
243
|
+
url = '/missions/business_courses/list_shixuns?subject_id='+subject_id
|
244
|
+
}
|
188
245
|
console.log(id)
|
246
|
+
console.log(subject_id)
|
189
247
|
var shixun_table = table.render({
|
190
248
|
elem: '#shixun_table',
|
191
|
-
url:
|
249
|
+
url: url,
|
192
250
|
data: data,
|
193
251
|
autoSort: false,
|
194
252
|
where: {q: data},
|
@@ -199,15 +257,25 @@
|
|
199
257
|
page: true,
|
200
258
|
skin: 'line'
|
201
259
|
});
|
202
|
-
|
260
|
+
// 重置
|
261
|
+
form.on('submit(reset_business_search)', function (data) {
|
262
|
+
table.reload('shixun_table', {
|
263
|
+
page: {
|
264
|
+
curr: 1
|
265
|
+
},
|
266
|
+
where: {q: {}}
|
267
|
+
}, 'data');
|
268
|
+
document.getElementById("list_shixun_search").reset();
|
269
|
+
form.render()
|
270
|
+
return false;
|
271
|
+
});
|
203
272
|
|
204
273
|
var data = form.val("list_shixun_search_form");
|
205
274
|
var sort = {}, search = {};
|
206
275
|
form.on('submit(search_list_shixuns_contract)', function (data) {
|
207
276
|
search = data.field
|
208
|
-
search.id = localStorage.getItem("business_delvier_subject_id")
|
209
277
|
console.log(search)
|
210
|
-
table.reload('
|
278
|
+
table.reload('shixun_table', {
|
211
279
|
page: {
|
212
280
|
curr: 1
|
213
281
|
},
|
@@ -1,16 +1,22 @@
|
|
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.
|
6
|
-
json.
|
4
|
+
json.shixun_producer handled_data d.shixun_producer
|
5
|
+
json.shixun_staff handled_data d.shixun_staff
|
6
|
+
json.category real_shixun_category d.category
|
7
|
+
json.deliver_date handled_time_data d.deliver_date
|
7
8
|
json.shixun_name handled_data d.s_name
|
8
|
-
|
9
|
+
|
10
|
+
json.s_identifier handled_data d.s_identifier
|
11
|
+
json.shixun_status real_shixun_status d.shixun_status
|
9
12
|
json.level real_shixun_level d.level
|
13
|
+
json.deliver_date handled_time_data d.deliver_date
|
10
14
|
json.id d.id
|
15
|
+
json.subjects_name d.subjects_name
|
16
|
+
json.subjects_identifier d.subjects_identifier
|
11
17
|
json.max_manage "喻银凤"
|
12
|
-
json.dectect_feedback
|
13
|
-
json.commit_dectect_time
|
18
|
+
json.dectect_feedback handled_data d.dectect_content
|
19
|
+
json.commit_dectect_time handled_time_data_accurate d.dectect_time
|
14
20
|
end
|
15
21
|
end
|
16
22
|
json.code 0
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<div class="min-height-table" style="margin:20px">
|
2
2
|
<div>
|
3
|
-
<form class="layui-form layui-form-pane " lay-filter="search_form">
|
3
|
+
<form class="layui-form layui-form-pane " id="list_subject_search" lay-filter="search_form">
|
4
4
|
<!-- <div class="layui-row">-->
|
5
5
|
<!-- <h2 style="padding-left: 25px">商机名称-实践课程列表</h2>-->
|
6
6
|
<!-- </div>-->
|
@@ -13,17 +13,17 @@
|
|
13
13
|
</div>
|
14
14
|
</div>
|
15
15
|
<div class="layui-inline borders">
|
16
|
-
<label class="layui-form-label" style="width:
|
16
|
+
<label class="layui-form-label" style="width: 130px">实践课程名称</label>
|
17
17
|
<div class="layui-input-inline">
|
18
18
|
<input type="text" name="name" class="layui-input" value="">
|
19
19
|
</div>
|
20
20
|
</div>
|
21
|
-
<div class="layui-inline borders"
|
22
|
-
<label class="layui-form-label">交付单位</label
|
23
|
-
<div class="layui-input-inline"
|
24
|
-
<div id="school_id" style="width: 300px;"></div
|
25
|
-
</div
|
26
|
-
</div
|
21
|
+
<!-- <div class="layui-inline borders">-->
|
22
|
+
<!-- <label class="layui-form-label">交付单位</label>-->
|
23
|
+
<!-- <div class="layui-input-inline">-->
|
24
|
+
<!-- <div id="school_id" style="width: 300px;"></div>-->
|
25
|
+
<!-- </div>-->
|
26
|
+
<!-- </div>-->
|
27
27
|
<div class="layui-inline borders">
|
28
28
|
<button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
|
29
29
|
</button>
|
@@ -42,18 +42,18 @@
|
|
42
42
|
<a lay-event="show_list_shixun" style="color: deepskyblue">{{= d.shixuns_completed_progress }}</a>
|
43
43
|
</script>
|
44
44
|
<script id="show_state_course" type="text/html">
|
45
|
-
{{# if(d.status ===
|
45
|
+
{{# if(d.status === 2 && d.public !== 1 && d.public !== 2){ }}
|
46
|
+
<span>已发布</span>
|
47
|
+
{{# } else if( d.status === 0 ){ }}
|
46
48
|
<span>编辑中</span>
|
47
|
-
{{# }
|
49
|
+
{{# }else if(d.public === 1 && d.status === 2){ }}
|
48
50
|
<span>审核中</span>
|
49
|
-
{{# }else if(d.public === 2){ }}
|
51
|
+
{{# } else if(d.public === 2 && d.status === 2){ }}
|
50
52
|
<span>已公开</span>
|
51
|
-
{{# } else if(d.status === 2){ }}
|
52
|
-
<span>已发布</span>
|
53
53
|
{{# } }}
|
54
54
|
</script>
|
55
55
|
<script id="educode_link" type="text/html">
|
56
|
-
<a href="<%= @url
|
56
|
+
<a href="<%= @url %>/paths/{{= d.identifier}}" target="_blank" style="color: #1E9FFF">{{= d.name}}</a>
|
57
57
|
</script>
|
58
58
|
<script>
|
59
59
|
layui.use(['form', 'table', 'miniPage', 'element', 'laydate', 'dropdown'], function () {
|
@@ -124,34 +124,19 @@
|
|
124
124
|
{
|
125
125
|
title: '状态',
|
126
126
|
align: 'center',
|
127
|
-
|
127
|
+
field: 'shixun_status'
|
128
|
+
// templet: "#show_state_course"
|
128
129
|
},
|
129
130
|
{
|
130
|
-
field: '
|
131
|
+
field: 'deliver_date',
|
131
132
|
title: '交付时间',
|
132
133
|
align: 'center'
|
133
|
-
},
|
134
|
-
{
|
135
|
-
field: 'school',
|
136
|
-
title: '交付单位',
|
137
|
-
align: 'center'
|
138
|
-
},
|
139
|
-
{
|
140
|
-
field: 'p_sale_staff',
|
141
|
-
title: '销售',
|
142
|
-
align: 'center'
|
143
|
-
},
|
144
|
-
{
|
145
|
-
field: 'p_sale_staff1',
|
146
|
-
title: '课程经理',
|
147
|
-
align: 'center'
|
148
134
|
}
|
149
135
|
]
|
150
136
|
]
|
151
137
|
|
152
138
|
|
153
139
|
var id = localStorage.getItem("business_delvier_subject_id")
|
154
|
-
console.log(id)
|
155
140
|
var subjects_table = table.render({
|
156
141
|
elem: '#subjects_table',
|
157
142
|
url: '/missions/business_courses/list_subjects?id=' + id,
|
@@ -166,7 +151,18 @@
|
|
166
151
|
page: true,
|
167
152
|
skin: 'line'
|
168
153
|
});
|
169
|
-
|
154
|
+
// 重置
|
155
|
+
form.on('submit(reset_business_search)', function (data) {
|
156
|
+
table.reload('subjects_table', {
|
157
|
+
page: {
|
158
|
+
curr: 1
|
159
|
+
},
|
160
|
+
where: {q: {}}
|
161
|
+
}, 'data');
|
162
|
+
document.getElementById("list_subject_search").reset();
|
163
|
+
form.render()
|
164
|
+
return false;
|
165
|
+
});
|
170
166
|
var sort = {}, search = {};
|
171
167
|
// 监听搜索操作
|
172
168
|
form.on('submit(search_bussiness_contract)', function (data) {
|
@@ -185,7 +181,6 @@
|
|
185
181
|
var data = obj.data;
|
186
182
|
// 编辑按钮监听
|
187
183
|
if (obj.event === 'show_list_shixun') {
|
188
|
-
console.log(233)
|
189
184
|
localStorage.setItem("subject_id", data.id)
|
190
185
|
var content = miniPage.getHrefContent('/missions/business_courses/list_shixuns');
|
191
186
|
var openWH = miniPage.getOpenWidthHeight();
|