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
@@ -3,8 +3,8 @@
|
|
3
3
|
<input style="display: none" value="<%=@id %>" name="id">
|
4
4
|
<input style="display: none" value="<%=@school_id %>" name="school_id">
|
5
5
|
<div class="layui-form-item">
|
6
|
-
<label class="layui-form-label"
|
7
|
-
<div class="layui-input-block">
|
6
|
+
<label class="layui-form-label" style="width: 112px">实践课程名称:<span style="color: red"> *</span></label>
|
7
|
+
<div class="layui-input-block" style="margin-left: 25px;width: 92%">
|
8
8
|
<input type="text" name="name"
|
9
9
|
lay-verify="required" disabled
|
10
10
|
value="<%= @item.name %>" class="layui-input"
|
@@ -12,9 +12,9 @@
|
|
12
12
|
</div>
|
13
13
|
</div>
|
14
14
|
<div class="layui-form-item" >
|
15
|
-
<label class="layui-form-label"
|
15
|
+
<label class="layui-form-label" style="width: 112px">实践项目名称:</label>
|
16
16
|
<div class="layui-input-block" >
|
17
|
-
<div id="shixun_ids" style="width: 50%;margin-left:
|
17
|
+
<div id="shixun_ids" style="width: 50%;margin-left: 25px"></div>
|
18
18
|
</div>
|
19
19
|
</div>
|
20
20
|
|
@@ -10,15 +10,15 @@
|
|
10
10
|
</div>
|
11
11
|
</div>
|
12
12
|
<div class="layui-inline">
|
13
|
-
<label class="layui-form-label" style="width:
|
13
|
+
<label class="layui-form-label" style="width: 130px">实践课程名称</label>
|
14
14
|
<div class="layui-input-inline">
|
15
15
|
<input type="text" class="layui-input" name="subjects_name">
|
16
16
|
</div>
|
17
17
|
</div>
|
18
18
|
<div class="layui-inline">
|
19
|
-
<label class="layui-form-label" style="width: 120px"
|
19
|
+
<label class="layui-form-label" style="width: 120px">商机名称</label>
|
20
20
|
<div class="layui-input-inline">
|
21
|
-
<input type="text" class="layui-input" name="
|
21
|
+
<input type="text" class="layui-input" name="business_name">
|
22
22
|
</div>
|
23
23
|
</div>
|
24
24
|
<div class="layui-inline" style="margin-left: 20px">
|
@@ -54,7 +54,7 @@
|
|
54
54
|
<script type="text/html" id="statusBar">
|
55
55
|
{{# if(d.public === 2){ }}
|
56
56
|
<span>已公开</span>
|
57
|
-
{{# } else if(d.
|
57
|
+
{{# } else if(d.status === 0){ }}
|
58
58
|
<span>编辑中</span>
|
59
59
|
{{# } else if(d.status === 1){ }}
|
60
60
|
<span>审核中</span>
|
@@ -67,6 +67,10 @@
|
|
67
67
|
<a lay-event="link_shixuns" style="color: deepskyblue">{{= d.shixun_progress }}</a>
|
68
68
|
</script>
|
69
69
|
|
70
|
+
<script type="text/html" id="link_subject">
|
71
|
+
<a target='_blank' style='color: #1E9FFF' href='<%=@url %>/paths/{{=d.identifier}}'>{{=d.s_name}}</a>
|
72
|
+
</script>
|
73
|
+
|
70
74
|
<script>
|
71
75
|
layui.use(['form', 'table', 'miniPage', 'element', 'laydate', 'dropdown'], function () {
|
72
76
|
var laydate = layui.laydate,
|
@@ -94,7 +98,8 @@
|
|
94
98
|
field: 's_name',
|
95
99
|
title: '实践课程名称',
|
96
100
|
align: 'center',
|
97
|
-
minWidth: 200
|
101
|
+
minWidth: 200,
|
102
|
+
templet: '#link_subject'
|
98
103
|
},
|
99
104
|
{
|
100
105
|
field: 'shixun_progress',
|
@@ -115,7 +120,7 @@
|
|
115
120
|
title: '状态',
|
116
121
|
minWidth: 50,
|
117
122
|
align: 'center',
|
118
|
-
templet: '#statusBar'
|
123
|
+
// templet: '#statusBar'
|
119
124
|
},
|
120
125
|
{
|
121
126
|
field: 'b_name',
|
@@ -150,18 +155,22 @@
|
|
150
155
|
}
|
151
156
|
]
|
152
157
|
]
|
153
|
-
|
158
|
+
var tableDataCount = 0
|
154
159
|
table.render({
|
155
160
|
elem: '#table',
|
156
161
|
where: {q: form.val()},
|
157
162
|
url: '/missions/subjects',
|
158
163
|
cellMinWidth: 80,
|
164
|
+
title: '实践课程列表',
|
159
165
|
toolbar: '#bussinessBar',
|
160
166
|
defaultToolbar: [],
|
161
167
|
cols: cols_table,
|
162
168
|
limit: 10,
|
163
169
|
limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
|
164
|
-
page: true
|
170
|
+
page: true,
|
171
|
+
done:function (res, curr, count){
|
172
|
+
tableDataCount = count;
|
173
|
+
}
|
165
174
|
})
|
166
175
|
var sort = {}, search = {};
|
167
176
|
// 监听搜索操作
|
@@ -191,7 +200,7 @@
|
|
191
200
|
type: 1,
|
192
201
|
shade: 0.2,
|
193
202
|
maxmin: true,
|
194
|
-
shadeClose:
|
203
|
+
shadeClose: false,
|
195
204
|
area: [openWH[0] + 'px', openWH[1] + 'px'],
|
196
205
|
offset: [openWH[2] + 'px', openWH[3] + 'px'],
|
197
206
|
content: content
|
@@ -209,7 +218,7 @@
|
|
209
218
|
type: 1,
|
210
219
|
shade: 0.2,
|
211
220
|
maxmin: true,
|
212
|
-
shadeClose:
|
221
|
+
shadeClose: false,
|
213
222
|
area: [openWH[0] + 'px', openWH[1] + 'px'],
|
214
223
|
offset: [openWH[2] + 'px', openWH[3] + 'px'],
|
215
224
|
content: content
|
@@ -219,7 +228,18 @@
|
|
219
228
|
return false;
|
220
229
|
}
|
221
230
|
});
|
222
|
-
|
231
|
+
// 重置
|
232
|
+
form.on('submit(reset_business_search)', function (data) {
|
233
|
+
table.reload('table', {
|
234
|
+
page: {
|
235
|
+
curr: 1
|
236
|
+
},
|
237
|
+
where: {q: {}}
|
238
|
+
}, 'data');
|
239
|
+
$(".layui-form")[0].reset();
|
240
|
+
form.render()
|
241
|
+
return false;
|
242
|
+
});
|
223
243
|
|
224
244
|
table.on('toolbar(table)', function (obj) {
|
225
245
|
// 新增按钮监听
|
@@ -233,7 +253,7 @@
|
|
233
253
|
type: 1,
|
234
254
|
shade: 0.2,
|
235
255
|
maxmin: true,
|
236
|
-
shadeClose:
|
256
|
+
shadeClose: false,
|
237
257
|
area: [openWH[0] + 'px', openWH[1] + 'px'],
|
238
258
|
offset: [openWH[2] + 'px', openWH[3] + 'px'],
|
239
259
|
content: content
|
@@ -241,6 +261,24 @@
|
|
241
261
|
$(window).on("resize", function () {
|
242
262
|
});
|
243
263
|
return false;
|
264
|
+
}else if(obj.event === 'list'){
|
265
|
+
table.reload('table',{
|
266
|
+
page: 1,
|
267
|
+
limit:tableDataCount, //加载所有数据
|
268
|
+
done:function (){
|
269
|
+
//导出所有数据
|
270
|
+
table.exportFile("table",false,"xls");
|
271
|
+
//恢复数据分页显示
|
272
|
+
table.reload('table',{
|
273
|
+
page: 1,
|
274
|
+
limit:20,
|
275
|
+
done:function (res, curr, count){
|
276
|
+
tableDataCount = count;
|
277
|
+
}
|
278
|
+
})
|
279
|
+
|
280
|
+
}
|
281
|
+
})
|
244
282
|
}
|
245
283
|
});
|
246
284
|
});
|
@@ -3,13 +3,13 @@ json.data do
|
|
3
3
|
json.s_name handled_data d.s_name
|
4
4
|
json.deliver_date handled_time_data d.deliver_date
|
5
5
|
json.b_name handled_data d.b_name
|
6
|
-
json.status d
|
7
|
-
json.public d.public
|
6
|
+
json.status status d
|
8
7
|
json.school_name handled_data @business_subject_schools["#{d.id}"]
|
9
8
|
json.id d.id
|
9
|
+
json.identifier d.s_identifier
|
10
10
|
json.staff_name handled_data @business_subject_staffs["#{d.id}"]
|
11
11
|
json.mange_name handled_data @business_subject_manges["#{d.id}"]
|
12
|
-
|
12
|
+
json.shixun_progress d.shixun_compeled_count
|
13
13
|
end
|
14
14
|
end
|
15
15
|
json.code 0
|
@@ -1,3 +1,14 @@
|
|
1
|
+
<style>
|
2
|
+
.markdown_list img {
|
3
|
+
max-width: 700px;
|
4
|
+
}
|
5
|
+
.layui-table-cell{
|
6
|
+
height: auto !important;
|
7
|
+
width: auto;
|
8
|
+
white-space: normal;
|
9
|
+
/*line-height: 28px;*/
|
10
|
+
}
|
11
|
+
</style>
|
1
12
|
<div class="min-height-table" style="margin: 20px">
|
2
13
|
<div>
|
3
14
|
<form class="layui-form layui-form-pane" lay-filter="search_form">
|
@@ -23,20 +34,21 @@
|
|
23
34
|
<div class="layui-input-inline">
|
24
35
|
<%= select_tag "status", options_for_select(
|
25
36
|
[["全部", 0], ["待建设", 1], ["已签协议", 2], ["建设中", 3],
|
26
|
-
["审核中", 4], ["返修中", 5], ["已内部发布", 6], ["已公开发布", 7]
|
37
|
+
["审核中", 4], ["返修中", 5], ["已内部发布", 6], ["已公开发布", 7],
|
38
|
+
["已付费用",8],["审核通过",9]], selected: 0
|
27
39
|
), { include_blank: true } %>
|
28
40
|
</div>
|
29
41
|
</div>
|
30
42
|
|
31
43
|
<br>
|
32
44
|
<div class="layui-inline borders">
|
33
|
-
<label class="layui-form-label" style="width:
|
45
|
+
<label class="layui-form-label" style="width: 130px">实践项目名称</label>
|
34
46
|
<div class="layui-input-inline">
|
35
47
|
<input type="text" name="shixun_name" class="layui-input">
|
36
48
|
</div>
|
37
49
|
</div>
|
38
50
|
<div class="layui-inline borders">
|
39
|
-
<button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
|
51
|
+
<button type="reset" class="layui-btn layui-btn-primary" id="list_shixuns_search_reset" lay-submit lay-filter="reset_business_search">重置
|
40
52
|
</button>
|
41
53
|
<button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_shixun_contract">搜索
|
42
54
|
</button>
|
@@ -50,7 +62,9 @@
|
|
50
62
|
|
51
63
|
</div>
|
52
64
|
|
53
|
-
|
65
|
+
<script type="text/html" id="shixun_name_link">
|
66
|
+
<a target='_blank' style='color: #1E9FFF' href='<%=@url %>/shixuns/{{=d.identifier}}/challenges'>{{=d.name}}</a>
|
67
|
+
</script>
|
54
68
|
<script type="text/html" id="show_state">
|
55
69
|
{{# if(d.shixun_status === 1){ }}
|
56
70
|
<span>待建设</span>
|
@@ -66,6 +80,10 @@
|
|
66
80
|
<span>已内部发布</span>
|
67
81
|
{{# } else if(d.shixun_status === 7){ }}
|
68
82
|
<span>已公开发布</span>
|
83
|
+
{{# } else if(d.shixun_status === 8){ }}
|
84
|
+
<span>已付费用</span>
|
85
|
+
{{# } else if(d.shixun_status === 9){ }}
|
86
|
+
<span>审核通过</span>
|
69
87
|
{{# } }}
|
70
88
|
</script>
|
71
89
|
<script type="text/html" id="show_level">
|
@@ -84,24 +102,52 @@
|
|
84
102
|
|
85
103
|
|
86
104
|
<script type="text/html" id="show_type">
|
87
|
-
{{# if(d.
|
105
|
+
{{# if(d.category === 1){ }}
|
88
106
|
<span>管培</span>
|
89
|
-
{{# } else if(d.
|
107
|
+
{{# } else if(d.category === 2){ }}
|
90
108
|
<span>全职</span>
|
91
|
-
{{# } else if(d.
|
109
|
+
{{# } else if(d.category === 3){ }}
|
92
110
|
<span>专职</span>
|
93
111
|
{{# } }}
|
94
112
|
</script>
|
95
113
|
<script type="text/html" id="shixun_table_bar">
|
96
114
|
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
|
115
|
+
{{# if(d.shixun_status === 3 || d.shixun_status === 5){ }}
|
97
116
|
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="examine">提交审核</a>
|
117
|
+
{{# } else { }}
|
118
|
+
<a class="layui-btn layui-btn-disabled layui-btn-xs data-count-edit">提交审核</a>
|
119
|
+
{{# } }}
|
98
120
|
</script>
|
99
|
-
|
121
|
+
<script type="text/html" id="link_shixun">
|
122
|
+
<a target='_blank' style='color: #1E9FFF' href='<%=@url %>/shixuns/{{=d.identifier}}'>{{=d.name}}</a>
|
123
|
+
</script>
|
124
|
+
<script src="/markdown/marked.min.js" type="text/javascript" charset="utf-8"></script>
|
100
125
|
<script>
|
101
|
-
|
126
|
+
function extractFirstTenCharsAndImage(markdownText) {
|
127
|
+
let firstTenChars = '';
|
128
|
+
let imageTag = '';
|
129
|
+
// 行内图片的正则表达式
|
130
|
+
const inlineImageRegex = /!\[.*?\]\((.*?)\)/g;
|
131
|
+
// 处理行内图片
|
132
|
+
markdownText = markdownText.replace(inlineImageRegex, (_, imagePath) => {
|
133
|
+
// 如果匹配到行内图片,则生成图片标签,并将匹配的图片部分替换为空字符串
|
134
|
+
imageTag = `<img style="max-height: 100px" src="${imagePath}" />`;
|
135
|
+
return '';
|
136
|
+
});
|
137
|
+
// 去除Markdown格式,只保留纯文本内容
|
138
|
+
const pureText = markdownText.replace(/(^|\n)(\d+\.|)\s*/g, '$1').trim();
|
139
|
+
// 获取前十个字符
|
140
|
+
firstTenChars = pureText.substring(0, 10);
|
141
|
+
// 输出结果
|
142
|
+
return `<div lay-event="show_markdown"><p>${firstTenChars}</p> ${imageTag}</div>`
|
143
|
+
}
|
144
|
+
layui.config({
|
145
|
+
base: '/markdown/mods/' //存放layui拓展模块的目录位置
|
146
|
+
}).use(['form', 'table', 'miniPage', 'element', 'laydate', 'dropdown','easyeditor'], function () {
|
102
147
|
var laydate = layui.laydate,
|
103
148
|
form = layui.form,
|
104
149
|
table = layui.table,
|
150
|
+
easyeditor= layui.easyeditor,
|
105
151
|
miniPage = layui.miniPage
|
106
152
|
|
107
153
|
|
@@ -116,12 +162,11 @@
|
|
116
162
|
{
|
117
163
|
field: 'id',
|
118
164
|
width: 60,
|
119
|
-
fixed: 'left',
|
120
165
|
title: '序号', type: 'numbers',
|
121
166
|
align: 'center'
|
122
167
|
},
|
123
168
|
{
|
124
|
-
field: '
|
169
|
+
field: 'category',
|
125
170
|
title: '任务类型',
|
126
171
|
width: 150,
|
127
172
|
align: 'center',
|
@@ -131,7 +176,9 @@
|
|
131
176
|
field: 'name',
|
132
177
|
title: '实践项目名称',
|
133
178
|
width: 150,
|
134
|
-
align: 'center'
|
179
|
+
align: 'center',
|
180
|
+
templet: '#shixun_name_link'
|
181
|
+
|
135
182
|
},
|
136
183
|
{
|
137
184
|
field: 'level',
|
@@ -154,16 +201,21 @@
|
|
154
201
|
align: 'center'
|
155
202
|
},
|
156
203
|
{
|
157
|
-
field: '
|
204
|
+
field: 'commit_dectect_time',
|
158
205
|
title: '提交审核时间',
|
159
206
|
width: 150,
|
160
207
|
align: 'center'
|
161
208
|
},
|
162
209
|
{
|
163
|
-
field: 'feedback',
|
164
210
|
title: '审核反馈',
|
165
211
|
width: 150,
|
166
|
-
align: 'center'
|
212
|
+
align: 'center',
|
213
|
+
templet: (d)=>{
|
214
|
+
if(d.dectect_feedback){
|
215
|
+
return extractFirstTenCharsAndImage(d.dectect_feedback)
|
216
|
+
}
|
217
|
+
return ''
|
218
|
+
},
|
167
219
|
},
|
168
220
|
{
|
169
221
|
field: 'shixun_producer',
|
@@ -178,7 +230,7 @@
|
|
178
230
|
align: 'center'
|
179
231
|
},
|
180
232
|
{
|
181
|
-
field: '
|
233
|
+
field: 'max_manage',
|
182
234
|
title: '课程组主管',
|
183
235
|
width: 150,
|
184
236
|
align: 'center'
|
@@ -187,7 +239,6 @@
|
|
187
239
|
title: '操作',
|
188
240
|
width: 150,
|
189
241
|
align: 'center',
|
190
|
-
fixed: 'right',
|
191
242
|
templet: "#shixun_table_bar"
|
192
243
|
}
|
193
244
|
]
|
@@ -206,6 +257,81 @@
|
|
206
257
|
page: true,
|
207
258
|
skin: 'line'
|
208
259
|
});
|
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_shixuns_search_reset').reset();
|
269
|
+
form.render()
|
270
|
+
return false;
|
271
|
+
});
|
272
|
+
|
273
|
+
table.on('tool(shixun_table)', function (obj) {
|
274
|
+
var data = obj.data;
|
275
|
+
console.log(data)
|
276
|
+
// 编辑按钮监听
|
277
|
+
if (obj.event === 'edit') {
|
278
|
+
var content = miniPage.getHrefContent('/missions/shixuns/' + data.id + '/edit');
|
279
|
+
var openWH = miniPage.getOpenWidthHeight();
|
280
|
+
|
281
|
+
var edit = layer.open({
|
282
|
+
title: '编辑实践项目',
|
283
|
+
type: 1,
|
284
|
+
shade: 0.2,
|
285
|
+
maxmin: true,
|
286
|
+
shadeClose: false,
|
287
|
+
area: [openWH[0] + 'px', openWH[1] + 'px'],
|
288
|
+
offset: [openWH[2] + 'px', openWH[3] + 'px'],
|
289
|
+
content: content
|
290
|
+
});
|
291
|
+
$(window).on("resize", function () {
|
292
|
+
});
|
293
|
+
return false;
|
294
|
+
} else if (obj.event === 'examine') {
|
295
|
+
var status = data.shixun_status
|
296
|
+
console.log(status)
|
297
|
+
if (status != 3 && status != 5) {
|
298
|
+
layer.confirm("当前状态无法提交审核")
|
299
|
+
return false
|
300
|
+
}
|
301
|
+
|
302
|
+
$.ajax('/missions/shixun_dectects/submit', {
|
303
|
+
method: 'POST',
|
304
|
+
data: data,
|
305
|
+
dataType: 'json',
|
306
|
+
success: function (res) {
|
307
|
+
var data = res.data;
|
308
|
+
console.log(res)
|
309
|
+
if (res.success) {
|
310
|
+
layer.msg("提交成功")
|
311
|
+
}
|
312
|
+
},
|
313
|
+
error: (res) => {
|
314
|
+
layer.msg("已经提交过了")
|
315
|
+
}
|
316
|
+
})
|
317
|
+
return false
|
318
|
+
}else if(obj.event === 'show_markdown'){
|
319
|
+
if(data.content !== '--'){
|
320
|
+
var text = `<div class="markdown_list" style="margin: 50px" >` + data.dectect_feedback + `</div>`
|
321
|
+
layer.open({
|
322
|
+
type: 1,
|
323
|
+
title: '审核反馈',
|
324
|
+
area: ['900px', '700px'], // 宽高
|
325
|
+
content: text,
|
326
|
+
move: '#ID-test-layer-move'
|
327
|
+
});
|
328
|
+
easyeditor.render({
|
329
|
+
elem: ".markdown_list"
|
330
|
+
});
|
331
|
+
}
|
332
|
+
}
|
333
|
+
});
|
334
|
+
|
209
335
|
|
210
336
|
var sort = {}, search = {};
|
211
337
|
form.on('submit(search_shixun_contract)', function (data) {
|
@@ -1,16 +1,21 @@
|
|
1
1
|
json.data do
|
2
2
|
json.array! @shixuns do |d|
|
3
|
-
json.shixun_manages d.shixun_manages
|
4
|
-
json.shixun_producer d.shixun_producer
|
5
|
-
json.shixun_staff d.shixun_staff
|
3
|
+
json.shixun_manages handled_data d.shixun_manages
|
4
|
+
json.shixun_producer handled_data d.shixun_producer
|
5
|
+
json.shixun_staff handled_data d.shixun_staff
|
6
6
|
json.shixun_status d.shixun_status
|
7
7
|
json.shixun_type d.shixun_type
|
8
|
-
json.
|
8
|
+
json.category d.category
|
9
|
+
json.deliver_date handled_time_data d.deliver_date
|
9
10
|
json.school_id d.school_id
|
10
11
|
json.shixun_id d.shixun_id
|
11
12
|
json.name d.shixun_name
|
12
13
|
json.level d.level
|
14
|
+
json.identifier d.identifier
|
13
15
|
json.id d.id
|
16
|
+
json.max_manage "喻银凤"
|
17
|
+
json.dectect_feedback handled_data d.dectects_content
|
18
|
+
json.commit_dectect_time handled_time_data_accurate d.shixun_dectects_time
|
14
19
|
end
|
15
20
|
end
|
16
21
|
json.code 0
|
@@ -2,15 +2,15 @@
|
|
2
2
|
<form class="layui-form" action="" style="width: 90%;margin-top: 20px">
|
3
3
|
|
4
4
|
<div class="layui-form-item">
|
5
|
-
<label class="layui-form-label" style="width:
|
5
|
+
<label class="layui-form-label" style="width: 112px">实践课程名称:<span style="color: red"> *</span></label>
|
6
6
|
<div class="layui-input-block">
|
7
|
-
<div id="subject_id" style="width:
|
7
|
+
<div id="subject_id" style="width: 48%;margin-left: 25px"></div>
|
8
8
|
</div>
|
9
9
|
</div>
|
10
10
|
<div class="layui-form-item">
|
11
|
-
<label class="layui-form-label" style="width:
|
11
|
+
<label class="layui-form-label" style="width: 112px">实践项目名称:<span style="color: red"> *</span></label>
|
12
12
|
<div class="layui-input-block">
|
13
|
-
<div id="shixun_ids" style="width:
|
13
|
+
<div id="shixun_ids" style="width: 48%;margin-left: 25px"></div>
|
14
14
|
</div>
|
15
15
|
</div>
|
16
16
|
<div class="layui-form-item">
|
@@ -104,7 +104,7 @@
|
|
104
104
|
<%= image_tag "educode_sales/5.渠道管理.png",size:"15"%>
|
105
105
|
<i style="font-size: 25px; padding-right: 15px"></i>渠道管理</a></dd>
|
106
106
|
<% end %>
|
107
|
-
<% if can? :
|
107
|
+
<% if can? :new_index, EducodeSales::SalePlan %>
|
108
108
|
<dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>">
|
109
109
|
<i style="padding-right: 35px"></i>
|
110
110
|
<%= image_tag "educode_sales/6.销售计划.png",size:"15"%>
|
@@ -233,7 +233,7 @@
|
|
233
233
|
<dl class="layui-nav-child">
|
234
234
|
<% if can?(:status, EducodeSales::BusinessDeliverSubject) %>
|
235
235
|
<dd>
|
236
|
-
<a href="/missions/subject_trends/trends" class=""><i style="padding-right: 35px"></i><%= image_tag "educode_sales/7.运营活动.png", size: "15" %>
|
236
|
+
<a href="/missions/subject_trends/trends" class="<%= current?('layui-this', trends_subject_trends_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/7.运营活动.png", size: "15" %>
|
237
237
|
<i style="font-size: 25px; padding-right: 15px"></i>课程态势</a></dd>
|
238
238
|
<%end %>
|
239
239
|
<% if can?(:business, EducodeSales::BusinessDeliverSubject) %>
|
data/config/routes.rb
CHANGED
@@ -39,7 +39,7 @@ EducodeSales::Engine.routes.draw do
|
|
39
39
|
get :sales_details
|
40
40
|
end
|
41
41
|
end
|
42
|
-
|
42
|
+
|
43
43
|
resources :sales_details do
|
44
44
|
collection do
|
45
45
|
post :upload
|
@@ -267,10 +267,15 @@ EducodeSales::Engine.routes.draw do
|
|
267
267
|
get :month_plan
|
268
268
|
get :monthly
|
269
269
|
get :year_plan
|
270
|
-
get :
|
270
|
+
get :year_execute
|
271
|
+
get :year_target
|
272
|
+
get :years_all_target
|
273
|
+
post :cal_finish_amount
|
274
|
+
post :add_year_target
|
271
275
|
end
|
272
276
|
member do
|
273
277
|
delete :delete_business_info
|
278
|
+
put :update_year_target
|
274
279
|
end
|
275
280
|
end
|
276
281
|
|
@@ -0,0 +1,45 @@
|
|
1
|
+
class CreateEducodeSalesSalesTargetHistories < ActiveRecord::Migration[5.2]
|
2
|
+
def change
|
3
|
+
create_table :educode_sales_sales_target_histories do |t|
|
4
|
+
t.references :staff
|
5
|
+
t.string :target_clazz, comment: '目标类别'
|
6
|
+
t.integer :school_tag_id, comment: '客户类别'
|
7
|
+
t.integer :num, comment: '序号'
|
8
|
+
t.string :state, comment: '审核状态'
|
9
|
+
t.float :year_target, comment: '年度目标', :limit => 53
|
10
|
+
t.float :year_finish, comment: '年度完成', :limit => 53
|
11
|
+
t.string :year, comment: '年份'
|
12
|
+
t.float :year_diff, comment: '年度差额', :limit => 53
|
13
|
+
t.references :reviewer, comment: '审核人员'
|
14
|
+
t.integer :creator_id, comment: '创建者'
|
15
|
+
t.boolean :is_use, default: false, comment: '采用'
|
16
|
+
t.string :comment, comment: '评论'
|
17
|
+
t.float :target_1, comment: '1月目标', :limit => 53
|
18
|
+
t.float :m_target_1, comment: '修改的1月目标', :limit => 53
|
19
|
+
t.float :target_2, comment: '2月目标', :limit => 53
|
20
|
+
t.float :m_target_2, comment: '修改的2月目标', :limit => 53
|
21
|
+
t.float :target_3, :limit => 53
|
22
|
+
t.float :m_target_3, :limit => 53
|
23
|
+
t.float :target_4, :limit => 53
|
24
|
+
t.float :m_target_4, :limit => 53
|
25
|
+
t.float :target_5, :limit => 53
|
26
|
+
t.float :m_target_5, :limit => 53
|
27
|
+
t.float :target_6, :limit => 53
|
28
|
+
t.float :m_target_6, :limit => 53
|
29
|
+
t.float :target_7, :limit => 53
|
30
|
+
t.float :m_target_7, :limit => 53
|
31
|
+
t.float :target_8, :limit => 53
|
32
|
+
t.float :m_target_8, :limit => 53
|
33
|
+
t.float :target_9, :limit => 53
|
34
|
+
t.float :m_target_9, :limit => 53
|
35
|
+
t.float :target_10, :limit => 53
|
36
|
+
t.float :m_target_10, :limit => 53
|
37
|
+
t.float :target_11, :limit => 53
|
38
|
+
t.float :m_target_11, :limit => 53
|
39
|
+
t.float :target_12, :limit => 53
|
40
|
+
t.float :m_target_12, :limit => 53
|
41
|
+
|
42
|
+
t.timestamps
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
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: 1.10.
|
4
|
+
version: 1.10.59
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- anke1460
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-08-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -269,6 +269,7 @@ files:
|
|
269
269
|
- app/models/educode_sales/sale_report.rb
|
270
270
|
- app/models/educode_sales/sale_trend.rb
|
271
271
|
- app/models/educode_sales/sales_detail.rb
|
272
|
+
- app/models/educode_sales/sales_target_history.rb
|
272
273
|
- app/models/educode_sales/shixun_dectect.rb
|
273
274
|
- app/models/educode_sales/staff.rb
|
274
275
|
- app/models/educode_sales/staff_permission.rb
|
@@ -526,10 +527,11 @@ files:
|
|
526
527
|
- app/views/educode_sales/places/new.html.erb
|
527
528
|
- app/views/educode_sales/plans/_monthPlan.html.erb
|
528
529
|
- app/views/educode_sales/plans/_monthly.html.erb
|
529
|
-
- app/views/educode_sales/plans/_target_track.html.erb
|
530
530
|
- app/views/educode_sales/plans/_weekPlan.html.erb
|
531
531
|
- app/views/educode_sales/plans/_weekly.html.erb
|
532
532
|
- app/views/educode_sales/plans/_yearPlan.html.erb
|
533
|
+
- app/views/educode_sales/plans/_year_execute.html.erb
|
534
|
+
- app/views/educode_sales/plans/_year_target.html.erb
|
533
535
|
- app/views/educode_sales/plans/audit_weekly.html.erb
|
534
536
|
- app/views/educode_sales/plans/business_infos.json.jbuilder
|
535
537
|
- app/views/educode_sales/plans/edit_bussiness_info.html.erb
|
@@ -556,9 +558,12 @@ files:
|
|
556
558
|
- app/views/educode_sales/plans/show_monthly.html.erb
|
557
559
|
- app/views/educode_sales/plans/show_week.html.erb
|
558
560
|
- app/views/educode_sales/plans/show_weekly.html.erb
|
559
|
-
- app/views/educode_sales/plans/target_track.js.erb
|
560
561
|
- app/views/educode_sales/plans/weekly.js.erb
|
562
|
+
- app/views/educode_sales/plans/year_execute.js.erb
|
561
563
|
- app/views/educode_sales/plans/year_plan.js.erb
|
564
|
+
- app/views/educode_sales/plans/year_target.js.erb
|
565
|
+
- app/views/educode_sales/plans/year_target.json.jbuilder
|
566
|
+
- app/views/educode_sales/plans/years_all_target.json.jbuilder
|
562
567
|
- app/views/educode_sales/plans/years_plan.json.jbuilder
|
563
568
|
- app/views/educode_sales/project_charts/_sales_analysis.html.erb
|
564
569
|
- app/views/educode_sales/project_charts/sales_analysis.js.erb
|
@@ -790,6 +795,7 @@ files:
|
|
790
795
|
- db/migrate/20230614142145_create_educode_sales_watch_follow_ups.rb
|
791
796
|
- db/migrate/20230629130033_add_clazz_to_money_plans.rb
|
792
797
|
- db/migrate/20230704124921_add_plan_a_date_to_follow_ups.rb
|
798
|
+
- db/migrate/20230729085359_create_educode_sales_sales_target_histories.rb
|
793
799
|
- lib/educode_sales.rb
|
794
800
|
- lib/educode_sales/engine.rb
|
795
801
|
- lib/educode_sales/version.rb
|