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.
Files changed (75) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/educode_sales/modules/easyeditor/easyeditor.css +1 -1
  3. data/app/controllers/educode_sales/application_controller.rb +10 -0
  4. data/app/controllers/educode_sales/business_courses_controller.rb +58 -33
  5. data/app/controllers/educode_sales/businesses_controller.rb +43 -7
  6. data/app/controllers/educode_sales/contracts_controller.rb +6 -0
  7. data/app/controllers/educode_sales/money_plan_records_controller.rb +6 -2
  8. data/app/controllers/educode_sales/money_plans_controller.rb +3 -0
  9. data/app/controllers/educode_sales/plans_controller.rb +392 -9
  10. data/app/controllers/educode_sales/sale_trends_controller.rb +1 -1
  11. data/app/controllers/educode_sales/shixun_dectects_controller.rb +77 -16
  12. data/app/controllers/educode_sales/shixuns_controller.rb +65 -4
  13. data/app/controllers/educode_sales/subject_trends_controller.rb +99 -892
  14. data/app/controllers/educode_sales/subjects_controller.rb +29 -18
  15. data/app/helpers/educode_sales/application_helper.rb +3 -1
  16. data/app/helpers/educode_sales/business_courses_helper.rb +29 -6
  17. data/app/helpers/educode_sales/sale_trends_helper.rb +52 -52
  18. data/app/helpers/educode_sales/subject_helper.rb +5 -1
  19. data/app/models/educode_sales/business.rb +5 -5
  20. data/app/models/educode_sales/business_deliver_subject.rb +3 -2
  21. data/app/models/educode_sales/business_subject.rb +9 -3
  22. data/app/models/educode_sales/business_subject_shixun.rb +37 -8
  23. data/app/models/educode_sales/business_subject_staff.rb +1 -0
  24. data/app/models/educode_sales/permission.rb +7 -0
  25. data/app/models/educode_sales/sales_target_history.rb +11 -0
  26. data/app/views/educode_sales/business_courses/edit.html.erb +30 -4
  27. data/app/views/educode_sales/business_courses/index.html.erb +34 -12
  28. data/app/views/educode_sales/business_courses/index.json.jbuilder +2 -2
  29. data/app/views/educode_sales/business_courses/list_shixuns.html.erb +132 -64
  30. data/app/views/educode_sales/business_courses/list_shixuns.json.jbuilder +12 -6
  31. data/app/views/educode_sales/business_courses/list_subjects.html.erb +29 -34
  32. data/app/views/educode_sales/business_courses/list_subjects.json.jbuilder +7 -2
  33. data/app/views/educode_sales/business_courses/new.html.erb +45 -20
  34. data/app/views/educode_sales/businesses/index.html.erb +11 -9
  35. data/app/views/educode_sales/contracts/_list.html.erb +16 -1
  36. data/app/views/educode_sales/contracts/index.html.erb +5 -2
  37. data/app/views/educode_sales/contracts/list.js.erb +4 -1
  38. data/app/views/educode_sales/money_plan_records/_index.html.erb +21 -5
  39. data/app/views/educode_sales/money_plan_records/index.js.erb +4 -1
  40. data/app/views/educode_sales/money_plans/list.html.erb +6 -2
  41. data/app/views/educode_sales/plans/_year_execute.html.erb +293 -0
  42. data/app/views/educode_sales/plans/_year_target.html.erb +677 -0
  43. data/app/views/educode_sales/plans/index.html.erb +104 -81
  44. data/app/views/educode_sales/plans/year_execute.js.erb +1 -0
  45. data/app/views/educode_sales/plans/year_target.js.erb +1 -0
  46. data/app/views/educode_sales/plans/year_target.json.jbuilder +48 -0
  47. data/app/views/educode_sales/plans/years_all_target.json.jbuilder +53 -0
  48. data/app/views/educode_sales/sale_trends/_return_money_forecast.html.erb +1 -1
  49. data/app/views/educode_sales/sale_trends/_user_stat.html.erb +1 -1
  50. data/app/views/educode_sales/sale_trends/_visit_analysis.html.erb +1 -1
  51. data/app/views/educode_sales/sale_trends/return_money_forecast.js.erb +1 -1
  52. data/app/views/educode_sales/sale_trends/trends.html.erb +6 -6
  53. data/app/views/educode_sales/sale_trends/user_stat.js.erb +1 -1
  54. data/app/views/educode_sales/sale_trends/visit_analysis.js.erb +1 -1
  55. data/app/views/educode_sales/shixun_dectects/index.html.erb +97 -47
  56. data/app/views/educode_sales/shixun_dectects/index.json.jbuilder +4 -3
  57. data/app/views/educode_sales/shixun_dectects/markdown.html.erb +1 -1
  58. data/app/views/educode_sales/shixuns/edit.html.erb +35 -13
  59. data/app/views/educode_sales/shixuns/index.html.erb +348 -138
  60. data/app/views/educode_sales/shixuns/index.json.jbuilder +9 -5
  61. data/app/views/educode_sales/shixuns/new.html.erb +22 -12
  62. data/app/views/educode_sales/subject_trends/trends.html.erb +177 -575
  63. data/app/views/educode_sales/subjects/edit.html.erb +4 -4
  64. data/app/views/educode_sales/subjects/index.html.erb +50 -12
  65. data/app/views/educode_sales/subjects/index.json.jbuilder +3 -3
  66. data/app/views/educode_sales/subjects/list_shixuns.html.erb +143 -17
  67. data/app/views/educode_sales/subjects/list_shixuns.json.jbuilder +9 -4
  68. data/app/views/educode_sales/subjects/new.html.erb +4 -4
  69. data/app/views/layouts/educode_sales/application.html.erb +2 -2
  70. data/config/routes.rb +7 -2
  71. data/db/migrate/20230729085359_create_educode_sales_sales_target_histories.rb +45 -0
  72. data/lib/educode_sales/version.rb +1 -1
  73. metadata +10 -4
  74. data/app/views/educode_sales/plans/_target_track.html.erb +0 -178
  75. data/app/views/educode_sales/plans/target_track.js.erb +0 -1
@@ -2,10 +2,15 @@ json.data do
2
2
  json.array! @subjects do |item|
3
3
  json.identifier item.identifier
4
4
  json.name item.name
5
- json.status item.status
5
+ # p item.status, item.public
6
+ # json.status item.status
7
+ p status item
8
+ json.shixun_status status item
6
9
  json.public item.public
7
10
  json.id item.id
8
- json.shixuns_completed_progress item.shixuns_completed_progress
11
+ json.shixuns_completed_progress item.shixun_compeled_count
12
+ json.deliver_date item.reception_at
13
+
9
14
  end
10
15
  end
11
16
  json.code 0
@@ -7,25 +7,25 @@
7
7
  <div id="businesses_id" style="width: 50%;"></div>
8
8
  </div>
9
9
  </div>
10
+ <!-- <div class="layui-form-item">-->
11
+ <!-- <label class="layui-form-label" >交付单位:<span style="color: red"> *</span></label>-->
12
+ <!-- <div class="layui-input-block">-->
13
+ <!-- <div id="school_id" style="width: 50%;"></div>-->
14
+ <!-- </div>-->
15
+ <!-- </div>-->
10
16
  <div class="layui-form-item">
11
- <label class="layui-form-label" style="width: 80px">交付单位:<span style="color: red"> *</span></label>
17
+ <label class="layui-form-label" style="width: 102px">实践课程名称:<span style="color: red"> *</span></label>
12
18
  <div class="layui-input-block">
13
- <div id="school_id" style="width: 50%;"></div>
14
- </div>
15
- </div>
16
- <div class="layui-form-item">
17
- <label class="layui-form-label" style="width: 90px">实践课程名称:</label>
18
- <div class="layui-input-block">
19
- <div id="subject_ids" style="width: 50%"></div>
19
+ <div id="subject_ids" style="width: 49%;margin-left: 12px"></div>
20
20
  </div>
21
21
  </div>
22
22
 
23
- <div class="layui-form-item">
24
- <label class="layui-form-label">交付时间:</label>
25
- <div class="layui-input-block">
26
- <input type="text" name="deliver_date" style="width: 50%;" class="layui-input" id="ID-laydate-demo" placeholder="- -">
27
- </div>
28
- </div>
23
+ <!-- <div class="layui-form-item">-->
24
+ <!-- <label class="layui-form-label">交付时间:</label>-->
25
+ <!-- <div class="layui-input-block">-->
26
+ <!-- <input type="text" name="deliver_date" style="width: 50%;" class="layui-input" id="ID-laydate-demo" placeholder="- -">-->
27
+ <!-- </div>-->
28
+ <!-- </div>-->
29
29
 
30
30
  <div class="layui-form-item">
31
31
  <label class="layui-form-label">交付状态:<span style="color: red"> *</span></label>
@@ -39,7 +39,7 @@
39
39
  </div>
40
40
  </div>
41
41
  <div class="layui-form-item">
42
- <label class="layui-form-label">课程经理:</label>
42
+ <label class="layui-form-label">课程经理:<span style="color: red"> *</span></label>
43
43
  <div class="layui-input-block">
44
44
  <div id="manage_id" style="width: 50%"></div>
45
45
  </div>
@@ -64,9 +64,9 @@
64
64
  // 解决form表单中select不渲染的问题
65
65
  form.render();
66
66
  form.render('select', 'test')
67
- laydate.render({
68
- elem: '#ID-laydate-demo'
69
- });
67
+ // laydate.render({
68
+ // elem: '#ID-laydate-demo'
69
+ // });
70
70
 
71
71
  // 交付单位
72
72
  var school_id = xmSelect.render({
@@ -96,9 +96,9 @@
96
96
  disabled: true,
97
97
  selected: true
98
98
  }]
99
- school_id.setValue(school)
99
+ // school_id.setValue(school)
100
100
  }else{
101
- school_id.setValue([])
101
+ // school_id.setValue([])
102
102
  }
103
103
 
104
104
  },
@@ -180,10 +180,33 @@
180
180
  multiple: true
181
181
  })
182
182
 
183
+ function isNull(str){
184
+ return str === "" || str === null
185
+ }
186
+
183
187
  form.on('submit(saveBtn)', function (data) {
188
+
184
189
  console.log(form.val())
185
190
  let new_data = form.val();
186
191
 
192
+ if(isNull(new_data.business_id)){
193
+ layer.msg('请选商机');
194
+ return false
195
+ }
196
+ if(isNull(new_data.subject_ids)){
197
+ layer.msg('请选实践课程');
198
+ return false
199
+ }
200
+ if(isNull(new_data.manage_id)){
201
+ layer.msg('请选课堂经理');
202
+ return false
203
+ }
204
+ if(isNull(new_data.state)){
205
+ layer.msg('请选状态');
206
+ return false
207
+ }
208
+
209
+
187
210
  $.ajax('/missions/business_courses/', {
188
211
  method: 'POST',
189
212
  data: {
@@ -208,5 +231,7 @@
208
231
  })
209
232
  return false;
210
233
  });
234
+
235
+
211
236
  });
212
237
  </script>
@@ -800,15 +800,13 @@
800
800
  dropdown.render({
801
801
  elem: '.export_more-btn',
802
802
  data: export_dropmenu,
803
- click: function(data, othis){
804
- var elem = $(this.elem);
805
- id = elem.data('id');
803
+ click: function(data){
806
804
  switch (data.event) {
807
805
  case 'export_csv':
808
- export_bussiness('csv')
806
+ export_bussiness('csv');
809
807
  break;
810
808
  case 'export_excel':
811
- export_bussiness('xls')
809
+ export_bussiness('xls');
812
810
  break;
813
811
  case 'export_records':
814
812
  export_records();
@@ -818,17 +816,17 @@
818
816
 
819
817
  }
820
818
  });
821
- }
819
+ };
822
820
  function export_bussiness(type) {
823
821
  var data = form.val("search_form");
824
822
  var business_type = [];
825
823
  business_type_list.getValue().forEach(function(d) {
826
824
  business_type.push(d.value);
827
- })
825
+ });
828
826
  var business_step = [];
829
827
  business_step_list.getValue().forEach(function(d) {
830
828
  business_step.push(d.value);
831
- })
829
+ });
832
830
  data.place_id = index_place_list.getValue('valueStr');
833
831
  data.business_type = business_type.toString();
834
832
  data.business_step = business_step.toString();
@@ -855,8 +853,12 @@
855
853
  year: data.year,
856
854
  mine: search['clazz'] == 'me' ? true : '',
857
855
  is_follow: search['clazz'] == 'followes' ? true : '',
856
+ special: search['clazz'] == 'special' ? true : '',
857
+ is_area: search['clazz'] == 'area' ? true : '',
858
+ delete_list: search['clazz'] == 'delete_list' ? true : '',
859
+ plan_year: search['clazz'] == 'plan_year' ? true : ''
858
860
  }, function (res) {
859
- data = res.data
861
+ data = res.data;
860
862
  table.exportFile(business_table.config.id,data, type);
861
863
  layer.closeAll('loading');
862
864
  request.get('missions/businesses/add_export_records?type=' + type, {}, function (res) {
@@ -486,7 +486,7 @@
486
486
  });
487
487
  var contract_table = table.render({
488
488
  elem: '#contact_table',
489
- url: '/missions/contracts',
489
+ // url: '/missions/contracts',
490
490
  autoSort: false,
491
491
  where: {q: data},
492
492
  defaultToolbar: ['filter'],
@@ -500,6 +500,21 @@
500
500
  skin: 'line',
501
501
  });
502
502
 
503
+ if (gon.bidded_date) {
504
+ table.reload('contact_table', {
505
+ url: '/missions/contracts',
506
+ where: {
507
+ q: {
508
+ bidded_date: gon.bidded_date,
509
+ }
510
+ }
511
+ });
512
+ } else {
513
+ table.reload('contact_table', {
514
+ url: '/missions/contracts'
515
+ });
516
+ }
517
+
503
518
 
504
519
  var sort = {}, search = data;
505
520
 
@@ -2,7 +2,7 @@
2
2
  <div class="layui-tab" lay-filter="contract_tab">
3
3
  <ul class="layui-tab-title">
4
4
  <li class="layui-this follows_li">跟进动态</li>
5
- <li class="contracts_list_li">合同列表</li>
5
+ <li class="contracts_list_li" lay-id="contract">合同列表</li>
6
6
  <% if can? :read_sales_detail, EducodeSales::Business %>
7
7
  <li class="sales_list_li">销售明细</li>
8
8
  <% end %>
@@ -29,9 +29,9 @@
29
29
  request = layui.request,
30
30
  dropdown = layui.dropdown,
31
31
  miniPage = layui.miniPage,
32
- element = layui.element,
33
32
  laydate = layui.laydate;
34
33
  var laydate = layui.laydate;
34
+ element = layui.element;
35
35
 
36
36
 
37
37
 
@@ -44,6 +44,9 @@
44
44
  }
45
45
  });
46
46
 
47
+ <% if params[:date_at].present? %>
48
+ loadPage("/missions/contracts/list?date_at=<%= params[:date_at] %>");
49
+ <% end %>
47
50
 
48
51
  function loadPage(url) {
49
52
  var layer_index = layer.load(0, {shade: [0.1, '#fff']});
@@ -1 +1,4 @@
1
- $("#contract_list_wraper").html("<%= j render 'list' %>");
1
+ $("#contract_list_wraper").html("<%= j render 'list' %>");
2
+ <% if params[:date_at].present? %>
3
+ element.tabChange('contract_tab', 'contract');
4
+ <% end %>
@@ -17,7 +17,7 @@
17
17
  <div class="layui-inline">
18
18
  <label class="layui-form-label">回款日期</label>
19
19
  <div class="layui-input-inline">
20
- <input type="text" name="date_at" class="layui-input" id="date">
20
+ <input type="text" name="date_at" class="layui-input" id="return_date">
21
21
  </div>
22
22
  </div>
23
23
  <div class="layui-inline">
@@ -35,7 +35,7 @@
35
35
  <div class="layui-inline">
36
36
  <label class="layui-form-label required">匹配状态</label>
37
37
  <div class="layui-input-inline">
38
- <%= select_tag "state", options_for_select(['已认领', '待认领', '无对应合同', '无对应应收款']), { 'lay-filter': 'state', include_blank: true, "lay-search": "" } %>
38
+ <%= select_tag "state", options_for_select(['已认领', '待认领', '无对应合同', '无对应应收款'], params[:date_at].present? ? "已认领" : ""), { 'lay-filter': 'state', include_blank: true, "lay-search": "" } %>
39
39
  </div>
40
40
  </div>
41
41
  <div class="layui-inline show_item">
@@ -92,13 +92,14 @@
92
92
  laydate = layui.laydate;
93
93
  table = layui.table;
94
94
  laydate.render({
95
- elem: '#date',
96
- range: true
95
+ elem: '#return_date',
96
+ range: true,
97
+ value: gon.date
97
98
  });
98
99
  form.render();
99
100
  var money_plan_record_table = table.render({
100
101
  elem: '#money_plan_record_table',
101
- url: '/missions/money_plan_records',
102
+ // url: '/missions/money_plan_records',
102
103
  title: '回款记录列表',
103
104
  toolbar: '#toolbar_money_plan_record',
104
105
  defaultToolbar: ['filter'],
@@ -182,6 +183,21 @@
182
183
  filterable: true,
183
184
  radio: true,
184
185
  });
186
+ if (gon.date) {
187
+ table.reload('money_plan_record_table', {
188
+ url: '/missions/money_plan_records',
189
+ where: {
190
+ q: {
191
+ date_at: gon.date,
192
+ state: '已认领'
193
+ }
194
+ }
195
+ });
196
+ } else {
197
+ table.reload('money_plan_record_table', {
198
+ url: '/missions/money_plan_records'
199
+ });
200
+ }
185
201
 
186
202
  var sort = {},
187
203
  search = {};
@@ -1 +1,4 @@
1
- $("#monley_plan_record_wraper").html("<%= j render 'index' %>");
1
+ $("#monley_plan_record_wraper").html("<%= j render 'index' %>");
2
+ <% if params[:date_at].present? %>
3
+ element.tabChange('money_plan_tab', 'money_record');
4
+ <% end %>
@@ -3,7 +3,7 @@
3
3
  <ul class="layui-tab-title">
4
4
  <li class="layui-this">回款计划</li>
5
5
  <% if can? :record, EducodeSales::MoneyPlan %>
6
- <li class="">回款记录</li>
6
+ <li class="" lay-id="money_record">回款记录</li>
7
7
  <% end %>
8
8
  <li class="">开票记录</li>
9
9
  </ul>
@@ -29,9 +29,10 @@
29
29
  request = layui.request,
30
30
  dropdown = layui.dropdown,
31
31
  miniPage = layui.miniPage,
32
- element = layui.element,
32
+
33
33
  laydate = layui.laydate;
34
34
  var laydate = layui.laydate;
35
+ element = layui.element;
35
36
 
36
37
 
37
38
 
@@ -44,6 +45,9 @@
44
45
  loadPage('/missions/invoices/apply_records')
45
46
  }
46
47
  });
48
+ <% if params[:date_at].present? %>
49
+ loadPage("/missions/money_plan_records?date_at=<%= params[:date_at] %>");
50
+ <% end %>
47
51
  <% else %>
48
52
  element.on('tab(money_plan_tab)', function(data) {
49
53
  if (data.index == 1 && $("#invoice_apply").length == 0) {
@@ -0,0 +1,293 @@
1
+ <%= Gon::Base.render_data %>
2
+ <div id="year_execute_wraper">
3
+ <div class="layuimini-main min-height-table" id="year_execute_table_wraper">
4
+ <form class="layui-form layui-form-pane" lay-filter="assessment_progress_form">
5
+ <div class="layui-form-item">
6
+ <div class="layui-inline">
7
+ <label class="layui-form-label">人员</label>
8
+ <div class="layui-input-inline large-select">
9
+ <%= select_tag "staff_id", options_for_select(@staffs), { id: 'execute_staff_id', include_blank: true} %>
10
+ </div>
11
+ </div>
12
+ <div class="layui-inline">
13
+ <label class="layui-form-label">年度</label>
14
+ <div class="layui-input-inline">
15
+ <input type="text" class="layui-input" autocomplete="off" name="year" value="<%= Time.now.year %>" id="assessment_year">
16
+ </div>
17
+ </div>
18
+ <div class="layui-inline">
19
+ <label class="layui-form-label">客户类型</label>
20
+ <div class="layui-input-inline">
21
+ <div id="execute_property" style="width: 190px;"></div>
22
+ </div>
23
+ </div>
24
+ <div class="layui-inline">
25
+ <label class="layui-form-label">目标类别</label>
26
+ <div class="layui-input-inline">
27
+ <div id="execute_clazz" style="width: 190px;"></div>
28
+ </div>
29
+ </div>
30
+ <div class="layui-inline">
31
+ <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="progress_resert_btn">重置
32
+ </button>
33
+ <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="progress_search_btn">检索
34
+ </button>
35
+ </div>
36
+ </div>
37
+ </form>
38
+ <table class="layui-tab" id="finished_table" lay-filter="progressTable"></table>
39
+ </div>
40
+ <script type="text/html" id="progress_Toolbar">
41
+ <div class="layui-btn-container">
42
+ <span class="table-label">年度销售执行情况</span>
43
+ <button class="layui-btn layui-btn-primary layui-btn-sm pull-right" lay-event="export"> 导出</button>
44
+ <button class="layui-btn layui-btn-primary layui-btn-sm pull-right" lay-event="show_all" id="show_all"> 分类显示</button>
45
+ <button class="layui-btn layui-btn-default layui-btn-sm pull-right" lay-event="show_staff" id="show_staff"> 人员显示</button>
46
+ </div>
47
+ </script>
48
+
49
+ <script>
50
+ layui.use(['form', 'table', 'miniPage', 'element', 'rate', 'laydate', 'request', 'xmSelect'], function () {
51
+
52
+ var $ = layui.jquery,
53
+ form = layui.form,
54
+ laydate = layui.laydate,
55
+ request = layui.request,
56
+ table = layui.table,
57
+ rate = layui.rate,
58
+ xmSelect = layui.xmSelect,
59
+ miniPage = layui.miniPage,
60
+ dropdown = layui.dropdown;
61
+
62
+
63
+ laydate.render({
64
+ elem: '#assessment_year',
65
+ type: 'year'
66
+ });
67
+
68
+ var execute_property = xmSelect.render({
69
+ el: '#execute_property',
70
+ name: 'target_property',
71
+ data: gon.school_tags
72
+ })
73
+
74
+ var execute_clazz = xmSelect.render({
75
+ el: '#execute_clazz',
76
+ name: 'target_clazz',
77
+ data: [{value: '中标', name: '中标'}, {value: '回款', name: '回款'}, {value: '商机', name: '商机'}]
78
+ })
79
+ form.render();
80
+ form.on('submit(progress_resert_btn)', function (data) {
81
+ execute_property.setValue([]);
82
+ execute_clazz.setValue([]);
83
+ return false;
84
+ })
85
+
86
+ table.render({
87
+ elem: '#finished_table'
88
+ , toolbar: '#target_progress_toolbar'
89
+ , totalRow: true
90
+ , url: '/missions/plans/years_all_target'
91
+ , page: true
92
+ , title: "绩效考核指标完成情况" // 目前发现的作用(导出文件的文件名)
93
+ , defaultToolbar: ['exports']
94
+ , height: 'full-200'
95
+ , cols: [
96
+ [ //标题栏
97
+ {field: 'id', group: 'id', align: 'center', title: '序号', width: 80, totalRowText: '合计', rowspan: 3}
98
+ , {field: 'name', align: 'center', title: '姓名', width: 100, rowspan: 3}
99
+ , {field: 'target_clazz', align: 'center', title: '类别', width: 100, rowspan: 3}
100
+ , {field: 'year_target', align: 'center', title: '年度目标', width: 100, rowspan: 3, totalRow: true}
101
+ , {field: 'school_tag_name', align: 'center', title: '客户类型', width: 100, rowspan: 3}
102
+ , {field: 'year_clazz_target', align: 'center', title: '分项目标', width: 100, rowspan: 3, totalRow: true}
103
+ , {field: 'year_plan', title: '年度计划', width: 100, rowspan: 3, totalRow: true}
104
+ , {field: 'year_finish', title: '年度完成', width: 100, rowspan: 3, totalRow: true}
105
+
106
+ ,{align: 'center', title: '1月', colspan: 3}
107
+ ,{align: 'center', title: '2月', colspan: 3}
108
+ ,{align: 'center', title: '3月', colspan: 3}
109
+ ,{align: 'center', title: '4月', colspan: 3}
110
+ ,{align: 'center', title: '5月', colspan: 3}
111
+ ,{align: 'center', title: '6月', colspan: 3}
112
+ ,{align: 'center', title: '7月', colspan: 3}
113
+ ,{align: 'center', title: '8月', colspan: 3}
114
+ ,{align: 'center', title: '9月', colspan: 3}
115
+ ,{align: 'center', title: '10月', colspan: 3}
116
+ ,{align: 'center', title: '11月', colspan: 3}
117
+ ,{align: 'center', title: '12月', colspan: 3}
118
+ ],
119
+ [
120
+ {field: 'target_1', title: '目标', width: 100, totalRow:true, hidden: true}
121
+ ,{field: 'plan_1', title: '计划', width: 100, totalRow:true, hidden: true}
122
+ ,{field: 'finish_1', title: '完成', width: 100, totalRow:true}
123
+
124
+ ,{field: 'target_2', title: '目标', width: 100, totalRow:true}
125
+ ,{field: 'plan_2', title: '计划', width: 100, totalRow:true}
126
+ ,{field: 'finish_2', title: '完成', width: 100, totalRow:true}
127
+
128
+ ,{field: 'target_3', title: '目标', width: 100, totalRow:true}
129
+ ,{field: 'plan_3', title: '计划', width: 100, totalRow:true}
130
+ ,{field: 'finish_3', title: '完成', width: 100, totalRow:true}
131
+
132
+ ,{field: 'target_4', title: '目标', width: 100, totalRow:true}
133
+ ,{field: 'plan_4', title: '计划', width: 100, totalRow:true}
134
+ ,{field: 'finish_4', title: '完成', width: 100, totalRow:true}
135
+
136
+ ,{field: 'target_5', title: '目标', width: 100, totalRow:true}
137
+ ,{field: 'plan_5', title: '计划', width: 100, totalRow:true}
138
+ ,{field: 'finish_5', title: '完成', width: 100, totalRow:true}
139
+
140
+ ,{field: 'target_6', title: '目标', width: 100, totalRow:true}
141
+ ,{field: 'plan_6', title: '计划', width: 100, totalRow:true}
142
+ ,{field: 'finish_6', title: '完成', width: 100, totalRow:true}
143
+
144
+ ,{field: 'target_7', title: '目标', width: 100, totalRow:true}
145
+ ,{field: 'plan_7', title: '计划', width: 100, totalRow:true}
146
+ ,{field: 'finish_7', title: '完成', width: 100, totalRow:true}
147
+
148
+ ,{field: 'target_8', title: '目标', width: 100, totalRow:true}
149
+ ,{field: 'plan_8', title: '计划', width: 100, totalRow:true}
150
+ ,{field: 'finish_8', title: '完成', width: 100, totalRow:true}
151
+
152
+ ,{field: 'target_9', title: '目标', width: 100, totalRow:true}
153
+ ,{field: 'plan_9', title: '计划', width: 100, totalRow:true}
154
+ ,{field: 'finish_9', title: '完成', width: 100, totalRow:true}
155
+
156
+ ,{field: 'target_10', title: '目标', width: 100, totalRow:true}
157
+ ,{field: 'plan_10', title: '计划', width: 100, totalRow:true}
158
+ ,{field: 'finish_10', title: '完成', width: 100, totalRow:true}
159
+
160
+ ,{field: 'target_11', title: '目标', width: 100, totalRow:true}
161
+ ,{field: 'plan_11', title: '计划', width: 100, totalRow:true}
162
+ ,{field: 'finish_11', title: '完成', width: 100, totalRow:true}
163
+
164
+ ,{field: 'target_12', title: '目标', width: 100, totalRow:true}
165
+ ,{field: 'plan_12', title: '计划', width: 100, totalRow:true}
166
+ ,{field: 'finish_12', title: '完成', width: 100, totalRow:true}
167
+
168
+ ]],
169
+ done : function(res, curr, count) {
170
+ var id = res.data[0]['id'];
171
+ merge(res);
172
+ if (!id) {
173
+ $("[data-field='id']").css('display', 'none');
174
+ $("[data-field='name']").css('display', 'none');
175
+ }
176
+ table.render('select');
177
+ }
178
+
179
+ });
180
+ function merge(res, id) {
181
+ var data = res.data;
182
+ var mergeIndex = 0;//定位需要添加合并属性的行数
183
+ var mark = 1; //这里涉及到简单的运算,mark是计算每次需要合并的格子数
184
+ var columsName = ['id','name','target_clazz',{name:'year_target',mergeBase:'target_clazz',valueBase:'year_clazz_target'}];//需要合并的列名称
185
+ var columsIndex = [0,1,2,3];//需要合并的列索引值
186
+
187
+ for (var k = 0; k < columsName.length; k++) { //这里循环所有要合并的列
188
+ var trArr = $(".layui-table-body>.layui-table").find("tr");//所有行
189
+ for (var i = 1; i < res.data.length; i++) { //这里循环表格当前的数据
190
+ var tdCurArr = trArr.eq(i).find("td").eq(columsIndex[k]);//获取当前行的当前列
191
+ var tdPreArr = trArr.eq(mergeIndex).find("td").eq(columsIndex[k]);//获取相同列的第一列
192
+
193
+ var opt = columsName[k];
194
+ var name = opt.name;
195
+ var mergeBase = opt.mergeBase;
196
+ var valueBase = opt.valueBase;
197
+
198
+ if(name && mergeBase){
199
+ tdCurValue = parseFloat(tdPreArr[0].querySelector('.layui-table-cell').textContent) || 0;
200
+ if(valueBase && !tdCurValue){
201
+ tdPreArr[0].querySelector('.layui-table-cell').innerHTML = data[i-1][valueBase];
202
+ }
203
+
204
+ if (data[i][mergeBase] === data[i-1][mergeBase]) { //后一行的值与前一行的值做比较,相同就需要合并
205
+ mark += 1;
206
+ tdPreArr.each(function (a,b) {//相同列的第一列增加rowspan属性
207
+ $(this).attr("rowspan", mark);
208
+
209
+ var oldV = parseFloat($(this).find('.layui-table-cell').html()) || 0;
210
+ var curentV = 0;
211
+ if(valueBase){
212
+ curentV = parseFloat(data[i][valueBase]) || 0;
213
+ }else{
214
+ curentV = parseFloat(data[i][name]) || 0;
215
+ }
216
+ var newV = oldV + curentV;
217
+ $(this).find('.layui-table-cell').html(newV);
218
+ });
219
+ tdCurArr.each(function () {//当前行隐藏
220
+ $(this).css("display", "none");
221
+ });
222
+ }else {
223
+ mergeIndex = i;
224
+ mark = 1;//一旦前后两行的值不一样了,那么需要合并的格子数mark就需要重新计算
225
+ }
226
+ }else{
227
+ if (data[i][columsName[k]] === data[i-1][columsName[k]]) { //后一行的值与前一行的值做比较,相同就需要合并
228
+ mark += 1;
229
+ tdPreArr.each(function () {//相同列的第一列增加rowspan属性
230
+ $(this).attr("rowspan", mark);
231
+ });
232
+ tdCurArr.each(function () {//当前行隐藏
233
+ $(this).css("display", "none");
234
+ });
235
+ }else {
236
+ mergeIndex = i;
237
+ mark = 1;//一旦前后两行的值不一样了,那么需要合并的格子数mark就需要重新计算
238
+ }
239
+ }
240
+ }
241
+ mergeIndex = 0;
242
+ mark = 1;
243
+ }
244
+ }
245
+ table.on('toolbar(year_all_target_form)', function (obj) {
246
+ search = form.val('assessment_progress_form')
247
+ var event = obj.event;
248
+ switch (event) {
249
+ case 'show_staff':
250
+ search.type = 'staff';
251
+ break;
252
+ case 'show_all':
253
+ search.type = 'all';
254
+ search.staff_id = '';
255
+ break;
256
+ case 'export':
257
+ layer.load(0, {});
258
+ request.authGet("missions/plans/years_all_target?=" + $.param({q: search}), {}, function (res) {
259
+ data = res.data
260
+ table.exportFile(target_table.config.id, data, 'xls');
261
+ layer.closeAll('loading');
262
+ });
263
+ break;
264
+ }
265
+ if (event === 'show_staff' || event === 'show_all') {
266
+ loadFinishTable(search);
267
+ var $ = layui.$;
268
+ var buttonId = `#${event}`;
269
+ // 移除所有按钮的 layui-btn-default 类名,添加 layui-btn-primary 类名
270
+ $(buttonId).siblings('.layui-btn').removeClass('layui-btn-default').addClass('layui-btn-primary');
271
+ $(buttonId).removeClass('layui-btn-primary').addClass('layui-btn-default');
272
+ }
273
+ });
274
+
275
+ //loadFinishTable(form.val('assessment_progress_form'))
276
+
277
+ form.on('submit(progress_search_btn)', function (data) {
278
+ var search = data.field;
279
+ loadFinishTable(search);
280
+ return false;
281
+ })
282
+
283
+ function loadFinishTable(search) {
284
+ table.reload('finished_table', {
285
+ where: search,
286
+ url: '/missions/plans/years_all_target'
287
+ });
288
+ }
289
+
290
+ })
291
+
292
+ </script>
293
+ </div>