educode_sales 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82398cf1df1cb40215b1632031edfd6b6ffa4dfed2ff1c8f86c624fa938c917c
-  data.tar.gz: b11d133013cc1dfe416f77b26255709fb24b33061568380abf625012b13b4ee0
+  metadata.gz: a02b261726217306908f432883b2fc65fbaafb7f5cca5011756ac826bed71729
+  data.tar.gz: 9683550674255290ce92aa546115e5c12737d6f998b489ee94d2342b061fde33
 SHA512:
-  metadata.gz: ee3920c928e0d06ba4785d0a5ab091b9833d94c42eb881e879c378d36d71f6c75985299b225c198b9abf0f2d5d9a6e133a5afeb7147c87e6523bcde609f07f30
-  data.tar.gz: 14a4f1e5e7f23f94279b9023656d170fed8cf6b3d1a6a034b71cca658bc4d0ab13c27f8d82b589a747f02fca5f53fda1a224c7fb76d1a7f25db4552b2a9ac53d
+  metadata.gz: b6b1540d81940940df2d890b102a0aa45459b11b094951b59ac659029e5d7bae03b2682ccfc8d3a7ed70fbf319f2b714840dd5943b605e4f4d28fb863984cb8d
+  data.tar.gz: 93334a9161ed506b31284db48649d0ef5db377cbb03f3a464637c10f8fbbbca19dd4d243b3f1ba0192540d3cc42e6fe7acd52337029c43a10ee10a497c6d3c63

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

@@ -1,14 +1,16 @@
 <div class="layuimini-main">
   <form class="layui-form  layuimini-form" action="">
+    <div class="layui-form-item" style="padding: 25px">
     <div class="layui-form-item" style="padding: 25px">
       <div class="layui-inline">
         <label class="layui-form-label required">部门名称</label>
-        <div class="layui-input-block">
+        <div class="layui-input-block" style="width: 300px;">
           <input type="text" name="department_name" required lay-verify="required" autocomplete="off" placeholder="请输入"
                  class="layui-input" id="inputFocus" value="<%=@department.name %>">
         </div>
       </div>
-      <div class="layui-inline" style="padding-left: 30px">
+      </div>
+      <div class="layui-form-item" style="padding-left: 130px">
         <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-edit">提交
         </button>
       </div>

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

@@ -1,18 +1,18 @@
 <h1 class="text-center" style="padding: 25px"><%=@school.name %></h1>
-<form class="layui-form " action="">
-  <div class="layui-form-item layui-form-text">
-    <label class="layui-form-label">跟进内容</label>
+<form class="layui-form layuimini-form " action="">
+  <div class="layui-form-item layui-form-text" style="padding-right: 30px">
+    <label class="layui-form-label required">跟进内容</label>
     <div class="layui-input-block">
-      <textarea name="content" placeholder="请输入跟进内容" class="layui-textarea" ><%=@follow_up.content %></textarea>
+      <textarea name="content" placeholder="请输入跟进内容" lay-verify="required" style="height: 200px" class="layui-textarea" ><%=@follow_up.content %></textarea>
     </div>
   </div>
-  <div class="layui-inline">
+  <div class="layui-form-item ">
     <label class="layui-form-label">跟进部门</label>
-    <div class="layui-input-inline">
+    <div class="layui-input-inline" style="width: 300px;">
       <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id),@follow_up.department_id)%>
     </div>
   </div>
-  <div class="layui-inline" style="padding-left: 50px">
+  <div class="layui-form-item " style="padding-left: 110px">
     <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_follow_up">提交
     </button>
   </div>

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

@@ -16,7 +16,7 @@
       <div class="layui-inline">
         <label class="layui-form-label">负责人</label>
         <div class="layui-input-inline">
-          <%= select_tag "staff_id", options_for_select(@staffs), { include_blank: true } %>
+          <%= select_tag "staff_id", options_for_select(@staffs,params[:staff_id]), { include_blank: true } %>
         </div>
       </div>
       <div class="layui-inline">
