educode_sales 0.9.38 → 0.9.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cca79688654d4f1d0c185d2ff93545207d44a8c2cb14d6410d3e735f87d0aacb
-  data.tar.gz: '088b785c025fd68874dca49d397097073f9cc1f6d5c0e848613711655035e855'
+  metadata.gz: 41be1a85301a5d440bb31501f01a0ff9db5158f0890c5096916ff238ffc34e38
+  data.tar.gz: 81a70162b88c7d09eaf90b4181177f757d993264761d65ec376e7719307da53e
 SHA512:
-  metadata.gz: 4731d275b6dd92d870438d37f8cf0ba12894bbb42f90bd74e2413bdf9f5e59441601aa3f2988056c690630755b69099f74a29e4e2b961972e49350e62f00d5a8
-  data.tar.gz: cea6cd42c1daa137b075e59c848c25432a19ba72db4e129349011ca1b0f204af51c4873a4ed468a146babc346d40ea9407afff4df0277aae08850b5623ba4fd4
+  metadata.gz: 99f2999ebcb569c813f3251d060e0347a5a2e488ae1f778d4a51b594ff03416854f7ef9ae8cc0fe5a433f95417801a7549c16e56f1c8a96d0e031a6ec2b9539b
+  data.tar.gz: 62a7671b59dbb8ffb5ad827d310ead46aecf6c5de76b6151d4d6c0c56a81c6835a490c4171d4ee55e40317af0098e30ad87ebab6e9be0be112442a0c15747ddc

data/app/assets/javascripts/educode_sales/application.js

@@ -10,10 +10,10 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require jquery2
 //= require rails-ujs
 //= require activestorage
 //= require ./layui
 //= require_tree ./extent
 //= require ./jquery.cxselect
 //= require ./table2excel
-//= require ./jquery

data/app/controllers/educode_sales/businesses_controller.rb

@@ -10,7 +10,8 @@ module EducodeSales
       respond_to do |format|
         format.html do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
-          @staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11).map { |d| [d.user.real_name, d.id]}  # [[], [], ............]
+          @staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11).map { |d| [d.user.real_name, d.id]}
+          gon.staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11).map { |d| {name: d.user.real_name, value: d.id } }
           # @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business) || can?(:show_file, EducodeSales::Business)
           @more = true
           gon.menus = []
@@ -40,7 +41,7 @@ module EducodeSales
               gon.bidded_date = Time.new(params[:bidded_date_year]).strftime("%Y-%m-%d") + " - " + Time.new(params[:bidded_date_year]).end_of_year.strftime("%Y-%m-%d")
             end
           end
-          
+
           if params[:signed_date_year].present? && params[:signed_date_year] != '全部'
             gon.signed_date = Time.new(params[:signed_date_year]).strftime("%Y-%m-%d") + " - " + Time.new(params[:signed_date_year]).end_of_year.strftime("%Y-%m-%d")
           end

data/app/models/educode_sales/staff.rb

@@ -47,9 +47,13 @@ module EducodeSales
 
     def self.month_list
       list = []
-      24.times.map do |d|
-        ["#{d + 1}个月", d + 1]
+      24.times do |d|
+        list << ["#{d + 1}个月", d + 1]
       end
+      8.times do |d|
+        list << ["#{d + 3}年", (d + 3) * 12]
+      end
+      list
     end
 
     def area_ids

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

@@ -30,7 +30,7 @@
               <div class="layui-inline">
                 <label class="layui-form-label">最新跟进人</label>
                 <div class="layui-input-inline">
-                  <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true } %>
+                  <div id="staffs_id" style="width: 190px;"></div>
                 </div>
               </div>
               <div class="layui-inline">
@@ -268,6 +268,13 @@
             data: gon.business_type
         })
 
+        var staff_list = xmSelect.render({
+          el: '#staffs_id',
+          data: gon.staffs,
+          filterable: true,
+          radio: true,
+        })
+
         var business_step_list = xmSelect.render({
             el: '#business_step',
             data: gon.business_step
@@ -322,6 +329,7 @@
         data.business_year = gon.business_year;
         data.business_type = business_type_list.getValue('valueStr')
         data.business_step = business_step_list.getValue('valueStr');
+        data.staff_id = staff_list.getValue('valueStr');
 
         table = layui.table;
         var cols_table = [
@@ -413,6 +421,19 @@
                     title: '最新跟进人',
                     hide: gon.filter.last_follow_person
                 },
+                {
+                    field: 'no_followup_days',
+                    width: 100,
+                    title: '无跟进天数',
+                    hide: gon.filter.no_followup_days
+                },
+                {
+                    field: 'created_at',
+                    width: 200,
+                    title: '商机创建时间',
+                    sort: true,
+                    hide: gon.filter.created_at
+                },
                 {
                     field: 'latest_time',
                     width: 200,
@@ -701,6 +722,7 @@
             data.place_id = index_place_list.getValue('valueStr');
             data.business_type = business_type.toString();
             data.business_step = business_step.toString();
+            data.staff_id = staff_list.getValue('valueStr');
             layer.load(0, {});
             request.authPost("/missions/businesses/get_export_data", {
                 name: data.name,
@@ -912,6 +934,7 @@
                 business_step.push(d.value);
             })
             data.field.place_id = index_place_list.getValue('valueStr');
+            data.field.staff_id = staff_list.getValue('valueStr');
             data.field.business_type = business_type.toString();
             data.field.business_step = business_step.toString();
              if (search['clazz']) {
@@ -958,6 +981,7 @@
             business_type_list.setValue([])
             business_step_list.setValue([])
             index_place_list.setValue([])
+            staff_list.setValue([])
 
             return false;
         });

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

@@ -21,7 +21,9 @@ json.data do
     json.signed_date d.last_follow_up&.signed_date.to_s
     json.o_business_deployment  EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].to_h.invert[d.last_follow_up&.o_business_deployment]
     json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
-  
+    json.created_at d.created_at.to_s
+    json.no_followup_days (d['latest_time'] ? DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d['latest_time'].strftime("%Y-%m-%d")) : DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d.created_at.strftime("%Y-%m-%d"))).to_i
+
     json.divide_rate d.divide_rate
     json.divide_money d.divide_amount.to_f.round(2)
     json.budget_amount d.budget_amount.to_f.round(2)  #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.38'
+  VERSION = '0.9.40'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.38
+  version: 0.9.40
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-29 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -121,7 +121,6 @@ files:
 - app/assets/javascripts/educode_sales/extent/select_input.js
 - app/assets/javascripts/educode_sales/extent/xm-select.js
 - app/assets/javascripts/educode_sales/jquery.cxselect.js
-- app/assets/javascripts/educode_sales/jquery.js
 - app/assets/javascripts/educode_sales/layui.js
 - app/assets/javascripts/educode_sales/table2excel.js
 - app/assets/stylesheets/educode_sales/Chart.min.css