educode_sales 0.8.3 → 0.8.6

data/app/views/educode_sales/businesses/new_follow_record.html.erb

@@ -74,12 +74,14 @@
         <input type="text" class="layui-input required" id="service_time" name="service_time" placeholder=" - " autocomplete="off" value="<%= (@last_follow_up&.service_start_time.present? && @last_follow_up&.service_end_time.present?) ? (@last_follow_up.service_start_time.to_s + " - " + @last_follow_up.service_end_time.to_s) : '' %>">
       </div>
     </div>
+
     <div class="layui-inline deployment_type layui-hide">
       <label class="layui-form-label required">部署类型</label>
       <div class="layui-input-inline">
         <%= select_tag "o_business_deployment", options_for_select(@deployment_type, @last_follow_up&.o_business_deployment), class: 'required' %>
       </div>
     </div>
+
     <br class="service_show layui-hide">
     <div class="layui-inline">
       <label class="layui-form-label">总额(万)</label>
@@ -291,6 +293,10 @@
                     layer.msg('请选择服务期', {time: 2000, icon: 2, shade: 0.01});
                     return false;
                 }
+                if (data.field.o_business_deployment === ''){
+                    layer.msg('请选择部署类型', {time: 2000, icon: 2, shade: 0.01});
+                    return false // 退出添加该条记录
+                }
             }
             $(".submit-btn").addClass("layui-hide");
             var assign_follow = [];
@@ -313,8 +319,6 @@
                     parent.table.reload('teachers_table')
                 }
             })
-
-
             return false;
         });
 

data/app/views/educode_sales/businesses/show_follow_record.html.erb

@@ -52,6 +52,7 @@
         <%= @follow_up.reception_at.to_s %>
       </div>
     </div>
+
     <br>
     <%if @follow_up.clazz_id == EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id %>
       <div class="layui-inline">
@@ -70,6 +71,7 @@
       </div>
     <% end %>
     <br>
+
     <div class="layui-inline">
       <label class="layui-form-label">总额：</label>
       <div class="layui-input-inline">
@@ -137,7 +139,6 @@
 </form>
 <div  style=" text-align:center;">
   <div class="layui-btn-group">
-
     <%if @pre_id != 0 %>
     <button type="button" class="layui-btn" onclick="pre_follow()">上一条</button>
     <%else %>

data/app/views/educode_sales/customers/edit_follow_record.html.erb

@@ -41,8 +41,6 @@
                     parent.table.reload('unfinish_table')
                 }
             })
-
-
             return false;
         });
 

data/app/views/educode_sales/places/index.html.erb

@@ -241,4 +241,4 @@
     .layui-table-tool-temp{
         padding-right: 0px; !important;
     }
-</style>
+</style>

data/db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb

@@ -0,0 +1,9 @@
+class UpdateAssessmentMonthColumnToAssessmentSettings < ActiveRecord::Migration[5.2]
+  def change
+    arry = ["annual", "first_quarter", "second_quarter", "third_quarter", "fourth_quarter", "january", "february", "march", "april", "may", "july",
+            "june", "august", "september", "october", "november", "december"]
+    arry.each do |d|
+    change_column :educode_sales_assessments_settings, :"#{d}", :string
+    end
+  end
+end

data/db/migrate/20220523101628_update_column_to_follow_ups.rb

@@ -0,0 +1,8 @@
+class UpdateColumnToFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    array = ["total_amount", "actual_amount", "profit_amount", "divide_amount"]
+    array.each do |d|
+      change_column :educode_sales_follow_ups, :"#{d}", :double
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.8.3'
+  VERSION = '0.8.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.6
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -121,6 +121,7 @@ files:
 - app/assets/javascripts/educode_sales/extent/select_input.js
 - app/assets/javascripts/educode_sales/extent/xm-select.js
 - app/assets/javascripts/educode_sales/layui.js
+- app/assets/javascripts/educode_sales/table2excel.js
 - app/assets/stylesheets/educode_sales/app.css
 - app/assets/stylesheets/educode_sales/application.css
 - app/assets/stylesheets/educode_sales/error.css
@@ -458,6 +459,8 @@ files:
 - db/migrate/20220507091959_change_educode_sales_filter_column_length.rb
 - db/migrate/20220509073936_update_educode_sales_filters_filter_data.rb
 - db/migrate/20220512031715_add_column_o_business_deployment_to_follow_ups.rb
+- db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb
+- db/migrate/20220523101628_update_column_to_follow_ups.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb