educode_sales 0.9.16 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6356a47918d891333b14e6db67f9e7fbf45ff008c04cb06ec89f7a5ea1dd34cf
-  data.tar.gz: 55aaca16b358087288298d0abbaf579340b4dd5dc2b53b39c4a6d1cb80b31c26
+  metadata.gz: 401a52833b246003026eafddf61ee59f1303a01632bb6f57ac9453a962599eec
+  data.tar.gz: 7553aae8c2a7158ed0e4326faa7377fc015bb2312fe42dfab7e796cc50f6218b
 SHA512:
-  metadata.gz: 8f8f2febaa9f93c3ce44766b4ddc45930db17c21c405ebe542f0e7c4ca862c6f3c7840c5b02b5e06efdea128411ef8ab40cb64105f3f32cde31aeafe35e9afea
-  data.tar.gz: 8556d4243ffc1208725c7ec4e7a59f83b11088d9b064b20d36ba238a05e90536ac885cc53c76dd8e1b9f79f3e5290fa00ff9b9c20bfcb0b4d104d6fa8adb496d
+  metadata.gz: 42f17f4136cb57ff0b3811bd7d1e938421918eb7bb9708760b7adea13a38e3c4c29a0ca5874abf6c2a7d2d61df7ae6c30aae3e38ce3279a989f1d190055ed0eb
+  data.tar.gz: ede1c33e7159390055a461a2fb1c726ce467004c52094457562590ffee6b2b80da8630cd27b33bd5c489c0a82dc0806714048b299a7e4fb88e0c5171fdc90406

data/app/assets/stylesheets/educode_sales/app.css

@@ -314,4 +314,9 @@ td .layui-table-cell .layui-form-select {
   position: absolute;
   top: 5px;
   left: -10px;
+}
+
+.layui-btn.selected-btn {
+  color: #fff !important;
+  background: #009688;
 }

data/app/controllers/educode_sales/businesses_controller.rb

@@ -10,7 +10,7 @@ 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).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]}  # [[], [], ............]
           # @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business) || can?(:show_file, EducodeSales::Business)
           @more = true
           gon.menus = []
@@ -155,13 +155,6 @@ module EducodeSales
             @businesses = @businesses
           end
 
-          if params[:q].present? && params[:q][:mine].present?
-            ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
-            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
-
-          @businesses = @businesses
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-" + @year + "-已中标商机)" && params[:q][:name] != "(销售态势-" + @year + "-已签单商机)" && params[:q][:name] != "(销售态势-" + @year + "-已回款商机)" && params[:q][:name] != "(销售态势-" + @year + "-现有商机)" && params[:q][:name] != "(销售态势-" + @year + "-应收款商机)"
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
@@ -237,8 +230,19 @@ module EducodeSales
             @businesses = @businesses.where("number like :data",  data: "%#{params[:q][:number].strip}%")
           end
 
+          if params[:q][:clazz].present?
+            # 我的关注
+            if params[:q][:clazz] == 'followes'
+              my_ids = BusinessRelationShip.where(user_id:@current_admin.user_id).pluck(:business_id)
+              @businesses = @businesses.where(id: my_ids)
+            elsif params[:q][:clazz] == 'me'
+              ids = AssignFollowUp.joins("JOIN educode_sales_follow_ups ON educode_sales_follow_ups.id = educode_sales_assign_follow_ups.follow_up_id").where(staff_id: @current_admin.id).pluck(:business_id)
+              @businesses = @businesses.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids, @current_admin.id)
+            end
+          end
+
           if params[:sort].present? && params[:sort][:field]
-            if params[:sort][:field] = "service_end_time"
+            if params[:sort][:field] == "service_end_time"
               @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
             else
               @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
@@ -274,6 +278,17 @@ module EducodeSales
 
     def daily_paper
       @followups = EducodeSales::FollowUp.where(staff_id: @current_admin.id).where("updated_at > ?", Time.now.beginning_of_day).order("updated_at")
+      ab = EducodeSales::Common.where(extras: [EducodeSales::Common::ATYPE, EducodeSales::Common::BTYPE]).pluck(:id)
+      business = EducodeSales::FollowUp.joins("
+        JOIN educode_sales_businesses ON educode_sales_businesses.id = educode_sales_follow_ups.business_id
+        JOIN educode_sales_follow_ups AS last_up ON last_up.id = educode_sales_businesses.last_follow_up_id
+       ").where("educode_sales_businesses.staff_id = ? AND educode_sales_follow_ups.staff_id = ? AND last_up.clazz_id IN (?)", @current_admin.id, @current_admin.id, ab)
+     
+
+      @month = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_month).group("educode_sales_follow_ups.business_id").select("COUNT(DISTINCT(educode_sales_follow_ups.business_id)) AS num")
+      @quarter = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_quarter).group("educode_sales_follow_ups.business_id").select("COUNT(DISTINCT(educode_sales_follow_ups.business_id)) AS num")
+      @year = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_year).group("educode_sales_follow_ups.business_id").select("COUNT(DISTINCT(educode_sales_follow_ups.business_id)) AS num")
+     
       render layout: false
     end
 

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -243,7 +243,7 @@ module EducodeSales
     # o类商机增加编号
     def add_business_number
       # test数据库中 o类商机id=74 pre与线上o类商机=77