@@ -29,7 +29,7 @@
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
         </button>
-        <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_teachers">搜 索
+        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索
         </button>
       </div>
     </div>
@@ -87,6 +87,13 @@
 
         var laydate = layui.laydate;
 
+        function hn(){
+            $("#search_bt").trigger("click");
+        }
+        $(document).ready(function(){
+            window.onload=hn;
+        });
+
         laydate.render({
             elem: '#date',
             range: true
@@ -114,7 +121,6 @@
                     },
                     {
                         field: 'name',
-                        width: 160,
                         title: '客户名称',
                         templet: "#name"
                     },
@@ -143,7 +149,7 @@
                     },
                     {
                         field: 'last_follow_time',
-                        width: 160,
+                        width: 170,
                         title: '最后跟进时间',
                     },
                     {
@@ -153,7 +159,7 @@
                     },
                     {
                         title: '操作',
-                        minWidth: 170,
+                        width: 300,
                         toolbar: '#currentTableBar',
                         align: "center",
                         fixed: 'right'
@@ -251,11 +257,12 @@
                 name: "",
                 professional_title: "",
                 regist_at: "",
+                staff_id: "",
                 status: "",
                 school: "",
                 assist: "",
                 teacher_source: ""
-            })
+            });
             return false;
         });
         /**

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

@@ -4,8 +4,8 @@ json.data do
     business_ids = EducodeSales::Business.where(department_id: department_ids).ids
     follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
     customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
-    a_last_follow_time = follow_ups.last&.created_at&.to_s(:date)
-    b_last_follow_time = customer_follows.last&.created_at&.to_s(:date)
+    a_last_follow_time = follow_ups.last&.created_at&.to_s
+    b_last_follow_time = customer_follows.last&.created_at&.to_s
     if a_last_follow_time.present? && b_last_follow_time.present?
       json.last_follow_time a_last_follow_time < b_last_follow_time ? b_last_follow_time : a_last_follow_time
     else

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

@@ -1,14 +1,16 @@
 <div class="layuimini-main">
   <form class="layui-form  layuimini-form" action="">
+    <div class="layui-form-item" style="padding: 25px">
     <div class="layui-form-item" style="padding: 25px">
       <div class="layui-inline">
         <label class="layui-form-label required">部门名称</label>
-        <div class="layui-input-block">
+        <div class="layui-input-block" style="width: 300px;">
           <input type="text" name="department_name" required lay-verify="required" autocomplete="off" placeholder="请输入"
                  class="layui-input" id="inputFocus">
         </div>
       </div>
-      <div class="layui-inline" style="padding-left: 30px">
+      </div>
+      <div class="layui-form-item" style="padding-left: 130px">
         <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
         </button>
       </div>

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

@@ -1,18 +1,18 @@
 <h1 class="text-center" style="padding: 25px"><%=@school.name %></h1>
-<form class="layui-form " action="">
-    <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">跟进内容</label>
+<form class="layui-form layuimini-form " action="">
+    <div class="layui-form-item layui-form-text" style="padding-right: 30px">
+      <label class="layui-form-label required" >跟进内容</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder="请输入跟进内容" class="layui-textarea"></textarea>
+        <textarea name="content" placeholder="请输入跟进内容" lay-verify="required" style="height: 200px" class="layui-textarea"></textarea>
       </div>
     </div>
-    <div class="layui-inline">
-      <label class="layui-form-label required">跟进部门</label>
-      <div class="layui-input-inline">
-        <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id)), {"lay-verify": "required", include_blank: true}%>
+  <div class="layui-form-item ">
+      <label class="layui-form-label ">跟进部门</label>
+      <div class="layui-input-inline" style="width: 300px">
+        <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id)), { include_blank: true}%>
       </div>
     </div>
-    <div class="layui-inline" style="padding-left: 50px">
+  <div class="layui-form-item " style="padding-left: 110px">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_follow_up">提交
       </button>
     </div>

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

@@ -54,7 +54,7 @@
                         },
                         {
                             title: '操作',
-                            minWidth: 190,
+                            width: 190,
                             toolbar: '#currentTableBar_follow',
                             align: "center",
                             fixed: 'right'
@@ -251,7 +251,7 @@
                     },
                     {
                         field: 'created_at',
-                        width: 300,
+                        width: 180,
                         title: '时间'
                     },
                     {
@@ -266,11 +266,11 @@
                     },
                     {
                         field: 'content',
-                        width: 100,
                         title: '跟进内容'
                     },
                     {
                         title: '操作',
+                        width: 300,
                         toolbar: '#currentTableBar1234',
                         align: "center"
                     }

data/app/views/educode_sales/customers/show_follow.json.jbuilder

@@ -3,7 +3,7 @@ json.data do
     json.id d.id
     json.created_at d.created_at.to_s
     json.staff d.staff.user.real_name
-    json.department Department.find(d.department_id)&.name
+    json.department d.department_id.present? ? Department.find(d.department_id)&.name : ''
     json.content d.content
     json.is_latest d.id == @latest.id
   end

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

@@ -44,6 +44,11 @@
     <a href="/missions/businesses?clazz_id={{d.o_clazz_id}}&staff_id={{d.id}}">{{d.business_o}}</a>
   </div>
 </script>
+<script type="text/html" id="school_count">
+  <div class="layui-text">
+    <a href="/missions/customers?staff_id={{d.id}}">{{d.school_count}}</a>
+  </div>
+</script>
 <script>
   layui.use('table', function () {
       var form = layui.form,
@@ -73,6 +78,7 @@
           }, {
             field: 'area',
             title: '负责区域',
+            width: 100,
             templet:'<div><span title="{{d.area}}">{{d.area}}</span></div>'
           }, {
             field: 'business_a',
@@ -132,30 +138,36 @@
             {
             field: 'school_count',
             title: '负责学校数',
-            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+                sort:true,
+            totalRow:true,
+                templet: "#school_count",
             width: 120
           },
             {
             field: 'follow_school_count',
             title: '跟进学校数',
+                sort:true,
             totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
             width: 120
           },
             {
             field: 'follow_school_counts',
             title: '跟进学校次数',
+                sort:true,
             totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-            width: 120
+            width: 130
           },
             {
             field: 'follow_school_rate',
             title: '学校覆盖率',
+                sort:true,
             totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
             width: 120
           },
             {
             field: 'follow_department_rate',
             title: '学院覆盖率',
+                sort:true,
             totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
             width: 120
           },

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

@@ -4,6 +4,7 @@ businesses_c_count = 0
 businesses_d_count = 0
 businesses_e_count = 0
 businesses_o_count = 0
+school_counts = 0
 area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @staffs do |d|
@@ -33,9 +34,11 @@ json.data do
       business_d = @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 = ?", @d_clazz&.id).count
       business_e = @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 = ?", @e_clazz&.id).count
       business_o = @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 = ?", @o_clazz&.id).count
+      school_count = EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
       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 EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
+      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
     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
@@ -43,9 +46,11 @@ json.data do
       business_d = @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 = ?", @d_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
       business_e = @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 = ?", @e_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
       business_o = @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 = ?", @o_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      school_count = EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
       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 EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
+      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
     end
 
     json.business_a business_a
@@ -67,6 +72,7 @@ json.data do
     businesses_d_count += business_d
     businesses_e_count += business_e
     businesses_o_count += business_o
+    school_counts += school_count
   end
 end
 
@@ -77,6 +83,7 @@ json.totalRow do
   json.business_d businesses_d_count.to_s
   json.business_e businesses_e_count.to_s
   json.business_o businesses_o_count.to_s
+  json.school_count school_counts.to_s
 end
 json.code 0
 json.count @staffs.total_count

data/lib/educode_sales/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails