educode_sales 0.9.29 → 0.9.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0916e70d7b1d843bcfc73d0cb46bae0d2ea24607af4370e949c0794e6ad5c5a
-  data.tar.gz: dd6dfbdae1de1ad91a5a6d525dea33a5bccfdfebc90a3b0317c2e7c9cc7df2b4
+  metadata.gz: e90cfebc689f75a8729f824db95f6dd3fe8a6c1c2f97edfec4d7d8ac8c6ad17d
+  data.tar.gz: b517a994b1be4ac595f8c8664526d1ba0eb7785c60df9ddb0373348cde0b4a5f
 SHA512:
-  metadata.gz: a3df0e9c3f3da1c7b13042101fd8df450d99177c6eaeba578bfd041d808e183d74d61a3ac5940f45edc43eba732a7a6db42096f22e811e8b19d86f166e32a54b
-  data.tar.gz: 428c1bbf876168570b6f763ee70d6415db15b05c2b3a94985f7ba81721b16690eee0f0278a813e8c21cf028b3a0f1488e358f7622d9d101c08c6c01ffd244485
+  metadata.gz: 4169878b95d9f6ab1f53165587e783b7a85f8be05295187b7f070466bad23645b5c2801d49827265337004a60fa8380bf2fae9f15a345e2a7f188cfc3bc46c7c
+  data.tar.gz: 7050ecd4233c2ae9b835542187b57f82a3ad305fb008f0e6ef31fc3beeab367862fcad099b8c6c7b108f4b708863dfed3dea5c1d3238cd6390dd84474becaae2

data/app/controllers/educode_sales/businesses_controller.rb

@@ -264,11 +264,11 @@ module EducodeSales
             (last_follow.total_amount - last_follow.actual_amount) as divide_money,
             (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
             last_follow.total_amount,
-            total_follow_ups.follow_ups_count
+            total_follow_ups.follow_ups_counts
             ").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id AND last_follow.deleted_at IS NULL
             LEFT JOIN (
-              SELECT COUNT(*) AS follow_ups_count, educode_sales_follow_ups.business_id
+              SELECT COUNT(*) AS follow_ups_counts, educode_sales_follow_ups.business_id
               FROM educode_sales_follow_ups
               WHERE educode_sales_follow_ups.deleted_at IS NULL
               GROUP BY educode_sales_follow_ups.business_id
@@ -321,6 +321,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 +699,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/sale_trends_controller.rb

@@ -117,7 +117,8 @@ module EducodeSales
             when "week" #按周
               if params[:date_week].present?
                 date = params[:date_week].split(" - ")
-                dates = (date[0].to_date..date[1].to_date).map { |d|  d.strftime("%Y-%W") }.uniq
+                # 年初第一天周数是0会导致周数重复计算
+                dates = (date[0].to_date..date[1].to_date).map { |d|  d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
                 @follow_count_data =  business_followup_charts(dates, names, x_business_ids, SaleTrend::COLORS, date, "%Y%u") do |dates|
                   dates.map { |date|
                     d = date.split("-")
@@ -190,6 +191,9 @@ module EducodeSales
             when "month" #按月
               if params[:goal_date_month].present?
                 date = params[:goal_date_month].split(" - ")
+                date[0] = (date[0] + "-01").to_date.to_s
+                date[1] = (date[1] + "-01").to_date.end_of_month.to_s
+
                 dates = ((date[0] + "-01").to_date..(date[1] + "-01").to_date).map { |d| d.strftime("%Y-%m") }.uniq
                 @goal_count_data = month_sale_chart(dates, sale_names, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type, date)
               else
@@ -414,11 +418,9 @@ module EducodeSales
 
 
     def month_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type, range)
-      begin_at = range[0].split("-")
-      end_at = range[1].split("-")
+      begin_at = range[0]
+      end_at = range[1]
 
-      begin_at = DateTime.new begin_at[0].to_i, begin_at[1].to_i
-      end_at = DateTime.new end_at[0].to_i, end_at[1].to_i
       data_1 = EducodeSales::Business.joins(:last_follow_up).
         where("educode_sales_follow_ups.clazz_id != ?", x).
         where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).
@@ -531,8 +533,8 @@ module EducodeSales
     def year_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type, range)
       begin_at = range[0].split("-")
       end_at = range[1].split("-")
-      begin_at = DateTime.new(begin_at[0].to_i).beginning_of_year
-      end_at = DateTime.new(end_at[0].to_i).end_of_year
+      begin_at = DateTime.new(begin_at[0].to_i).beginning_of_year.to_date.to_s
+      end_at = DateTime.new(end_at[0].to_i).end_of_year.to_date.to_s
 
       data_1 = EducodeSales::Business.joins(:last_follow_up).
         where("educode_sales_follow_ups.clazz_id != ?", x).

data/app/models/educode_sales/business.rb

@@ -29,7 +29,7 @@ module EducodeSales
 
     def self.include_types(type)
       {
-        '1' => %w[a_class b_class c_class d_class e_class o_class],
+        '1' => %w[a_class b_class c_class d_class e_class],
         'a' => ['a_class'],
         'b' => ['b_class'],
       }[type]

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.json.jbuilder

@@ -8,7 +8,7 @@ json.data do
     json.department d.department.name
     json.school d.department.school.name
     json.school_id d.department.school.id
-    follow_ups_count = d['follow_ups_count'] || 0
+    follow_ups_count = d['follow_ups_counts'] || 0
     json.follow_ups_count follow_ups_count
     follow_count += follow_ups_count
     json.follow_up_id d.last_follow_up_id

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/sale_trends/_business_followup_analysis.html.erb

@@ -54,11 +54,11 @@
       function renderTable(chart_data) {
         var labels = [];
         fields = [
-          {field: 'col0', title: '姓名', width:100}
+          {field: 'col0', title: '姓名', width:100, totalRowText: '合计：'}
         ];
         chart_data.labels.forEach(function(d, i) {
           labels.push(d);
-          fields.push({title: d.split("(").join("<br/>").replace(")", ""), field: 'col' + (i + 1), width:160,  align: 'center'})
+          fields.push({title: d.split("(").join("<br/>").replace(")", ""), field: 'col' + (i + 1), width:180,  align: 'center', sort: true, totalRow: '{{ parseInt(d.TOTAL_NUMS) }}'})
         })
         var table_data = [];
         chart_data.datasets.forEach(function(d, i) {
@@ -78,6 +78,7 @@
           url: '',
           limit: 1000,
           page: false,
+          totalRow: true,
           data: table_data,
           cols: [fields]
         });

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/lib/educode_sales/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.29
+  version: 0.9.31
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -250,6 +249,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
@@ -483,6 +483,7 @@ 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
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -491,7 +492,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -506,8 +507,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []