educode_sales 0.7.5 → 0.7.8

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.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/educode_sales/top_page.png +0 -0
  3. data/app/controllers/educode_sales/assessments_controller.rb +51 -60
  4. data/app/controllers/educode_sales/businesses_controller.rb +1 -0
  5. data/app/helpers/educode_sales/application_helper.rb +1 -1
  6. data/app/views/educode_sales/assessments/_progress.html.erb +7 -4
  7. data/app/views/educode_sales/assessments/_setup.html.erb +54 -10
  8. data/app/views/educode_sales/assessments/edit.html.erb +45 -53
  9. data/app/views/educode_sales/assessments/new.html.erb +147 -111
  10. data/app/views/educode_sales/businesses/new_follow_record.html.erb +1 -1
  11. data/app/views/educode_sales/home/index.html.erb +1 -1
  12. data/app/views/educode_sales/plans/edit_month.html.erb +1 -1
  13. data/db/migrate/20220418033025_add_staff_id_to_sets.rb +5 -0
  14. data/db/migrate/20220419103842_add_column_timestamps_to_assessments_settings.rb +9 -0
  15. data/lib/educode_sales/version.rb +1 -1
  16. metadata +5 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3d682317c15b09667c1c6c61d293b8d2c03e8c2af55cd08502e135eaab348a88
4
- data.tar.gz: 5b577be152af9d51e88abe6e22b2e638b1c376322da24ac615aca52695793466
3
+ metadata.gz: 2972ed1989662bb4f717d0a4d84bd29f5605fa53006e744de50836bde4273d51
4
+ data.tar.gz: 9c64c442924ed94d857c29c9141d22ea66714f237671d46964033e46a075fcef
5
5
  SHA512:
6
- metadata.gz: c07c678f2c6303fcfe4f20990e0c247846da3af1b3d54fb636c0da49cf59ad343987b6c6bfd099851ea5509f3e65981b71e50dda4ae7da05953fdbeefea58c78
7
- data.tar.gz: ce2c311b7965b947e07089ec32883c036ab04e92e2bb96953e7818b80ac8c6f32a6f96e17284d21466d2cfce3666c141b3c7624c821299d7fae564fee819aaf2
6
+ metadata.gz: 25648696a64348151f0380b1c8c160b12ed21263f06417a48aaff9529252048764edd343a78ef88e899c336bbd19cb007168d41dbbbaa7f90d2b75cff656a2aa
7
+ data.tar.gz: 7e519c3723917de704f95e17d809503aab65401b56a979c48c0a45d3a88f1837b8080305af33994a410c2e10cbff1ccc2d9cdba1ac8652cfe8221ddb1ff21b18
data/app/controllers/educode_sales/assessments_controller.rb CHANGED
@@ -1,6 +1,5 @@
1
1
  require_dependency "educode_sales/application_controller"
2
2
 
3
-
4
3
  module EducodeSales
5
4
  class AssessmentsController < ApplicationController
6
5
  def index
@@ -12,20 +11,19 @@ module EducodeSales
12
11
  gon.export_menus = []
13
12
  gon.export_menus << { title: '导出到Csv文件', event: 'export_csv' }
14
13
  gon.export_menus << { title: '导出到Excel文件', event: 'export_excel' }
14
+ # index页面new弹出层下使用
15
+ gon.demo = Staff.joins(:user).where(job_type: common.id).map do |d|
16
+ {value: d.id, name: d.user.real_name }
17
+ end
15
18
  end
16
19
  format.json do
17
-
18
- p '--------------------------admin'
19
- p @current_admin
20
- p '----------------admin'
21
-
22
20
  @assessments = AssessmentsSetting.all
23
21
  @year = params[:q].present? && params[:q][:assessment_year].present? ? params[:q][:assessment_year]:'2022'
24
22
  @assessments_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]: '1'
25
23
  @assessments = @assessments.where("assessment_year >= ? and assessment_year <= ?", "#{@year}-01-01 00:00:00".to_date, "#{@year}-12-31 23:59:00".to_date)
26
- @assessments = @assessments.where(assessment: @assessments_id).order("id desc")
24
+ @assessments = @assessments.where(assessment: @assessments_id).order("updated_at desc")
27
25
  if params[:q].present? && params[:q][:staff_id].present?
28
- @assessments = @assessments.where(staff_id: params[:q][:staff_id]).order("id desc")
26
+ @assessments = @assessments.where(staff_id: params[:q][:staff_id]).order("updated_at desc")
29
27
  end
30
28
  # 对数据进行分页 默认为page=1 limit=10
31
29
  # @assessments = @assessments.order("id desc").page(params[:page]).per(params[:limit])
@@ -37,22 +35,23 @@ module EducodeSales
37
35
 
38
36
  # 新增
39
37
  def create
40
- ActiveRecord::Base.transaction do
41
- demo = AssessmentsSetting.new(params_create)
42
- demo.user_id = current_user.user_id
43
- demo.assessment_year = "#{params[:assessment_year]}-01-01"
44
- demo.save
45
- p demo.assessment_year,'ok'
38
+ begin
39
+ demo = AssessmentsSetting.new(params_create)
40
+ demo.user_id = current_user.user_id
41
+ demo.assessment_year = "#{params[:assessment_year]}-01-01"
42
+ params[:staffs_ids].split(",").each do |d|
43
+ staff = demo.dup
44
+ staff.staff_id = d.to_i
45
+ staff.save
46
+ end
47
+ render_success
48
+ rescue => e
49
+ render_failure '增加数据错误'
46
50
  end
47
- render_success
48
51
  end
49
52
 
50
53
 
51
54
  def new
52
- common = Common.find_by(clazz: 'staff_type', name: '销售')
53
- @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]} # [[], [], ............]
54
- # do something
55
- # @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
56
55
  render layout: false
57
56
  end
58
57
 
@@ -62,13 +61,13 @@ module EducodeSales
62
61
  @username = @assessment.staff.user.real_name
63
62
  @year = @assessment.assessment_year.to_s[0..3]
64
63
  case @assessment.assessment
65
- when "1"
64
+ when 1
66
65
  @assessment_name = "签单金额"
67
- when "2"
66
+ when 2
68
67
  @assessment_name = "回款金额"
69
- when "3"
68
+ when 3
70
69
  @assessment_name = "拜访量"
71
- when "4"
70
+ when 4
72
71
  @assessment_name = "新增商机数"
73
72
  end
74
73
  render layout: false
@@ -81,6 +80,10 @@ module EducodeSales
81
80
  render_success
82
81
  end
83
82
 
83
+
84
+
85
+
86
+
84
87
  # 删除接口
85
88
  def destroy
86
89
  begin
@@ -105,36 +108,25 @@ module EducodeSales
105
108
  @assessments =AssessmentsSetting.where(assessment: @assessment_id).
106
109
  where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
107
110
  if params[:staff_id].present?
108
- @assessment = @assessments.where(staff_id: params[:staff_id]).order("id desc").first
111
+ @assessments = @assessments.where(staff_id: params[:staff_id])
109
112
  progress_main
110
113
  else
111
114
  # @assessments = @assessments.where(staff_id: @staff_ids) 注意 这样写有问题
112
115
  @staff_ids.each do |s|
113
- @assessment = @assessments.where(staff_id: s).order("id desc").first
116
+ @assessments = @assessments.where(staff_id: s).order("updated_at desc")
114
117
  progress_main
115
118
  end
119
+ @assessments = AssessmentsSetting.where(assessment: @assessment_id).
120
+ where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
116
121
  end
117
- # 在从新获取一下 统计后的所有assessment_setting数据
118
- @assessments = AssessmentsSetting.where(assessment: @assessment_id).
119
- where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
120
- @assessments = params[:staff_id].present? ? @assessments.where(staff_id: params[:staff_id]).order("id desc"):
121
- @assessments.order("id desc")
122
122
  end
123
123
 
124
124
 
125
125
 
126
126
 
127
- # 增加导出记录
128
- def add_export_records
129
- end
130
-
131
-
132
-
133
127
 
134
128
 
135
129
 
136
- # todo 可以增加一个字段(用户判断assessment_setting表中的某一数据是否在一定条件下为最新数据
137
- # todo 在统计数据时 可以通过该字段 获取最新的数据 并统计 当比之前写的大大降低的代码的重复量 ，并且提高了数据库的性能)----注意 如果增加该字段后 在对某条数据进行操作时，要实施更新该条数据的该字段
138
130
 
139
131
  # 考核完成情况
140
132
  def progress
@@ -145,21 +137,19 @@ module EducodeSales
145
137
  @assessments =AssessmentsSetting.where(assessment: @assessment_id).
146
138
  where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
147
139
  if params[:q].present? && params[:q][:staff_id].present?
148
- @assessment = @assessments.where(staff_id: params[:q][:staff_id]).order("id desc").first
140
+ @assessments = @assessments.where(staff_id: params[:q][:staff_id])
149
141
  progress_main
150
142
  else
151
143
  # @assessments = @assessments.where(staff_id: @staff_ids) 注意 这样写有问题
152
144
  @staff_ids.each do |s|
153
- @assessment = @assessments.where(staff_id: s).order("id desc").first
145
+ @staff_id = s
146
+ @assessments = @assessments.where(staff_id: s)
154
147
  progress_main
155
148
  end
149
+ @assessments = AssessmentsSetting.where(assessment: @assessment_id)
150
+ .where("assessment_year >= ? and assessment_year <= ?","#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:59".to_date )
151
+ .order("updated_at desc")
156
152
  end
157
- # 在从新获取一下 统计后的所有assessment_setting数据
158
- @assessments = AssessmentsSetting.where(assessment: @assessment_id).
159
- where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
160
- @assessments = params[:q].present? && params[:q][:staff_id].present? ? @assessments.where(staff_id: params[:q][:staff_id]).order("id desc"):
161
- @assessments.order("id desc")
162
-
163
153
  end
164
154
 
165
155
 
@@ -167,7 +157,7 @@ module EducodeSales
167
157
 
168
158
  # todo 主方法 统计用户的数据
169
159
  def progress_main
170
- if @assessment.present?
160
+ if @assessments.present?
171
161
  a = []
172
162
  case @assessment_id
173
163
  when '1' # 签单金额
@@ -187,7 +177,6 @@ module EducodeSales
187
177
  end
188
178
  update_assessments_progress(a)
189
179
  else
190
- # render layout:false
191
180
  end
192
181
  end
193
182
 
@@ -401,11 +390,10 @@ module EducodeSales
401
390
  # 新增商机数
402
391
  def busniness_add(a)
403
392
  # 1.新增商机数统计在哪一个时间段？以商机的创建时间为准；先默认 过滤2022之前的 businesses -created_et deleted_at follow_ups_count
404
- @businesses = @businesses.where("follow_ups_count > ?", '0').where("educode_sales_businesses.created_at >= ? and educode_sales_businesses.created_at <= ?", "#{@assessment_year}-01-01 00:00:00".to_date,"#{@assessment_year}-12-31 23:59:00".to_date)
393
+ @businesses = @businesses.where("educode_sales_businesses.created_at >= ? and educode_sales_businesses.created_at <= ?", "#{@assessment_year}-01-01 00:00:00".to_date,"#{@assessment_year}-12-31 23:59:59".to_date)
405
394
  # 2.销售人员新增的商机数量，过滤E、O、X类商机，包含：ABCD类商机； 上面有连接follow_up表
406
- ids = Common.where(extras: %w[a_class b_class c_class d_claass]).pluck(:id) # 数组[1,5,2,15]
395
+ ids = Common.where(extras: %w[a_class b_class c_class d_class]).pluck(:id) # 数组[1,5,2,15]
407
396
  @businesses = @businesses.joins("JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id").where("educode_sales_follow_ups.clazz_id in (?) ",ids)
408
- # 先把staff写死
409
397
  @businesses = @businesses.where(staff_id: @staff_id)
410
398
  @businesses.each do |d|
411
399
  case d.created_at.to_time.to_s[0..6]
@@ -462,14 +450,17 @@ module EducodeSales
462
450
 
463
451
  # 更新assessments_settings表中数据
464
452
  def update_assessments_progress(a)
465
- a[12] = a[0].to_i + a[1].to_i + a[2].to_i
466
- a[13] = a[3].to_i + a[4].to_i + a[5].to_i
467
- a[14] = a[6].to_i + a[7].to_i + a[8].to_i
468
- a[15] = a[9].to_i + a[10].to_i + a[11].to_i
469
- a[16] = a[12].to_i + a[13].to_i + a[14].to_i + a[15].to_i
470
- @assessment.update(annual_progress: a[16], first_quarter_progress: a[12], second_quarter_progress: a[13], third_quarter_progress: a[14], fourth_quarter_progress: a[15],
471
- january_progress: a[0], february_progress: a[1], march_progress: a[2], april_progress: a[3], may_progress: a[4], june_progress: a[5],
472
- july_progress: a[6], august_progress: a[7], september_progress: a[8], october_progress: a[9], november_progress: a[10], december_progress: a[11])
453
+ a[12] = a[0].to_i + a[1].to_i + a[2].to_i
454
+ a[13] = a[3].to_i + a[4].to_i + a[5].to_i
455
+ a[14] = a[6].to_i + a[7].to_i + a[8].to_i
456
+ a[15] = a[9].to_i + a[10].to_i + a[11].to_i
457
+ a[16] = a[12].to_i + a[13].to_i + a[14].to_i + a[15].to_i
458
+ @assessments.each do |d|
459
+ d.update(annual_progress: a[16], first_quarter_progress: a[12], second_quarter_progress: a[13], third_quarter_progress: a[14], fourth_quarter_progress: a[15],
460
+ january_progress: a[0], february_progress: a[1], march_progress: a[2], april_progress: a[3], may_progress: a[4], june_progress: a[5],
461
+ july_progress: a[6], august_progress: a[7], september_progress: a[8], october_progress: a[9], november_progress: a[10], december_progress: a[11])
462
+ end
463
+ @assessments.order("created_at desc")
473
464
  end
474
465
 
475
466
 
@@ -477,7 +468,7 @@ module EducodeSales
477
468
 
478
469
  private
479
470
  def params_create
480
- params.permit(:staff_id, :annual, :assessment,:assessment_year, :first_quarter, :second_quarter, :third_quarter, :fourth_quarter,
471
+ params.permit( :annual, :assessment,:assessment_year, :first_quarter, :second_quarter, :third_quarter, :fourth_quarter,
481
472
  :january, :february, :march, :april, :may, :june, :july, :august, :september, :october, :november, :december)
482
473
  end
483
474
 
data/app/controllers/educode_sales/businesses_controller.rb CHANGED
@@ -18,6 +18,7 @@ module EducodeSales
18
18
  gon.business_type = Common.where(clazz: 'business_type').map do |d|
19
19
  {value: d.id, name: d.name}
20
20
  end
21
+
21
22
  gon.type = params[:clazz_id].present? ? [{ value: params[:clazz_id], name: Common.find(params[:clazz_id]).name }] : []
22
23
  gon.business_step = Common.where(clazz: 'business_step').map do |d|
23
24
  {value: d.id, name: d.name}
data/app/helpers/educode_sales/application_helper.rb CHANGED
@@ -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 + "%"
data/app/views/educode_sales/assessments/_progress.html.erb CHANGED
@@ -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: 80, rowspan: 2,fixed:'left'}
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/businesses/get_export_data", {
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
  });
data/app/views/educode_sales/assessments/_setup.html.erb CHANGED
@@ -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
- limit: 10,
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('确定删除' + "demo" + data.id, function (index) {
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
- // 重新渲染弹层中的下拉选择框select
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>
data/app/views/educode_sales/assessments/edit.html.erb CHANGED
@@ -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 ">考核指标</label>
8
- <div class="layui-input-inline">
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">考核人员</label>
16
- <div class="layui-input-inline" style="width: 500px">
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 ">年度</label>
27
- <div class="layui-input-inline">
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">业务目标</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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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: 500px;">
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="number|data" 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
- // form.render();
177
- //
178
- // var parentIndex = layer.index;
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,7 +178,6 @@
185
178
  if (res.success == false) {
186
179
  layer.alert(res.msg)
187
180
  } else {
188
- console.log("ok");
189
181
  layer.closeAll();
190
182
  table.reload("assessments")
191
183
  }
data/app/views/educode_sales/assessments/new.html.erb CHANGED
@@ -1,37 +1,29 @@
1
1
  <div class="layui-form layuimini-form" lay-filter="new_assessment">
2
2
  <div class="layui-form-item" style="padding: 25px">
3
3
 
4
- <!-- month-->
5
- <!-- <div class="layui-inline">-->
6
- <!-- <label class="layui-form-label required">月份</label>-->
7
- <!-- <div class="layui-input-inline">-->
8
- <!-- <input type="text" lay-verify="required" class="layui-input" id="new_week_month" autocomplete="off" name="month">-->
9
- <!-- </div>-->
10
- <!-- </div>-->
11
-
12
4
 
13
5
  <div class="layui-form-item" style="padding: 25px">
14
6
  <div class="layui-inline">
15
7
  <label class="layui-form-label required ">考核指标</label>
16
8
  <div class="layui-input-inline">
17
- <select name="assessment" lay-verify="required" >
18
- <!-- <option value="0" selected ></option>-->
9
+ <select name="assessment" lay-verify="required" lay-filter="new_assessment_id" >
10
+ <option value="0" selected ></option>
19
11
  <option value="1">签单金额</option>
20
12
  <option value="2">回款金额</option>
21
13
  <option value="3">拜访量</option>
22
14
  <option value="4">新增商机数</option>
23
15
  </select>
24
16
  </div>
25
- </div>
17
+ </div>
26
18
  <div class="layui-inline">
27
19
  <label class="layui-form-label required">考核人员</label>
28
- <div class="layui-input-inline" style="width: 500px">
29
- <%#= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
30
- <div class="layui-input-inline" >
31
- <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true, 'lay-verify': 'required' } %>
20
+ <div class="layui-input-inline" >
21
+ <div class="layui-input-inline">
22
+ <div id="staffs" class="xm-select-demo"></div>
32
23
  </div>
33
24
  </div>
34
- </div></div>
25
+ </div>
26
+ </div>
35
27
  <div class="layui-form-item" style="padding: 25px">
36
28
  <div class="layui-inline" >
37
29
  <label class="layui-form-label required ">年度</label>
@@ -44,113 +36,131 @@
44
36
  <div class="layui-input-inline">
45
37
  <input type="text" class="layui-input" disabled value="" name="annual" autocomplete="off" placeholder="自动计算" id="annual">
46
38
  </div>
47
- <div class="layui-input-inline">万</div>
39
+ <div class="label1 layui-input-inline">万</div>
40
+ <div class="label2 layui-input-inline layui-hide">个</div>
48
41
  </div>
49
42
  </div>
50
43
  <div class="layui-form-item" style="padding: 25px">
51
- <div class="layui-row" >
44
+ <!-- 根据考核要求更换单位-->
45
+ <div class="layui-row " >
52
46
  <div class="layui-col-md3">
53
47
  <div class="layui-input-inline">
54
- <label class="layui-form-label ">第一季度(万)</label>
55
- <div class="layui-input-block" style="width: 500px;">
48
+ <label class="label1 layui-form-label ">第一季度(万)</label>
49
+ <label class="label2 layui-form-label layui-hide">第一季度(个)</label>
50
+ <div class="layui-input-block " style="width: 200px;">
56
51
  <input type="text" name="first_quarter" value="" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter1" >
57
52
  </div>
58
53
  </div>
59
54
 
60
55
  <div class="layui-input-inline ">
61
- <label class="layui-form-label ">1月(万)</label>
62
- <div class="layui-input-block" style="width: 500px;">
63
- <input type="text" name="january" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month1" onkeyup="sum()">
56
+ <label class="label1 layui-form-label ">1月(万)</label>
57
+ <label class="label2 layui-form-label layui-hide">1月(个)</label>
58
+ <div class="layui-input-block" style="width: 200px;">
59
+ <input type="text" name="january" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month1" onkeyup="sum()">
64
60
  </div>
65
61
  </div>
66
62
  <div class="layui-input-inline">
67
- <label class="layui-form-label ">2月(万)</label>
68
- <div class="layui-input-block" style="width: 500px;">
69
- <input type="text" name="february" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month2" onkeyup="sum()" >
63
+ <label class="label1 layui-form-label ">2月(万)</label>
64
+ <label class="label2 layui-form-label layui-hide">2月(个)</label>
65
+ <div class="layui-input-block" style="width: 200px;">
66
+ <input type="text" name="february" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month2" onkeyup="sum()" >
70
67
  </div>
71
68
  </div>
72
69
  <div class="layui-input-inline">
73
- <label class="layui-form-label ">3月(万)</label>
74
- <div class="layui-input-block" style="width: 500px;">
75
- <input type="text" name="march" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month3" onkeyup="sum()">
70
+ <label class="label1 layui-form-label ">3月(万)</label>
71
+ <label class="label2 layui-form-label layui-hide">3月(个)</label>
72
+ <div class="layui-input-block" style="width: 200px;">
73
+ <input type="text" name="march" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month3" onkeyup="sum()">
76
74
  </div>
77
75
  </div>
78
76
  </div>
79
77
  <div class="layui-col-md3">
80
78
  <div class="layui-input-inline">
81
- <label class="layui-form-label ">第二季度(万)</label>
82
- <div class="layui-input-block" style="width: 500px;">
79
+ <label class="label1 layui-form-label ">第二季度(万)</label>
80
+ <label class="label2 layui-form-label layui-hide">第二季度(个)</label>
81
+ <div class="layui-input-block" style="width: 200px;">
83
82
  <input type="text" name="second_quarter" value="" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter2" onkeyup="sum()" >
84
83
  </div>
85
84
  </div>
86
85
  <div class="layui-input-inline">
87
- <label class="layui-form-label ">4月(万)</label>
88
- <div class="layui-input-block" style="width: 500px;">
89
- <input type="text" name="april" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month4" onkeyup="sum()">
86
+ <label class="label1 layui-form-label ">4月(万)</label>
87
+ <label class="label2 layui-form-label layui-hide">4月(个)</label>
88
+ <div class="layui-input-block" style="width: 200px;">
89
+ <input type="text" name="april" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month4" onkeyup="sum()">
90
90
  </div>
91
91
  </div>
92
92
  <div class="layui-input-inline">
93
- <label class="layui-form-label ">5月(万)</label>
94
- <div class="layui-input-block" style="width: 500px;">
95
- <input type="text" name="may" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month5" onkeyup="sum()">
93
+ <label class="label1 layui-form-label ">5月(万)</label>
94
+ <label class="label2 layui-form-label layui-hide">5月(个)</label>
95
+ <div class="layui-input-block" style="width: 200px;">
96
+ <input type="text" name="may" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month5" onkeyup="sum()">
96
97
  </div>
97
98
  </div>
98
99
  <div class="layui-input-inline">
99
- <label class="layui-form-label ">6月(万)</label>
100
- <div class="layui-input-block" style="width: 500px;">
101
- <input type="text" name="june" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month6" onkeyup="sum()">
100
+ <label class="label1 layui-form-label ">6月(万)</label>
101
+ <label class="label2 layui-form-label layui-hide">6月(个)</label>
102
+ <div class="layui-input-block" style="width: 200px;">
103
+ <input type="text" name="june" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month6" onkeyup="sum()">
102
104
  </div>
103
105
  </div>
104
106
  </div>
105
107
  <div class="layui-col-md3">
106
108
  <div class="layui-input-inline">
107
- <label class="layui-form-label ">第三季度(万)</label>
108
- <div class="layui-input-block" style="width: 500px;">
109
+ <label class="label1 layui-form-label ">第三季度(万)</label>
110
+ <label class="label2 layui-form-label layui-hide">第三季度(个)</label>
111
+ <div class="layui-input-block" style="width: 200px;">
109
112
  <input type="text" name="third_quarter" value="" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter3" onkeyup="sum()">
110
113
  </div>
111
114
  </div>
112
115
  <div class="layui-input-inline">
113
- <label class="layui-form-label ">7月(万)</label>
114
- <div class="layui-input-block" style="width: 500px;">
115
- <input type="text" name="july" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month7" onkeyup="sum()">
116
+ <label class="label1 layui-form-label ">7月(万)</label>
117
+ <label class="label2 layui-form-label layui-hide">7月(个)</label>
118
+ <div class="layui-input-block" style="width: 200px;">
119
+ <input type="text" name="july" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month7" onkeyup="sum()">
116
120
  </div>
117
121
  </div>
118
122
  <div class="layui-input-inline">
119
- <label class="layui-form-label ">8月(万)</label>
120
- <div class="layui-input-block" style="width: 500px;">
121
- <input type="text" name="august" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month8" onkeyup="sum()">
123
+ <label class="label1 layui-form-label ">8月(万)</label>
124
+ <label class="label2 layui-form-label layui-hide">8月(个)</label>
125
+ <div class="layui-input-block" style="width: 200px;">
126
+ <input type="text" name="august" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month8" onkeyup="sum()">
122
127
  </div>
123
128
  </div>
124
129
  <div class="layui-input-inline">
125
- <label class="layui-form-label ">9月(万)</label>
126
- <div class="layui-input-block" style="width: 500px;">
127
- <input type="text" name="september" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month9" onkeyup="sum()">
130
+ <label class="label1 layui-form-label ">9月(万)</label>
131
+ <label class="label2 layui-form-label layui-hide">9月(个)</label>
132
+ <div class="layui-input-block" style="width: 200px;">
133
+ <input type="text" name="september" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month9" onkeyup="sum()">
128
134
  </div>
129
135
  </div>
130
136
  </div>
131
137
  <div class="layui-col-md3">
132
138
  <div class="layui-input-inline">
133
- <label class="layui-form-label ">第四季度(万)</label>
134
- <div class="layui-input-block" style="width: 500px;">
139
+ <label class="label1 layui-form-label ">第四季度(万)</label>
140
+ <label class="label2 layui-form-label layui-hide">第四季度(个)</label>
141
+ <div class="layui-input-block" style="width: 200px;">
135
142
  <input type="text" name="fourth_quarter" value="" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter4" onkeyup="sum()">
136
143
  </div>
137
144
  </div>
138
145
  <div class="layui-input-inline">
139
- <label class="layui-form-label ">10月(万)</label>
140
- <div class="layui-input-block" style="width: 500px;">
141
- <input type="text" name="october" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month10" onkeyup="sum()">
146
+ <label class="label1 layui-form-label ">10月(万)</label>
147
+ <label class="label2 layui-form-label layui-hide">10月(个)</label>
148
+ <div class="layui-input-block" style="width: 200px;">
149
+ <input type="text" name="october" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month10" onkeyup="sum()">
142
150
  </div>
143
151
  </div>
144
152
  <div class="layui-input-inline">
145
- <label class="layui-form-label ">11月(万)</label>
146
- <div class="layui-input-block" style="width: 500px;">
147
- <input type="text" name="november" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month11" onkeyup="sum()" >
153
+ <label class="label1 layui-form-label ">11月(万)</label>
154
+ <label class="label2 layui-form-label layui-hide">11月(个)</label>
155
+ <div class="layui-input-block" style="width: 200px;">
156
+ <input type="text" name="november" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month11" onkeyup="sum()" >
148
157
  </div>
149
158
  </div>
150
159
  <div class="layui-input-inline">
151
- <label class="layui-form-label ">12月(万)</label>
152
- <div class="layui-input-block" style="width: 500px;">
153
- <input type="text" name="december" value="" autocomplete="off" class="layui-input" lay-verify="number" id="month12" onkeyup="sum()">
160
+ <label class="label1 layui-form-label ">12月(万)</label>
161
+ <label class="label2 layui-form-label layui-hide">12月(个)</label>
162
+ <div class="layui-input-block" style="width: 200px;">
163
+ <input type="text" name="december" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month12" onkeyup="sum()">
154
164
  </div>
155
165
  </div>
156
166
  </div>
@@ -158,17 +168,37 @@
158
168
  </div>
159
169
  <div class="layui-form-item m-t-20">
160
170
  <div class="layui-input-block">
161
- <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_task_assessment">提交</button>
162
- <!-- <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="cancel_add_assessment">取消</button>-->
171
+ <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_task_assessment" id="add_task_assessment">提交</button>
163
172
  </div>
164
173
  </div>
165
174
 
166
175
 
167
176
 
168
177
  </div>
178
+
169
179
  </div>
170
180
 
181
+
182
+ <script>
183
+ // 单独写在这里配合upen(才实现打开open时清空select中数据)
184
+ // staffs(select多选)
185
+ // 因为new是弹出层 所以可以获取index页面的gon.demo数据
186
+ var test = gon.demo;
187
+ var staffs = xmSelect.render({
188
+ el: '#staffs',
189
+ data: test,
190
+ // 向后端传输的name值
191
+ name: 'staffs_ids'
192
+ });
193
+ </script>
194
+
195
+
196
+
171
197
  <script>
198
+
199
+
200
+
201
+
172
202
  layui.use(['form', 'table', 'laytpl', 'request', 'laydate'], function () {
173
203
  var form = layui.form,
174
204
  layer = layui.layer,
@@ -177,65 +207,64 @@
177
207
  laydate = layui.laydate,
178
208
  $ = layui.$;
179
209
 
210
+
211
+
212
+ // 自定义校验数据
213
+ form.verify({
214
+ data: function (value,item){
215
+ if (parseFloat(value) < 0 ){
216
+ console.log(value);
217
+ return "数据不能小于零"
218
+ }
219
+ }
220
+ })
221
+
222
+
223
+ // time
180
224
  laydate.render({
181
225
  elem: '#add_assessments_year',
182
226
  type: 'year',
227
+ value: <%=Time.now.year %>
183
228
  });
184
229
 
185
230
 
186
231
 
187
232
  form.on('submit(add_task_assessment)', function (data) {
188
233
  console.log(data)
189
- console.log($("#demo1").val())
190
- request.authPost("missions/assessments", data.field, function (res) {
191
- if (res.success == false) {
192
- layer.alert(res.msg)
193
- } else {
194
- // 增加成功 退出并重新reload_table ------------有问题
195
- layer.closeAll();
196
- layer.alert("添加成功");
197
- table.reload("assessments");
198
- }
199
- })
200
- return false;
234
+ console.log(data.field)
235
+ // console.log($("#demo1").val())
236
+ var staffs_selectArr = staffs.getValue();
237
+ if ( staffs_selectArr.length === 0 ) {
238
+ alert("请选择员工！！！");
239
+ } else {
240
+ request.authPost("missions/assessments", data.field, function (res) {
241
+ if (res.success == false) {
242
+ layer.alert(res.msg)
243
+ } else {
244
+ layer.closeAll();
245
+ layer.alert("添加成功");
246
+ table.reload("assessments");
247
+ }
248
+ });
249
+ return false;
250
+ }
201
251
  });
202
252
 
203
253
 
204
-
205
- // // que xiao
206
- // form.on('submit(cancel_add_assessment)', function (data) {
207
- // layer.closeAll();
208
- // return false;
209
- // });
210
- // form.on('submit(cancel_add_assessment)', function (data){
211
- // console.log(data.field);
212
- // form.val('new_assessment',{
213
- // first_quarter: '1',
214
- // february: '1',
215
- // march: '1',
216
- // second_quarter: '1',
217
- // april: '1',
218
- // may: '1',
219
- // june: '1',
220
- // third_quarter: '1',
221
- // august: '1',
222
- // september: '1',
223
- // fourth_quarter: '1',
224
- // october: '1',
225
- // november: '1',
226
- // december: '1',
227
- // annual: '1',
228
- // staff_id: '1'
229
- // });
230
- // layer.closeAll();
231
- // layer.alert("取消成功");
232
- // return false;
233
- // });
234
-
235
-
236
-
237
-
238
-
254
+ // 根据考核要求更换单位
255
+ form.on('select(new_assessment_id)', function (data){
256
+ console.log(data.value)
257
+ // 默认 签单金额 回款金额
258
+ if (data.value in ["2 ","1","0"]) {
259
+ // 默认 签单金额 回款金额
260
+ $(".label1").removeClass('layui-hide')
261
+ $(".label2").addClass('layui-hide')
262
+ } else {
263
+ // 新增商机 拜访量
264
+ $(".label1").addClass('layui-hide')
265
+ $(".label2").removeClass('layui-hide')
266
+ }
267
+ })
239
268
 
240
269
  });
241
270
  </script>
@@ -307,4 +336,11 @@
307
336
  document.getElementById('annual').value = parseInt(month1)+parseInt(month2)+parseInt(month3)+parseInt(month4)+
308
337
  parseInt(month5)+parseInt(month6)+parseInt(month7)+parseInt(month8)+parseInt(month9)+parseInt(month10)+parseInt(month11)+parseInt(month12)
309
338
  }
339
+
340
+
341
+
342
+
343
+
344
+
345
+
310
346
  </script>
data/app/views/educode_sales/businesses/new_follow_record.html.erb CHANGED
@@ -71,7 +71,7 @@
71
71
  <div class="layui-inline service_show layui-hide">
72
72
  <label class="layui-form-label required">服务期</label>
73
73
  <div class="layui-input-inline">
74
- <input type="text" class="layui-input required" id="service_time" name="service_time" placeholder=" - " autocomplete="off" value=<%= (@last_follow_up&.service_start_time.present? && @last_follow_up&.service_end_time.present?) ? (@last_follow_up.service_start_time.to_s + "-" + @last_follow_up.service_end_time.to_s) : '' %>>
74
+ <input type="text" class="layui-input required" id="service_time" name="service_time" placeholder=" - " autocomplete="off" value="<%= (@last_follow_up&.service_start_time.present? && @last_follow_up&.service_end_time.present?) ? (@last_follow_up.service_start_time.to_s + " - " + @last_follow_up.service_end_time.to_s) : '' %>">
75
75
  </div>
76
76
  </div>
77
77
  <br class="service_show layui-hide">
data/app/views/educode_sales/home/index.html.erb CHANGED
@@ -1 +1 @@
1
- <div style="text-align:center;"><%= image_tag "educode_sales/indexLogo.png", width: "900" %></div>
1
+ <div style="text-align:center;"><%= image_tag "educode_sales/top_page.png", width: "900" %></div>
data/app/views/educode_sales/plans/edit_month.html.erb CHANGED
@@ -38,7 +38,7 @@
38
38
  layui.use(['form', 'table', 'laytpl', 'request', 'laydate'], function () {
39
39
  var form = layui.form,
40
40
  layer = layui.layer,
41
- laydate = layui.laydate
41
+ laydate = layui.laydate,
42
42
  table = layui.table,
43
43
  request = layui.request,
44
44
  $ = layui.$;
data/db/migrate/20220418033025_add_staff_id_to_sets.rb ADDED
@@ -0,0 +1,5 @@
1
+ class AddStaffIdToSets < ActiveRecord::Migration[5.2]
2
+ def change
3
+ add_column :educode_sales_assessments_settings, :staff_id, :integer
4
+ end
5
+ end
data/db/migrate/20220419103842_add_column_timestamps_to_assessments_settings.rb ADDED
@@ -0,0 +1,9 @@
1
+ class AddColumnTimestampsToAssessmentsSettings < ActiveRecord::Migration[5.2]
2
+ def change
3
+ add_timestamps :educode_sales_assessments_settings
4
+ end
5
+ # def change_table
6
+ # add_timestamps(:assessments_settings)
7
+ # end
8
+ end
9
+
data/lib/educode_sales/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EducodeSales
2
- VERSION = '0.7.5'
2
+ VERSION = '0.7.8'
3
3
  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: 0.7.5
4
+ version: 0.7.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - anke1460
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-04-18 00:00:00.000000000 Z
11
+ date: 2022-04-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -112,6 +112,7 @@ files:
112
112
  - app/assets/images/educode_sales/loginbg.png
113
113
  - app/assets/images/educode_sales/logo.png
114
114
  - app/assets/images/educode_sales/money_plans.png
115
+ - app/assets/images/educode_sales/top_page.png
115
116
  - app/assets/images/educode_sales/回收站.png
116
117
  - app/assets/images/educode_sales/客户管理.png
117
118
  - app/assets/javascripts/educode_sales/application.js
@@ -447,6 +448,8 @@ files:
447
448
  - db/migrate/20220402020233_create_educode_sales_assessments_settings.rb
448
449
  - db/migrate/20220411021641_add_new_column_assessments_settings.rb
449
450
  - db/migrate/20220413090940_add_september_progress_to_assessment_settings.rb
451
+ - db/migrate/20220418033025_add_staff_id_to_sets.rb
452
+ - db/migrate/20220419103842_add_column_timestamps_to_assessments_settings.rb
450
453
  - lib/educode_sales.rb
451
454
  - lib/educode_sales/engine.rb
452
455
  - lib/educode_sales/version.rb