educode_sales 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 226066d76e63313c5fc919fdb52fe30d4cd5fbe1e27f5aed961018d4fc03617c
-  data.tar.gz: 66abf2859226856528e9511001e677bbb631f4fe626354994e05d25434992535
+  metadata.gz: beaaef9ad85e45c39ff91fc919a392c864872b7c3c6b5ad40cbff4ca931ab7b8
+  data.tar.gz: c99241524289cd79e31c992e85921aa706962253a60d08ecb10dece9215d9120
 SHA512:
-  metadata.gz: f844aa32c8352a830b2c24622f90d0b23801304a2aa4ae00c2080050f64ec5f17993e81802e8d9b3c228e74ff79ffb46880a6f56b174f859dc35b792ed15715c
-  data.tar.gz: 1f7697035a3b0c9e305a08d59000e215739e0fa7dfd548b01f1fbc05aba79c466e1eb0499a5e9d1ab2e8e07682ddd4868a8348956d217d3cfc8ae4e8889dd5d6
+  metadata.gz: 7abc3483c8e33f0385e1a77edaed2c60b8db9dbf06ae41679cbd379a74a168a3f5869b2a5bd49e2e5e95dd0c90fea504668433841970239ca453031a1ba04bc5
+  data.tar.gz: fe192afb0f2a09d6b924c5901c2aac1bc1d83046ffe4cd3fe20152df2084b19afc5bba62dc71816f68d30418ca2b35c060037b7acf5ab44b3d86f5d45a647d9e

data/app/controllers/educode_sales/businesses_controller.rb

@@ -29,10 +29,12 @@ module EducodeSales
             level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
             case level
             when '自己'
-              @businesses = Business.where(staff_id: @current_admin.id)
+              business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
+              @businesses = Business.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
-              @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}", school_ids)
+              business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
+              @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids)
             else
               @businesses = Business
             end
@@ -179,6 +181,11 @@ module EducodeSales
       @stages = Common.where(clazz: 'business_step').order("position").pluck(:name, :id)
       @places = Place.order("created_at desc").pluck(:name, :id)
       @last_follow_up = @business.last_follow_up
+      if @last_follow_up
+        gon.sales = @last_follow_up.assign_follow_ups.map do |d|
+          {value: d.staff_id, name: d.staff.user.full_name}
+        end
+      end
       render layout: false
     end
 

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -17,7 +17,7 @@ module EducodeSales
       @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, stage_ids).sum(:total_amount).round(2)
       s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
       @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, s_stage_ids).sum(:total_amount).round(2)
-      @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_money_plans.date_at >= ?", year_time).sum(:return_money).round(2)
+      @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_money_plans.date_at >= ?", year_time).sum(:amount).round(2)
       a = Common.where(clazz: '商机类型', name: 'A类').pluck(:id)
       @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).sum(:total_amount).round(2)
       b = Common.where(clazz: '商机类型', name: 'B类').pluck(:id)

data/app/controllers/educode_sales/teachers_controller.rb

@@ -61,7 +61,10 @@ module EducodeSales
             @teachers = @teachers.where("educode_sales_teachers.regist_at like ?", "%#{params[:q][:regist_at]}%")
           end
           if params[:q].present? && params[:q][:attitude].present?
-            @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:attitude]}")
+            # @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:attitude]}")
+            @teachers = @teachers.joins("
+              JOIN educode_sales_teacher_follows ON educode_sales_teachers.follow_up_id = educode_sales_teacher_follows.id
+            ").where("educode_sales_teacher_follows.attitude_id = ?", params[:q][:attitude])
           end
           if params[:q].present? && params[:q][:teacher_source].present?
             @teachers = @teachers.where("educode_sales_teachers.source_id = ?", "#{params[:q][:teacher_source]}")
@@ -82,10 +85,10 @@ module EducodeSales
           end
           if params[:q].present? && params[:q][:date].present?
             date = params[:q][:date].split(" - ")
-            @teachers = @teachers.where("created_at > ? AND created_at < ?", date[0], date[1])
+            @teachers = @teachers.where("educode_sales_teachers.created_at > ? AND educode_sales_teachers.created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.order("created_at desc").page(params[:page]).per(params[:limit])
+          @teachers = @teachers.order("educode_sales_teachers.created_at desc").page(params[:page]).per(params[:limit])
 
         end
       end
@@ -111,15 +114,24 @@ module EducodeSales
         teacher.regist_at = Time.now
       end
 
-      if params[:activity_id].present? && params[:user_id].present?
+      unless params[:activity_id].present?
+      return render json: {msg: '该教师已存在', success: false } if EducodeSales::Teacher.find_by(department_id: params[:department_id],name: params[:name])
+      end
+
+      if params[:activity_id].present?
+        if params[:user_id].present?
         # 把老师添加到活动列表，提取判断下老师列表是否存在
-        find_teacher = Teacher.find_by(user_id: params[:user_id])
-        if find_teacher
-          teacher = find_teacher
+          find_teacher = Teacher.find_by(user_id: params[:user_id])
+          if find_teacher
+            teacher = find_teacher
+          end
+        else
+           _teacher = EducodeSales::Teacher.find_by(department_id: params[:department_id],name: params[:name])
+           teacher = _teacher if _teacher.present?
         end
+        return render json: {msg: '该教师已在活动中', success: false } if teacher && teacher.activity_teachers.find_by(activity_id: params[:activity_id]).present?
       end
       if params[:activity_id].present?
-        return render json: {msg: '该教师已在活动中', success: false } if teacher.activity_teachers.find_by(activity_id: params[:activity_id]).present?
         teacher.activity_teachers.build(activity_id: params[:activity_id])
       end
 

data/app/models/educode_sales/teacher_follow.rb

@@ -2,5 +2,6 @@ module EducodeSales
   class TeacherFollow < ApplicationRecord
     belongs_to :teacher, counter_cache: true
     belongs_to :staff
+    belongs_to :attitude, class_name: 'Common'
   end
 end

data/app/views/educode_sales/activities/show_teachers.html.erb

@@ -15,7 +15,7 @@
   {{# if (d.login) { }}
   <a href="<%= base_url%>/users/{{d.login}}" class="layui-table-link" target="_blank">{{ d.name }}</a>
   {{# } else {}}
-  <a href="<%= base_url%>/users/{{d.login}}" class="">{{ d.name }}</a>
+  <a href="javascript:;" class="">{{ d.name }}</a>
   {{# }}}
 </script>
 <script type="text/html" id="courses">

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

@@ -2,9 +2,9 @@
 <div class="layui-form layuimini-form">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
-      <label class="layui-form-label required">名称</label>
+      <label class="layui-form-label required">商机名称</label>
       <div class="layui-input-block">
-        <input type="text" name="name" autocomplete="off" lay-verify="required" class="layui-input" value="<%= @business.name %>">
+        <input type="text" name="name" autocomplete="off" lay-verify="required" class="layui-input"  value="<%= @business.name %>" style="width: 300px;">
       </div>
     </div>
     <div class="layui-inline">

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

@@ -237,7 +237,7 @@
               edit(id);
               break;
             case 'delete':
-              deleteBusiness(id, elem.data['name']);
+              deleteBusiness(id, elem.data('name'));
               break;
             }
           }
@@ -300,7 +300,7 @@
       }
 
       function deleteBusiness(id, name) {
-        layer.confirm('确定删除' + name, function (index) {
+          layer.confirm('确定删除' + name, function (index) {
           request.delete('missions/businesses/' + id, {}, function (res) {
             layer.close(index);
             table.reload("businesses_table")

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

@@ -1,3 +1,4 @@
+<%= Gon::Base.render_data %>
 <h1 class="m-t-20 text-center"><%= @business.name %></h1>
 <div class="layui-form layuimini-form">
   <div class="layui-form-item" style="padding: 25px">
@@ -162,7 +163,7 @@
         }
       })
 
-
+      sales_list.setValue(gon.sales);
       form.render();
 
       form.on('submit(add_follow_up)', function (data) {

data/app/views/educode_sales/operation_plans/new_month.html.erb

@@ -73,8 +73,10 @@
                     layer.close(parent.new_monthly_index)
                     layer.close(parent.monthPlanIndex)
                     layer.close(parent.teacherindex2)
+                    layer.close(parent.sindex)
                     table.reload('monthPlanTable')
                     table.reload("newMonthlyTable")
+                    table.reload("newWeeklyTable")
                 }
             })
             return false;

data/app/views/educode_sales/plans/new_month.html.erb

@@ -80,6 +80,7 @@
           else {
             parent.table.reload('businesses_table')
           }
+          parent.table.reload('newWeeklyTable')
         }
       })
       return false;

data/app/views/educode_sales/teachers/import.html.erb

@@ -34,6 +34,7 @@
             }
             ,error: function(index, upload){
                 layer.closeAll('loading'); //关闭loading
+                layer.alert('导入失败，请检查文件格式')
             }
         });
     });

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

@@ -262,7 +262,7 @@
                             edit(id);
                             break;
                         case 'delete':
-                            deleteBusiness(id, elem.data['name']);
+                            deleteBusiness(id, elem.data('name'));
                             break;
                     }
                 }

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

@@ -13,7 +13,8 @@ json.data do
     json.activities_count d.activity_teachers_count
     json.source EducodeSales::Common.teacher_source_name[d.source_id]
     # a_id = EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).present? ? EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).attitude_id : 73
-    json.attitude EducodeSales::TeacherFollow.find_by(teacher_id: d.id).present? ? EducodeSales::Common.find(EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).attitude_id).name : ''
+    # json.attitude EducodeSales::TeacherFollow.find_by(teacher_id: d.id).present? ? EducodeSales::Common.find(EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).attitude_id).name : ''
+    json.attitude d.follow_up&.attitude&.name
     json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).distinct("course_id").count : 0
     json.actives d.actives
     json.students d.students_count

data/app/views/layouts/educode_sales/login.html.erb

@@ -5,7 +5,7 @@
   <title><%= @title || '头歌营销系统' %></title>
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
-  <%= favicon_link_tag "educode_sales/favicon.ico" %>
+  <%= favicon_link_tag "educode_sales/logo.png" %>
   <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
   <%= stylesheet_link_tag "educode_sales/application", media: "all" %>
   <%= javascript_include_tag "educode_sales/application" %>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.3.9'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails