educode_sales 0.8.4 → 0.8.7

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 (25) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/educode_sales/table2excel.js +2759 -0
  3. data/app/assets/stylesheets/educode_sales/layuimini.css +1 -1
  4. data/app/controllers/educode_sales/assessments_controller.rb +38 -17
  5. data/app/controllers/educode_sales/businesses_controller.rb +3 -3
  6. data/app/helpers/educode_sales/application_helper.rb +1 -1
  7. data/app/models/educode_sales/business.rb +0 -5
  8. data/app/models/educode_sales/staff.rb +1 -1
  9. data/app/views/educode_sales/assessments/_progress.html.erb +214 -146
  10. data/app/views/educode_sales/assessments/_setup.html.erb +108 -34
  11. data/app/views/educode_sales/assessments/edit.html.erb +53 -45
  12. data/app/views/educode_sales/assessments/index.html.erb +17 -5
  13. data/app/views/educode_sales/assessments/index.json.jbuilder +17 -17
  14. data/app/views/educode_sales/assessments/new.html.erb +113 -114
  15. data/app/views/educode_sales/assessments/progress.json.jbuilder +52 -52
  16. data/app/views/educode_sales/businesses/index.html.erb +6 -9
  17. data/app/views/educode_sales/businesses/new.html.erb +1 -4
  18. data/app/views/educode_sales/businesses/new_follow_record.html.erb +4 -4
  19. data/app/views/educode_sales/businesses/show_follow_record.html.erb +2 -1
  20. data/app/views/educode_sales/customers/edit_follow_record.html.erb +0 -2
  21. data/app/views/educode_sales/places/index.html.erb +1 -1
  22. data/db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb +9 -0
  23. data/db/migrate/20220523101628_update_column_to_follow_ups.rb +8 -0
  24. data/lib/educode_sales/version.rb +1 -1
  25. metadata +5 -2
@@ -52,6 +52,7 @@
52
52
  <%= @follow_up.reception_at.to_s %>
53
53
  </div>
54
54
  </div>
55
+
55
56
  <br>
56
57
  <%if @follow_up.clazz_id == EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id %>
57
58
  <div class="layui-inline">
@@ -70,6 +71,7 @@
70
71
  </div>
71
72
  <% end %>
72
73
  <br>
74
+
73
75
  <div class="layui-inline">
74
76
  <label class="layui-form-label">总额:</label>
75
77
  <div class="layui-input-inline">
@@ -137,7 +139,6 @@
137
139
  </form>
138
140
  <div style=" text-align:center;">
139
141
  <div class="layui-btn-group">
140
-
141
142
  <%if @pre_id != 0 %>
142
143
  <button type="button" class="layui-btn" onclick="pre_follow()">上一条</button>
143
144
  <%else %>
@@ -41,8 +41,6 @@
41
41
  parent.table.reload('unfinish_table')
42
42
  }
43
43
  })
44
-
45
-
46
44
  return false;
47
45
  });
48
46
 
@@ -241,4 +241,4 @@
241
241
  .layui-table-tool-temp{
242
242
  padding-right: 0px; !important;
243
243
  }
244
- </style>
244
+ </style>
@@ -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
@@ -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
@@ -1,3 +1,3 @@
1
1
  module EducodeSales
2
- VERSION = '0.8.4'
2
+ VERSION = '0.8.7'
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.7
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-06-01 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