educode_sales 0.7.6 → 0.7.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/assets/images/educode_sales/top_page.png +0 -0
- data/app/controllers/educode_sales/assessments_controller.rb +139 -282
- data/app/controllers/educode_sales/businesses_controller.rb +59 -1
- data/app/controllers/educode_sales/customers_controller.rb +0 -3
- data/app/helpers/educode_sales/application_helper.rb +3 -3
- data/app/models/educode_sales/business.rb +8 -0
- data/app/models/educode_sales/business_relation_ship.rb +6 -0
- data/app/models/educode_sales/customer_follow.rb +1 -0
- data/app/models/educode_sales/follow_up.rb +2 -0
- data/app/models/educode_sales/role_area.rb +1 -1
- data/app/views/educode_sales/assessments/_progress.html.erb +7 -4
- data/app/views/educode_sales/assessments/_setup.html.erb +54 -10
- data/app/views/educode_sales/assessments/edit.html.erb +47 -54
- data/app/views/educode_sales/assessments/index.html.erb +1 -2
- data/app/views/educode_sales/assessments/index.json.jbuilder +1 -1
- data/app/views/educode_sales/assessments/new.html.erb +148 -111
- data/app/views/educode_sales/assessments/progress.json.jbuilder +2 -198
- data/app/views/educode_sales/businesses/following_businesses.jbuilder +44 -0
- data/app/views/educode_sales/businesses/index.html.erb +122 -6
- data/app/views/educode_sales/businesses/index.json.jbuilder +1 -0
- data/app/views/educode_sales/businesses/new_follow_record.html.erb +1 -1
- data/app/views/educode_sales/home/index.html.erb +1 -1
- data/app/views/educode_sales/plans/edit_month.html.erb +1 -1
- data/app/views/layouts/educode_sales/application.html.erb +1 -1
- data/config/routes.rb +3 -0
- data/db/migrate/20220419103842_add_column_timestamps_to_assessments_settings.rb +9 -0
- data/db/migrate/20220420071909_create_educode_sales_business_relation_ships.rb +10 -0
- data/lib/educode_sales/version.rb +1 -1
- metadata +7 -2
@@ -2,6 +2,7 @@ require_dependency "educode_sales/application_controller"
|
|
2
2
|
|
3
3
|
module EducodeSales
|
4
4
|
class BusinessesController < ApplicationController
|
5
|
+
skip_before_action :verify_authenticity_token,only: [:following]
|
5
6
|
|
6
7
|
|
7
8
|
def index
|
@@ -18,6 +19,7 @@ module EducodeSales
|
|
18
19
|
gon.business_type = Common.where(clazz: 'business_type').map do |d|
|
19
20
|
{value: d.id, name: d.name}
|
20
21
|
end
|
22
|
+
|
21
23
|
gon.type = params[:clazz_id].present? ? [{ value: params[:clazz_id], name: Common.find(params[:clazz_id]).name }] : []
|
22
24
|
gon.business_step = Common.where(clazz: 'business_step').map do |d|
|
23
25
|
{value: d.id, name: d.name}
|
@@ -26,6 +28,8 @@ module EducodeSales
|
|
26
28
|
gon.menus << { title: '添加周计划', event: 'week' }
|
27
29
|
gon.menus << { title: '添加月计划', event: 'month' }
|
28
30
|
end
|
31
|
+
|
32
|
+
gon.menus << { title: '关注', event: 'following' }
|
29
33
|
gon.menus << { title: '跟进时间线', event: 'time_line' }
|
30
34
|
if can?(:show_file, EducodeSales::Business)
|
31
35
|
gon.menus << { title: '附件管理', event: 'file' }
|
@@ -221,11 +225,13 @@ module EducodeSales
|
|
221
225
|
last_follow.created_at as latest_time,
|
222
226
|
last_follow.actual_amount,
|
223
227
|
(last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
|
224
|
-
last_follow.total_amount
|
228
|
+
last_follow.total_amount
|
229
|
+
").joins("
|
225
230
|
LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
|
226
231
|
").page(params[:page]).per(params[:limit])
|
227
232
|
|
228
233
|
end
|
234
|
+
|
229
235
|
end
|
230
236
|
end
|
231
237
|
|
@@ -580,6 +586,54 @@ module EducodeSales
|
|
580
586
|
end
|
581
587
|
end
|
582
588
|
end
|
589
|
+
#关注接口
|
590
|
+
def following
|
591
|
+
if brs=follow_business(@current_admin.user_id,params[:business_id])
|
592
|
+
if brs.delete
|
593
|
+
render json: {code:200,msg:"已取消关注"}
|
594
|
+
else
|
595
|
+
render json: {code:300,msg:"操作失败"}
|
596
|
+
end
|
597
|
+
else
|
598
|
+
brs=BusinessRelationShip.new(user_id:@current_admin.user_id, business_id:params[:business_id])
|
599
|
+
if brs.save
|
600
|
+
render json: {code:200,msg:"关注成功"}
|
601
|
+
else
|
602
|
+
render json: {code:300,msg:"操作失败"}
|
603
|
+
end
|
604
|
+
end
|
605
|
+
end
|
606
|
+
|
607
|
+
#我已关注的商机
|
608
|
+
def following_businesses
|
609
|
+
p=[]
|
610
|
+
BusinessRelationShip.select(:business_id).where(user_id:@current_admin.user_id).to_a.each { |d| p << d.business_id}
|
611
|
+
@businesses=Business.where(id:p)
|
612
|
+
@businesses=@businesses.select("
|
613
|
+
educode_sales_businesses.*,
|
614
|
+
last_follow.invitation_at,
|
615
|
+
last_follow.reception_at,
|
616
|
+
last_follow.service_time_long,
|
617
|
+
last_follow.service_end_time,
|
618
|
+
last_follow.service_start_time,
|
619
|
+
last_follow.bidded_date,
|
620
|
+
last_follow.signed_date,
|
621
|
+
last_follow.created_at as latest_time,
|
622
|
+
last_follow.actual_amount,
|
623
|
+
(last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
|
624
|
+
last_follow.total_amount").joins("
|
625
|
+
LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
|
626
|
+
").page(params[:page]).per(params[:limit])
|
627
|
+
end
|
628
|
+
|
629
|
+
def followed
|
630
|
+
if brs=follow_business(@current_admin.user_id,params[:business_id])
|
631
|
+
render json: {msg:'确定取消关注?'}
|
632
|
+
else
|
633
|
+
render json: {msg:'确定关注?'}
|
634
|
+
end
|
635
|
+
end
|
636
|
+
|
583
637
|
|
584
638
|
private
|
585
639
|
|
@@ -594,5 +648,9 @@ module EducodeSales
|
|
594
648
|
def edu_setting name
|
595
649
|
EduSetting.get(name)
|
596
650
|
end
|
651
|
+
|
652
|
+
def follow_business(user_id,business_id)
|
653
|
+
BusinessRelationShip.where(user_id:user_id,business_id:business_id).first
|
654
|
+
end
|
597
655
|
end
|
598
656
|
end
|
@@ -68,9 +68,6 @@ module EducodeSales
|
|
68
68
|
@customers = @customers.where("schools.province = ?", "#{params[:q][:area]}")
|
69
69
|
end
|
70
70
|
if params[:q].present? && params[:q][:staff_id].present?
|
71
|
-
p "--------------------------------------------------------------------------------------"
|
72
|
-
p params[:q][:staff_id]
|
73
|
-
p "--------------------------------------------------------------------------------------"
|
74
71
|
school_ids = EducodeSales::CustomerExtension.where(customer_staff_id: params[:q][:staff_id]).pluck(:school_id)
|
75
72
|
@customers = @customers.where(id: school_ids)
|
76
73
|
end
|
@@ -55,7 +55,7 @@ module EducodeSales
|
|
55
55
|
|
56
56
|
# 完成率completion_rate
|
57
57
|
def completion_rate(setting,progress)
|
58
|
-
if setting.to_i == 0
|
58
|
+
if setting.to_i == 0 || progress.to_i >= setting.to_i
|
59
59
|
'100%'
|
60
60
|
else
|
61
61
|
(progress.to_f/setting.to_f*100).round(2).to_s + "%"
|
@@ -83,7 +83,7 @@ module EducodeSales
|
|
83
83
|
#新增商机数 得分规则
|
84
84
|
def add_businesses_score(staff_id,start_time,end_time)
|
85
85
|
if @current_admin.is_admin?
|
86
|
-
@businesses = Business
|
86
|
+
@businesses = Business.all
|
87
87
|
else
|
88
88
|
level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
|
89
89
|
case level
|
@@ -96,7 +96,7 @@ module EducodeSales
|
|
96
96
|
business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
|
97
97
|
@businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id} OR educode_sales_businesses.id in (?)", school_ids, business_ids)
|
98
98
|
else
|
99
|
-
@businesses = Business
|
99
|
+
@businesses = Business.all
|
100
100
|
end
|
101
101
|
end
|
102
102
|
|
@@ -8,6 +8,10 @@ module EducodeSales
|
|
8
8
|
has_many :sale_plans
|
9
9
|
has_many :follow_ups
|
10
10
|
|
11
|
+
#关联关注
|
12
|
+
has_many :users,:class_name => 'EducodeSales::BusinessRelationShip',foreign_key: 'business_id',:dependent => :destroy
|
13
|
+
|
14
|
+
|
11
15
|
#每次查询时 默认的查询条件
|
12
16
|
default_scope -> {where(deleted_at: nil)}
|
13
17
|
|
@@ -20,5 +24,9 @@ module EducodeSales
|
|
20
24
|
EducodeSales::Recycle.create(source: self, deleter_id: user_id)
|
21
25
|
end
|
22
26
|
|
27
|
+
|
28
|
+
|
29
|
+
|
30
|
+
|
23
31
|
end
|
24
32
|
end
|
@@ -81,6 +81,7 @@
|
|
81
81
|
,url: '/missions/assessments/progress'
|
82
82
|
,toolbar: '#progress_Toolbar'
|
83
83
|
,totalRow:true
|
84
|
+
,title: "绩效考核指标完成情况" // 目前发现的作用(导出文件的文件名)
|
84
85
|
,defaultToolbar: ['filter']
|
85
86
|
// ,limit: 10
|
86
87
|
,limits: [10,15,20,30,40,50,60,70,80,90]
|
@@ -89,7 +90,7 @@
|
|
89
90
|
,cols:[
|
90
91
|
[ //标题栏
|
91
92
|
{ title: '序号', width: 80, rowspan: 2,type:'numbers',fixed:'left',sort: true,} //rowspan即纵向跨越的单元格数
|
92
|
-
,{field: 'name', title: '考核人员', width:
|
93
|
+
,{field: 'name', title: '考核人员', width: 120, rowspan: 2,fixed:'left'}
|
93
94
|
,{align: 'center', title: '全年', colspan: 5} //colspan即横跨的单元格数,这种情况下不用设置field和width
|
94
95
|
,{align: 'center', title: '第1季度', colspan: 5} //colspan即横跨的单元格数,这种情况下不用设置field和width
|
95
96
|
,{align: 'center', title: '1月', colspan: 5} //colspan即横跨的单元格数,这种情况下不用设置field和width
|
@@ -252,6 +253,8 @@
|
|
252
253
|
// select: data.select, //有点东西
|
253
254
|
}, function (res) {
|
254
255
|
data = res.data
|
256
|
+
// table.exportFile(['标题','案件类型','立案日期'], data , "xls");
|
257
|
+
// 表格中每行的title , 数据 ,格式
|
255
258
|
table.exportFile(progress_table.config.id,data, 'csv');
|
256
259
|
layer.closeAll('loading');
|
257
260
|
})
|
@@ -259,12 +262,12 @@
|
|
259
262
|
}
|
260
263
|
function export_excel() {
|
261
264
|
var data = form.val("assessment_progress_form");
|
262
|
-
request.authPost("/missions/
|
265
|
+
request.authPost("/missions/assessments/get_export_data", {
|
263
266
|
assessment_year: data.assessment_year,
|
264
267
|
assessment_id: data.assessment_id,
|
265
268
|
staff_id: data.staff_id,
|
266
269
|
}, function (res) {
|
267
|
-
data = res.data
|
270
|
+
data = res.data;
|
268
271
|
table.exportFile(progress_table.config.id,data, 'xls');
|
269
272
|
layer.closeAll('loading');
|
270
273
|
})
|
@@ -310,7 +313,7 @@
|
|
310
313
|
form.val('assessment_progress_form', {
|
311
314
|
staff_id: '',
|
312
315
|
assessment_year: '2022',
|
313
|
-
assessment_id: '
|
316
|
+
assessment_id: '1', // 重置后显示value=1的name
|
314
317
|
})
|
315
318
|
return false;
|
316
319
|
});
|
@@ -2,7 +2,7 @@
|
|
2
2
|
<div class="layui-btn-container">
|
3
3
|
<span class="table-label">指标完成情况</span>
|
4
4
|
<% if can?(:create, EducodeSales::AssessmentsSetting) %>
|
5
|
-
<button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm pull-right" lay-event="add">添加人员任务指标</button>
|
5
|
+
<button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm pull-right" lay-event="add" >添加人员任务指标</button>
|
6
6
|
<% end %>
|
7
7
|
</div>
|
8
8
|
</script>
|
@@ -61,9 +61,6 @@
|
|
61
61
|
<% end %>
|
62
62
|
</script>
|
63
63
|
|
64
|
-
<!--<script type="text/html" id="showchance">-->
|
65
|
-
<!-- <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}asd</a>-->
|
66
|
-
<!--</script>-->
|
67
64
|
|
68
65
|
<script>
|
69
66
|
layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'laypage'], function () {
|
@@ -197,7 +194,11 @@
|
|
197
194
|
},
|
198
195
|
]
|
199
196
|
],
|
200
|
-
|
197
|
+
done : function () {
|
198
|
+
$('.layui-table-fixed-r').removeClass('layui-hide'); // 与底部的css文件解决fixed第一次加载无法实现问题
|
199
|
+
},
|
200
|
+
|
201
|
+
limit: 10,
|
201
202
|
limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
|
202
203
|
page: true,
|
203
204
|
parseData: function(res){ //将原始数据解析成 table 组件所规定的数据,res为从url中get到的数据
|
@@ -264,7 +265,7 @@
|
|
264
265
|
});
|
265
266
|
return false;
|
266
267
|
} else if (obj.event === 'delete') {
|
267
|
-
layer.confirm('
|
268
|
+
layer.confirm('确定删除该人员任务指标吗?', function (index) {
|
268
269
|
request.delete('missions/assessments/' + data.id, {}, function (res) {
|
269
270
|
layer.close(index);
|
270
271
|
table.reload("assessments")
|
@@ -288,10 +289,24 @@
|
|
288
289
|
offset: [openWH[2] + 'px', openWH[3] + 'px'],
|
289
290
|
content: content,
|
290
291
|
success: function (layero, index) {
|
291
|
-
//
|
292
|
-
form.render('select')
|
292
|
+
// 重新加载select下拉框(绩效考核标准)
|
293
|
+
form.render('select')
|
294
|
+
// clear上次弹层中的多选人员数据 // staffs不清楚为什么要写在单独的script下才有效
|
295
|
+
staffs.setValue([ ])
|
296
|
+
|
293
297
|
}
|
294
298
|
});
|
299
|
+
// 这样写无法实现 要写在success中记住(open弹出层) 294
|
300
|
+
// document.getElementById('clear_staffs').onclick = function() {
|
301
|
+
// console.log("delete")
|
302
|
+
// staffs.setValue([ {name:'', value:''} ])
|
303
|
+
// // console.log(staffs)
|
304
|
+
// // alert(staffs.setValue([ {name:'', value:''} ]))
|
305
|
+
// // staffs.setValue([ ])
|
306
|
+
// // alert(staffs.setValue([ ]))
|
307
|
+
// clear(staffs)
|
308
|
+
// console.log("ok")
|
309
|
+
// };
|
295
310
|
$(window).on("resize", function () {
|
296
311
|
layer.full(index);
|
297
312
|
});
|
@@ -321,11 +336,40 @@
|
|
321
336
|
console.log("setup");
|
322
337
|
form.val('search_assessments_form', {
|
323
338
|
assessment_year: '2022',
|
324
|
-
assessment_id:
|
339
|
+
assessment_id: 1, //重置后显示value=1的name
|
325
340
|
staff_id: ''
|
326
341
|
});
|
327
342
|
return false;
|
328
343
|
});
|
329
344
|
});
|
330
345
|
|
331
|
-
</script>
|
346
|
+
</script>
|
347
|
+
<style>
|
348
|
+
/*与table下的done解决fixed第一次加载无法实现问题*/
|
349
|
+
.layui-hide {
|
350
|
+
display: none!important;
|
351
|
+
}
|
352
|
+
|
353
|
+
.layui-table-fixed .layui-table-body {
|
354
|
+
height: auto!important;
|
355
|
+
}
|
356
|
+
.layui-table-fixed.layui-hide {
|
357
|
+
display: block!important;
|
358
|
+
}
|
359
|
+
|
360
|
+
|
361
|
+
</style>
|
362
|
+
|
363
|
+
<!--table下的tootbar布局-->
|
364
|
+
<style>
|
365
|
+
.layui-table-tool-temp{
|
366
|
+
padding-right: 30px; !important;
|
367
|
+
}
|
368
|
+
.layui-table-fixed .layui-table-body {
|
369
|
+
height: auto!important;
|
370
|
+
}
|
371
|
+
.layui-table-fixed.layui-hide {
|
372
|
+
display: block!important;
|
373
|
+
}
|
374
|
+
|
375
|
+
</style>
|
@@ -4,34 +4,20 @@
|
|
4
4
|
|
5
5
|
<div class="layui-form-item" style="padding: 25px">
|
6
6
|
<div class="layui-inline">
|
7
|
-
<label class="layui-form-label required "
|
8
|
-
<
|
9
|
-
<select disabled>
|
10
|
-
<option value=""><%= @assessment_name %></option>
|
11
|
-
</select>
|
12
|
-
</div>
|
7
|
+
<label class="layui-form-label required ">考核指标:</label>
|
8
|
+
<label class="layui-form-label "><%= @assessment_name %></label>
|
13
9
|
</div>
|
14
10
|
<div class="layui-inline">
|
15
|
-
<label class="layui-form-label required"
|
16
|
-
<
|
17
|
-
<div class="layui-input-inline" >
|
18
|
-
<select disabled>
|
19
|
-
<option value=""><%= @username %></option>
|
20
|
-
</select>
|
21
|
-
</div>
|
22
|
-
</div>
|
11
|
+
<label class="layui-form-label required">考核人员:</label>
|
12
|
+
<label class="layui-form-label"><%= @username %></label>
|
23
13
|
</div></div>
|
24
14
|
<div class="layui-form-item" style="padding: 25px">
|
25
15
|
<div class="layui-inline" >
|
26
|
-
<label class="layui-form-label required "
|
27
|
-
<
|
28
|
-
<select disabled>
|
29
|
-
<option value=""><%= @year %></option>
|
30
|
-
</select>
|
31
|
-
</div>
|
16
|
+
<label class="layui-form-label required ">年度:</label>
|
17
|
+
<label class="layui-form-label"><%= @year %></label>
|
32
18
|
</div>
|
33
19
|
<div class="layui-inline">
|
34
|
-
<label class="layui-form-label"
|
20
|
+
<label class="layui-form-label">业务目标:</label>
|
35
21
|
<div class="layui-input-inline">
|
36
22
|
<input type="text" class="layui-input" disabled value="<%= @assessment.annual %>" name="annual" autocomplete="off" placeholder="自动计算" id="annual" onkeyup="sum()">
|
37
23
|
</div>
|
@@ -43,105 +29,105 @@
|
|
43
29
|
<div class="layui-col-md3">
|
44
30
|
<div class="layui-input-inline">
|
45
31
|
<label class="layui-form-label ">第一季度(万)</label>
|
46
|
-
<div class="layui-input-block" style="width:
|
32
|
+
<div class="layui-input-block" style="width: 200px;">
|
47
33
|
<input type="text" name="first_quarter" value="<%= @assessment.first_quarter %>" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter1" >
|
48
34
|
</div>
|
49
35
|
</div>
|
50
36
|
|
51
37
|
<div class="layui-input-inline ">
|
52
38
|
<label class="layui-form-label ">1月(万)</label>
|
53
|
-
<div class="layui-input-block" style="width:
|
54
|
-
<input type="text" name="january" value="<%= @assessment.january %>" autocomplete="off" class="layui-input" lay-verify="number" id="month1" onkeyup="sum()">
|
39
|
+
<div class="layui-input-block" style="width: 200px;">
|
40
|
+
<input type="text" name="january" value="<%= @assessment.january %>" autocomplete="off" class="layui-input" lay-verify="number|data" id="month1" onkeyup="sum()">
|
55
41
|
</div>
|
56
42
|
</div>
|
57
43
|
<div class="layui-input-inline">
|
58
44
|
<label class="layui-form-label ">2月(万)</label>
|
59
|
-
<div class="layui-input-block" style="width:
|
60
|
-
<input type="text" name="february" value="<%= @assessment.february %>" autocomplete="off" class="layui-input" lay-verify="number" id="month2" onkeyup="sum()" >
|
45
|
+
<div class="layui-input-block" style="width: 200px;">
|
46
|
+
<input type="text" name="february" value="<%= @assessment.february %>" autocomplete="off" class="layui-input" lay-verify="number|data" id="month2" onkeyup="sum()" >
|
61
47
|
</div>
|
62
48
|
</div>
|
63
49
|
<div class="layui-input-inline">
|
64
50
|
<label class="layui-form-label ">3月(万)</label>
|
65
|
-
<div class="layui-input-block" style="width:
|
66
|
-
<input type="text" name="march" value="<%= @assessment.march %>" autocomplete="off" class="layui-input" lay-verify="number" id="month3" onkeyup="sum()" >
|
51
|
+
<div class="layui-input-block" style="width: 200px;">
|
52
|
+
<input type="text" name="march" value="<%= @assessment.march %>" autocomplete="off" class="layui-input" lay-verify="number|data" id="month3" onkeyup="sum()" >
|
67
53
|
</div>
|
68
54
|
</div>
|
69
55
|
</div>
|
70
56
|
<div class="layui-col-md3">
|
71
57
|
<div class="layui-input-inline">
|
72
58
|
<label class="layui-form-label ">第二季度(万)</label>
|
73
|
-
<div class="layui-input-block" style="width:
|
59
|
+
<div class="layui-input-block" style="width: 200px;">
|
74
60
|
<input type="text" name="second_quarter" value="<%= @assessment.second_quarter %>" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter2">
|
75
61
|
</div>
|
76
62
|
</div>
|
77
63
|
<div class="layui-input-inline">
|
78
64
|
<label class="layui-form-label ">4月(万)</label>
|
79
|
-
<div class="layui-input-block" style="width:
|
80
|
-
<input type="text" name="april" value="<%= @assessment.april %>" autocomplete="off" class="layui-input" lay-verify="number" id="month4" onkeyup="sum()">
|
65
|
+
<div class="layui-input-block" style="width: 200px;">
|
66
|
+
<input type="text" name="april" value="<%= @assessment.april %>" autocomplete="off" class="layui-input" lay-verify="number|data" id="month4" onkeyup="sum()">
|
81
67
|
</div>
|
82
68
|
</div>
|
83
69
|
<div class="layui-input-inline">
|
84
70
|
<label class="layui-form-label ">5月(万)</label>
|
85
|
-
<div class="layui-input-block" style="width:
|
86
|
-
<input type="text" name="may" value="<%= @assessment.may %>" autocomplete="off" class="layui-input" lay-verify="number" id="month5" onkeyup="sum()">
|
71
|
+
<div class="layui-input-block" style="width: 200px;">
|
72
|
+
<input type="text" name="may" value="<%= @assessment.may %>" autocomplete="off" class="layui-input" lay-verify="number|data" id="month5" onkeyup="sum()">
|
87
73
|
</div>
|
88
74
|
</div>
|
89
75
|
<div class="layui-input-inline">
|
90
76
|
<label class="layui-form-label ">6月(万)</label>
|
91
|
-
<div class="layui-input-block" style="width:
|
92
|
-
<input type="text" name="june" value="<%= @assessment.june %>" autocomplete="off" class="layui-input" lay-verify="number" id="month6" onkeyup="sum()" >
|
77
|
+
<div class="layui-input-block" style="width: 200px;">
|
78
|
+
<input type="text" name="june" value="<%= @assessment.june %>" autocomplete="off" class="layui-input" lay-verify="number|data" id="month6" onkeyup="sum()" >
|
93
79
|
</div>
|
94
80
|
</div>
|
95
81
|
</div>
|
96
82
|
<div class="layui-col-md3">
|
97
83
|
<div class="layui-input-inline">
|
98
84
|
<label class="layui-form-label ">第三季度(万)</label>
|
99
|
-
<div class="layui-input-block" style="width:
|
85
|
+
<div class="layui-input-block" style="width: 200px;">
|
100
86
|
<input type="text" name="third_quarter" value="<%= @assessment.third_quarter %>" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter3">
|
101
87
|
</div>
|
102
88
|
</div>
|
103
89
|
<div class="layui-input-inline">
|
104
90
|
<label class="layui-form-label ">7月(万)</label>
|
105
|
-
<div class="layui-input-block" style="width:
|
106
|
-
<input type="text" name="july" value="<%= @assessment.july %>" autocomplete="off" class="layui-input" lay-verify="number" id="month7" onkeyup="sum()" >
|
91
|
+
<div class="layui-input-block" style="width: 200px;">
|
92
|
+
<input type="text" name="july" value="<%= @assessment.july %>" autocomplete="off" class="layui-input" lay-verify="number|data" id="month7" onkeyup="sum()" >
|
107
93
|
</div>
|
108
94
|
</div>
|
109
95
|
<div class="layui-input-inline">
|
110
96
|
<label class="layui-form-label ">8月(万)</label>
|
111
|
-
<div class="layui-input-block" style="width:
|
112
|
-
<input type="text" name="august" value="<%= @assessment.august %>" autocomplete="off" class="layui-input" lay-verify="number" id="month8" onkeyup="sum()" >
|
97
|
+
<div class="layui-input-block" style="width: 200px;">
|
98
|
+
<input type="text" name="august" value="<%= @assessment.august %>" autocomplete="off" class="layui-input" lay-verify="number|data" id="month8" onkeyup="sum()" >
|
113
99
|
</div>
|
114
100
|
</div>
|
115
101
|
<div class="layui-input-inline">
|
116
102
|
<label class="layui-form-label ">9月(万)</label>
|
117
|
-
<div class="layui-input-block" style="width:
|
118
|
-
<input type="text" name="september" value="<%= @assessment.september %>" autocomplete="off" class="layui-input" lay-verify="number" id="month9" onkeyup="sum()" >
|
103
|
+
<div class="layui-input-block" style="width: 200px;">
|
104
|
+
<input type="text" name="september" value="<%= @assessment.september %>" autocomplete="off" class="layui-input" lay-verify="number|data" id="month9" onkeyup="sum()" >
|
119
105
|
</div>
|
120
106
|
</div>
|
121
107
|
</div>
|
122
108
|
<div class="layui-col-md3">
|
123
109
|
<div class="layui-input-inline">
|
124
110
|
<label class="layui-form-label ">第四季度(万)</label>
|
125
|
-
<div class="layui-input-block" style="width:
|
111
|
+
<div class="layui-input-block" style="width: 200px;">
|
126
112
|
<input type="text" name="fourth_quarter" value="<%= @assessment.fourth_quarter %>" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter4">
|
127
113
|
</div>
|
128
114
|
</div>
|
129
115
|
<div class="layui-input-inline">
|
130
116
|
<label class="layui-form-label ">10月(万)</label>
|
131
|
-
<div class="layui-input-block" style="width:
|
132
|
-
<input type="text" name="october" value="<%= @assessment.october %>" autocomplete="off" class="layui-input" lay-verify="number" id="month10" onkeyup="sum()">
|
117
|
+
<div class="layui-input-block" style="width: 200px;">
|
118
|
+
<input type="text" name="october" value="<%= @assessment.october %>" autocomplete="off" class="layui-input" lay-verify="number|data" id="month10" onkeyup="sum()">
|
133
119
|
</div>
|
134
120
|
</div>
|
135
121
|
<div class="layui-input-inline">
|
136
122
|
<label class="layui-form-label ">11月(万)</label>
|
137
|
-
<div class="layui-input-block" style="width:
|
138
|
-
<input type="text" name="november" value="<%= @assessment.november %>" autocomplete="off" class="layui-input" lay-verify="number" id="month11" onkeyup="sum()">
|
123
|
+
<div class="layui-input-block" style="width: 200px;">
|
124
|
+
<input type="text" name="november" value="<%= @assessment.november %>" autocomplete="off" class="layui-input" lay-verify="number|data" id="month11" onkeyup="sum()">
|
139
125
|
</div>
|
140
126
|
</div>
|
141
127
|
<div class="layui-input-inline">
|
142
128
|
<label class="layui-form-label ">12月(万)</label>
|
143
|
-
<div class="layui-input-block" style="width:
|
144
|
-
<input type="text" name="december" value="<%= @assessment.december %>" autocomplete="off" class="layui-input" lay-verify="number" id="month12" onkeyup="sum()">
|
129
|
+
<div class="layui-input-block" style="width: 200px;">
|
130
|
+
<input type="text" name="december" value="<%= @assessment.december %>" autocomplete="off" class="layui-input" lay-verify="data|number" id="month12" onkeyup="sum()">
|
145
131
|
</div>
|
146
132
|
</div>
|
147
133
|
</div>
|
@@ -173,9 +159,16 @@
|
|
173
159
|
$ = layui.$;
|
174
160
|
|
175
161
|
|
176
|
-
|
177
|
-
//
|
178
|
-
|
162
|
+
|
163
|
+
// 自定义校验数据
|
164
|
+
form.verify({
|
165
|
+
data: function (value,item){
|
166
|
+
if (parseFloat(value) < 0 ){
|
167
|
+
console.log(value);
|
168
|
+
return "数据不能小于零"
|
169
|
+
}
|
170
|
+
}
|
171
|
+
})
|
179
172
|
|
180
173
|
form.on('submit(edit_task_assessment)', function (data) {
|
181
174
|
console.log("okokokookokokokokook");
|
@@ -185,9 +178,9 @@
|
|
185
178
|
if (res.success == false) {
|
186
179
|
layer.alert(res.msg)
|
187
180
|
} else {
|
188
|
-
console.log("ok");
|
189
181
|
layer.closeAll();
|
190
|
-
table.reload("assessments")
|
182
|
+
table.reload("assessments");
|
183
|
+
table.reload("progressTable");
|
191
184
|
}
|
192
185
|
})
|
193
186
|
return false;
|