educode_sales 0.3.9 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 226066d76e63313c5fc919fdb52fe30d4cd5fbe1e27f5aed961018d4fc03617c
-  data.tar.gz: 66abf2859226856528e9511001e677bbb631f4fe626354994e05d25434992535
+  metadata.gz: fb60117f75870a9280a833425b4a29bac7172e70da78b061fa41ea92abc7c985
+  data.tar.gz: 203aaf0c96f4e246ab734cd3dc4844542563404f6939bc2613ae286fe37d8be7
 SHA512:
-  metadata.gz: f844aa32c8352a830b2c24622f90d0b23801304a2aa4ae00c2080050f64ec5f17993e81802e8d9b3c228e74ff79ffb46880a6f56b174f859dc35b792ed15715c
-  data.tar.gz: 1f7697035a3b0c9e305a08d59000e215739e0fa7dfd548b01f1fbc05aba79c466e1eb0499a5e9d1ab2e8e07682ddd4868a8348956d217d3cfc8ae4e8889dd5d6
+  metadata.gz: 688e3848050cd08d8598e8434e0039db4aa6fb0972f3bd558ad026b68462080fe898802082f94dfcf67b7e3a765631ecc39befad5382028c30c0b4259fb4e045
+  data.tar.gz: 5ed1048e97b6cf03f127040239eb7a7c8011b72edf8a94deb42d65a829a4e7ed15b98ecb94bdeb662dc6dc66efe3fff6e22cfeef28d819082a8f8ce9879cfeee

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
@@ -78,7 +80,6 @@ module EducodeSales
             @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1])
           end
 
-
           if params[:sort].present? && params[:sort][:field]
             @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
@@ -87,6 +88,18 @@ module EducodeSales
 
           @business_count = @businesses.count
 
+          if params[:q].present? && params[:q][:all].present?
+            @businesses = Business.all
+          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)
+            ids2 = Business.where(staff_id: @current_admin.id).pluck(:id)
+            # @businesses = Business.where(id: ids1+ids2)
+            @businesses =Business.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
+          end
+
           @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
@@ -175,10 +188,16 @@ module EducodeSales
 
     def new_follow_record
       load_business
+      @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       @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
 
@@ -194,6 +213,7 @@ module EducodeSales
     end
 
     def edit_follow_record
+      @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @follow_up = FollowUp.find(params[:follow_up_id])
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       @stages = Common.where(clazz: 'business_step').order("position").pluck(:name, :id)

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -11,7 +11,7 @@ module EducodeSales
         follow_up.assign_follow_ups.build(staff_id: d)
       end
       
-      follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
+      follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) if follow_up.actual_amount
       if follow_up.save
         if @business.last_follow_up.present?
           @business.last_follow_up.key_person.each do |d|
@@ -54,7 +54,7 @@ module EducodeSales
         assign_follow_ups << follow_up.assign_follow_ups.find_or_initialize_by(staff_id: d)
       end
       follow_up.assign_follow_ups = assign_follow_ups
-      follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
+      follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
         render_success
       else

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -20,8 +20,8 @@ module EducodeSales
             when '自己'
               @sale_plans = OperationPlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_plans = OperationPlan.where("staff_id in ?", staff_ids)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              @sale_plans = OperationPlan.where("staff_id in (?)", staff_ids)
             else
               @sale_plans = OperationPlan
             end

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -17,8 +17,8 @@ module EducodeSales
             when '自己'
               @sale_reports = OperationReport.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
-              @sale_reports = OperationReport.where("staff_id in ?", staff_ids)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              @sale_reports = OperationReport.where("staff_id in (?)", staff_ids)
             else
               @sale_reports = OperationReport
             end

data/app/controllers/educode_sales/places_controller.rb

@@ -9,7 +9,7 @@ module EducodeSales
         end
         format.json do
           @places = Place.page(params[:page]).per(params[:limit])
-          @x = Common.find_by(clazz: '商机类型', name: 'X类')&.id
+          @x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
           @stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
         end
       end

data/app/controllers/educode_sales/plans_controller.rb

@@ -21,8 +21,8 @@ module EducodeSales
             when '自己'
               @sale_plans = SalePlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
-              @sale_plans = SalePlan.where("staff_id in ?", staff_ids)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              @sale_plans = SalePlan.where("staff_id in (?)", staff_ids)
             else
               @sale_plans = SalePlan
             end

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -50,8 +50,8 @@ module EducodeSales
             when '自己'
               @sale_reports = SaleReport.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
-              @sale_reports = SaleReport.where("staff_id in ?", staff_ids)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              @sale_reports = SaleReport.where("staff_id in (?)", staff_ids)
             else
               @sale_reports = SaleReport
             end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -9,15 +9,15 @@ module EducodeSales
       @year = params[:year] ? params[:year] : Time.now.year
       @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
       year_time = "#{@year}-01-01 00:00:00"
-      x = Common.find_by(clazz: '商机类型', name: 'X类')&.id
-      o = Common.find_by(clazz: '商机类型', name: 'O类')&.id
+      x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+      o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
       @sale_trend = SaleTrend.find_or_create_by(year: @year)
       @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).where("educode_sales_follow_ups.created_at >= ?", year_time).sum(:total_amount).round(2)
       stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
       @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/sales_controller.rb

@@ -14,7 +14,7 @@ module EducodeSales
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @a_clazz = Common.find_by(clazz: 'business_type', name: 'A类')
           @b_clazz = Common.find_by(clazz: 'business_type', name: 'B类')
-          @x = Common.find_by(clazz: 'business_type', name: 'X类')
+          @x = Common.find_by(extras: EducodeSales::Common::XTYPE)
           @step_ids = Common.where(name: %w(已中标 已签单 已验收 回款中 服务中 已结束), clazz: 'business_step').pluck(:id)
           
           @staffs = Staff.where(job_type: common.id).page(params[:page]).per(params[:limit])

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
 
@@ -268,7 +280,7 @@ module EducodeSales
     def course_list
       user = User.find_by(id: params[:user_id])
       if user
-      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).distinct("course_id").page(params[:page]).per(params[:limit])
+      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct("course_id").page(params[:page]).per(params[:limit])
       else
         @courses = Course.none
       end

data/app/models/educode_sales/common.rb

@@ -2,6 +2,8 @@ module EducodeSales
   class Common < ApplicationRecord
     acts_as_list scope: [:clazz]
 
+    XTYPE = "x_class"
+    OTYPE = 'o_class'
 
     validates :name, uniqueness: {scope: :clazz, message: '已存在'}
     

data/app/models/educode_sales/teacher.rb

@@ -37,7 +37,7 @@ module EducodeSales
 
     def students_count
       if user_id.present?
-        course_ids = CourseMember.where.not(role: "STUDENT").where(user_id: user_id).pluck(:course_id)
+        course_ids = Course.joins(:course_members).where(course_members: {user_id: user_id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct("course_id").pluck(:course_id)
         CourseMember.where(course_id: course_ids, role: "STUDENT").count
       else
         0

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/edit_follow_record.html.erb

@@ -17,9 +17,9 @@
     <br>
     <div class="layui-inline">
       <label class="layui-form-label required">项目类型</label>
-      <%if  EducodeSales::FollowUp.where(business_id: @follow_up.business.id,clazz_id: EducodeSales::Common.find_by(name: "O类").id).count >= 2 %>
+      <%if  EducodeSales::FollowUp.where(business_id: @follow_up.business.id,clazz_id: EducodeSales::Common.find_by(name: @o_name).id).count >= 2 %>
         <div class="layui-input-inline">
-          <%= select_tag "clazz_id", options_for_select([['O类',EducodeSales::Common.find_by(name: "O类").id]]),:disabled => true, class: 'required' %>
+          <%= select_tag "clazz_id", options_for_select([[@o_name,EducodeSales::Common.find_by(name: @o_name).id]]),:disabled => true, class: 'required' %>
         </div>
       <%else %>
         <div class="layui-input-inline">
@@ -56,9 +56,9 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">实额</label>
+      <label class="layui-form-label">合同额</label>
       <div class="layui-input-inline">
-         <input name="actual_amount" type="number" class="layui-input" value="<%= @follow_up.actual_amount %>">
+         <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
       </div>
     </div>
     <br>
@@ -69,11 +69,10 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">分成</label>
+      <label class="layui-form-label">渠道分成</label>
       <div class="layui-input-inline">
         <input name="divide_rate" class="layui-input" value="<%= @follow_up.divide_rate%>">
       </div>
-      <span style="margin-top: 10px; float:left;">%</span>
     </div>
     <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
@@ -82,7 +81,7 @@
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label required">商机说明</label>
+      <label class="layui-form-label required">最新进展</label>
       <div class="layui-input-block">
         <textarea name="description" lay-verify="required" placeholder="此处可以填写：
 1、有无预算；

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

@@ -68,6 +68,8 @@
     <% 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="mine"> 我的商机</button>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="all"> 全部商机</button>
   </div>
 </script>
 <script type="text/html" id="currentTableBar">
@@ -150,7 +152,7 @@
               // },
               {
                 field: 'clazz',
-                width: 60,
+                width: 120,
                 title: '类型'
               },
               {
@@ -195,7 +197,12 @@
               {
                 field: 'last_follow_person',
                 width: 120,
-                title: '跟进人'
+                title: '最新跟进人'
+              },
+              {
+                field: 'latest_time',
+                width: 200,
+                title: '最新跟进时间'
               },
               {
                 title: '操作',
@@ -237,7 +244,7 @@
               edit(id);
               break;
             case 'delete':
-              deleteBusiness(id, elem.data['name']);
+              deleteBusiness(id, elem.data('name'));
               break;
             }
           }
@@ -300,7 +307,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")
@@ -361,7 +368,35 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
-            } else if (obj.event === 'delete') { // 监听删除操作
+            } else if (obj.event === 'all') {
+                search = {"all":"1"}
+                table.reload('businesses_table', {
+                    page: {
+                        curr: 1
+                    },
+                    where: {q: search, sort: sort}
+                }, 'data');
+                form.val('search_form', {
+                    name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                    place_id: '', date: '', area: ''
+                })
+                return false;
+            }
+            else if (obj.event === 'mine') {
+                search = {"mine":"1"}
+                table.reload('businesses_table', {
+                    page: {
+                        curr: 1
+                    },
+                    where: {q: search, sort: sort}
+                }, 'data');
+                form.val('search_form', {
+                    name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                    place_id: '', date: '', area: ''
+                })
+                return false;
+            }
+            else if (obj.event === 'delete') {
                 var checkStatus = table.checkStatus('currentTableId'),
                     data = checkStatus.data;
                 layer.alert(JSON.stringify(data));

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

@@ -20,6 +20,7 @@ json.data do
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
   end
 end
 json.code 0

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">
@@ -16,9 +17,9 @@
     <br>
     <div class="layui-inline">
       <label class="layui-form-label required">项目类型</label>
-      <%if @last_follow_up&.clazz&.name == "O类" %>
+      <%if @last_follow_up&.clazz&.name == @o_name %>
       <div class="layui-input-inline">
-        <%= select_tag "clazz_id", options_for_select([['O类',EducodeSales::Common.find_by(name: "O类").id]]),:disabled => true, class: 'required' %>
+        <%= select_tag "clazz_id", options_for_select([[@o_name,EducodeSales::Common.find_by(name: @o_name).id]]),:disabled => true, class: 'required' %>
       </div>
         <%else %>
         <div class="layui-input-inline">
@@ -58,9 +59,9 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">实额(万)</label>
+      <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
-        <input name="actual_amount" type="number" class="layui-input" autocomplete="off"
+        <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
           value="<%= @last_follow_up&.actual_amount%>">
       </div>
     </div>
@@ -72,11 +73,10 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">分成</label>
+      <label class="layui-form-label">渠道分成</label>
       <div class="layui-input-inline">
         <input name="divide_rate" class="layui-input" value="<%= @last_follow_up&.divide_rate%>">
       </div>
-      <span style="margin-top: 10px; float:left;">%</span>
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
@@ -85,7 +85,7 @@
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label required">商机说明</label>
+      <label class="layui-form-label required">最新进展</label>
       <div class="layui-input-block">
         <textarea name="description" lay-verify="required" placeholder="此处可以填写：
 1、有无预算；
@@ -162,7 +162,7 @@
         }
       })
 
-
+      sales_list.setValue(gon.sales);
       form.render();
 
       form.on('submit(add_follow_up)', function (data) {

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

@@ -86,9 +86,14 @@
                 title: '时间',
                 sort: true
               },
+                {
+                    field: 'staff',
+                    width: 100,
+                    title: '跟进人',
+                },
               {
                 field: 'clazz',
-                width: 60,
+                width: 120,
                 title: '类型',
               },
               {
@@ -120,12 +125,12 @@
               {
                 field: 'actual_amount',
                 width: 100,
-                title: '实额',
+                title: '合同额',
               },
               {
                 field: 'divide_rate',
-                width: 80,
-                title: '分成',
+                width: 100,
+                title: '渠道分成',
               },
               {
                 field: 'money',
@@ -138,11 +143,6 @@
                 title: '回款计划',
                 templet: '#edit_plan'
               },
-              {
-                field: 'staff',
-                width: 100,
-                title: '跟进人',
-              },
               {
                 field: 'place',
                 width: 200,

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

@@ -9,7 +9,7 @@ json.data do
     json.reception_at d.reception_at&.to_s(:date)
     json.total_amount d.total_amount
     json.actual_amount d.actual_amount
-    json.divide_rate d.divide_rate ? "#{d.divide_rate}%" : ""
+    json.divide_rate d.divide_amount ? d.divide_amount : ""
     json.staff d.staff.user.real_name
     json.place d.place&.name
     json.money_plans_count d.money_plans_count

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

@@ -47,7 +47,7 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">实额：</label>
+      <label class="layui-form-label">合同额：</label>
       <div class="layui-input-inline">
         <%= @follow_up.actual_amount %>万
       </div>
@@ -60,9 +60,9 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">分成：</label>
+      <label class="layui-form-label">渠道分成：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.divide_rate %>%
+        <%= @follow_up.divide_rate %>
       </div>
     </div>
     <div class="ayui-form-item">
@@ -72,7 +72,7 @@
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">商机说明：</label>
+      <label class="layui-form-label">最新进展：</label>
       <div class="layui-input-block" style="padding-right: 20px;">
         <pre><%= @follow_up.description %></pre>
       </div>
@@ -83,5 +83,17 @@
         <pre><%= @follow_up.advise %></pre>
       </div>
     </div>
+    <div class="layui-form-item layui-form-text">
+      <label class="layui-form-label">时间：</label>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @follow_up.created_at.to_s %></pre>
+      </div>
+    </div>
+    <div class="layui-form-item layui-form-text">
+      <label class="layui-form-label">跟进人：</label>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @follow_up.staff.user.real_name %></pre>
+      </div>
+    </div>
   </div>
 </form>

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

@@ -12,9 +12,8 @@ json.data do
     json.teacher_follows_count d.teacher_follows_count
     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.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).distinct("course_id").count : 0
+    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}).where("is_delete = 0 and role != 4  and excellent = 0 and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct(:course_id).count : 0
     json.actives d.actives
     json.students d.students_count
     json.regist_at d.user.present? ? d.user.created_on.to_s(:date) : ''

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

@@ -8,8 +8,9 @@ json.data do
     json.course_build EducodeSales::Common.find_by(id: d.course_build_id).name
     json.contact EducodeSales::Common.find_by(id: d.follow_id).name
     json.staff d.staff.user.real_name
-    json.students_count d.students_count
-    json.courses_count Course.joins(:course_members).where(course_members: {user_id: d.teacher&.user_id}).distinct("course_id").count
+    json.students_count d.teacher&.students_count
+    # json.courses_count Course.joins(:course_members).where(course_members: {user_id: d.teacher&.user_id}).distinct("course_id").count
+    json.courses_count Course.joins(:course_members).where(course_members: {user_id: d.teacher&.user_id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct(:course_id).count
     json.evaluates_count d.evaluates_count
     json.course_shixuns_count d.course_shixuns_count
     json.shixuns_count d.shixuns_count

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

@@ -10,13 +10,19 @@
   <%= stylesheet_link_tag "educode_sales/application", media: "all" %>
   <%= javascript_include_tag "educode_sales/application" %>
 </head>
-<body>
-<div class="layui-layout layui-layout-admin">
+<body class="" id="body">
+<div class="layui-layout layui-layout-admin " >
   <div class="layui-header">
-    <div class="layui-logo layui-hide-xs layui-bg-black">
+    <div class="layui-logo layui-hide-xs layui-bg-black layuimini-logo">
       <%= image_tag "educode_sales/logo.png", class: 'header-logo' %>
       <span class="app-title">营销系统</span>
     </div>
+
+    <ul class="layui-nav i_class" style="left: 200px">
+      <li class="layui-nav-item layui-show-xs-inline-block " lay-header-event="menuLeft">
+        <a href="javascript:;"> <i id="leftEnumIcon" class="layui-icon layui-icon-shrink-right"></i></a>
+      </li>
+    </ul>
     <ul class="layui-nav layui-layout-right">
       <li class="layui-nav-item layui-hide layui-show-md-inline-block">
         <a href="javascript:;">
@@ -41,64 +47,64 @@
       <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
       <ul class="layui-nav layui-nav-tree" lay-filter="test">
         <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;"><b>销售活动</b></a>
+          <a class="" href="javascript:;"><b><i class="layui-icon layui-icon-template-1" style="font-size: 25px;  padding-right: 20px"></i>销售活动</b></a>
           <dl class="layui-nav-child">
             <% if can? :trends, EducodeSales::SaleTrend %>
-            <dd>
-              <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>">市场态势</a>
-            </dd>
+              <dd>
+                <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>"><i class="layui-icon layui-icon-chart-screen" style="font-size: 25px;  padding-right: 20px"></i>市场态势</a>
+              </dd>
             <% end %>
             <% if can? :sales, EducodeSales::Staff %>
-            <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>">销售分工</a>
-            </dd>
+              <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>"><i class="layui-icon  layui-icon-username" style="font-size: 25px;  padding-right: 20px"></i>销售分工</a>
+              </dd>
             <% end %>
             <% if can? :read, EducodeSales::Business %>
-            <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>">商机管理</a>
-            </dd>
+              <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>"><i class="layui-icon layui-icon-component" style="font-size: 25px;  padding-right: 20px"></i>商机管理</a>
+              </dd>
             <% end %>
             <% if can? :read, EducodeSales::Place %>
-            <dd><a href="/missions/places" class="<%= current?('layui-this', places_path) %>">渠道管理</a></dd>
+              <dd><a href="/missions/places" class="<%= current?('layui-this', places_path) %>"><i class="layui-icon layui-icon-tabs" style="font-size: 25px;  padding-right: 20px"></i>渠道管理</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::SalePlan %>
-            <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>">销售计划</a></dd>
+              <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>"><i class="layui-icon layui-icon-form" style="font-size: 25px;  padding-right: 20px"></i>销售计划</a></dd>
             <% end %>
           </dl>
         </li>
         <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;"><b>运营活动</b></a>
+          <a class="" href="javascript:;"><b><i class="layui-icon layui-icon-app" style="font-size: 25px;  padding-right: 20px"></i>运营活动</b></a>
           <dl class="layui-nav-child">
-             <% if can? :read, EducodeSales::OperationTrend %>
-            <dd>
-              <a href="/missions/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>">运营态势</a>
-            </dd>
-             <% end %>
-             <% if can? :operations, EducodeSales::Staff %>
-            <dd>
-              <a href="/missions/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>">运营分工</a>
-            </dd>
+            <% if can? :read, EducodeSales::OperationTrend %>
+              <dd>
+                <a href="/missions/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>"><i class="layui-icon  layui-icon-chart" style="font-size: 25px;  padding-right: 20px"></i>运营态势</a>
+              </dd>
+            <% end %>
+            <% if can? :operations, EducodeSales::Staff %>
+              <dd>
+                <a href="/missions/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>"><i class="layui-icon layui-icon-friends" style="font-size: 25px;  padding-right: 20px"></i>运营分工</a>
+              </dd>
             <% end %>
             <% if can? :read, EducodeSales::Teacher %>
-            <dd><a href="/missions/teachers" class="<%= current?('layui-this', teachers_path) %>">教师运营</a></dd>
+              <dd><a href="/missions/teachers" class="<%= current?('layui-this', teachers_path) %>"><i class="layui-icon layui-icon-release" style="font-size: 25px;  padding-right: 20px"></i>教师运营</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::Activity %>
-            <dd><a href="/missions/activities" class="<%= current?('layui-this', activities_path) %>">活动运营</a></dd>
+              <dd><a href="/missions/activities" class="<%= current?('layui-this', activities_path) %>"><i class="layui-icon layui-icon-engine" style="font-size: 25px;  padding-right: 20px"></i>活动运营</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::OperationPlan %>
-            <dd>
-              <a href="/missions/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>">运营计划</a>
-            </dd>
+              <dd>
+                <a href="/missions/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>"><i class="layui-icon layui-icon-log" style="font-size: 25px;  padding-right: 20px"></i>运营计划</a>
+              </dd>
             <% end %>
           </dl>
         </li>
         <% if @current_admin.is_admin %>
-        <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;"><b>系统设置</b></a>
-          <dl class="layui-nav-child">
-            <dd><a href="/missions/roles" class="<%= current?('layui-this', roles_path) %>">角色管理</a></dd>
-            <dd><a href="/missions/staffs" class="<%= current?('layui-this', staffs_path) %>">人员管理</a></dd>
-            <dd><a href="/missions/commons" class="<%= current?('layui-this', commons_path) %>">字典列表</a></dd>
-          </dl>
-        </li>
+          <li class="layui-nav-item layui-nav-itemed">
+            <a class="" href="javascript:;"><b><i class="layui-icon layui-icon-set-sm" style="font-size: 25px;  padding-right: 20px"></i>系统设置</b></a>
+            <dl class="layui-nav-child">
+              <dd><a href="/missions/roles" class="<%= current?('layui-this', roles_path) %>"><i class="layui-icon layui-icon-username" style="font-size: 25px;  padding-right: 20px"></i>角色管理</a></dd>
+              <dd><a href="/missions/staffs" class="<%= current?('layui-this', staffs_path) %>"><i class="layui-icon layui-icon-user" style="font-size: 25px;  padding-right: 20px"></i>人员管理</a></dd>
+              <dd><a href="/missions/commons" class="<%= current?('layui-this', commons_path) %>"><i class="layui-icon layui-icon-file" style="font-size: 25px;  padding-right: 20px"></i>字典列表</a></dd>
+            </dl>
+          </li>
         <% end %>
       </ul>
     </div>
@@ -120,3 +126,71 @@
 
 </body>
 </html>
+<script type="text/javascript" charset="utf-8">
+    //头部事件
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            util = layui.util,
+            miniPage = layui.miniPage;
+
+        util.event('lay-header-event', {  //util 记得 声明 var util = layui.util
+            //左侧菜单事件
+            menuLeft: function (othis) {
+                var body = $("#body");
+                var btn = $("#leftEnumIcon");
+                if (btn.hasClass('layui-icon-shrink-right')) {
+                    menuHide(btn);
+                    btn.addClass('btn-index');
+                } else if (btn.has('layui-icon-spread-left')) {
+                    btn.removeClass('btn-index');
+                    menuShow(btn);
+
+                }
+
+                $(window).resize(function () {
+                    var width = $(document.body).width();
+                    var btn = $("leftEnumIcon");
+                    if (width < 1000) {
+                        if (btn.hasClass('layui-icon-shrink-right')) {
+                            menuShow(btn);
+                        }
+                    } else {
+                        if (!btn.hasClass('btn-index')) {
+                            if (btn.hasClass('layui-icon-spread-left')) {
+                                menuHide(btn);
+
+                            }
+                        }
+
+
+                    }
+
+                });
+
+                function menuShow(btn) {
+                    btn.removeClass('layui-icon-spread-left').addClass('layui-icon-shrink-right');
+                    body.removeClass('layuimini-mini')
+                    $(".i_class").animate({left: '200px'});
+                    // $(".zq-logo").animate({width: 'toggle'});
+                    // $(".layui-body").animate({left: '200px'});
+                    // $(".layui-footer").animate({left: '200px'});
+                }
+
+                function menuHide(btn) {
+                    btn.removeClass('layui-icon-shrink-right').addClass('layui-icon-spread-left');
+                    body.addClass('layuimini-mini');
+                    // $(".layui-side").animate({width: '50px'}); //toggle如果原来div是隐藏的就会把元素显示，如果原来是显示则隐藏
+                    $(".i_class").animate({left: '60px'});
+                    // $(".layui-body").animate({left: '0px'});
+                    // $(".layui-footer").animate({left: '0px'});
+                }
+            }
+        });
+    });
+</script>
+<style>
+
+</style>

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/db/migrate/20211018054256_add_extras_to_commons.rb

@@ -0,0 +1,6 @@
+class AddExtrasToCommons < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_commons, :extras, :string
+    add_column :educode_sales_follow_ups, :divide_amount, :float
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.3.9'
+  VERSION = '0.4.3'
 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.3
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -333,6 +333,7 @@ files:
 - db/migrate/20211009031109_add_tel_key_peoples.rb
 - db/migrate/20211009063423_add_source_businesses.rb
 - db/migrate/20211013060712_create_educode_sales_assign_follow_ups.rb
+- db/migrate/20211018054256_add_extras_to_commons.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb