educode_sales 1.10.59 → 1.10.70

data/app/controllers/educode_sales/shixuns_controller.rb

@@ -4,21 +4,29 @@
 module EducodeSales
   class ShixunsController < ApplicationController
     before_action :subject_members, :subject_staffs, :create_filter, :subject_url
-    def index
+    before_action :have_permission?, only: %i(index new create edit)
+
+    # 查看cancancan Gem优化代码
+    def have_permission?
+      have_permission = can?(:shixun, EducodeSales::BusinessDeliverSubject) || can?(:all_shixun, EducodeSales::BusinessDeliverSubject)
+
+      have_permission || @current_admin.is_admin ? "" : authorize!(:shixun, BusinessDeliverSubject)
+    end
+
 
-      authorize! :shixun, BusinessDeliverSubject
+    def index
 
       # 判断类型是否存在 1 管培 2 全职 3 专职 如果不存在就默认为1
       category = params[:q].present? ? params[:q][:category].to_i : BusinessSubjectShixun::CATEGORY_TYPE::TRAINING
       trends_category = params[:trends_category]
 
       gon.category = trends_category.present? ? trends_category.to_i : 1
-      gon.is_admin = is_commissioner_above?
+      gon.is_admin =  @current_admin.is_admin  || ["销售总监", "副总", "生态运营总监", "方案总监", "售后总监", "课程组总监"].include?(@current_admin.role.name)
 
       business_subject_shixuns = BusinessSubjectShixun
 
       # 根据身份获取对应数据
-      business_subject_shixuns  = if is_commissioner_above?
+      business_subject_shixuns  = if is_commissioner_above?("shixun")
                                     business_subject_shixuns
                                   else
                                     # 实训本身的成员
@@ -66,8 +74,14 @@ module EducodeSales
       if params[:q].present? && params[:q][:subject_name].present?
         @shixuns = @shixuns.where("subjects.name like '%#{params[:q][:subject_name]}%'")
       end
-
-
+      if params[:q].present? && params[:q][:shixun_type].present? && params[:q][:shixun_type].to_i != 0
+        @shixuns = @shixuns.where(shixun_type:params[:q][:shixun_type])
+      end
+      if params[:q] && params[:q][:deliver_date].present?
+        start_time = params[:q][:deliver_date].split(" - ")[0]
+        end_time = params[:q][:deliver_date].split(" - ")[-1]
+        @shixuns = @shixuns.where("educode_sales_business_subject_shixuns.deliver_date BETWEEN '#{start_time}' AND '#{end_time}' ")
+      end
       shixun_staffs = {}
       BusinessSubjectShixun.includes(business_subject:[ business_deliver_subject: [:manages, business: [:school, last_follow_up: :assign_follow_ups]] ]).find_each do |d|
         b_d_s = d.business_subject
@@ -96,7 +110,6 @@ module EducodeSales
     end
 
     def edit
-      authorize! :shixun, BusinessDeliverSubject
       @item = BusinessSubjectShixun.find(params[:id])
       @last_dectect = ''
       if @item.last_dectect.present?
@@ -118,7 +131,6 @@ module EducodeSales
     end
 
     def update
-      authorize! :shixun, BusinessDeliverSubject
       ActiveRecord::Base.transaction do
 
         if params[:id].present?
@@ -151,14 +163,12 @@ module EducodeSales
     end
 
     def new
-      authorize! :shixun, BusinessDeliverSubject
       gon.manage = @manages
       gon.staffs = @staffs
       render layout: false
     end
 
     def create
-      authorize! :shixun, BusinessDeliverSubject
       begin
         ActiveRecord::Base.transaction do
 

data/app/controllers/educode_sales/subjects_controller.rb

@@ -6,15 +6,23 @@ module EducodeSales
   # 实践课程管理
   class SubjectsController < ApplicationController
     before_action :subject_members, :subject_url
+    before_action :have_permission?, only: %i(index new create edit)
+
+    # 查看cancancan Gem优化代码
+    def have_permission?
+      have_permission = can?(:subject, EducodeSales::BusinessDeliverSubject) || can?(:all_subject, EducodeSales::BusinessDeliverSubject)
+
+      have_permission || @current_admin.is_admin ? "" : authorize!(:subject, BusinessDeliverSubject)
+    end
+
 
     def index
-      authorize! :subject, BusinessDeliverSubject
       respond_to do |format|
         format.html do
         end
         format.json do
 
-          if is_commissioner_above?
+          if is_commissioner_above?("subject")
             business_subject = BusinessSubject
           else
             deliver_staffs = BusinessSubject.joins(business_deliver_subject: [manages: :staff])
@@ -69,14 +77,12 @@ module EducodeSales
     end
 
     def new
-      authorize! :subject, BusinessDeliverSubject
       # staffs = Staff.where.not(role_id: 11).includes(:user)
       gon.staffs = @manages
       render layout: false
     end
 
     def edit
-      authorize! :subject, BusinessDeliverSubject
       if params[:id]
         business_subject = BusinessSubject.find(params[:id])
         @item = business_subject.subject
@@ -91,7 +97,6 @@ module EducodeSales
     end
 
     def create
-      authorize! :subject, BusinessDeliverSubject
       # 开启事务
       ActiveRecord::Base.transaction do
         subject = Subject.where.not(id: BusinessSubject.pluck(:subject_id) ).find_by(id: params[:subject_id])
@@ -123,7 +128,6 @@ module EducodeSales
     end
 
     def update
-      authorize! :subject, BusinessDeliverSubject
       # 开启事务
       ActiveRecord::Base.transaction do
         business_subject = BusinessSubject.find_by(id: params[:id])

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -116,6 +116,10 @@ module EducodeSales
         @follow_ups = @follow_ups.where("educode_sales_teacher_follows.created_at > ? AND educode_sales_teacher_follows.created_at < ?", date[0], date[1] + ' 23:59:59')
       end
 
+      if params[:q].present? && params[:q][:staff].present?
+        @follow_ups = @follow_ups.joins(staff: :user).where("CONCAT(users.lastname,users.firstname) like ?", "%#{params[:q][:staff]}%")
+      end
+
       @follow_ups =  @follow_ups.includes(:teacher, :attitude, :staff)
       if params[:sort].present? && params[:sort][:field]
         @follow_ups = @follow_ups.order("#{params[:sort][:field]} #{params[:sort][:order]}")

data/app/controllers/educode_sales/teachers_controller.rb

@@ -119,6 +119,9 @@ module EducodeSales
           if params[:q].present? && params[:q][:professional_title].present?
             @teachers = @teachers.where("educode_sales_teachers.professional_title = ?", "#{params[:q][:professional_title]}")
           end
+          if params[:q].present? && params[:q][:job].present?
+            @teachers = @teachers.where("educode_sales_teachers.job = ?", "#{params[:q][:job]}")
+          end
           # if params[:q].present? && params[:q][:regist_at].present?
           #   @teachers = @teachers.where("educode_sales_teachers.regist_at like ?", "%#{params[:q][:regist_at]}%")
           # end

data/app/models/educode_sales/business.rb

@@ -82,11 +82,11 @@ module EducodeSales
     # 创建商机交付课程数据
     def change_diliver
 
-      # if previous_changes["last_follow_up_id"].present?
-      #   last_clazz_id = previous_changes["last_follow_up_id"][-1]
-      #   common_type = FollowUp.find_by(id: last_clazz_id)&.stage&.name == "已中标"
-      #   BusinessDeliverSubject.find_or_create_by(business_id: self.id) if common_type
-      # end
+      if previous_changes["last_follow_up_id"].present?
+        last_clazz_id = previous_changes["last_follow_up_id"][-1]
+        common_type = FollowUp.find_by(id: last_clazz_id)&.stage&.name == "已中标"
+        BusinessDeliverSubject.find_or_create_by(business_id: self.id) if common_type
+      end
     end
 
     def school_name

data/app/models/educode_sales/sales_target.rb

@@ -0,0 +1,10 @@
+module EducodeSales
+  class SalesTarget < ApplicationRecord
+    belongs_to :staff
+    belongs_to :reviewer, class_name: 'Staff', optional: true 
+    belongs_to :school_tag
+
+    enum target_clazz: { '中标': 18, '回款': 2, '商机': 7 }
+    enum state: %w[待审核 已通过 已驳回]
+  end
+end

data/app/models/educode_sales/sales_target_log.rb

@@ -0,0 +1,11 @@
+module EducodeSales
+  class SalesTargetLog < ApplicationRecord
+    belongs_to :staff
+    belongs_to :reviewer, class_name: 'Staff', optional: true 
+    belongs_to :school_tag
+
+    enum target_clazz: { '中标': 18, '回款': 2, '商机': 7 }
+    enum state: %w[待审核 已通过 已驳回]
+
+  end
+end

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

@@ -164,7 +164,7 @@
                 },
                 {
                     field: 'subject_manages',
-                    title: '课程经理',
+                    title: '课程组组长',
                     align: 'center',
                     minWidth: 100,
                     templet: '#show_phone_number'

data/app/views/educode_sales/business_courses/new.html.erb

@@ -39,9 +39,9 @@
     </div>
   </div>
   <div class="layui-form-item">
-    <label class="layui-form-label">课程经理:<span style="color: red"> *</span></label>
+    <label class="layui-form-label" style="width: 96px">课程组组长:<span style="color: red"> *</span></label>
     <div class="layui-input-block">
-      <div id="manage_id" style="width: 50%"></div>
+      <div id="manage_id" style="width: 49%;margin-left: 12px"></div>
     </div>
   </div>
 

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

@@ -43,6 +43,12 @@
           <input type="text" name="description" class="layui-input">
         </div>
       </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">跟进人</label>
+        <div class="layui-input-inline">
+          <input type="text" name="staff" class="layui-input">
+        </div>
+      </div>
 
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_follows_search">重置
@@ -77,14 +83,14 @@
 
 
 <script>
-    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'functions'], function () {
         var $ = layui.jquery,
             form = layui.form,
             request = layui.request,
             dropdown = layui.dropdown,
             miniPage = layui.miniPage,
             laydate = layui.laydate;
-
+        var functions = layui.functions;
         var laydate = layui.laydate;
 
         laydate.render({
@@ -93,6 +99,96 @@
         });
 
         table = layui.table;
+        let columns = [
+            {
+                field: 'id',
+                width: 60,
+                title:'序号',type: 'numbers',
+            },
+            {
+                field: 'description',
+                title: '最新进展',
+                templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
+            },
+            {
+                field: 'business',
+                width: 120,
+                title: '所属商机',
+                templet:'#business'
+            },
+            {
+                field: 'school',
+                width: 120,
+                title: '单位',
+                templet:'#school'
+            },
+            {
+                field: 'property',
+                width: 150,
+                title: '客户类型',
+            },
+            {
+                field: 'clazz',
+                width: 80,
+                title: '类型',
+                templet:'<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
+            },
+            {
+                field: 'stage',
+                title: '阶段',
+                width: 90,
+                templet:'<div><span title="{{d.stage}}">{{d.stage}}</span></div>'
+            },
+            {
+                field: 'advise',
+                width: 120,
+                title: '团队建议',
+                templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
+            },
+            {
+                field: 'key_people',
+                width: 100,
+                title: '关键人',
+                templet:'<div><span title="{{d.key_people}}">{{d.key_people}}</span></div>'
+            },
+            {
+                field: 'rival',
+                width: 100,
+                title: '竞争对手',
+            },
+            {
+                field: 'staff_manages',
+                width: 120,
+                title: '销售经理',
+            },
+            {
+                field: 'tel',
+                width: 90,
+                title: '联系方式',
+                templet:'<div><span title="{{d.tel}}">{{d.tel}}</span></div>'
+            },
+            {
+                field: 'staff',
+                width: 90,
+                title: '跟进人',
+            },
+            {
+                field: 'created_at',
+                width: 120,
+                title: '跟进时间',
+                sort: true,
+                templet:'<div><span title="{{d.created_at}}">{{d.created_at}}</span></div>'
+
+            },
+            {
+                title: '操作',
+                width: 160,
+                toolbar: '#currentTableBar_follows',
+                align: "center",
+                fixed: 'right'
+            }
+        ];
+        columns = functions.initTableColumnsFilter('teachers_table', columns);
         table.render({
             elem: '#teachers_table',
             url: '/missions/follow_ups',
@@ -103,106 +199,16 @@
                 field: 'created_at' //排序字段，对应 cols 设定的各字段名
                 ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
             },
-            cols: [
-                [
-                    {
-                        field: 'id',
-                        width: 60,
-                        title:'序号',type: 'numbers',
-                    },
-                    {
-                        field: 'description',
-                        title: '最新进展',
-                        templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
-                    },
-                    {
-                        field: 'business',
-                        width: 120,
-                        title: '所属商机',
-                        templet:'#business'
-                    },
-                    {
-                        field: 'school',
-                        width: 120,
-                        title: '单位',
-                        templet:'#school'
-                    },
-                    {
-                      field: 'property',
-                      width: 150,
-                      title: '客户类型',
-                    },
-                    {
-                        field: 'clazz',
-                        width: 80,
-                        title: '类型',
-                        templet:'<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
-                    },
-                    {
-                        field: 'stage',
-                        title: '阶段',
-                        width: 90,
-                        templet:'<div><span title="{{d.stage}}">{{d.stage}}</span></div>'
-                    },
-                    {
-                        field: 'advise',
-                        width: 120,
-                        title: '团队建议',
-                        templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
-                    },
-                    {
-                        field: 'key_people',
-                        width: 100,
-                        title: '关键人',
-                        templet:'<div><span title="{{d.key_people}}">{{d.key_people}}</span></div>'
-                    },
-                    {
-                      field: 'rival',
-                      width: 100,
-                      title: '竞争对手',
-                    },    
-                    {
-                        field: 'staff_manages',
-                        width: 120,
-                        title: '销售经理',
-                    },
-                    {
-                        field: 'tel',
-                        width: 90,
-                        title: '联系方式',
-                        templet:'<div><span title="{{d.tel}}">{{d.tel}}</span></div>'
-                    },
-                    {
-                        field: 'staff',
-                        width: 90,
-                        title: '跟进人',
-                    },
-                    {
-                        field: 'created_at',
-                        width: 120,
-                        title: '跟进时间',
-                        sort: true,
-                        templet:'<div><span title="{{d.created_at}}">{{d.created_at}}</span></div>'
-
-                    },
-                    {
-                        title: '操作',
-                        width: 160,
-                        toolbar: '#currentTableBar_follows',
-                        align: "center",
-                        fixed: 'right'
-                    }
-                ]
-            ],
+            cols: [columns],
             limit: 20,
             limits: [10,15,20,30,40,50,60,70,80,90],
             page: true,
+            done: function () {
+                var that = this;
+                functions.observerTableColumnFilter(that);
+            }
         });
 
-
-
-
-
         var sort = {}, search = {};
         table.on('sort(teachers_table)', function (obj) {
             sort.field = obj.field;
@@ -245,8 +251,9 @@
                 name: "",
                 department: "",
                 description: "",
-                staff_id: ""
-            })
+                staff_id: "",
+                staff: ""
+            });
             return false;
         });
         table.on('toolbar(teachers_table)', function(obj){
@@ -327,7 +334,7 @@
                         }
                       })
                     }
-                    
+
                     return false
                   },
                   btn2: function(index, l) {

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

@@ -28,7 +28,7 @@
                 </div>
               </div>
               <div class="layui-inline">
-                <label class="layui-form-label">最新跟进人</label>
+                <label class="layui-form-label" style="width: 130px">最新跟进人</label>
                 <div class="layui-input-inline">
                   <div id="staffs_id" style="width: 190px;"></div>
                 </div>
@@ -256,13 +256,14 @@
 
 
 <script>
-    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown','laytpl'], function () {
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown','laytpl', 'functions'], function () {
         var $ = layui.jquery,
             form = layui.form,
             request = layui.request,
             miniPage = layui.miniPage,
             dropdown = layui.dropdown,
             laydate = layui.laydate;
+        var functions = layui.functions;
         var openWH = miniPage.getOpenWidthHeight();
         laydate.render({
           elem: '#date',
@@ -664,7 +665,7 @@
                 }
             ]
         ]
-
+        cols_table[0] = functions.initTableColumnsFilter('businesses_table', cols_table[0]);
         var delete_business_cols = [cols_table[0].slice(0, -1).concat(
           {
             field: 'delete_reason',
@@ -707,6 +708,8 @@
             //     $('#businesses_table_wraper .layui-table-header').removeClass('table-header-fixed'); //移除样式
             //   }
             // });
+              var that = this;
+              functions.observerTableColumnFilter(that);
           }
       });
 

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

@@ -26,7 +26,7 @@ json.data do
     json.created_at d.created_at.to_s
     json.no_followup_days (d['latest_time'] ? DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d['latest_time'].strftime("%Y-%m-%d")) : DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d.created_at.strftime("%Y-%m-%d"))).to_i
     
-    json.staff_manages 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.staff_manages 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.divide_rate d.divide_rate
     json.divide_money d.divide_amount.to_f.round(2)
     json.budget_amount d.budget_amount.to_f.round(2)  #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
@@ -47,7 +47,7 @@ json.data do
     #   property << '企业' if school_property.enterprise
     # end
     if d.department&.school
-      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
     else
       json.property ''
     end

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

@@ -4,7 +4,7 @@ json.data do
     json.created_at d.created_at.to_s
     json.clazz d.clazz.name
     json.stage d.stage.name
-    json.teachers_count d.key_people_count
+    json.teachers_count d.key_person.size
     json.invitation_at d.invitation_at&.to_s(:date)
     json.reception_at d.reception_at&.to_s(:date)
     json.bidded_date d.bidded_date&.to_s(:date)