-      if ( @business.number.blank?) && Common.find_by(extras: "o_class")
+        if ( @business.number.blank?) && params[:clazz_id].to_i == Common.find_by(extras: "o_class").id
         totual_count = EducodeSales::Business.unscoped.where("number like :data",data: "#{Time.now.year}%").count + 1 + Time.now.year*1000.to_i
         @business_number_record = BusinessNumberRecord.find_or_create_by(id: 1)
         while @business_number_record.value.include?(totual_count) || Business.pluck(:number).include?(totual_count.to_s)

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -414,7 +414,7 @@ module EducodeSales
         if last_month != month.split("-")[0]
           last_sum = 0
         end
-        data_1_total_hash[month] = (data_1_hash[month] || 0) + last_sum
+        data_1_total_hash[month] = ((data_1_hash[month] || 0) + last_sum).round(2)
         last_sum += data_1_hash[month] || 0
         last_month = month.split("-")[0]
       end
@@ -439,7 +439,7 @@ module EducodeSales
         if last_month != month.split("-")[0]
           last_sum = 0
         end
-        data_2_total_hash[month] = (data_2_hash[month] || 0) + last_sum
+        data_2_total_hash[month] = ((data_2_hash[month] || 0) + last_sum).round(2)
         last_sum += data_2_hash[month] || 0
         last_month = month.split("-")[0]
       end
@@ -464,7 +464,7 @@ module EducodeSales
         if last_month != month.split("-")[0]
           last_sum = 0
         end
-        data_3_total_hash[month] = (data_3_hash[month] || 0) + last_sum
+        data_3_total_hash[month] = ((data_3_hash[month] || 0) + last_sum).round(2)
         last_sum += data_3_hash[month] || 0
         last_month = month.split("-")[0]
       end
@@ -529,7 +529,7 @@ module EducodeSales
         if last_month != month.split("-")[0]
           last_sum = 0
         end
-        data_1_total_hash[month] = (data_1_hash[month] || 0) + last_sum
+        data_1_total_hash[month] = ((data_1_hash[month] || 0) + last_sum).round(2)
         last_sum += data_1_hash[month] || 0
         last_month = month.split("-")[0]
       end
@@ -554,7 +554,7 @@ module EducodeSales
         if last_month != month.split("-")[0]
           last_sum = 0
         end
-        data_2_total_hash[month] = (data_2_hash[month] || 0) + last_sum
+        data_2_total_hash[month] = ((data_2_hash[month] || 0) + last_sum).round(2)
         last_sum += data_2_hash[month] || 0
         last_month = month.split("-")[0]
       end
@@ -580,7 +580,7 @@ module EducodeSales
           last_sum = 0
         end
 
-        data_3_total_hash[month] = (data_3_hash[month] || 0) + last_sum
+        data_3_total_hash[month] = ((data_3_hash[month] || 0) + last_sum).round(2)
         last_sum += data_3_hash[month] || 0
         last_month = month.split("-")[0]
       end

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

@@ -1,15 +1,23 @@
 <div style="padding: 15px;" id="day_content">
-  <h2>今日跟进动态</h2>
+  <h2>今日工作报告</h2>
   <hr>
-  <div style="height: 480px;overflow: auto;">
+  <div style="height: 450px;overflow: auto;">
     <% text = "\n" %>
     <% @followups.each_with_index do |d, i| %>
       <% text += "#{i+1}、**学校--**商机：#{d .description}\n" %>
       <p style="margin-bottom: 10px;"><%= i+1 %>、**学校--**商机：<%= d .description%></p>
     <% end %>
+    <% text += "本月开拓A、B类商机数：#{@month[0]&.[]('num') || 0 } \n"%>
+    <% text += "本季开拓A、B类商机数：#{@quarter[0]&.[]('num') || 0 } \n"%>
+    <% text += "本年开拓A、B类商机数：#{@year[0]&.[]('num') || 0 } \n"%>
+    <p style="margin-bottom: 10px;">本月开拓A、B类商机数：<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @month[0]&.[]('num') || 0 %></span></p>
+    <p style="margin-bottom: 10px;">本季开拓A、B类商机数：<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @quarter[0]&.[]('num') || 0  %></span></p>
+    <p style="margin-bottom: 10px;">本年开拓A、B类商机数：<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @year[0]&.[]('num') || 0  %></span></p>
   </div>
 
   <div id="content" style="display: none;" data-content="今日跟进动态<%=text %>"></div>
+  <p>头歌营销系统</p>
+  <p><%= Time.now.to_s %></p>
   <button type="button" onclick="copy()" style=" margin-right: 20px; float: right;" class="layui-btn layui-btn-primary">复制</button>
 </div>
 <script>

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

@@ -110,9 +110,9 @@
     <% if can? :create, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加商机</button>
     <% end %>
-    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="followes"> 我的关注</button>
-    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="mine"> 我的商机</button>
-    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="all"> 全部商机</button>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right at-btn" lay-event="followes"> 我的关注</button>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right my-btn" lay-event="mine"> 我的商机</button>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right all-btn" lay-event="all"> 全部商机</button>
   </div>
 </script>
 <script type="text/html" id="currentTableBar">
@@ -375,13 +375,6 @@
                     sort: true,
                     hide: gon.filter.bidded_date
                 },
-                {
-                    field: 'budget_money',
-                    width: 105,
-                    title: '预算金额',
-                    sort: true,
-                    hide: gon.filter.budget_money
-                },
                 {
                     field: 'signed_date',
                     width: 105,
@@ -410,6 +403,13 @@
                     sort: true,
                     hide: gon.filter.o_business_deployment
                 },
+                {
+                    field: 'budget_money',
+                    width: 105,
+                    title: '预算金额',
+                    sort: true,
+                    hide: gon.filter.budget_money
+                },
                 {
                     field: 'total_amount',
                     width: 100,
@@ -776,6 +776,7 @@
       }
       function time_line(id,name) {
           business_id = id
+          business_name = name;
         var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({
@@ -867,6 +868,9 @@
             data.field.place_id = index_place_list.getValue('valueStr');
             data.field.business_type = business_type.toString();
             data.field.business_step = business_step.toString();
+             if (search['clazz']) {
+              data.field['clazz'] = search['clazz']
+             }
             search = data.field
             table.reload('businesses_table', {
                 url: '/missions/businesses',
@@ -884,6 +888,13 @@
             form.val('search_follows', {
                 name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
             })
+            if (search['clazz'] == 'me') {
+              $(".my-btn").addClass("selected-btn");
+            } else if (search['clazz'] == 'followes') {
+              $(".at-btn").addClass("selected-btn");
+            } else {
+              $(".all-btn").addClass("selected-btn");
+            }
           return false;
         });
 
@@ -966,11 +977,13 @@
                     name: '', department: '', staff_id: '', business_type: '', business_step: '',
                     place_id: '', date: '', area: ''
                 })
+                $(".all-btn").addClass("selected-btn");
                 return false;
             } else if (obj.event === 'followes') {
-                search = {"all":"1"}
+                search = {"all":"1", clazz: 'followes'}
+                business_type_list.setValue([])
                 table.reload('businesses_table', {
-                    url: '/missions/businesses/following_businesses',
+                    url: '/missions/businesses',
                     page: {
                         curr: 1
                     },
@@ -980,10 +993,12 @@
                     name: '', department: '', staff_id: '', business_type: '', business_step: '',
                     place_id: '', date: '', area: ''
                 })
+                $(".at-btn").addClass("selected-btn");
                 return false;
             }
             else if (obj.event === 'mine') {
-                search = {"mine":"1"}
+                search = {"clazz":"me"}
+                business_type_list.setValue([])
                 table.reload('businesses_table', {
                     url: '/missions/businesses',
                     page: {
@@ -995,6 +1010,7 @@
                     name: '', department: '', staff_id: '', business_type: '', business_step: '',
                     place_id: '', date: '', area: ''
                 })
+                $(".my-btn").addClass("selected-btn");
                 return false;
             }
             else if (obj.event === 'delete') {

data/db/migrate/20221025094655_delete_business_number.rb

@@ -0,0 +1,5 @@
+class DeleteBusinessNumber < ActiveRecord::Migration[5.2]
+  def change
+    EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != 77").update_all("educode_sales_businesses.number = null")
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.16'
+  VERSION = '0.9.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.18
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
+- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -478,6 +479,7 @@ files:
 - db/migrate/20220920080302_add_column_number_to_educode_sales_businesses.rb
 - db/migrate/20220921131116_add_change_clazz_to_follow_up.rb
 - db/migrate/20220923084102_create_table_to_busines_number_recoreds.rb
+- db/migrate/20221025094655_delete_business_number.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -486,7 +488,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -501,8 +503,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []