educode_sales 0.8.2 → 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 (29) 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 -9
  4. data/app/controllers/educode_sales/businesses_controller.rb +8 -0
  5. data/app/controllers/educode_sales/follow_ups_controller.rb +1 -1
  6. data/app/controllers/educode_sales/money_plans_controller.rb +0 -2
  7. data/app/helpers/educode_sales/application_helper.rb +1 -1
  8. data/app/models/educode_sales/filter.rb +0 -3
  9. data/app/models/educode_sales/follow_up.rb +8 -0
  10. data/app/models/educode_sales/staff.rb +1 -1
  11. data/app/views/educode_sales/assessments/_progress.html.erb +214 -146
  12. data/app/views/educode_sales/assessments/_setup.html.erb +247 -192
  13. data/app/views/educode_sales/assessments/edit.html.erb +53 -45
  14. data/app/views/educode_sales/assessments/index.html.erb +16 -4
  15. data/app/views/educode_sales/assessments/index.json.jbuilder +17 -17
  16. data/app/views/educode_sales/assessments/new.html.erb +113 -114
  17. data/app/views/educode_sales/assessments/progress.json.jbuilder +52 -52
  18. data/app/views/educode_sales/businesses/edit_follow_record.html.erb +13 -0
  19. data/app/views/educode_sales/businesses/index.html.erb +206 -187
  20. data/app/views/educode_sales/businesses/index.json.jbuilder +6 -0
  21. data/app/views/educode_sales/businesses/new_follow_record.html.erb +17 -3
  22. data/app/views/educode_sales/businesses/show_follow.html.erb +5 -0
  23. data/app/views/educode_sales/businesses/show_follow.json.jbuilder +7 -0
  24. data/app/views/educode_sales/businesses/show_follow_record.html.erb +15 -5
  25. data/db/migrate/20220512031715_add_column_o_business_deployment_to_follow_ups.rb +5 -0
  26. data/db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb +9 -0
  27. data/db/migrate/20220523101628_update_column_to_follow_ups.rb +8 -0
  28. data/lib/educode_sales/version.rb +1 -1
  29. metadata +6 -2
data/app/views/educode_sales/assessments/edit.html.erb CHANGED
@@ -10,18 +10,18 @@
10
10
  <div class="layui-inline">
11
11
  <label class="layui-form-label required">考核人员:</label>
12
12
  <label class="layui-form-label"><%= @username %></label>
13
- </div></div>
13
+ </div>
14
+ </div>
14
15
  <div class="layui-form-item" style="padding: 25px">
15
- <div class="layui-inline" >
16
+ <div class="layui-inline">
16
17
  <label class="layui-form-label required ">年度:</label>
17
18
  <label class="layui-form-label"><%= @year %></label>
18
- </div>
19
+ </div>
19
20
  <div class="layui-inline">
20
- <label class="layui-form-label">业务目标:</label>
21
+ <label class="layui-form-label">目标(万):</label>
21
22
  <div class="layui-input-inline">
22
- <input type="text" class="layui-input" disabled value="<%= @assessment.annual %>" name="annual" autocomplete="off" placeholder="自动计算" id="annual" onkeyup="sum()">
23
+ <input type="text" class="layui-input layui-disabled" style="color: #0C0C0C;border:1px solid #a6aebf;" disabled value="<%= @assessment.annual %>" name="annual" autocomplete="off" placeholder="自动计算" id="annual" onkeyup="sum()">
23
24
  </div>
24
- <div class="layui-input-inline">万</div>
25
25
  </div>
26
26
  </div>
27
27
  <div class="layui-form-item" style="padding: 25px">
@@ -30,7 +30,7 @@
30
30
  <div class="layui-input-inline">
31
31
  <label class="layui-form-label ">第一季度(万)</label>
32
32
  <div class="layui-input-block" style="width: 200px;">
33
- <input type="text" name="first_quarter" value="<%= @assessment.first_quarter %>" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter1" >
33
+ <input type="text" name="first_quarter" style="color: #0C0C0C;border:1px solid #a6aebf;"value="<%= @assessment.first_quarter %>" autocomplete="off" class="layui-input layui-disabled" placeholder="自动计算" disabled id="quarter1" >
34
34
  </div>
35
35
  </div>
36
36
 
@@ -57,7 +57,7 @@
57
57
  <div class="layui-input-inline">
58
58
  <label class="layui-form-label ">第二季度(万)</label>
59
59
  <div class="layui-input-block" style="width: 200px;">
60
- <input type="text" name="second_quarter" value="<%= @assessment.second_quarter %>" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter2">
60
+ <input type="text" name="second_quarter" style="color: #0C0C0C;border:1px solid #a6aebf;" value="<%= @assessment.second_quarter %>" autocomplete="off" class="layui-input layui-disabled" placeholder="自动计算" disabled id="quarter2">
61
61
  </div>
62
62
  </div>
63
63
  <div class="layui-input-inline">
@@ -83,7 +83,7 @@
83
83
  <div class="layui-input-inline">
84
84
  <label class="layui-form-label ">第三季度(万)</label>
85
85
  <div class="layui-input-block" style="width: 200px;">
86
- <input type="text" name="third_quarter" value="<%= @assessment.third_quarter %>" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter3">
86
+ <input type="text" name="third_quarter" style="color: #0C0C0C;border:1px solid #a6aebf;" value="<%= @assessment.third_quarter %>" autocomplete="off" class="layui-input layui-disabled" placeholder="自动计算" disabled id="quarter3">
87
87
  </div>
88
88
  </div>
89
89
  <div class="layui-input-inline">
@@ -109,7 +109,7 @@
109
109
  <div class="layui-input-inline">
110
110
  <label class="layui-form-label ">第四季度(万)</label>
111
111
  <div class="layui-input-block" style="width: 200px;">
112
- <input type="text" name="fourth_quarter" value="<%= @assessment.fourth_quarter %>" autocomplete="off" class="layui-input" placeholder="自动计算" disabled id="quarter4">
112
+ <input type="text" name="fourth_quarter" style="color: #0C0C0C;border:1px solid #a6aebf;" value="<%= @assessment.fourth_quarter %>" autocomplete="off" class="layui-input layui-disabled" placeholder="自动计算" disabled id="quarter4">
113
113
  </div>
114
114
  </div>
115
115
  <div class="layui-input-inline">
@@ -161,37 +161,40 @@
161
161
 
162
162
 
163
163
  // 自定义校验数据
164
- form.verify({
165
- data: function (value,item){
166
- if (parseFloat(value) < 0 ){
167
- console.log(value);
168
- return "数据不能小于零"
169
- }
170
- }
171
- })
172
-
173
- form.on('submit(edit_task_assessment)', function (data) {
174
- console.log("okokokookokokokokook");
175
- console.log(data);
176
- data.field.id = <%= @assessment.id %>; //
177
- request.authPut("missions/assessments/"+<%= @assessment.id %> , data.field, function (res) {
178
- if (res.success == false) {
179
- layer.alert(res.msg)
180
- } else {
181
- layer.closeAll();
182
- table.reload("assessments");
183
- table.reload("progressTable");
184
- }
185
- })
186
- return false;
187
- });
164
+ // form.verify({
165
+ // data: function (value,item){
166
+ // if (parseFloat(value) < 0 ){
167
+ // console.log(value);
168
+ // return "数据不能小于零"
169
+ // }else if (parseFloat(value) > 100000000){
170
+ // console.log(value);
171
+ // return "数据不能大于一亿"
172
+ // }
173
+ // }
174
+ // })
175
+
176
+ <!-- form.on('submit(edit_task_assessment)', function (data) {-->
177
+ <!-- console.log("okokokookokokokokook");-->
178
+ <!-- console.log(data);-->
179
+ <!-- data.field.id = <%#= @assessment.id %>; -->
180
+ <!-- request.authPut("missions/assessments/"+<%#= @assessment.id %> , data.field, function (res) {-->
181
+ <!-- if (res.success == false) {-->
182
+ <!-- layer.alert(res.msg)-->
183
+ <!-- } else {-->
184
+ <!-- layer.closeAll();-->
185
+ <!-- table.reload("assessments");-->
186
+ <!-- table.reload("progressTable");-->
187
+ <!-- }-->
188
+ <!-- })-->
189
+ <!-- return false;-->
190
+ <!-- });-->
188
191
 
189
192
  // que xiao
190
- form.on('submit(cancel_edit_assessment)', function (data) {
191
- console.log(data)
192
- layer.closeAll();
193
- return false;
194
- });
193
+ // form.on('submit(cancel_edit_assessment)', function (data) {
194
+ // console.log(data)
195
+ // layer.closeAll();
196
+ // return false;
197
+ // });
195
198
  });
196
199
  </script>
197
200
 
@@ -221,11 +224,16 @@
221
224
  if ( month10 === ""){ month10 = 0 ;}
222
225
  if ( month11 === ""){ month11 = 0 ;}
223
226
  if ( month12 === ""){ month12 = 0 ;}
224
- document.getElementById('quarter1').value = parseInt(month1)+parseInt(month2)+parseInt(month3)
225
- document.getElementById('quarter2').value = parseInt(month4)+parseInt(month5)+parseInt(month6)
226
- document.getElementById('quarter3').value = parseInt(month7)+parseInt(month8)+parseInt(month9)
227
- document.getElementById('quarter4').value = parseInt(month10)+parseInt(month11)+parseInt(month12)
228
- document.getElementById('annual').value =parseInt(month1)+parseInt(month2)+
229
- parseInt(month3)+parseInt(month4)+parseInt(month5)+parseInt(month6)+parseInt(month7)+parseInt(month8)+parseInt(month9)+parseInt(month10)+parseInt(month11)+parseInt(month12)
227
+ var quarter1 = parseFloat(month1)+parseFloat(month2)+parseFloat(month3)
228
+ var quarter2 = parseFloat(month4)+parseFloat(month5)+parseFloat(month6)
229
+ var quarter3 = parseFloat(month7)+parseFloat(month8)+parseFloat(month9)
230
+ var quarter4 = parseFloat(month10)+parseFloat(month11)+parseFloat(month12)
231
+ var annual = parseFloat(month1)+parseFloat(month2)+parseFloat(month3)+parseFloat(month4)+
232
+ parseFloat(month5)+parseFloat(month6)+parseFloat(month7)+parseFloat(month8)+parseFloat(month9)+parseFloat(month10)+parseFloat(month11)+parseFloat(month12)
233
+ document.getElementById('quarter1').value = quarter1.toFixed(2)
234
+ document.getElementById('quarter2').value = quarter2.toFixed(2)
235
+ document.getElementById('quarter3').value = quarter3.toFixed(2)
236
+ document.getElementById('quarter4').value = quarter4.toFixed(2)
237
+ document.getElementById('annual').value = annual.toFixed(2)
230
238
  }
231
239
  </script>
data/app/views/educode_sales/assessments/index.html.erb CHANGED
@@ -10,14 +10,26 @@
10
10
  <div class="layuimini-main min-height-table"></div>
11
11
  <div class="layui-tab-content">
12
12
  <%if can?(:show_result, EducodeSales::AssessmentsSetting) %>
13
- <div class="layui-tab-item layui-show">
13
+ <div class="layui-tab-item layui-show">
14
14
  <%= render 'progress' %>
15
15
  </div>
16
+ <!-- else 语句没有执行(可能是写法错了 先解决问题 以后在重写)-->
17
+ <%# else %>
18
+ <!-- <script>-->
19
+ <!-- $("#is_layui_show").addClass('layui-show');-->
20
+ <!-- </script>-->
16
21
  <%end %>
17
22
  <% if can?(:show, EducodeSales::AssessmentsSetting)%>
18
- <div class="layui-tab-item " >
19
- <%= render 'setup' %>
20
- </div>
23
+ <%if can?(:show_result, EducodeSales::AssessmentsSetting) %>
24
+ <div class="layui-tab-item " id="is_layui_show" >
25
+ <%= render 'setup' %>
26
+ </div>
27
+ <%end %>
28
+ <%unless can?(:show_result, EducodeSales::AssessmentsSetting) %>
29
+ <div class="layui-tab-item layui-show" >
30
+ <%= render 'setup' %>
31
+ </div>
32
+ <%end %>
21
33
  <%end %>
22
34
  </div>
23
35
  </div>
data/app/views/educode_sales/assessments/index.json.jbuilder CHANGED
@@ -2,23 +2,23 @@ json.data do
2
2
  json.array! @assessments do |d|
3
3
  json.id d.id
4
4
  json.username d.staff_id.present? ? d.staff.user.real_name : ""
5
- json.annual d.annual
6
- json.first_quarter d.first_quarter
7
- json.january d.january
8
- json.february d.february
9
- json.march d.march
10
- json.second_quarter d.second_quarter
11
- json.april d.april
12
- json.may d.may
13
- json.june d.june
14
- json.third_quarter d.third_quarter
15
- json.july d.july
16
- json.august d.august
17
- json.september d.september
18
- json.fourth_quarter d.fourth_quarter
19
- json.october d.october
20
- json.november d.november
21
- json.december d.december
5
+ json.annual d.annual.to_f.round(2)
6
+ json.first_quarter d.first_quarter.to_f.round(2)
7
+ json.january d.january.to_f.round(2)
8
+ json.february d.february.to_f.round(2)
9
+ json.march d.march.to_f.round(2)
10
+ json.second_quarter d.second_quarter.to_f.round(2)
11
+ json.april d.april.to_f.round(2)
12
+ json.may d.may.to_f.round(2)
13
+ json.june d.june.to_f.round(2)
14
+ json.third_quarter d.third_quarter.to_f.round(2)
15
+ json.july d.july.to_f.round(2)
16
+ json.august d.august.to_f.round(2)
17
+ json.september d.september.to_f.round(2)
18
+ json.fourth_quarter d.fourth_quarter.to_f.round(2)
19
+ json.october d.october.to_f.round(2)
20
+ json.november d.november.to_f.round(2)
21
+ json.december d.december.to_f.round(2)
22
22
  end
23
23
  end
24
24
 
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