educode_sales 0.9.7 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa0d6ecd7b1640ebee8c24dfedb2fa8aea54ebae05121178a5d7276a5e89bdcc
-  data.tar.gz: e187d271d9f14998d6c7dbcdc82bf12f82e8f2b53b0f5fe98262f63fffa8c8c3
+  metadata.gz: 4d8bedbdcc700c3e37997808523860f75848a078352a86063239219a19992301
+  data.tar.gz: 0dd303bd7b2fc3ce8f24c3ec4300e31ef4aeec4f9a3a84f1d3b17854dcbbb20b
 SHA512:
-  metadata.gz: 2dfd27a654570f6f321fc71cf68ed3993d3be0f24a075b3a038d4ba83473a7a5b6f957d06e6d9fc3ad6ed8bb2e06269886f98853e8421c99f1c167511cf6064c
-  data.tar.gz: 8c589a6c2c1dee705f74167849a1ea69a4fa784193ab2b7063481d74b3114d0bb13e6cfec9b9d43c180d4a9642c4f7d6a873ee97c98db8e0f3c8c4c60e8e544a
+  metadata.gz: 9ef8a07852f16502421892cb9f7103e2ff428d85f2f1be25cedf1dfef984ba8953af1acddb9526b78b3d9336e4bc305124f1a0f7633173556b114eed3af89ca5
+  data.tar.gz: 384480cc86552819dbce83f34f4c24a28501e167c16e66625343e26c3611502a15408c3d135a0f379bdbd5197e9e48e3ad232410146429d23320058a64182a38

data/app/controllers/educode_sales/businesses_controller.rb

@@ -208,6 +208,11 @@ module EducodeSales
             ").where("educode_sales_follow_ups.invitation_at > ? AND educode_sales_follow_ups.invitation_at < ?", date[0] + '00:00:00', date[1] + '23:59:59')
           end
 
+          # 根据编号获取商机
+          if params[:q].present? && params[:q][:number].present?
+            @businesses = @businesses.where("number like :data",  data: "%#{params[:q][:number].strip}%")
+          end
+
           if params[:sort].present? && params[:sort][:field]
             if params[:sort][:field] = "service_end_time"
               @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -100,6 +100,8 @@ module EducodeSales
 
         end
         @business.update(last_follow_up_id: follow_up.id)
+        # 增加o商机编号
+        add_business_number
         render_success
       else
         render_failure follow_up
@@ -135,6 +137,9 @@ module EducodeSales
       follow_up.assign_follow_ups = assign_follow_ups
       follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
+        # 增加o类商机
+        @business = follow_up.business
+        add_business_number
         render_success
       else
         render_failure follow_up
@@ -235,6 +240,15 @@ module EducodeSales
       @business = Business.find(params[:business_id])
     end
 
+    # o类商机增加编号
+    def add_business_number
+      if (@business.number.blank?) && params[:clazz_id] == '74'
+        totual_count = EducodeSales::Business.unscoped.where("number like :data",data: "#{Time.now.year}%").count
+        current_number = Time.now.year*1000 + totual_count + 1
+        @business.update(number: current_number.to_s)
+      end
+    end
+
     def follow_up_params
       params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment)
     end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -21,8 +21,8 @@ module EducodeSales
         s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
         @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:total_amount).round(2)
         @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:actual_amount).round(2)
-        # @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).sum(:amount).round(2)
-        @return_amount = total_return[0]['return_money']&.round(2) || 0
+        @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).sum(:amount).round(2)
+        # @return_amount = total_return[0]['return_money']&.round(2) || 0
         @receivable_amount = @goal_amount - @return_amount
 
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)
@@ -45,8 +45,8 @@ module EducodeSales
         s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
         @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids).sum(:total_amount).round(2)
         @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids).sum(:actual_amount).round(2)
-        # @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
-        @return_amount = total_return[0]['return_money']&.round(2) || 0
+        @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
+        # @return_amount = total_return[0]['return_money']&.round(2) || 0
         @receivable_amount = @goal_amount - @return_amount
 
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)

data/app/models/educode_sales/business.rb

@@ -1,6 +1,8 @@
 module EducodeSales
   class Business < ApplicationRecord
 
+    validates_uniqueness_of :number ,allow_nil: true
+
     belongs_to :staff
     belongs_to :department
     belongs_to :last_follow_up, class_name: 'FollowUp', optional: true # 允许last_follow_up_id字段中的数为nil

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

@@ -1,6 +1,7 @@
 json.data do
   json.array! @businesses do |d|
     json.id d.id
+    json.number d.number
     json.name d.name
     json.department d.department.name
     json.school d.department.school.name

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

@@ -75,6 +75,12 @@
                   <input type="text" class="layui-input" id="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
                 </div>
               </div>
+              <div class="layui-inline show_item" style="display:none;">
+                <label class="layui-form-label">编号</label>
+                <div class="layui-input-inline">
+                  <input type="text" class="layui-input" id="number" name="number" placeholder=" - " autocomplete="off">
+                </div>
+              </div>
               <div class="layui-inline">
                 <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
                 </button>
@@ -266,6 +272,13 @@
                     totalRowText: '合计',
                     fixed: "left"
                 },
+                {
+                    field: 'number',
+                    width: 120,
+                    title: '编号',
+                    fixed: 'left',
+                    hide: gon.filter.number
+                },
                 {
                     field: 'name',
                     width: 170,
@@ -849,7 +862,7 @@
             var field = data.field;
             form.val('search_form', {
                 name: '', department: '', staff_id: '', business_type: '', business_step: '',
-                place_id: '', date: '', area: '', invitation_at: '', business_year: ''
+                place_id: '', date: '', area: '', invitation_at: '', business_year: '', number: ''
             })
             business_type_list.setValue([])
             business_step_list.setValue([])

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

@@ -3,6 +3,7 @@ follow_count = 0
 json.data do
   json.array! @businesses do |d|
     json.id d.id
+    json.number d.number
     json.name d.name
     json.department d.department.name
     json.school d.department.school.name

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

@@ -7,6 +7,14 @@
         <%= @follow_up.business.department&.school&.name %>
       </div>
     </div>
+    <%if @follow_up.business.number.present?%>
+      <div class="layui-inline">
+        <label class="layui-form-label">编号：</label>
+        <div class="layui-input-inline">
+          <%= @follow_up.business.number %>
+        </div>
+      </div>
+    <%end %>
     <div class="layui-inline">
       <label class="layui-form-label">部门：</label>
       <div class="layui-input-inline">

data/db/migrate/20220920080302_add_column_number_to_educode_sales_businesses.rb

@@ -0,0 +1,6 @@
+class AddColumnNumberToEducodeSalesBusinesses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :number, :string, comment: "只有o类商机才有编号 "
+
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.7'
+  VERSION = '0.9.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.9
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -473,6 +473,7 @@ files:
 - db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb
 - db/migrate/20220523101628_update_column_to_follow_ups.rb
 - db/migrate/20220827130438_create_educode_sales_login_histories.rb
+- db/migrate/20220920080302_add_column_number_to_educode_sales_businesses.rb
 - db/migrate/20220921131116_add_change_clazz_to_follow_up.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb