educode_sales 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a02b261726217306908f432883b2fc65fbaafb7f5cca5011756ac826bed71729
-  data.tar.gz: 9683550674255290ce92aa546115e5c12737d6f998b489ee94d2342b061fde33
+  metadata.gz: 88c76bb62d36b9922c99d80e365218b4dbde3bfe9632773d71ba40bdda28ef2f
+  data.tar.gz: 4ba6723ac69f19bb92c57a876b1e7c7299fc15bf1d213eede7ce215e12a932bc
 SHA512:
-  metadata.gz: b6b1540d81940940df2d890b102a0aa45459b11b094951b59ac659029e5d7bae03b2682ccfc8d3a7ed70fbf319f2b714840dd5943b605e4f4d28fb863984cb8d
-  data.tar.gz: 93334a9161ed506b31284db48649d0ef5db377cbb03f3a464637c10f8fbbbca19dd4d243b3f1ba0192540d3cc42e6fe7acd52337029c43a10ee10a497c6d3c63
+  metadata.gz: 608ee9cf6238d241410cb879004c9d18d5ee4e2fa346f285a6f81e3391b3438b905997dbc03c5b37c83c1c9dbd5f2cda1c7f11c3c831c3f986ceda2b443fe925
+  data.tar.gz: 0f5c04324244916fe4a6fd75625076b8ae56bf6398f04676d168b41af251dd66b0db586f53881bbb68ddfaebef7d0ef95d0b47f790b64ed34729c57b5533d856

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

@@ -112,11 +112,11 @@
             defaultToolbar: ['filter'],
             cols: [
                 [
-                    {type:'checkbox'},
+                    {type: 'checkbox'},
                     {
                         field: 'id',
                         width: 60,
-                        title:'序号',type: 'numbers',
+                        title: '序号', type: 'numbers',
 
                     },
                     {
@@ -151,6 +151,7 @@
                         field: 'last_follow_time',
                         width: 170,
                         title: '最后跟进时间',
+                        sort: true
                     },
                     {
                         field: 'staff',

data/app/views/educode_sales/customers/new_department.html.erb

@@ -47,6 +47,7 @@
                 } else {
                     layer.close(parent.new_department_index); //关闭所有层
                     table.reload('sale_plan_follow_table')
+                    parent.table.reload('customers_table')
                 }
             })
             return false;

data/app/views/educode_sales/customers/show_follow.html.erb

@@ -252,7 +252,8 @@
                     {
                         field: 'created_at',
                         width: 180,
-                        title: '时间'
+                        title: '时间',
+                        sort: true
                     },
                     {
                         field: 'staff',
@@ -266,7 +267,8 @@
                     },
                     {
                         field: 'content',
-                        title: '跟进内容'
+                        title: '跟进内容',
+                        templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
                     },
                     {
                         title: '操作',
@@ -365,6 +367,7 @@
                 layer.confirm('确定删除ID为' + data.id + "的记录", function (index) {
                     request.authDelete("missions/customer_follows/" + data.id, {}, function() {
                         obj.del();
+                        parent.table.reload('customers_table')
                         layer.close(index);
                     })
 

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

@@ -7,10 +7,11 @@
         <span><%= @follow_up.content%></span>
       </div>
     </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">跟进部门：</label>
       <div class="layui-input-inline">
-        <span><%= Department.find(@follow_up.department_id)&.name %></span>
+        <span><%=  Department.find(@follow_up.department_id)&.name if @follow_up.department_id.present? %></span>
       </div>
     </div>
   </div>

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

@@ -38,7 +38,11 @@ json.data do
       json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
       json.return_money @businesses.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)
       json.school_count school_count
-      # json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).size + EducodeSales::FollowUp.where(staff_id: d.id).size
+      follow_school_count = EducodeSales::CustomerFollow.where(staff_id: d.id).pluck(:school_id).uniq.size
+      json.follow_school_count follow_school_count
+      json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).size + EducodeSales::FollowUp.where(staff_id: d.id).size
+      json.follow_school_rate follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0
+      json.follow_department_rate follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0
     else
       business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
       business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
@@ -50,7 +54,11 @@ json.data do
       json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", "#{@year}-01-01", "#{@year}-12-31").sum(:total_amount).round(2)
       json.return_money @businesses.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}-01-01 00:00:00", "#{@year}-12-31 23:59:59").sum(:amount).round(2)
       json.school_count school_count
-      # json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).size + EducodeSales::FollowUp.where(staff_id: d.id).size
+      follow_school_count = EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").pluck(:school_id).uniq.size || 0
+      json.follow_school_count follow_school_count
+      json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size + EducodeSales::FollowUp.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size
+      json.follow_school_rate follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0
+      json.follow_department_rate follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0
     end
 
     json.business_a business_a

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - anke1460