educode_sales 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 424093f43324c2f4af4d4989f4ff829a9cf10bd9ad1ea4b42bd46c86031c8aed
-  data.tar.gz: cc722d4ff970b1cfb81d06f46be5b4463da9bb129ca5710dbcfc93c91e893de6
+  metadata.gz: 2f22bc4c0ef5a0ae9badb57ed14a6ea2d06f3ebb757746eb2b865cc1d9295c7f
+  data.tar.gz: 9a1d107c5a64574e40693890012cba94d9eb3593325db8723320dfbe56a3957b
 SHA512:
-  metadata.gz: 3fe4801f732d17d747152c861f101527f3160c71c7d63168bd1beec408b5f4b19f4a3f0355f1283edb5d2e125bf5e836f9b9f6ad68eff30f50095a24cb0371ef
-  data.tar.gz: a975715e196da44618cad0d5d6cc453f3aefbf236b58f51473b2ec2f4b1b60a6259bcd705a1bef425f844edb5d9140765cbc842f3bda03c5188a952f654e50a1
+  metadata.gz: 7b67e1c0d5edc38a48f8e9dcebfac180fe01d4546cdf23cb98aeda429835de1e68221071fb62af3d30622101ddc3f64cec9d88a7c879a90642ba0e5d30faf466
+  data.tar.gz: e062d9eee3c4c6ceae7ffcea260dc8b4f2d107b74afbd67f68e440a7adc22031b48c21f24f7e25fa74339c931c55386b2e0bdbfa92a408225e2d1d4021690f02

data/app/controllers/educode_sales/contracts_controller.rb

@@ -352,9 +352,8 @@ module EducodeSales
         d.select! { |d| d.delete_if{|f| f == ''}.present? }
       end
 
-    
-
       follow_up = last_follow_up.dup
+     
       follow_up.assign_attributes(follow_up_params)
       follow_up.description = params[:content]
       if params[:service_time].present?
@@ -366,6 +365,8 @@ module EducodeSales
       follow_up.staff = @current_admin
 
       if follow_up.save!
+        last_follow_up.assign_follow_ups.update_all(follow_up_id: follow_up.id)
+
         contract_lists = EducodeSales::ContractDateList.clazzs.invert
         data.each_with_index do |s, i|
           if s.present?

data/app/controllers/educode_sales/recycles_controller.rb

@@ -9,7 +9,13 @@ module EducodeSales
       render_success
     end
 
-
+    def restore_follow_up
+      @recycle = Recycle.find(params[:id])
+      report_id = @recycle.source_id
+      EducodeSales::FollowUp.unscoped.find(report_id).update(deleted_at: nil)
+      @recycle.destroy
+      render_success
+    end
 
     def restore_reports
       @recycle = Recycle.find(params[:id])
@@ -52,6 +58,16 @@ module EducodeSales
       @businesses = @businesses.page(params[:page]).per(params[:limit])
     end
 
+    def follow_up
+      @data = Recycle.where(source_type:"EducodeSales::FollowUp")
+      if params[:sort].present? && params[:sort][:field]
+        @data = @data.order("created_at #{params[:sort][:order]}")
+      else
+        @data = @data.order("educode_sales_recycles.created_at desc")
+      end
+      @data = @data.page(params[:page]).per(params[:limit])
+    end
+
     def weekly
       @weekly = Recycle.where(source_type:"EducodeSales::SaleReport").order(created_at: :desc).page(params[:page]).per(params[:limit])
       if params[:sort].present? && params[:sort][:field]

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -456,7 +456,7 @@ module EducodeSales
           user_stat = EducodeSales::UserStatService.new
           gon.table_1 = user_stat.table_1
           gon.table_2 = user_stat.table_2(1)
-          gon.table_3 = user_stat.table_2(0)
+          gon.table_3 = user_stat.table_3
         end
       end
     end

data/app/controllers/educode_sales/sales_details_controller.rb

@@ -138,14 +138,15 @@ module EducodeSales
       rows.times do |r|  #行数
         next unless ods.row(r+2)[0]
         business = EducodeSales::Business.find_by(number: ods.row(r+2)[0].to_s.strip)
-        product_catalog = EducodeSales::ProductCatalog.find_by(item_clazz: ods.row(r+2)[7].to_s.strip, 
-        brand: ods.row(r+2)[8].to_s.strip, 
-        specification: ods.row(r+2)[9].to_s.strip, 
-        unit: ods.row(r+2)[10].to_s.strip,
-        source_method: ods.row(r+2)[14].to_s.strip,
-        supplier:  ods.row(r+2)[16].to_s.strip)
+        product_catalog = EducodeSales::ProductCatalog.find_by(name: ods.row(r+2)[5].to_s.strip,
+        item_clazz: ods.row(r+2)[6].to_s.strip, 
+        brand: ods.row(r+2)[7].to_s.strip, 
+        specification: ods.row(r+2)[8].to_s.strip, 
+        unit: ods.row(r+2)[9].to_s.strip,
+        source_method: ods.row(r+2)[13].to_s.strip,
+        supplier:  ods.row(r+2)[15].to_s.strip)
         if business.present? && product_catalog.present?
-          SalesDetail.create(staff_id: @current_admin.id, business_id: business.id, product_catalog_id: product_catalog.id, price: ods.row(r+2)[12].to_s.strip, amount: ods.row(r+2)[11].to_s.strip, total_price: ods.row(r+2)[13].to_s.strip, custom_clazz: ods.row(r+2)[15].to_s.strip, delivery_date: ods.row(r+2)[17].to_s.strip, proprietorship: ods.row(r+2)[18].to_s.strip)
+          SalesDetail.create(staff_id: @current_admin.id, business_id: business.id, product_catalog_id: product_catalog.id, price: ods.row(r+2)[11].to_s.strip, amount: ods.row(r+2)[10].to_s.strip, total_price: ods.row(r+2)[12].to_s.strip, custom_clazz: ods.row(r+2)[14].to_s.strip, delivery_date: ods.row(r+2)[16].to_s.strip, proprietorship: ods.row(r+2)[17].to_s.strip)
         end
       end
       

data/app/models/educode_sales/user_stat_service.rb

@@ -109,6 +109,87 @@ module EducodeSales
       end
     end
 
+    def table_3
+      users = {'1' => [0, 0, 0], '2-5' => [0, 0, 0], '6-10' => [0, 0, 0], '11-20' => [0, 0, 0], '21-50' => [0, 0, 0], '51-100' => [0, 0, 0] }
+      signed_users = {'1' => [0, 0, 0], '2-5' => [0, 0, 0], '6-10' => [0, 0, 0], '11-20' => [0, 0, 0], '21-50' => [0, 0, 0], '51-100' => [0, 0, 0] }
+      schools(0).each do |d|
+        if d[1] == 1
+          users['1'][0] += 1
+         elsif d[1] <= 5
+           users['2-5'][0] += 1
+         elsif d[1] <= 10
+           users['6-10'][0] += 1
+         elsif d[1] <= 20
+           users['11-20'][0] += 1
+         elsif d[1] <= 50
+           users['21-50'][0] += 1
+         elsif d[1] <= 100
+            users['51-100'][0] += 1
+         end
+      end
+
+      departments(0).each do |d|
+        if d[1] == 1
+          users['1'][1] += 1
+         elsif d[1] <= 5
+           users['2-5'][1] += 1
+         elsif d[1] <= 10
+           users['6-10'][1] += 1
+         elsif d[1] <= 20
+           users['11-20'][1] += 1
+         elsif d[1] <= 50
+           users['21-50'][1] += 1
+         elsif d[1] <= 100
+            users['51-100'][1] += 1
+         end
+      end
+
+      signed_schools(0).each do |d|
+        if d[1] == 1
+          signed_users['1'][0] += 1
+         elsif d[1] <= 5
+          signed_users['2-5'][0] += 1
+         elsif d[1] <= 10
+          signed_users['6-10'][0] += 1
+         elsif d[1] <= 20
+           signed_users['11-20'][0] += 1
+         elsif d[1] <= 50
+          signed_users['21-50'][0] += 1
+         elsif d[1] <= 100
+          signed_users['51-100'][0] += 1
+         end
+      end
+
+      signed_departments(0).each do |d|
+        if d[1] == 1
+          signed_users['1'][1] += 1
+         elsif d[1] <= 5
+          signed_users['2-5'][1] += 1
+         elsif d[1] <= 10
+          p "----#{d}"
+          signed_users['6-10'][1] += 1
+         elsif d[1] <= 20
+           signed_users['11-20'][1] += 1
+         elsif d[1] <= 50
+          signed_users['21-50'][1] += 1
+         elsif d[1] <= 100
+          signed_users['51-100'][1] += 1
+         end
+      end
+
+
+      ['1', '2-5', '6-10', '11-20', '21-50', '51-100'].map do |d|
+        {
+          'num' => d,
+          'schools' => users[d][0],
+          'departments' => users[d][1],
+          'majors' => 0,
+          'signed_schools' => signed_users[d][0],
+          'signed_departments' => signed_users[d][1],
+          'signed_majors' => 0,
+        }
+      end
+    end
 
     def public_user
       UserExtension.where(school_id: @school_ids).

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

@@ -1,6 +1,7 @@
 json.data do
   json.array! @business do |d|
     json.value d.id
-    json.name d.name
+    staff_manage = d.last_follow_up&.assign_follow_ups.present? ? (d.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.staff&.user&.real_name
+    json.name d.name + " " + staff_manage + " " + d.created_at.to_s
   end
 end

data/app/views/educode_sales/recycles/_follow_up.html.erb

@@ -0,0 +1,143 @@
+<script type="text/html" id="toolbarfollowup">
+  <div class="layui-btn-container">
+    <span class="table-label">商机跟进列表</span>
+  </div>
+</script>
+
+<table class="layui-hide" id="follow_up" lay-filter="follow_up"></table>
+
+<script type="text/html" id="currentTable_followup">
+  <%# if can? :update, EducodeSales::business %>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="restore">还原</a>
+  <%# end %>
+  <%# if can? :destroy, EducodeSales::business %>
+  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <%# end %>
+</script>
+
+<script type="text/html" id="showchance">
+  <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
+</script>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            miniPage = layui.miniPage;
+
+        table.render({
+            elem: '#follow_up',
+            url: '/missions/recycles/follow_up',
+            toolbar: '#toolbarfollowup',
+            totalRow:true,
+            defaultToolbar: [],
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        title:'序号',type: 'numbers',
+                    },
+                    {
+                        field: 'name',
+                        width: 180,
+                        title: '商机名称'
+                    },
+                    {
+                        field: 'follow_up_content',
+                        width: 180,
+                        title: '内容'
+                    },
+                    {
+                        field: 'clazz',
+                        title: '商机类型'
+                    },
+                    {
+                        field: 'stage',
+                        title: '阶段'
+                    },
+                    {
+                        field: 'staff_manages',
+                        width: 150,
+                        title: '销售经理'
+                    },
+                    {
+                        field: 'school',
+                        title: '单位'
+                    },
+                    {
+                        field: 'department',
+                        title: '部门'
+                    },
+                    {
+                        field: 'last_follow_person',
+                        width: 150,
+                        title: '最新跟进人'
+                    },
+                    {
+                        field: 'latest_time',
+                        title: '最新跟进时间',
+                        width: 150,
+                    },
+                    {
+                        field: 'deleter',
+                        width: 90,
+                        title: '删除人',
+                    },
+                    {
+                        field: 'delete_time',
+                        title: '删除时间',
+                        width: 150,
+                        sort: true,
+
+                    },
+                    {
+                        title: '操作',
+                        width: 120,
+                        toolbar: '#currentTable_followup',
+                        align: "center"
+                    }
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true
+        });
+
+        var sort = {}, search = {};
+        table.on('sort(follow_up)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('follow_up', {
+                initSort: obj,
+                where: {
+                    sort: sort,
+                    q: search
+                }
+            });
+        })
+
+
+        table.on('tool(follow_up)', function (obj) {
+            var data = obj.data;
+            var id = data.id
+            if (obj.event === 'restore') {
+                layer.confirm('确定恢复' + data.name, function (index) {
+                    request.get('missions/recycles/' + data.id + '/restore_follow_up', {}, function (res) {
+                        layer.close(index);
+                        table.reload("follow_up")
+                    })
+                });
+            } else if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.name, function (index) {
+                    request.delete('missions/recycles/' + data.id, {}, function (res) {
+                        layer.close(index);
+                        table.reload("follow_up")
+                    })
+                });
+            }
+        });
+
+    });
+</script>

data/app/views/educode_sales/recycles/follow_up.json.jbuilder

@@ -0,0 +1,21 @@
+json.data do
+  json.array! @data do |d|
+    follow_up = EducodeSales::FollowUp.unscoped.find(d.source_id)
+    business = EducodeSales::Business.unscoped.find(follow_up.business_id)
+    json.id d.id
+    json.name business&.name
+    json.clazz business.clazz&.name
+    json.staff_manages follow_up.assign_follow_ups.present? ? (follow_up.assign_follow_ups.map{ |s| s.staff.user&.real_name}.join("、")) : business.staff&.user&.real_name
+    json.follow_up_content follow_up.description
+    json.school business.department&.school&.name
+    json.department business.department&.name
+    json.last_follow_person follow_up.staff.user&.real_name
+    json.latest_time follow_up.created_at.to_s
+    json.deleter EducodeSales::Staff.find(d.deleter_id).user&.real_name
+    json.delete_time d.created_at.to_s
+    json.stage follow_up.stage&.name
+  end
+end
+
+json.code 0
+json.count @data.total_count

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

@@ -1,6 +1,7 @@
 <div class="layui-tab" lay-filter="sale_tab">
   <ul class="layui-tab-title">
     <li class="layui-this" data="business">商机</li>
+    <li  data="follow_up">商机跟进</li>
     <li  data="week">周计划</li>
     <li data="weekly">周报</li>
     <li data="month">月计划</li>
@@ -11,6 +12,9 @@
     <div class="layui-tab-item   layui-show">
       <%= render 'business' %>
     </div>
+    <div class="layui-tab-item">
+      <%= render 'follow_up' %>
+    </div>
     <div class="layui-tab-item">
       <%= render 'weekPlan' %>
     </div>

data/app/views/educode_sales/sale_trends/_user_stat.html.erb

@@ -25,7 +25,6 @@
               align: 'center',
               width: 150,
               rowspan: 2,
-              totalRowText:'合计',
             }
             , {
               title: '公有云',
@@ -47,59 +46,49 @@
             title: '用户数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'school_1',
             title: '学校数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'department_1',
             title: '学院数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           },{
             field: 'user_2',
             title: '用户数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'school_2',
             title: '学校数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'department_2',
             align: 'center',
             title: '学院数',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           },{
             field: 'user_2',
             title: '用户数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'school_2',
             title: '学校数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'department_2',
             align: 'center',
             title: '学院数',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }]
         ],
         data: gon.table_1,
-        totalRow: true,
         page: false
       });
 

data/app/views/educode_sales/sales_details/_index.html.erb

@@ -151,14 +151,20 @@
         field: 'majors',
         width: 150,
         title: '专业',
+        hide: true
       }, {
         field: 'signed_department',
         title: '签约单位',
         width: 280,
+        hide: true
       }, {
         field: 'actual_amount',
         width: 120,
         title: '合同金额',
+      }, {
+        field: 'project_name',
+        width: 100,
+        title: '产品名称',
       }, {
         field: 'item_clazz',
         width: 100,

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

@@ -27,6 +27,7 @@ json.data do
     json.supplier d.product_catalog.supplier
     json.delivery_date d.delivery_date
     json.proprietorship d.proprietorship
+    json.project_name d.product_catalog.name
   end
 end
 

data/config/routes.rb

@@ -185,11 +185,13 @@ EducodeSales::Engine.routes.draw do
       get :weekPlan
       get :business
       get :yearPlan
+      get :follow_up
     end
     member do
       get :restore_plans
       get :restore_reports
       get :restore_businesses
+      get :restore_follow_up
     end
   end
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -495,12 +495,14 @@ files:
 - app/views/educode_sales/projects/index.html.erb
 - app/views/educode_sales/projects/index.json.jbuilder
 - app/views/educode_sales/recycles/_business.html.erb
+- app/views/educode_sales/recycles/_follow_up.html.erb
 - app/views/educode_sales/recycles/_monthPlan.html.erb
 - app/views/educode_sales/recycles/_monthly.html.erb
 - app/views/educode_sales/recycles/_weekPlan.html.erb
 - app/views/educode_sales/recycles/_weekly.html.erb
 - app/views/educode_sales/recycles/_yearPlan.html.erb
 - app/views/educode_sales/recycles/business.json.jbuilder
+- app/views/educode_sales/recycles/follow_up.json.jbuilder
 - app/views/educode_sales/recycles/index.html.erb
 - app/views/educode_sales/recycles/monthPlan.json.jbuilder
 - app/views/educode_sales/recycles/monthly.json.jbuilder
@@ -706,7 +708,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.0.0
 signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.