educode_sales 0.8.2 → 0.8.5

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

@@ -74,6 +74,12 @@
         <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, nil ), class: 'required' %>
+      </div>
+    </div>
     <br class="service_show layui-hide">
     <div class="layui-inline">
       <label class="layui-form-label">总额(万)</label>
@@ -168,10 +174,11 @@
             xmSelect = layui.xmSelect,
             $ = layui.$;
 
-        flag =
-        <%=@last_follow_up&.clazz&.name == @o_name %>
+        flag = <%=@last_follow_up&.clazz&.name == @o_name %>
         if (flag) {
+            console.log(flag)
             $(".service_show").removeClass('layui-hide')
+            $(".deployment_type").removeClass('layui-hide')
         }
 
         form.on('select(clazz_id)', function (data) {
@@ -179,8 +186,9 @@
             const value = data.value;
             if (value == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
                 $(".service_show").removeClass('layui-hide')
+                $(".deployment_type").removeClass('layui-hide')
             } else {
-                console.log(data.value)
+                $(".deployment_type").addClass('layui-hide')
                 $(".service_show").addClass('layui-hide')
             }
         })
@@ -283,6 +291,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 = [];
@@ -292,6 +304,8 @@
             data.field.assign_follow_up = assign_follow;
             data.field.business_id = "<%= @business.id %>";
             data.field.place_id = place_list.getValue('valueStr');
+            console.log("start")
+            console.log(data.field)
             request.authPost("missions/follow_ups", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)

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

@@ -178,6 +178,11 @@
                     width: 200,
                     title: '服务期',
                 },
+                {
+                    field: 'o_business_deployment',
+                    width: 100,
+                    title: '部署类型',
+                },
                 {
                     field: 'total_amount',
                     width: 100,

data/app/views/educode_sales/businesses/show_follow.json.jbuilder

@@ -10,6 +10,13 @@ json.data do
     json.bidded_date d.bidded_date&.to_s(:date)
     json.signed_date d.signed_date&.to_s(:date)
     json.service_end_time (d.service_start_time.present? && d.service_end_time.present?) ? (d.service_start_time&.to_s + "-" + d.service_end_time&.to_s) : ''
+    if d.o_business_deployment.present?
+      EducodeSales::FollowUp::BUSINESS_DEPLOYMENT.each do |m|
+        if d.o_business_deployment == m[1]
+          json.o_business_deployment m[0]
+        end
+      end
+    end
     json.total_amount d.total_amount
     json.actual_amount d.actual_amount
     json.divide_amount d.divide_amount ? d.divide_amount : ""

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

@@ -53,12 +53,22 @@
       </div>
     </div>
     <br>
-    <div class="layui-inline">
-      <label class="layui-form-label">服务期：</label>
-      <div class="layui-input-inline">
-        <%= @follow_up.service_start_time.to_s + "-" + @follow_up.service_end_time.to_s %>
+    <%if @follow_up.clazz_id == EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id %>
+      <div class="layui-inline">
+        <label class="layui-form-label">服务期：</label>
+        <div class="layui-input-inline">
+          <%= @follow_up.service_start_time.to_s + "-" + @follow_up.service_end_time.to_s %>
+        </div>
       </div>
-    </div>
+    <%end %>
+    <%if @follow_up.clazz_id == EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id %>
+      <div class="layui-inline">
+        <label class="layui-form-label">部署类型：</label>
+        <div class="layui-input-inline">
+          <%=@show_follow_recored_deployment%>
+        </div>
+      </div>
+    <% end %>
     <br>
     <div class="layui-inline">
       <label class="layui-form-label">总额：</label>

data/db/migrate/20220512031715_add_column_o_business_deployment_to_follow_ups.rb

@@ -0,0 +1,5 @@
+class AddColumnOBusinessDeploymentToFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :o_business_deployment, :integer
+  end
+end

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.2'
+  VERSION = '0.8.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.5
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-05-26 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
@@ -457,6 +458,9 @@ files:
 - db/migrate/20220507020149_create_filter.rb
 - 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