educode_sales 0.8.4 → 0.8.5

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 (17) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/educode_sales/table2excel.js +2759 -0
  3. data/app/controllers/educode_sales/assessments_controller.rb +23 -11
  4. data/app/helpers/educode_sales/application_helper.rb +1 -1
  5. data/app/models/educode_sales/staff.rb +1 -1
  6. data/app/views/educode_sales/assessments/_progress.html.erb +214 -146
  7. data/app/views/educode_sales/assessments/_setup.html.erb +108 -34
  8. data/app/views/educode_sales/assessments/edit.html.erb +53 -45
  9. data/app/views/educode_sales/assessments/index.html.erb +16 -4
  10. data/app/views/educode_sales/assessments/index.json.jbuilder +17 -17
  11. data/app/views/educode_sales/assessments/new.html.erb +113 -114
  12. data/app/views/educode_sales/assessments/progress.json.jbuilder +52 -52
  13. data/app/views/educode_sales/businesses/new_follow_record.html.erb +1 -1
  14. data/db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb +9 -0
  15. data/db/migrate/20220523101628_update_column_to_follow_ups.rb +8 -0
  16. data/lib/educode_sales/version.rb +1 -1
  17. metadata +5 -2
data/app/views/educode_sales/assessments/new.html.erb CHANGED
@@ -32,12 +32,14 @@
32
32
  </div>
33
33
  </div>
34
34
  <div class="layui-inline">
35
- <label class="layui-form-label">业务目标</label>
35
+ <!-- <div class="label1 layui-input-inline" >(万)</div>-->
36
+ <!-- <div class="label2 layui-input-inline layui-hide">(个)</div>-->
37
+ <label class="label1 layui-form-label">业务目标(万)</label>
38
+ <label class="label2 layui-form-label layui-hide ">业务目标(次)</label>
39
+ <label class="label3 layui-form-label layui-hide ">业务目标(个)</label>
36
40
  <div class="layui-input-inline">
37
- <input type="text" class="layui-input" disabled value="" name="annual" autocomplete="off" placeholder="自动计算" id="annual">
41
+ <input type="text" class="layui-input layui-disabled" style="color: #0C0C0C;border:1px solid #a6aebf;" value="" name="annual" autocomplete="off" placeholder="自动计算" id="annual">
38
42
  </div>
39
- <div class="label1 layui-input-inline">万</div>
40
- <div class="label2 layui-input-inline layui-hide">个</div>
41
43
  </div>
42
44
  </div>
43
45
  <div class="layui-form-item" style="padding: 25px">
@@ -46,29 +48,33 @@
46
48
  <div class="layui-col-md3">
47
49
  <div class="layui-input-inline">
48
50
  <label class="label1 layui-form-label ">第一季度(万)</label>
49
- <label class="label2 layui-form-label layui-hide">第一季度(个)</label>
51
+ <label class="label2 layui-form-label layui-hide">第一季度(次)</label>
52
+ <label class="label3 layui-form-label layui-hide">第一季度(个)</label>
50
53
  <div class="layui-input-block " style="width: 200px;">
51
- <input type="text" name="first_quarter" value="" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter1" >
54
+ <input type="text" name="first_quarter" style="color: #0C0C0C;border:1px solid #a6aebf;" value="" autocomplete="off" class="layui-input layui-disabled" placeholder="自动计算" disabled id="quarter1" >
52
55
  </div>
53
56
  </div>
54
57
 
55
58
  <div class="layui-input-inline ">
56
59
  <label class="label1 layui-form-label ">1月(万)</label>
57
- <label class="label2 layui-form-label layui-hide">1月(个)</label>
60
+ <label class="label2 layui-form-label layui-hide">1月(次)</label>
61
+ <label class="label3 layui-form-label layui-hide">1月(个)</label>
58
62
  <div class="layui-input-block" style="width: 200px;">
59
63
  <input type="text" name="january" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month1" onkeyup="sum()">
60
64
  </div>
61
65
  </div>
62
66
  <div class="layui-input-inline">
63
67
  <label class="label1 layui-form-label ">2月(万)</label>
64
- <label class="label2 layui-form-label layui-hide">2月(个)</label>
68
+ <label class="label2 layui-form-label layui-hide">2月(次)</label>
69
+ <label class="label3 layui-form-label layui-hide">2月(个)</label>
65
70
  <div class="layui-input-block" style="width: 200px;">
66
71
  <input type="text" name="february" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month2" onkeyup="sum()" >
67
72
  </div>
68
73
  </div>
69
74
  <div class="layui-input-inline">
70
75
  <label class="label1 layui-form-label ">3月(万)</label>
71
- <label class="label2 layui-form-label layui-hide">3月(个)</label>
76
+ <label class="label2 layui-form-label layui-hide">3月(次)</label>
77
+ <label class="label3 layui-form-label layui-hide">3月(个)</label>
72
78
  <div class="layui-input-block" style="width: 200px;">
73
79
  <input type="text" name="march" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month3" onkeyup="sum()">
74
80
  </div>
@@ -77,28 +83,32 @@
77
83
  <div class="layui-col-md3">
78
84
  <div class="layui-input-inline">
79
85
  <label class="label1 layui-form-label ">第二季度(万)</label>
80
- <label class="label2 layui-form-label layui-hide">第二季度(个)</label>
86
+ <label class="label2 layui-form-label layui-hide">第二季度(次)</label>
87
+ <label class="label3 layui-form-label layui-hide">第二季度(个)</label>
81
88
  <div class="layui-input-block" style="width: 200px;">
82
- <input type="text" name="second_quarter" value="" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter2" onkeyup="sum()" >
89
+ <input type="text" name="second_quarter" style="color: #0C0C0C;border:1px solid #a6aebf;" value="" autocomplete="off" class="layui-input layui-disabled" placeholder="自动计算" disabled id="quarter2" onkeyup="sum()" >
83
90
  </div>
84
91
  </div>
85
92
  <div class="layui-input-inline">
86
93
  <label class="label1 layui-form-label ">4月(万)</label>
87
- <label class="label2 layui-form-label layui-hide">4月(个)</label>
94
+ <label class="label2 layui-form-label layui-hide">4月(次)</label>
95
+ <label class="label3 layui-form-label layui-hide">4月(个)</label>
88
96
  <div class="layui-input-block" style="width: 200px;">
89
97
  <input type="text" name="april" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month4" onkeyup="sum()">
90
98
  </div>
91
99
  </div>
92
100
  <div class="layui-input-inline">
93
101
  <label class="label1 layui-form-label ">5月(万)</label>
94
- <label class="label2 layui-form-label layui-hide">5月(个)</label>
102
+ <label class="label2 layui-form-label layui-hide">5月(次)</label>
103
+ <label class="label3 layui-form-label layui-hide">5月(个)</label>
95
104
  <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()">
105
+ <input type="text" name="may" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month5" onkeyup="sum()">
97
106
  </div>
98
107
  </div>
99
108
  <div class="layui-input-inline">
100
109
  <label class="label1 layui-form-label ">6月(万)</label>
101
- <label class="label2 layui-form-label layui-hide">6月(个)</label>
110
+ <label class="label2 layui-form-label layui-hide">6月(次)</label>
111
+ <label class="label3 layui-form-label layui-hide">6月(个)</label>
102
112
  <div class="layui-input-block" style="width: 200px;">
103
113
  <input type="text" name="june" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month6" onkeyup="sum()">
104
114
  </div>
@@ -107,28 +117,32 @@
107
117
  <div class="layui-col-md3">
108
118
  <div class="layui-input-inline">
109
119
  <label class="label1 layui-form-label ">第三季度(万)</label>
110
- <label class="label2 layui-form-label layui-hide">第三季度(个)</label>
120
+ <label class="label2 layui-form-label layui-hide">第三季度(次)</label>
121
+ <label class="label3 layui-form-label layui-hide">第三季度(个)</label>
111
122
  <div class="layui-input-block" style="width: 200px;">
112
- <input type="text" name="third_quarter" value="" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter3" onkeyup="sum()">
123
+ <input type="text" name="third_quarter" style="color: #0C0C0C;border:1px solid #a6aebf;" value="" autocomplete="off" class="layui-input layui-disabled" placeholder="自动计算" disabled id="quarter3" onkeyup="sum()">
113
124
  </div>
114
125
  </div>
115
126
  <div class="layui-input-inline">
116
127
  <label class="label1 layui-form-label ">7月(万)</label>
117
- <label class="label2 layui-form-label layui-hide">7月(个)</label>
128
+ <label class="label2 layui-form-label layui-hide">7月(次)</label>
129
+ <label class="label3 layui-form-label layui-hide">7月(个)</label>
118
130
  <div class="layui-input-block" style="width: 200px;">
119
131
  <input type="text" name="july" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month7" onkeyup="sum()">
120
132
  </div>
121
133
  </div>
122
134
  <div class="layui-input-inline">
123
135
  <label class="label1 layui-form-label ">8月(万)</label>
124
- <label class="label2 layui-form-label layui-hide">8月(个)</label>
136
+ <label class="label2 layui-form-label layui-hide">8月(次)</label>
137
+ <label class="label3 layui-form-label layui-hide">8月(个)</label>
125
138
  <div class="layui-input-block" style="width: 200px;">
126
139
  <input type="text" name="august" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month8" onkeyup="sum()">
127
140
  </div>
128
141
  </div>
129
142
  <div class="layui-input-inline">
130
143
  <label class="label1 layui-form-label ">9月(万)</label>
131
- <label class="label2 layui-form-label layui-hide">9月(个)</label>
144
+ <label class="label2 layui-form-label layui-hide">9月(次)</label>
145
+ <label class="label3 layui-form-label layui-hide">9月(个)</label>
132
146
  <div class="layui-input-block" style="width: 200px;">
133
147
  <input type="text" name="september" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month9" onkeyup="sum()">
134
148
  </div>
@@ -137,28 +151,32 @@
137
151
  <div class="layui-col-md3">
138
152
  <div class="layui-input-inline">
139
153
  <label class="label1 layui-form-label ">第四季度(万)</label>
140
- <label class="label2 layui-form-label layui-hide">第四季度(个)</label>
154
+ <label class="label2 layui-form-label layui-hide">第四季度(次)</label>
155
+ <label class="label3 layui-form-label layui-hide">第四季度(个)</label>
141
156
  <div class="layui-input-block" style="width: 200px;">
142
- <input type="text" name="fourth_quarter" value="" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter4" onkeyup="sum()">
157
+ <input type="text" name="fourth_quarter" style="color: #0C0C0C;border:1px solid #a6aebf;" value="" autocomplete="off" class="layui-input layui-disabled" placeholder="自动计算" disabled id="quarter4" onkeyup="sum()">
143
158
  </div>
144
159
  </div>
145
160
  <div class="layui-input-inline">
146
161
  <label class="label1 layui-form-label ">10月(万)</label>
147
- <label class="label2 layui-form-label layui-hide">10月(个)</label>
162
+ <label class="label2 layui-form-label layui-hide">10月(次)</label>
163
+ <label class="label3 layui-form-label layui-hide">10月(个)</label>
148
164
  <div class="layui-input-block" style="width: 200px;">
149
165
  <input type="text" name="october" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month10" onkeyup="sum()">
150
166
  </div>
151
167
  </div>
152
168
  <div class="layui-input-inline">
153
169
  <label class="label1 layui-form-label ">11月(万)</label>
154
- <label class="label2 layui-form-label layui-hide">11月(个)</label>
170
+ <label class="label2 layui-form-label layui-hide">11月(次)</label>
171
+ <label class="label3 layui-form-label layui-hide">11月(个)</label>
155
172
  <div class="layui-input-block" style="width: 200px;">
156
173
  <input type="text" name="november" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month11" onkeyup="sum()" >
157
174
  </div>
158
175
  </div>
159
176
  <div class="layui-input-inline">
160
177
  <label class="label1 layui-form-label ">12月(万)</label>
161
- <label class="label2 layui-form-label layui-hide">12月(个)</label>
178
+ <label class="label2 layui-form-label layui-hide">12月(次)</label>
179
+ <label class="label3 layui-form-label layui-hide">12月(个)</label>
162
180
  <div class="layui-input-block" style="width: 200px;">
163
181
  <input type="text" name="december" value="" autocomplete="off" class="layui-input" lay-verify="number|data" id="month12" onkeyup="sum()">
164
182
  </div>
@@ -210,101 +228,77 @@
210
228
 
211
229
 
212
230
  // 自定义校验数据
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
224
- laydate.render({
225
- elem: '#add_assessments_year',
226
- type: 'year',
227
- value: <%=Time.now.year %>
228
- });
229
-
230
-
231
-
232
- form.on('submit(add_task_assessment)', function (data) {
233
- console.log(data)
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
- }
252
- });
231
+ // form.verify({
232
+ // data: function (value,item){
233
+ // if (parseFloat(value) < 0 ){
234
+ // console.log(value);
235
+ // return "数据不能小于零"
236
+ // }else if (parseFloat(value) > 100000000) {
237
+ // console.log(value);
238
+ // return "数据不能大于一亿"
239
+ // }
240
+ // }
241
+ // })
242
+
243
+
244
+
245
+ //laydate.render({
246
+ // elem: '#add_assessments_year',
247
+ // type: 'year',
248
+ // value: <%=Time.now.year %>
249
+ //});
250
+
251
+
252
+
253
+ // form.on('submit(add_task_assessment)', function (data) {
254
+ // console.log(data.field)
255
+ // var staffs_selectArr = staffs.getValue();
256
+ // if ( data.field.assessment === '0' || staffs_selectArr.length === 0 ) {
257
+ // if (data.field.assessment === '0'){
258
+ // alert("请选择考核指标！！！");
259
+ // }else {
260
+ // alert("请选择员工！！！");
261
+ // }
262
+ // return false;
263
+ // } else {
264
+ // request.authPost("missions/assessments", data.field, function (res) {
265
+ // if (res.success == false) {
266
+ // layer.alert(res.msg)
267
+ // } else {
268
+ // layer.closeAll();
269
+ // layer.alert("添加成功");
270
+ // table.reload("assessments");
271
+ // // 重新加载后 progressTable错位
272
+ // // table.reload("progressTable");
273
+ // }
274
+ // });
275
+ // }
276
+ // });
253
277
 
254
278
 
255
279
  // 根据考核要求更换单位
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
- })
280
+ // form.on('select(new_assessment_id)', function (data){
281
+ // console.log(data.value)
282
+ // // 默认 签单金额 回款金额
283
+ // if (data.value in ["2 ","1","0"]) {
284
+ // // 默认 签单金额 回款金额
285
+ // $(".label1").removeClass('layui-hide')
286
+ // $(".label2").addClass('layui-hide')
287
+ // } else {
288
+ // // 新增商机 拜访量
289
+ // $(".label1").addClass('layui-hide')
290
+ // $(".label2").removeClass('layui-hide')
291
+ // }
292
+ // })
269
293
 
270
294
  });
271
295
  </script>
272
296
 
273
297
 
274
298
 
275
-
276
-
277
299
  <!--要写在这下面-->
278
300
  <script type="application/javascript">
279
301
 
280
- function sum2(){undefined
281
- var month1 = $("#month1").val();
282
- console.log(month1+"==========================");
283
- var month2 = $("#month2").val();
284
- var month3 = $("#month3").val();
285
- var month4 = $("#month4").val();
286
- var month5 = $("#month5").val();
287
- var month6 = $("#month6").val();
288
- var month7 = $("#month7").val();
289
- var month8 = $("#month8").val();
290
- var month9 = $("#month9").val();
291
- var month10 = $("#month10").val();
292
- var month11= $("#month11").val();
293
- var month12 = $("#month12").val();
294
- var quarter1 = parseInt(month1)+parseInt(month2)+parseInt(month3);
295
- console.log(quarter1);
296
- var quarter2 = parseInt(month4)+parseInt(month6)+parseInt(month5);
297
- var quarter3 = parseInt(month7)+parseInt(month8)+parseInt(month9);
298
- var quarter4 = parseInt(month10)+parseInt(month11)+parseInt(month12);
299
- $("#quarter1").val(quarter1);
300
- $("#quarter2").val(quarter2);
301
- $("#quarter3").val(quarter3);
302
- $("#quarter4").val(quarter4);
303
- var annual = parseInt(quarter1)+parseInt(quarter2)+parseInt(quarter3)+parseInt(quarter4);
304
- $("#annual").val(annual);
305
- }
306
-
307
-
308
302
  function sum(){
309
303
  var month1 = document.getElementById('month1').value;
310
304
  var month2 = document.getElementById('month2').value;
@@ -330,12 +324,17 @@
330
324
  if ( month10 === ""){ month10 = 0 ;}
331
325
  if ( month11 === ""){ month11 = 0 ;}
332
326
  if ( month12 === ""){ month12 = 0 ;}
333
- document.getElementById('quarter1').value = parseInt(month1)+parseInt(month2)+parseInt(month3)
334
- document.getElementById('quarter2').value = parseInt(month4)+parseInt(month5)+parseInt(month6)
335
- document.getElementById('quarter3').value = parseInt(month7)+parseInt(month8)+parseInt(month9)
336
- document.getElementById('quarter4').value = parseInt(month10)+parseInt(month11)+parseInt(month12)
337
- document.getElementById('annual').value = parseInt(month1)+parseInt(month2)+parseInt(month3)+parseInt(month4)+
338
- parseInt(month5)+parseInt(month6)+parseInt(month7)+parseInt(month8)+parseInt(month9)+parseInt(month10)+parseInt(month11)+parseInt(month12)
327
+ var quarter1 = parseFloat(month1)+parseFloat(month2)+parseFloat(month3)
328
+ var quarter2 = parseFloat(month4)+parseFloat(month5)+parseFloat(month6)
329
+ var quarter3 = parseFloat(month7)+parseFloat(month8)+parseFloat(month9)
330
+ var quarter4 = parseFloat(month10)+parseFloat(month11)+parseFloat(month12)
331
+ var annual = parseFloat(month1)+parseFloat(month2)+parseFloat(month3)+parseFloat(month4)+
332
+ parseFloat(month5)+parseFloat(month6)+parseFloat(month7)+parseFloat(month8)+parseFloat(month9)+parseFloat(month10)+parseFloat(month11)+parseFloat(month12)
333
+ document.getElementById('quarter1').value = quarter1.toFixed(2)
334
+ document.getElementById('quarter2').value = quarter2.toFixed(2)
335
+ document.getElementById('quarter3').value = quarter3.toFixed(2)
336
+ document.getElementById('quarter4').value = quarter4.toFixed(2)
337
+ document.getElementById('annual').value = annual.toFixed(2)
339
338
  }
340
339
 
341
340
 
data/app/views/educode_sales/assessments/progress.json.jbuilder CHANGED
@@ -4,59 +4,59 @@ json.data do
4
4
  # 目标任务
5
5
  json.name assessment.staff.user.real_name
6
6
  json.id assessment.id
7
- json.annual assessment.annual.to_i
8
- json.first_quarter assessment.first_quarter.to_i
9
- json.january assessment.january.to_i
10
- json.february assessment.february.to_i
11
- json.march assessment.march.to_i
12
- json.second_quarter assessment.second_quarter.to_i
13
- json.april assessment.april.to_i
14
- json.may assessment.may.to_i
15
- json.june assessment.june.to_i
16
- json.third_quarter assessment.third_quarter.to_i
17
- json.july assessment.july.to_i
18
- json.august assessment.august.to_i
19
- json.september assessment.september.to_i
20
- json.fourth_quarter assessment.fourth_quarter.to_i
21
- json.october assessment.october.to_i
22
- json.november assessment.november.to_i
23
- json.december assessment.december.to_i
7
+ json.annual assessment.annual.to_f
8
+ json.first_quarter assessment.first_quarter.to_f
9
+ json.january assessment.january.to_f
10
+ json.february assessment.february.to_f
11
+ json.march assessment.march.to_f
12
+ json.second_quarter assessment.second_quarter.to_f
13
+ json.april assessment.april.to_f
14
+ json.may assessment.may.to_f
15
+ json.june assessment.june.to_f
16
+ json.third_quarter assessment.third_quarter.to_f
17
+ json.july assessment.july.to_f
18
+ json.august assessment.august.to_f
19
+ json.september assessment.september.to_f
20
+ json.fourth_quarter assessment.fourth_quarter.to_f
21
+ json.october assessment.october.to_f
22
+ json.november assessment.november.to_f
23
+ json.december assessment.december.to_f
24
24
  # 实际任务
25
- json.annual_progress assessment.annual_progress.to_i
26
- json.first_quarter_progress assessment.first_quarter_progress.to_i
27
- json.january_progress assessment.january_progress.to_i
28
- json.february_progress assessment.february_progress.to_i
29
- json.march_progress assessment.march_progress.to_i
30
- json.second_quarter_progress assessment.second_quarter_progress.to_i
31
- json.april_progress assessment.april_progress.to_i
32
- json.may_progress assessment.may_progress.to_i
33
- json.june_progress assessment.june_progress.to_i
34
- json.third_quarter_progress assessment.third_quarter_progress.to_i
35
- json.july_progress assessment.july_progress.to_i
36
- json.august_progress assessment.august_progress.to_i
37
- json.september_progress assessment.september_progress.to_i
38
- json.fourth_quarter_progress assessment.fourth_quarter_progress.to_i
39
- json.october_progress assessment.october_progress.to_i
40
- json.november_progress assessment.november_progress.to_i
41
- json.december_progress assessment.december_progress.to_i
25
+ json.annual_progress assessment.annual_progress.to_f
26
+ json.first_quarter_progress assessment.first_quarter_progress.to_f
27
+ json.january_progress assessment.january_progress.to_f
28
+ json.february_progress assessment.february_progress.to_f
29
+ json.march_progress assessment.march_progress.to_f
30
+ json.second_quarter_progress assessment.second_quarter_progress.to_f
31
+ json.april_progress assessment.april_progress.to_f
32
+ json.may_progress assessment.may_progress.to_f
33
+ json.june_progress assessment.june_progress.to_f
34
+ json.third_quarter_progress assessment.third_quarter_progress.to_f
35
+ json.july_progress assessment.july_progress.to_f
36
+ json.august_progress assessment.august_progress.to_f
37
+ json.september_progress assessment.september_progress.to_f
38
+ json.fourth_quarter_progress assessment.fourth_quarter_progress.to_f
39
+ json.october_progress assessment.october_progress.to_f
40
+ json.november_progress assessment.november_progress.to_f
41
+ json.december_progress assessment.december_progress.to_f
42
42
  # 差值 dif
43
- json.annual_dif assessment.annual.to_i - assessment.annual_progress.to_i
44
- json.first_quarter_dif assessment.first_quarter.to_i - assessment.first_quarter_progress.to_i
45
- json.january_dif assessment.january.to_i - assessment.january_progress.to_i
46
- json.february_dif assessment.february.to_i - assessment.february_progress.to_i
47
- json.march_dif assessment.march.to_i - assessment.may_progress.to_i
48
- json.second_quarter_dif assessment.second_quarter.to_i - assessment.second_quarter_progress.to_i
49
- json.april_dif assessment.april.to_i - assessment.april_progress.to_i
50
- json.may_dif assessment.may.to_i - assessment.may_progress.to_i
51
- json.june_dif assessment.june.to_i - assessment.june_progress.to_i
52
- json.third_quarter_dif assessment.third_quarter.to_i - assessment.third_quarter_progress.to_i
53
- json.july_dif assessment.july.to_i - assessment.july_progress.to_i
54
- json.august_dif assessment.august.to_i - assessment.august_progress.to_i
55
- json.september_dif assessment.september.to_i - assessment.september_progress.to_i
56
- json.fourth_quarter_dif assessment.fourth_quarter.to_i - assessment.fourth_quarter_progress.to_i
57
- json.october_dif assessment.october.to_i - assessment.october_progress.to_i
58
- json.november_dif assessment.november.to_i - assessment.november_progress.to_i
59
- json.december_dif assessment.december.to_i - assessment.december_progress.to_i
43
+ json.annual_dif assessment.annual.to_f - assessment.annual_progress.to_f
44
+ json.first_quarter_dif assessment.first_quarter.to_f - assessment.first_quarter_progress.to_f
45
+ json.january_dif assessment.january.to_f - assessment.january_progress.to_f
46
+ json.february_dif assessment.february.to_f - assessment.february_progress.to_f
47
+ json.march_dif assessment.march.to_f - assessment.may_progress.to_f
48
+ json.second_quarter_dif assessment.second_quarter.to_f - assessment.second_quarter_progress.to_f
49
+ json.april_dif assessment.april.to_f - assessment.april_progress.to_f
50
+ json.may_dif assessment.may.to_f - assessment.may_progress.to_f
51
+ json.june_dif assessment.june.to_f - assessment.june_progress.to_f
52
+ json.third_quarter_dif assessment.third_quarter.to_f - assessment.third_quarter_progress.to_f
53
+ json.july_dif assessment.july.to_f - assessment.july_progress.to_f
54
+ json.august_dif assessment.august.to_f - assessment.august_progress.to_f
55
+ json.september_dif assessment.september.to_f - assessment.september_progress.to_f
56
+ json.fourth_quarter_dif assessment.fourth_quarter.to_f - assessment.fourth_quarter_progress.to_f
57
+ json.october_dif assessment.october.to_f - assessment.october_progress.to_f
58
+ json.november_dif assessment.november.to_f - assessment.november_progress.to_f
59
+ json.december_dif assessment.december.to_f - assessment.december_progress.to_f
60
60
  # 完成率completion_rate
61
61
  json.annual_rate completion_rate(assessment.annual, assessment.annual_progress)
62
62
  json.first_quarter_rate completion_rate(assessment.first_quarter, assessment.first_quarter_progress)
@@ -160,7 +160,7 @@ json.data do
160
160
 
161
161
  end
162
162
 
163
- json.code 1
163
+ json.code 0
164
164
  json.count @assessments.count
165
165
 
166
166
 
data/app/views/educode_sales/businesses/new_follow_record.html.erb CHANGED
@@ -292,7 +292,7 @@
292
292
  return false;
293
293
  }
294
294
  if (data.field.o_business_deployment === ''){
295
- layer.msg('请选择部署类型');
295
+ layer.msg('请选择部署类型', {time: 2000, icon: 2, shade: 0.01});
296
296
  return false // 退出添加该条记录
297
297
  }
298
298
  }
data/db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb ADDED
@@ -0,0 +1,9 @@
1
+ class UpdateAssessmentMonthColumnToAssessmentSettings < ActiveRecord::Migration[5.2]
2
+ def change
3
+ arry = ["annual", "first_quarter", "second_quarter", "third_quarter", "fourth_quarter", "january", "february", "march", "april", "may", "july",
4
+ "june", "august", "september", "october", "november", "december"]
5
+ arry.each do |d|
6
+ change_column :educode_sales_assessments_settings, :"#{d}", :string
7
+ end
8
+ end
9
+ end
data/db/migrate/20220523101628_update_column_to_follow_ups.rb ADDED
@@ -0,0 +1,8 @@
1
+ class UpdateColumnToFollowUps < ActiveRecord::Migration[5.2]
2
+ def change
3
+ array = ["total_amount", "actual_amount", "profit_amount", "divide_amount"]
4
+ array.each do |d|
5
+ change_column :educode_sales_follow_ups, :"#{d}", :double
6
+ end
7
+ end
8
+ end
data/lib/educode_sales/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EducodeSales
2
- VERSION = '0.8.4'
2
+ VERSION = '0.8.5'
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.8.4
4
+ version: 0.8.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - anke1460
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-05-13 00:00:00.000000000 Z
11
+ date: 2022-05-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -121,6 +121,7 @@ files:
121
121
  - app/assets/javascripts/educode_sales/extent/select_input.js
122
122
  - app/assets/javascripts/educode_sales/extent/xm-select.js
123
123
  - app/assets/javascripts/educode_sales/layui.js
124
+ - app/assets/javascripts/educode_sales/table2excel.js
124
125
  - app/assets/stylesheets/educode_sales/app.css
125
126
  - app/assets/stylesheets/educode_sales/application.css
126
127
  - app/assets/stylesheets/educode_sales/error.css
@@ -458,6 +459,8 @@ files:
458
459
  - db/migrate/20220507091959_change_educode_sales_filter_column_length.rb
459
460
  - db/migrate/20220509073936_update_educode_sales_filters_filter_data.rb
460
461
  - db/migrate/20220512031715_add_column_o_business_deployment_to_follow_ups.rb
462
+ - db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb
463
+ - db/migrate/20220523101628_update_column_to_follow_ups.rb
461
464
  - lib/educode_sales.rb
462
465
  - lib/educode_sales/engine.rb
463
466
  - lib/educode_sales/version.rb