educode_sales 0.9.30 → 0.9.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51800df7e8c3e444188f0353c66757741c5a99e710426b47da2e9593c65f819f
-  data.tar.gz: 89735f6378821ee46fc806198a24559015440a0047ee6fc4ca27f8d364b69755
+  metadata.gz: baf1f64ce29343ba494bc426661bff113268f32056597273f67fb103c6d4800d
+  data.tar.gz: 50630bc44ae41626f2d7a6fe62307c7a890366ff28dac4fb8cf9f42a3f9b9b03
 SHA512:
-  metadata.gz: 6f967ae4f53c7819b02f3f006a9309434b41b5d22474504464b6e22f3a5469c810a24e221e82468b642240dd81e320b019cd45f0a018e9d94fda99fa646245c5
-  data.tar.gz: 65c325fc5d46fcfdb7ec964881ab0fb832857d428a10241fced792709871c9092ce907c5f74cc23581e2f8776a972a7f3f32d17343a2d377a4b2597610d4f65c
+  metadata.gz: 9321b37e3c51aaa2304ecf8b68b3b9c9e78317a08b506d4792792c8d90640ebe8b146038fe15f9163afdd688b670b09d10abc624602dc24ff45f8c27a3a5dbe0
+  data.tar.gz: c688c3e5c06fea4cb77ff221f8db5cb9f6cdb2118ef7da812fd264f7075da755ed24792799a18d51a684ad1b745619cd56990bdda5bc87ad0ed78059e271b3be

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,
@@ -321,6 +328,14 @@ module EducodeSales
       business = Business.find(params[:id])
       department = Department.find(params[:department_id])
       if business.update(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
+        if params[:merge_business_ids].present?
+          merge_business =  Business.where(id: params[:merge_business_ids].split(","))
+          merge_business.each do |b|
+            b.follow_ups.update_all(origin_business_id: b.id, business_id: business.id)
+            b.update(deleted_at: Time.now)
+          end
+          business.update(follow_ups_count: EducodeSales::FollowUp.where(business_id: business.id).size)
+        end
         render_success
       else
         render_failure business
@@ -691,6 +706,10 @@ module EducodeSales
       end
     end
 
+    def search
+      @business = Business.where.not(id: params[:id]).order("created_at desc")
+      @business = @business.where("educode_sales_businesses.name like ?", "%#{params[:q]}%").limit(30) if params[:q].present?
+    end
 
     private
 

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/models/educode_sales/staff.rb

@@ -63,5 +63,9 @@ module EducodeSales
         nil
       end
     end
+
+    def is_enabled
+      expired_at.present? && enabled_at.present? && expired_at > Time.now && enabled_at < Time.now
+    end
   end
 end

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

@@ -22,6 +22,17 @@
     <div class="layui-inline" style="padding-top: 20px">
       <p style="padding-left: 40px">请填写提供本商机的人名（如‘张明’）；如果为非头歌用户，请增加单位信息（如‘张明，华为公司’）</p>
     </div>
+    <% if can?(:merge_business, EducodeSales::Business) %>
+      <div class="layui-inline-block" style="padding-top: 20px">
+        <label class="layui-form-label ">合并商机</label>
+        <div class="layui-input-inline" style="width: 300px">
+          <div class="layui-input-block confirm-select" id="merge_business" style="width: 300px; margin-left: 0px"></div>
+        </div>
+        <div class="layui-inline" style="padding-top: 10px">
+          <p style="padding-left: 40px">选择的商机及其下的跟进记录将会合并到该编辑的商机中</p>
+        </div>
+      </div>
+    <% end %>
     <div class="layui-form-item m-t-20">
       <div class="layui-input-block">
         <button class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_business">提交</button>
@@ -30,12 +41,13 @@
   </div>
 </div>
 <script>
-  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
+  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput', 'xmSelect'], function () {
     var form = layui.form,
       layer = layui.layer,
       table = layui.table,
       laytpl = layui.laytpl,
       request = layui.request,
+      xmSelect = layui.xmSelect,
       $ = layui.$;
     selectInput = layui.selectInput;
 
@@ -64,6 +76,20 @@
       }
     });
 
