educode_sales 0.7.7 → 0.8.1

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 (32) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/educode_sales/application_controller.rb +24 -0
  3. data/app/controllers/educode_sales/assessments_controller.rb +151 -285
  4. data/app/controllers/educode_sales/businesses_controller.rb +68 -2
  5. data/app/controllers/educode_sales/customers_controller.rb +0 -3
  6. data/app/helpers/educode_sales/application_helper.rb +3 -3
  7. data/app/models/educode_sales/business.rb +8 -0
  8. data/app/models/educode_sales/business_relation_ship.rb +6 -0
  9. data/app/models/educode_sales/customer_follow.rb +1 -0
  10. data/app/models/educode_sales/filter.rb +18 -0
  11. data/app/models/educode_sales/follow_up.rb +2 -0
  12. data/app/models/educode_sales/role_area.rb +1 -1
  13. data/app/views/educode_sales/assessments/_progress.html.erb +7 -4
  14. data/app/views/educode_sales/assessments/_setup.html.erb +115 -13
  15. data/app/views/educode_sales/assessments/edit.html.erb +47 -54
  16. data/app/views/educode_sales/assessments/index.html.erb +1 -2
  17. data/app/views/educode_sales/assessments/index.json.jbuilder +1 -1
  18. data/app/views/educode_sales/assessments/new.html.erb +148 -111
  19. data/app/views/educode_sales/assessments/progress.json.jbuilder +2 -198
  20. data/app/views/educode_sales/businesses/following_businesses.jbuilder +44 -0
  21. data/app/views/educode_sales/businesses/index.html.erb +175 -27
  22. data/app/views/educode_sales/businesses/index.json.jbuilder +1 -0
  23. data/app/views/educode_sales/businesses/new_follow_record.html.erb +1 -1
  24. data/app/views/educode_sales/plans/edit_month.html.erb +1 -1
  25. data/app/views/layouts/educode_sales/application.html.erb +2 -2
  26. data/config/routes.rb +4 -0
  27. data/db/migrate/20220419103842_add_column_timestamps_to_assessments_settings.rb +9 -0
  28. data/db/migrate/20220420071909_create_educode_sales_business_relation_ships.rb +10 -0
  29. data/db/migrate/20220507020149_create_filter.rb +10 -0
  30. data/db/migrate/20220507091959_change_educode_sales_filter_column_length.rb +5 -0
  31. data/lib/educode_sales/version.rb +1 -1
  32. metadata +9 -2
@@ -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.staff_ids;
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,65 @@
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
+ table.reload("progressTable");
248
+ }
249
+ });
250
+ return false;
251
+ }
201
252
  });
202
253
 
203
254
 
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
-
255
+ // 根据考核要求更换单位
256
+ form.on('select(new_assessment_id)', function (data){
257
+ console.log(data.value)
258
+ // 默认 签单金额 回款金额
259
+ if (data.value in ["2 ","1","0"]) {
260
+ // 默认 签单金额 回款金额
261
+ $(".label1").removeClass('layui-hide')
262
+ $(".label2").addClass('layui-hide')
263
+ } else {
264
+ // 新增商机 拜访量
265
+ $(".label1").addClass('layui-hide')
266
+ $(".label2").removeClass('layui-hide')
267
+ }
268
+ })
239
269
 
240
270
  });
241
271
  </script>
@@ -307,4 +337,11 @@
307
337
  document.getElementById('annual').value = parseInt(month1)+parseInt(month2)+parseInt(month3)+parseInt(month4)+
308
338
  parseInt(month5)+parseInt(month6)+parseInt(month7)+parseInt(month8)+parseInt(month9)+parseInt(month10)+parseInt(month11)+parseInt(month12)
309
339
  }
340
+
341
+
342
+
343
+
344
+
345
+
346
+
310
347
  </script>
@@ -160,206 +160,10 @@ json.data do
160
160
 
161
161
  end
162
162
 
163
- json.code 0
164
- json.count 0
163
+ json.code 1
164
+ json.count @assessments.count
165
165
 
166
166
 
167
-
168
-
169
-
170
-
171
-
172
-
173
-
174
-
175
-
176
-
177
-
178
-
179
-
180
-
181
-
182
-
183
-
184
-
185
-
186
-
187
-
188
-
189
-
190
-
191
-
192
-
193
-
194
-
195
-
196
-
197
-
198
- # json.data do
199
- #
200
- #
201
- # # 目标任务
202
- # json.name assessment.staff.user.real_name
203
- # json.id assessment.id
204
- # json.annual assessment.annual.to_i
205
- # json.first_quarter assessment.first_quarter.to_i
206
- # json.january assessment.january.to_i
207
- # json.february assessment.february.to_i
208
- # json.march assessment.march.to_i
209
- # json.second_quarter assessment.second_quarter.to_i
210
- # json.april assessment.april.to_i
211
- # json.may assessment.may.to_i
212
- # json.june assessment.june.to_i
213
- # json.third_quarter assessment.third_quarter.to_i
214
- # json.july assessment.july.to_i
215
- # json.august assessment.august.to_i
216
- # json.september assessment.september.to_i
217
- # json.fourth_quarter assessment.fourth_quarter.to_i
218
- # json.october assessment.october.to_i
219
- # json.november assessment.november.to_i
220
- # json.december assessment.december.to_i
221
- # # 实际任务
222
- # json.annual_progress assessment.annual_progress.to_i
223
- # json.first_quarter_progress assessment.first_quarter_progress.to_i
224
- # json.january_progress assessment.january_progress.to_i
225
- # json.february_progress assessment.february_progress.to_i
226
- # json.march_progress assessment.march_progress.to_i
227
- # json.second_quarter_progress assessmentsecond_quarter_progress.to_i
228
- # json.april_progress assessment.april_progress.to_i
229
- # json.may_progress assessment.may_progress.to_i
230
- # json.june_progress assessment.june_progress.to_i
231
- # json.third_quarter_progress assessment.third_quarter_progress.to_i
232
- # json.july_progress assessment.july_progress.to_i
233
- # json.august_progress assessment.august_progress.to_i
234
- # json.september_progress assessment.september_progress.to_i
235
- # json.fourth_quarter_progress assessment.fourth_quarter_progress.to_i
236
- # json.october_progress assessment.october_progress.to_i
237
- # json.november_progress assessment.november_progress.to_i
238
- # json.december_progress assessment.december_progress.to_i
239
- # # 差值 dif
240
- # json.annual_dif assessment.annual.to_i - assessment.annual_progress.to_i
241
- # json.first_quarter_dif assessment.first_quarter.to_i - assessment.first_quarter_progress.to_i
242
- # json.january_dif assessment.january.to_i - assessment.january_progress.to_i
243
- # json.february_dif assessment.february.to_i - assessment.february_progress.to_i
244
- # json.march_dif assessment.march.to_i - assessment.may_progress.to_i
245
- # json.second_quarter_dif assessment.second_quarter.to_i - assessmentsecond_quarter_progress.to_i
246
- # json.april_dif assessment.april.to_i - assessment.april_progress.to_i
247
- # json.may_dif assessment.may.to_i - assessment.may_progress.to_i
248
- # json.june_dif assessment.june.to_i - assessment.june_progress.to_i
249
- # json.third_quarter_dif assessment.third_quarter.to_i - assessment.third_quarter_progress.to_i
250
- # json.july_dif assessment.july.to_i - assessment.july_progress.to_i
251
- # json.august_dif assessment.august.to_i - assessment.august_progress.to_i
252
- # json.september_dif assessment.september.to_i - assessment.september_progress.to_i
253
- # json.fourth_quarter_dif assessment.fourth_quarter.to_i - assessment.fourth_quarter_progress.to_i
254
- # json.october_dif assessment.october.to_i - assessment.october_progress.to_i
255
- # json.november_dif assessment.november.to_i - assessment.november_progress.to_i
256
- # json.december_dif assessment.december.to_i - assessment.december_progress.to_i
257
- # # 完成率completion_rate
258
- # json.annual_rate completion_rate(assessment.annual, assessment.annual_progress)
259
- # json.first_quarter_rate completion_rate(assessment.first_quarter, assessment.first_quarter_progress)
260
- # json.january_rate completion_rate(assessment.january,assessment.january_progress)
261
- # json.february_rate completion_rate(assessment.february,assessment.february_progress)
262
- # json.march_rate completion_rate(assessment.march, assessment.march_progress)
263
- # json.second_quarter_rate completion_rate(assessment.second_quarter, assessment.second_quarter_progress)
264
- # json.april_rate completion_rate(assessment.april, assessment.april_progress)
265
- # json.may_rate completion_rate(assessment.may, assessment.may_progress)
266
- # json.june_rate completion_rate(assessment.june, assessment.june_progress)
267
- # json.third_quarter_rate completion_rate(assessment.third_quarter, assessment.third_quarter_progress)
268
- # json.july_rate completion_rate(assessment.july,assessment.july_progress)
269
- # json.august_rate completion_rate(assessment.august,assessment.august_progress)
270
- # json.september_rate completion_rate(assessment.september,assessment.september_progress)
271
- # json.fourth_quarter_rate completion_rate(assessment.fourth_quarter,assessment.fourth_quarter_progress)
272
- # json.october_rate completion_rate(assessment.october,assessment.october_progress)
273
- # json.november_rate completion_rate(assessment.november,assessment.november_progress)
274
- # json.december_rate completion_rate(assessment.december,assessment.december_progress)
275
- #
276
- #
277
- # # 得分_score
278
- # if assessment.assessment == 1
279
- # json.assessment '签单金额'
280
- # json.annual_score signed_amount_score(assessment.annual, assessment.annual_progress)
281
- # json.first_quarter_score signed_amount_score(assessment.first_quarter, assessment.first_quarter_progress)
282
- # json.january_score signed_amount_score(assessment.january,assessment.january_progress)
283
- # json.february_score signed_amount_score(assessment.february,assessment.february_progress)
284
- # json.march_score signed_amount_score(assessment.march, assessment.march_progress)
285
- # json.second_quarter_score signed_amount_score(assessment.second_quarter, assessment.second_quarter_progress)
286
- # json.april_score signed_amount_score(assessment.april, assessment.april_progress)
287
- # json.may_score signed_amount_score(assessment.may, assessment.may_progress)
288
- # json.june_score signed_amount_score(assessment.june, assessment.june_progress)
289
- # json.third_quarter_score signed_amount_score(assessment.third_quarter, assessment.third_quarter_progress)
290
- # json.july_score signed_amount_score(assessment.july,assessment.july_progress)
291
- # json.august_score signed_amount_score(assessment.august,assessment.august_progress)
292
- # json.september_score signed_amount_score(assessment.september,assessment.september_progress)
293
- # json.fourth_quarter_score signed_amount_score(assessment.fourth_quarter,assessment.fourth_quarter_progress)
294
- # json.october_score signed_amount_score(assessment.october,assessment.october_progress)
295
- # json.november_score signed_amount_score(assessment.november,assessment.november_progress)
296
- # json.december_score signed_amount_score(assessment.december,assessment.december_progress)
297
- # elsif assessment.assessment == 2
298
- # json.assessment '回款金额'
299
- # json.annual_score collection_amount_score(assessment.annual, assessment.annual_progress)
300
- # json.first_quarter_score collection_amount_score(assessment.first_quarter, assessment.first_quarter_progress)
301
- # json.january_score collection_amount_score(assessment.january,assessment.january_progress)
302
- # json.february_score collection_amount_score(assessment.february,assessment.february_progress)
303
- # json.march_score collection_amount_score(assessment.march, assessment.march_progress)
304
- # json.second_quarter_score collection_amount_score(assessment.second_quarter, assessment.second_quarter_progress)
305
- # json.april_score collection_amount_score(assessment.april, assessment.april_progress)
306
- # json.may_score collection_amount_score(assessment.may, assessment.may_progress)
307
- # json.june_score collection_amount_score(assessment.june, assessment.june_progress)
308
- # json.third_quarter_score collection_amount_score(assessment.third_quarter, assessment.third_quarter_progress)
309
- # json.july_score collection_amount_score(assessment.july,assessment.july_progress)
310
- # json.august_score collection_amount_score(assessment.august,assessment.august_progress)
311
- # json.september_score collection_amount_score(assessment.september,assessment.september_progress)
312
- # json.fourth_quarter_score collection_amount_score(assessment.fourth_quarter,assessment.fourth_quarter_progress)
313
- # json.october_score collection_amount_score(assessment.october,assessment.october_progress)
314
- # json.november_score collection_amount_score(assessment.november,assessment.november_progress)
315
- # json.december_score collection_amount_score(assessment.december,assessment.december_progress)
316
- # elsif assessment.assessment == 3
317
- # json.assessment '拜访量'
318
- # json.annual_score visits_score(assessment.annual_progress)
319
- # json.first_quarter_score visits_score(assessment.first_quarter_progress)
320
- # json.january_score visits_score(assessment.january_progress)
321
- # json.february_score visits_score(assessment.february_progress)
322
- # json.march_score visits_score(assessment.march_progress)
323
- # json.second_quarter_score visits_score(assessment.second_quarter_progress)
324
- # json.april_score visits_score(assessment.april_progress)
325
- # json.may_score visits_score(assessment.may_progress)
326
- # json.june_score visits_score(assessment.june_progress)
327
- # json.third_quarter_score visits_score(assessment.third_quarter_progress)
328
- # json.july_score visits_score(assessment.july_progress)
329
- # json.august_score visits_score(assessment.august_progress)
330
- # json.september_score visits_score(assessment.september_progress)
331
- # json.fourth_quarter_score visits_score(assessment.fourth_quarter_progress)
332
- # json.october_score visits_score(assessment.october_progress)
333
- # json.november_score visits_score(assessment.november_progress)
334
- # json.december_score visits_score(assessment.december_progress)
335
- # else
336
- # json.assessment '新增商机数'
337
- # json.annual_score add_businesses_score(assessment.staff_id,'01-01','12-31')
338
- # json.first_quarter_score add_businesses_score(assessment.staff_id,'01-01','03-31')
339
- # json.january_score add_businesses_score(assessment.staff_id,'01-01','01-31')
340
- # # assessment_year如果时闰年或则平年时的判断----02-28 02-29
341
- # json.february_score add_businesses_score(assessment.staff_id,'02-01','02-28')
342
- # json.march_score add_businesses_score(assessment.staff_id,'03-01','03-31')
343
- # json.second_quarter_score add_businesses_score(assessment.staff_id,'04-01','06-30')
344
- # json.april_score add_businesses_score(assessment.staff_id,'04-01','04-30')
345
- # json.may_score add_businesses_score(assessment.staff_id,'05-01','05-31')
346
- # json.june_score add_businesses_score(assessment.staff_id,'06-01','06-30')
347
- # json.third_quarter_score add_businesses_score(assessment.staff_id,'07-01','09-30')
348
- # json.july_score add_businesses_score(assessment.staff_id,'07-01','07-31')
349
- # json.august_score add_businesses_score(assessment.staff_id,'08-01','08-31')
350
- # json.september_score add_businesses_score(assessment.staff_id,'09-01','09-30')
351
- # json.fourth_quarter_score add_businesses_score(assessment.staff_id,'10-01','12-31')
352
- # json.october_score add_businesses_score(assessment.staff_id,'10-01','10-31')
353
- # json.november_score add_businesses_score(assessment.staff_id,'11-01','11-30')
354
- # json.december_score add_businesses_score(assessment.staff_id,'12-01','12-31')
355
- # end
356
- #
357
- # end
358
- #
359
- # json.code 0
360
- # json.count 0
361
- #
362
- #
363
167
  #
364
168
  #
365
169
  #