educode_sales 0.9.20 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 482f37ccd129a5ea2fab08879a380aeed531a2026aac73a42528e6ee653a9aae
-  data.tar.gz: 27893e5d818e5bf26ec582dfed97bc1793f822fb818a5c2ec7311dea47439e13
+  metadata.gz: b4fae64ecffcde833caad4eeb11687321dbdca19dfac5341a925a3a4b87dd432
+  data.tar.gz: d64d6231647df25b5acbcff39343dc47fa4004cee0eabae5f1b445ef992a9042
 SHA512:
-  metadata.gz: 0a416d26f945870f4c40587ec1fd0f89d3c661f671d5162b4643f79bdd9bc4d23d05025b07604dbc459f05e2df660f1f1898cd1c4cf6101da472586a27b265f3
-  data.tar.gz: d45d9f2fd66387be4c58a46e072b21a80ec9b1285283a77f0cb9dbe11eb7b034ff503dae8fa01dc89422977b47315df4916c96d78f4d06224a64527eb0953bb7
+  metadata.gz: af522a8b74ab3c53caf2829135dce88059fa79dab77e898a56a60e6a6e0f39fc87f730bdff119d490d224bfe9ef4dc2a7e90cd22c02cece971b968b0971a07f9
+  data.tar.gz: 855b240baed276147aa6130ba441cc7bcffb0ed7e4e3d5dd764c26a0a74c246907aea41263d26aeb25e6bcbc7d2de3cc425d7bff2339c9d6424aa696d9cdd0f9

data/app/controllers/educode_sales/businesses_controller.rb

@@ -270,10 +270,17 @@ module EducodeSales
             last_follow.divide_amount,
             (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
+            last_follow.total_amount,
+            total_follow_ups.follow_ups_count
             ").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
-          ").page(params[:page]).per(params[:limit])
+            LEFT JOIN (
+              SELECT COUNT(*) AS follow_ups_count, 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
+            ) AS total_follow_ups ON educode_sales_businesses.id = total_follow_ups.business_id
+          ").includes(:users, last_follow_up: [:clazz, :assign_follow_ups]).page(params[:page]).per(params[:limit])
 
         end
 
@@ -575,6 +582,11 @@ module EducodeSales
             ids1 = FollowUp.where(id: ids).pluck(:business_id)
             @businesses =@businesses.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
           end
+          if params[:is_follow].present?
+            # 关注
+            my_ids = BusinessRelationShip.where(user_id:@current_admin.user_id).pluck(:business_id)
+            @businesses = @businesses.where(id: my_ids)
+          end
 
           @businesses = @businesses
           if params[:name].present? && params[:name] != "(销售态势-" + @year + "-已中标商机)" && params[:name] != "(销售态势-" + @year + "-已签单商机)" && params[:name] != "(销售态势-" + @year + "-已回款商机)" && params[:name] != "(销售态势-" + @year + "-现有商机)"&&  params[:name] != "(销售态势-" + @year + "-应收款商机)"
@@ -666,9 +678,17 @@ module EducodeSales
             last_follow.divide_amount,
             (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").joins("
+            last_follow.total_amount,
+            total_follow_ups.follow_ups_count
+            ").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
+              FROM educode_sales_follow_ups
+              WHERE educode_sales_follow_ups.deleted_at IS NULL
+              GROUP BY educode_sales_follow_ups.business_id
+            ) AS total_follow_ups ON educode_sales_businesses.id = total_follow_ups.business_id
+          ").includes(last_follow_up: [:clazz, :assign_follow_ups])
         end
       end
     end

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

@@ -6,7 +6,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.where(deleted_at: nil).size
+    follow_ups_count = d['follow_ups_count'] || 0
     json.follow_ups_count follow_ups_count
     json.follow_up_id d.last_follow_up_id
     json.clazz d.last_follow_up&.clazz&.name || ""
@@ -25,8 +25,8 @@ json.data do
     end
 
     json.divide_rate d.divide_rate
-    json.divide_money d.divide_money
-    json.budget_money d.budget_amount
+    json.divide_money d.divide_amount
+    json.budget_amount d.budget_amount
     json.area d.department.school.province
     school_property = d.department.school.school_property
     property = []

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

@@ -404,25 +404,11 @@
                     hide: gon.filter.o_business_deployment
                 },
                 {
-                    field: 'budget_money',
+                    field: 'budget_amount',
                     width: 105,
                     title: '预算金额',
                     sort: true,
-                    hide: gon.filter.budget_money
-                },
-                {
-                    field: 'divide_rate',
-                    width: 160,
-                    title: '渠道分成比例',
-                    sort: true,
-                    hide: gon.filter.divide_rate
-                },
-                {
-                  field: 'divide_money',
-                  width: 160,
-                  title: '渠道分成金额',
-                  sort: true,
-                  hide: gon.filter.divide_money
+                    hide: gon.filter.budget_amount
                 },
                 {
                     field: 'total_amount',
@@ -463,10 +449,24 @@
                     hide: gon.filter.return_money_days
                 },
                 {
-                    field: 'place',
-                    width: 160,
-                    title: '渠道',
-                    hide: gon.filter.place
+                  field: 'divide_rate',
+                  width: 160,
+                  title: '渠道分成比例',
+                  sort: true,
+                  hide: gon.filter.divide_rate
+                },
+                {
+                  field: 'divide_money',
+                  width: 160,
+                  title: '渠道分成金额',
+                  sort: true,
+                  hide: gon.filter.divide_money
+                },
+                {
+                  field: 'place',
+                  width: 160,
+                  title: '渠道',
+                  hide: gon.filter.place
                 },
                 {
                   field: 'sale_way',
@@ -616,10 +616,10 @@
             id = elem.data('id');
             switch (data.event) {
             case 'export_csv':
-                export_csv();
+               export_bussiness('csv')
               break;
             case 'export_excel':
-                export_excel();
+                export_bussiness('xls')
               break;
             case 'export_records':
                 export_records();
@@ -628,8 +628,7 @@
           }
         });
       }
-
-        function export_csv() {
+        function export_bussiness(type) {
             var data = form.val("search_form");
             var business_type = [];
             business_type_list.getValue().forEach(function(d) {
@@ -643,7 +642,6 @@
             data.business_type = business_type.toString();
             data.business_step = business_step.toString();
             layer.load(0, {});
-            console.log(data);
             request.authPost("/missions/businesses/get_export_data", {
                 name: data.name,
                 area: data.area,
@@ -654,53 +652,21 @@
                 invitation_at: data.invitation_at,
                 place_id: data.place_id,
                 select: data.select,
-                staff_id: data.staff_id
+                staff_id: data.staff_id,
+                mine: search['clazz'] == 'me' ? true : '',
+                is_follow: search['clazz'] == 'followes' ? true : '',
             }, function (res) {
                 console.log(res.data);
                 data = res.data
-                table.exportFile(business_table.config.id,data, 'csv');
+                table.exportFile(business_table.config.id,data, type);
                 layer.closeAll('loading');
-                request.get('/missions/businesses/add_export_records?type=csv', {}, function (res) {
+                request.get('/missions/businesses/add_export_records?type=' + type, {}, function (res) {
                 })
             })
 
         }
-        function export_excel() {
-            var data = form.val("search_form");
-            var business_type = [];
-            business_type_list.getValue().forEach(function(d) {
-                business_type.push(d.value);
-            })
-            var business_step = [];
-            business_step_list.getValue().forEach(function(d) {
-                business_step.push(d.value);
-            })
-            data.place_id = index_place_list.getValue('valueStr');
-            data.business_type = business_type.toString();
-            data.business_step = business_step.toString();
-            layer.load(0, {});
-            console.log(data);
-            request.authPost("/missions/businesses/get_export_data", {
-                name: data.name,
-                area: data.area,
-                business_step: data.business_step,
-                business_type: data.business_type,
-                date: data.date,
-                department: data.department,
-                invitation_at: data.invitation_at,
-                place_id: data.place_id,
-                select: data.select,
-                staff_id: data.staff_id
-            }, function (res) {
-                console.log(res.data);
-                data = res.data
-                table.exportFile(business_table.config.id,data, 'xls');
-                layer.closeAll('loading');
-                request.get('/missions/businesses/add_export_records?type=xls', {}, function (res) {
-                })
-            })
 
-        }
+
         function export_records() {
             var content = miniPage.getHrefContent('/missions/businesses/export_records')
             var openWH = miniPage.getOpenWidthHeight();
@@ -856,6 +822,9 @@
 
 
       var sort = {}, search = {};
+      <% if params[:name].present? %>
+      search.name = "<%= params[:name] %>";
+      <% end %>
       table.on('sort(businesses_table)', function (obj) {
         sort.field = obj.field;
         sort.order = obj.type;

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.where(deleted_at: nil).size
+    follow_ups_count = d['follow_ups_count'] || 0
     json.follow_ups_count follow_ups_count
     follow_count += follow_ups_count
     json.follow_up_id d.last_follow_up_id
@@ -28,7 +28,7 @@ json.data do
     end
     json.divide_rate d.divide_rate
     json.divide_money d.divide_amount
-    json.budget_money d.budget_amount #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
+    json.budget_amount d.budget_amount #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
     json.area d.department.school.province
     school_property = d.department.school.school_property
     property = []
@@ -55,7 +55,7 @@ json.data do
     json.staff_id d.staff_id
     json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
     json.self_flag (d.staff_id == @current_admin.id) || (d.last_follow_up_id.in? follow_up_ids)
-    json.followed  d.users.where(user_id:@current_admin.user.id).first ? 1 : 0
+    json.followed  d.users.pluck(:user_id).include?(@current_admin.user.id) ? 1 : 0 # d.users.where(user_id:@current_admin.user.id).first ? 1 : 0
     end
 end
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.20'
+  VERSION = '0.9.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.9.22
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails