educode_sales 0.9.81 → 0.9.82

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/educode_sales/businesses/show_follow.html.erb +24 -23
  3. data/app/views/layouts/educode_sales/login.html.erb +1 -1
  4. data/lib/educode_sales/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2a02f50d9c3e88bb55ba6352183871b6e80eaabd42e2f32640043cc140255560
4
- data.tar.gz: 6fd1ff6c5df5d5b53c72399e370c0c15bb37da1fae1e8a6f1bd626da81d8ddf1
3
+ metadata.gz: a5c4108bbab976a92d5f43a438e6d39e16331c222a0046a45745e6730e751a87
4
+ data.tar.gz: 7e13154cfed9228addd477ffd99ae03ba8d0defcba553f586078ad440035f7d8
5
5
  SHA512:
6
- metadata.gz: a41df2eb05cc02587e6c4d4fa800b5e1048f01f3e1c53498c2f6dc61d1dbd6bcf13188eeab9d0e14d0b0da4f52f553b593ad1f4394613c416f4fa89caec3c9d5
7
- data.tar.gz: 04a3399b18c8cb0b62c016591be00a668996b5c4a62434ab913d511564ea1cb7666e2af1a2197c9fd8dcaef85e7292a5c6c2d473105f379d8868fb8d0abaabc5
6
+ metadata.gz: 40591e809b707f2c944e7662373e3d3160eecd854407aa900fc520c2a498a681c1e75e5c012ecab902debaefa41bcb636bdcb9a5717100fcfb5ba25bf3cc4737
7
+ data.tar.gz: e7c0c20ceae1b0fbadd8547cd6cf209e762bbe1b451d8659c20ff59b0f1244b94861f066134e4e7cf71fbe213f5e523cb64d5b3a52acdd99bd79d03e7d245de4
data/app/views/educode_sales/businesses/show_follow.html.erb CHANGED
@@ -3,21 +3,21 @@
3
3
  <span class="table-label">跟进记录</span>
4
4
  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="time_line"> 时间线视图>></button>
5
5
  <%unless !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
6
- <% if can? :add_follow, EducodeSales::Business %>
7
- <% if @current_admin.is_admin %>
8
- <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
9
- <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
10
- <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
6
+ <% if can? :add_follow, EducodeSales::Business %>
7
+ <% if @current_admin.is_admin %>
8
+ <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
9
+ <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
10
+ <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
11
+ <% end %>
11
12
  <% end %>
12
13
  <% end %>
13
- <% end %>
14
14
  <%if !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
15
- <% if @current_admin.is_admin %>
15
+ <% if @current_admin.is_admin %>
16
16
  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right add_follow" lay-event="add"> 添加跟进记录</button>
17
17
  <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
18
18
  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right add_follow" lay-event="add"> 添加跟进记录</button>
19
19
  <% end %>
20
- <% end %>
20
+ <% end %>
21
21
  <span class="table-label pull-right" style="padding-right: 20px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
22
22
  </div>
23
23
  </script>
@@ -25,23 +25,23 @@
25
25
  <div class="z-index">
26
26
  <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
27
27
  </div>
28
- <table class="layui-hide" id="unfinish_table" lay-filter="unfinish_table" style="min-height: 300px;"></table>
28
+ <table class="layui-hide" id="unfinish_table" lay-filter="unfinish_table" style="min-height: 300px;"></table>
29
29
  </div>
30
30
  <script type="text/html" id="currentTableBar_follow">
31
31
  <% if can? :follow, EducodeSales::Business %>
32
- <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
32
+ <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
33
33
  <% end %>
34
34
  {{# if(d.is_latest && d.flag){ }}
35
35
 
36
36
  <%unless !can?(:update_follow, EducodeSales::Business) && can?(:self_edit_follow, EducodeSales::Business)%>
37
- <% if can? :update_follow, EducodeSales::Business %>
38
- <% if @current_admin.is_admin %>
39
- <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
40
- <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
41
- <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
37
+ <% if can? :update_follow, EducodeSales::Business %>
38
+ <% if @current_admin.is_admin %>
39
+ <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
40
+ <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
41
+ <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
42
+ <% end %>
42
43
  <% end %>
43
44
  <% end %>
44
- <% end %>
45
45
 
46
46
  <%if !can?(:update_follow, EducodeSales::Business) && can?(:self_edit_follow, EducodeSales::Business)%>
47
47
  {{# if(d.self_flag){ }}
@@ -53,16 +53,17 @@
53
53
  {{# } }}
54
54
  <% end %>
55
55
 
56
- <%unless !can?(:destroy_follow, EducodeSales::Business) && can?(:self_delete_follow, EducodeSales::Business)%>
57
- <% if can? :destroy_follow, EducodeSales::Business %>
58
- <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
59
- <% end %>
60
- <% end %>
61
- <%if !can?(:destroy_follow, EducodeSales::Business) && can?(:self_delete_follow, EducodeSales::Business)%>
56
+ <% if can?(:destroy_follow, EducodeSales::Business) && !can?(:self_delete_follow, EducodeSales::Business) || @current_admin.is_admin %>
57
+ <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
58
+ <% elsif !can?(:destroy_follow, EducodeSales::Business) && can?(:self_delete_follow, EducodeSales::Business)%>
62
59
  {{# if(d.self_flag){ }}
63
60
  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
64
61
  {{# } }}
65
- <% end %>
62
+ <% end %>
63
+ {{# } else if (d.is_latest) { }}
64
+ <% if @current_admin.is_admin %>
65
+ <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
66
+ <% end %>
66
67
  {{# } }}
67
68
  </script>
68
69
 
data/app/views/layouts/educode_sales/login.html.erb CHANGED
@@ -16,5 +16,5 @@
16
16
  <%= yield %>
17
17
  </div>
18
18
  <div class="footer">
19
- ©版权所有 <%= Time.now.year %> 头歌<span class="padding-5">|</span><a target="_blank" href="http://www.educoder.net">头歌官方网站</a>
19
+ ©版权所有 <%= Time.now.year %> 头歌<span class="padding-5">|</span><a target="_blank" href="http://www.educoder.net">头歌官网</a>
20
20
  </div>
data/lib/educode_sales/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EducodeSales
2
- VERSION = '0.9.81'
2
+ VERSION = '0.9.82'
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.9.81
4
+ version: 0.9.82
5
5
  platform: ruby
6
6
  authors:
7
7
  - anke1460
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-05-08 00:00:00.000000000 Z
11
+ date: 2023-05-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails