educode_sales 0.9.31 → 0.9.33

data/app/assets/stylesheets/educode_sales/Chart.min.css

@@ -0,0 +1 @@
+@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}

data/app/controllers/educode_sales/businesses_controller.rb

@@ -233,6 +233,12 @@ module EducodeSales
             end
           end
 
+          # 商机变化
+          if params[:q][:clazz_changes].present?
+            clazz_changes = EducodeSales::BusinessClazzChange.clazz_changes_value[params[:q][:clazz_changes].to_s]
+            @businesses = @businesses.joins("JOIN educode_sales_business_clazz_changes ON educode_sales_business_clazz_changes.business_id = educode_sales_businesses.id").where("educode_sales_business_clazz_changes.clazz_changed in (?)", clazz_changes)
+          end
+
           if params[:sort].present? && params[:sort][:field]
             if params[:sort][:field] == "service_end_time"
               @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
@@ -243,9 +249,10 @@ module EducodeSales
             @businesses = @businesses.order("educode_sales_businesses.created_at desc")
           end
 
-          @business_count = @businesses.count
+          @business_count = @businesses.distinct.count
           # mysql -select
           @businesses = @businesses.select("
+            distinct
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.budget_amount,

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -84,7 +84,14 @@ module EducodeSales
 
       follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) if follow_up.actual_amount
       last_follow_up = @business.last_follow_up
-      follow_up.clazz_changed = last_follow_up.clazz_id != follow_up.clazz_id if last_follow_up.present?
+      if last_follow_up.present?
+        follow_up.clazz_changed = last_follow_up.clazz_id != follow_up.clazz_id
+        if follow_up.clazz_changed 
+          clazz_changes = "#{last_follow_up.clazz.extras.split('_')[0]}-#{follow_up.clazz.extras.split('_')[0]}"
+          business_clazz_change = @business.business_clazz_changes.find_or_initialize_by clazz_changed: clazz_changes
+          business_clazz_change.save unless business_clazz_change.persisted?
+        end
+      end
       if follow_up.save
         if last_follow_up.present?
           last_follow_up.key_person.each do |d|

data/app/models/educode_sales/business.rb

@@ -9,11 +9,11 @@ module EducodeSales
 
     has_many :sale_plans
     has_many :follow_ups
+    has_many :business_clazz_changes
 
     #关联关注
     has_many :users,:class_name => 'EducodeSales::BusinessRelationShip',foreign_key: 'business_id',:dependent => :destroy
 
-
     #每次查询时 默认的查询条件
     default_scope  -> {where(deleted_at: nil)}
 
@@ -43,4 +43,5 @@ module EducodeSales
       }[type]
     end
   end
+
 end

data/app/models/educode_sales/business_clazz_change.rb

@@ -0,0 +1,21 @@
+module EducodeSales
+  class BusinessClazzChange < ApplicationRecord
+    belongs_to :business
+    validates :clazz_changed, uniqueness: { message: '已存在' }
+
+
+
+    def self.clazz_changes_value
+      {
+        '1' => ['a-x', 'b-x', 'c-x'],
+        '2' => ['b-a', 'c-a', 'd-a'],
+        '3' => ['a-x'],
+        '4' => ['a-x', 'b-x'],
+        '5' => ['a-x', 'b-x', 'c-x'],
+        '6' => ['b-a'],
+        '7' => ['b-a', 'c-a'],
+        '8' => ['b-a', 'c-a', 'd-a']
+      }
+    end
+  end
+end

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

@@ -33,6 +33,22 @@
                   <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true } %>
                 </div>
               </div>
+              <div class="layui-inline">
+                <label class="layui-form-label">商机变化</label>
+                <div class="layui-input-inline">
+                  <select name="clazz_changes">
+                    <option value=""></option>
+                    <option value="1">商机降级</option>
+                    <option value="2">商机晋级</option>
+                    <option value="3">商机降级 A-X</option>
+                    <option value="4">商机降级 AB-X</option>
+                    <option value="5">商机降级 ABC-X</option>
+                    <option value="6">商机晋级 B-A</option>
+                    <option value="7">商机晋级 BC-A</option>
+                    <option value="8">商机晋级 BCD-A</option>
+                  </select>
+                </div>
+              </div>
               <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
                 <label class="layui-form-label">项目类型</label>
                 <div class="layui-input-inline">

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -234,8 +234,6 @@
 </div>
 
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.css">
-<script src="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.js"></script>
   <script>
     layui.use(['form', 'jquery', 'request', 'element'], function () {
       var $ = layui.jquery,

data/app/views/layouts/educode_sales/application.html.erb

@@ -9,9 +9,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
   <%= stylesheet_link_tag "educode_sales/application", media: "all" %>
   <%= javascript_include_tag "educode_sales/application" %>
-  <script src="https://cdn.jsdelivr.net/npm/cxselect@1.4.0/js/jquery.cxselect.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/cxselect@1.4.0/js/jquery.cxselect.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.js"></script>
 </head>
 <body class="" id="body">
 <div class="layui-layout layui-layout-admin " >

data/db/migrate/20230117144025_create_educode_sales_business_clazz_changes.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesBusinessClazzChanges < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_business_clazz_changes do |t|
+      t.references :business
+      t.string :clazz_changed
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.31'
+  VERSION = '0.9.33'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.31
+  version: 0.9.33
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-15 00:00:00.000000000 Z
+date: 2023-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,12 +115,17 @@ files:
 - app/assets/images/educode_sales/回收站.png
 - app/assets/images/educode_sales/客户管理.png
 - app/assets/javascripts/educode_sales/application.js
+- app/assets/javascripts/educode_sales/extent/Chart.min.js
+- app/assets/javascripts/educode_sales/extent/jquery.cxselect.js
+- app/assets/javascripts/educode_sales/extent/jquery.cxselect.min.js
+- app/assets/javascripts/educode_sales/extent/jquery.js
 - app/assets/javascripts/educode_sales/extent/miniPage.js
 - app/assets/javascripts/educode_sales/extent/request.js
 - 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/Chart.min.css
 - app/assets/stylesheets/educode_sales/app.css
 - app/assets/stylesheets/educode_sales/application.css
 - app/assets/stylesheets/educode_sales/error.css
@@ -186,6 +191,7 @@ files:
 - app/models/educode_sales/assessments_setting.rb
 - app/models/educode_sales/assign_follow_up.rb
 - app/models/educode_sales/business.rb
+- app/models/educode_sales/business_clazz_change.rb
 - app/models/educode_sales/business_export_record.rb
 - app/models/educode_sales/business_number_record.rb
 - app/models/educode_sales/business_relation_ship.rb
@@ -484,6 +490,7 @@ files:
 - db/migrate/20221025094655_delete_business_number.rb
 - db/migrate/20221107122147_change_divide_rate_follow_ups.rb
 - db/migrate/20230115080730_add_origin_business_id_to_follow_ups.rb
+- db/migrate/20230117144025_create_educode_sales_business_clazz_changes.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb