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
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="data|number" 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,9 +178,9 @@
185
178
  if (res.success == false) {
186
179
  layer.alert(res.msg)
187
180
  } else {
188
- console.log("ok");
189
181
  layer.closeAll();
190
- table.reload("assessments")
182
+ table.reload("assessments");
183
+ table.reload("progressTable");
191
184
  }
192
185
  })
193
186
  return false;
data/app/views/educode_sales/assessments/index.html.erb CHANGED
@@ -41,9 +41,8 @@
41
41
  $("#setup_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
42
42
  break;
43
43
  }
44
-
45
-
46
44
  });
45
+
47
46
  // 重置按钮写在index下无效！！！
48
47
  // 监控重置
49
48
  form.on('submit(reset_assessments_search)', function (data) {
data/app/views/educode_sales/assessments/index.json.jbuilder CHANGED
@@ -23,4 +23,4 @@ json.data do
23
23
  end
24
24
 
25
25
  json.code 0
26
- json.count 0
26
+ json.count @assessments.count