educode_sales 0.1.8 → 0.2.0
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.
- checksums.yaml +4 -4
- data/app/views/educode_sales/operation_plans/edit_month.html.erb +4 -3
- data/app/views/educode_sales/operation_plans/edit_week.html.erb +4 -3
- data/app/views/educode_sales/operation_plans/new_month.html.erb +4 -3
- data/app/views/educode_sales/operation_plans/new_week.html.erb +4 -3
- data/app/views/educode_sales/sales/operations.json.jbuilder +1 -1
- data/app/views/educode_sales/teachers/index.html.erb +1 -1
- data/lib/educode_sales/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 32ccbb45cc443858202f0e53c3f30a5545100930
|
|
4
|
+
data.tar.gz: 1fa4454eb41cf3c2a554859251d5484e487aa9ec
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0f4bdf23a11199467f92acb3dd4f2eac20c2500130bc5838eb69bf85984f42b2399f5d6854bf8afb20e7b85fedea6e1557e8b4cc8a0191fec627faa75a4cf8e8
|
|
7
|
+
data.tar.gz: bc4ae21970c1e12ab3ad7ec78b053fb1a90d431a8a6cbe0022e53f36befc6a25ea7e6fbcc5ace7b1c4f43761f8f3936e9519448b295cb0a4fe3b4d38eacc4e4d
|
|
@@ -31,9 +31,10 @@
|
|
|
31
31
|
<%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
|
|
32
32
|
</div>
|
|
33
33
|
</div>
|
|
34
|
-
<div class="layui-
|
|
35
|
-
<
|
|
36
|
-
|
|
34
|
+
<div class="layui-form-item m-t-20">
|
|
35
|
+
<div class="layui-input-block">
|
|
36
|
+
<button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交</button>
|
|
37
|
+
</div>
|
|
37
38
|
</div>
|
|
38
39
|
</div>
|
|
39
40
|
</form>
|
|
@@ -39,9 +39,10 @@
|
|
|
39
39
|
<%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
|
|
40
40
|
</div>
|
|
41
41
|
</div>
|
|
42
|
-
<div class="layui-
|
|
43
|
-
<
|
|
44
|
-
|
|
42
|
+
<div class="layui-form-item m-t-20">
|
|
43
|
+
<div class="layui-input-block">
|
|
44
|
+
<button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交</button>
|
|
45
|
+
</div>
|
|
45
46
|
</div>
|
|
46
47
|
</div>
|
|
47
48
|
</form>
|
|
@@ -39,9 +39,10 @@
|
|
|
39
39
|
</select>
|
|
40
40
|
</div>
|
|
41
41
|
</div>
|
|
42
|
-
<div class="layui-
|
|
43
|
-
<
|
|
44
|
-
|
|
42
|
+
<div class="layui-form-item m-t-20">
|
|
43
|
+
<div class="layui-input-block">
|
|
44
|
+
<button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_month_plan">提交</button>
|
|
45
|
+
</div>
|
|
45
46
|
</div>
|
|
46
47
|
</div>
|
|
47
48
|
</div>
|
|
@@ -46,9 +46,10 @@
|
|
|
46
46
|
</select>
|
|
47
47
|
</div>
|
|
48
48
|
</div>
|
|
49
|
-
<div class="layui-
|
|
50
|
-
<
|
|
51
|
-
|
|
49
|
+
<div class="layui-form-item m-t-20">
|
|
50
|
+
<div class="layui-input-block">
|
|
51
|
+
<button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_week_plan">提交</button>
|
|
52
|
+
</div>
|
|
52
53
|
</div>
|
|
53
54
|
</div>
|
|
54
55
|
</div>
|
|
@@ -6,7 +6,7 @@ json.data do
|
|
|
6
6
|
json.job_type EducodeSales::Common.job_type_name[d.job_type]
|
|
7
7
|
json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
|
|
8
8
|
json.departments EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(educode_sales_follow_ups.staff_id) AS count")[0]&.send('count') || 0
|
|
9
|
-
json.schools EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").
|
|
9
|
+
json.schools EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count']
|
|
10
10
|
end
|
|
11
11
|
end
|
|
12
12
|
|