+    var merge_business_select = xmSelect.render({
+      el: '#merge_business', 
+      filterable: true,
+      name: 'merge_business_ids',
+      remoteSearch: true,
+      remoteMethod: function(val, cb, show){
+        request.get('missions/businesses/search?id=' + parent.id + "&q=" + val, {},
+         function(res) {
+          cb(res.data)
+        })
+      },
+      data: []
+    })
+
     // 当前弹出层，防止ID被覆盖
     var parentIndex = layer.index;
 
@@ -76,7 +102,8 @@
       request.authPut("missions/businesses/" + parent.id, {
         department_id: department.getValue() || department_id,
         name: data.field.name,
-        source: data.field.source
+        source: data.field.source,
+        merge_business_ids: data.field.merge_business_ids,
       }, function (res) {
         if (res.success == false) {
           layer.alert(res.msg)

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/businesses/search.json.jbuilder

@@ -0,0 +1,6 @@
+json.data do
+  json.array! @business do |d|
+    json.value d.id
+    json.name d.name
+  end
+end

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

@@ -94,6 +94,11 @@
             title: '监管学校',
               templet:'<div><span title="{{d.schools}}">{{d.schools}}</span></div>'
           },
+          {
+            field: 'enabled',
+            width: 120,
+            title: '状态'
+          },
           {
             field: 'month',
             width: 120,

data/app/views/educode_sales/staffs/index.json.jbuilder

@@ -9,6 +9,7 @@ json.data do
     json.month d.month
     json.enabled_at d.enabled_at ? d.enabled_at.to_s(:date) : ''
     json.expired_at d.enabled_at ? "#{d.enabled_at.to_s(:date)}-#{d.expired_at.to_s(:date)}" : ''
+    json.enabled d.is_enabled ? '启用' : '禁用'
     if d.areas.present?
       if d.areas.ids.sort.to_s == area_ids
         json.area '全国'

data/config/routes.rb

@@ -107,6 +107,7 @@ EducodeSales::Engine.routes.draw do
       get :following_businesses
       get :followed
       get :daily_paper
+      get :search
     end
 
     member do

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -28,6 +28,8 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       EducodeSales::Permission.create(name: '添加跟进记录(本人商机)', subject: 'Business', action: 'self_add_follow', clazz: 'business', position: '8')
       EducodeSales::Permission.create(name: '编辑跟进记录(本人创建)', subject: 'Business', action: 'self_edit_follow', clazz: 'business', position: '9')
       EducodeSales::Permission.create(name: '删除跟进记录(本人创建)', subject: 'Business', action: 'self_delete_follow', clazz: 'business', position: '10')
+
+      EducodeSales::Permission.create(name: '合并商机', subject: 'Business', action: 'merge_business', clazz: 'business', position: '12')
       #回款管理权限
       EducodeSales::Permission.create(name: '查看回款列表', subject: 'MoneyPlan', action: 'read', clazz: 'money_plan', position: '15')
 

data/db/migrate/20230115080730_add_origin_business_id_to_follow_ups.rb

@@ -0,0 +1,6 @@
+class AddOriginBusinessIdToFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :origin_business_id, :integer
+    add_column :educode_sales_sale_plans, :origin_business_id, :integer
+  end
+end

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.30'
+  VERSION = '0.9.32'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.30
+  version: 0.9.32
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -186,6 +186,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
@@ -249,6 +250,7 @@ files:
 - app/views/educode_sales/businesses/index.json.jbuilder
 - app/views/educode_sales/businesses/new.html.erb
 - app/views/educode_sales/businesses/new_follow_record.html.erb
+- app/views/educode_sales/businesses/search.json.jbuilder
 - app/views/educode_sales/businesses/show_follow.html.erb
 - app/views/educode_sales/businesses/show_follow.json.jbuilder
 - app/views/educode_sales/businesses/show_follow_record.html.erb
@@ -482,6 +484,8 @@ files:
 - db/migrate/20220923084102_create_table_to_busines_number_recoreds.rb
 - 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