educode_sales 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c060696641e16a80fea2b02631788112e85082b8ccba0a037a2635d6563dbe24
-  data.tar.gz: 07230a0582b71a0ebfceddc1ce347a667651f778fed3640a0c82b22ee952f620
+  metadata.gz: a3990eb5d7556c5bab5819c03981769a0385a28d52a8357ca8116cc1083ab6d0
+  data.tar.gz: 073e8a50229f8a39a2966fdfad84bd177efceb1101e82c6553dbc3fc905542b2
 SHA512:
-  metadata.gz: 110a25d3261f894f5ce6c5fed8e08d7afd62dd186ce6e18a10fe8d7f68033f03e48e2bdeca23df1408495e608899fc1383e5f3a0da25f1c13736b04488179820
-  data.tar.gz: 876c22dbca43a2624dbb2407cd5520c1ea0e044d696b4e3adb9571d65220560b0de3c13ecb337a9d914097b93cce6373db0a598dc5be440bbd925ee8744f995e
+  metadata.gz: 7fefe63cc01a8977e73b6f4f758aee060afe88f6c9706effda0e61ec0ab4cf38a21fa5a825e2ccf7420940a17d3712c91ac2e9a9a5268040d897dae24df55197
+  data.tar.gz: 03a089117cb9d969c68e38fb91904983dd978c459a33e8d0a03264355852e3716044fd85e280f5f9d62d54445332e516f4a0d0f324178305d8d988dd8ca3365a

data/app/controllers/educode_sales/businesses_controller.rb

@@ -270,6 +270,7 @@ module EducodeSales
         gon.sales = @last_follow_up.assign_follow_ups.map do |d|
           {value: d.staff_id, name: d.staff.user.full_name}
         end
+        gon.place = [{ value: @last_follow_up.place&.id, name: @last_follow_up.place&.name }]
       end
       render layout: false
     end
@@ -303,6 +304,7 @@ module EducodeSales
       gon.sales = @follow_up.assign_follow_ups.map do |d|
         {value: d.staff_id, name: d.staff.user.full_name}
       end
+      gon.place = [{ value: @follow_up.place&.id, name: @follow_up.place&.name }]
       render layout: false
     end
 

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -3,6 +3,63 @@ require_dependency "educode_sales/application_controller"
 module EducodeSales
   class FollowUpsController < ApplicationController
 
+    def index
+      authorize! :read, Business
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          if @current_admin.is_admin?
+            @follow_ups = FollowUp.all
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+            case level
+            when '自己'
+              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)
+              business_ids = @businesses.pluck(:id)
+              @follow_ups = @follow_ups.where(business_id: business_ids)
+            when '区域'
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(: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.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)
+              business_ids = @businesses.pluck(:id)
+              @follow_ups = @follow_ups.where(business_id: business_ids)
+            else
+              @follow_ups = FollowUp.all
+            end
+          end
+          if params[:q].present? && params[:q][:follows_business].present?
+            @follow_ups = @follow_ups.joins(:business).where("educode_sales_businesses.name LIKE ?", "%#{params[:q][:follows_business]}%")
+          end
+          if params[:q].present? && params[:q][:follows_date].present?
+            date = params[:q][:follows_date].split(" - ")
+            @follow_ups = @follow_ups.where("educode_sales_follow_ups.created_at > ? AND educode_sales_follow_ups.created_at < ?", date[0], date[1])
+          end
+          if params[:q].present? && params[:q][:follows_staff_id].present?
+            @follow_ups = @follow_ups.where(staff_id: params[:q][:follows_staff_id])
+          end
+          if params[:q].present? && params[:q][:follows_department].present?
+            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:follows_department]}%").pluck(:id)
+            @follow_ups = @follow_ups.joins(business: :department).where("departments.id in (?)", departments_ids)
+          end
+          if params[:q].present? && params[:q][:follows_area].present?
+            p = EducodeSales::Common.find(params[:q][:follows_area]).name
+            @follow_ups = @follow_ups.joins(:business).joins("
+              JOIN departments ON educode_sales_businesses.department_id = departments.id
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+          end
+          if params[:sort].present? && params[:sort][:field]
+            @follow_ups = @follow_ups.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @follow_ups = @follow_ups.order("educode_sales_follow_ups.created_at desc")
+          end
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+        end
+    end
+    end
+
     def create
       load_business
       follow_up = @business.follow_ups.build(follow_up_params)

data/app/controllers/educode_sales/home_controller.rb

@@ -43,6 +43,9 @@ module EducodeSales
 
     def sales_staff
       common = Common.find_by(clazz: 'staff_type', name: '销售')
+      if params[:teacher_assist].present?
+        common = Common.find_by(clazz: 'staff_type', name: '运营')
+      end
       @staffs = Staff
       if params[:q].present?
         @staffs = @staffs.joins(user: :user_extension).where("concat(lastname, firstname) like :q", q: "%#{params[:q]}%")
@@ -50,5 +53,13 @@ module EducodeSales
       @staffs = @staffs.where(is_admin: false).where.not(id: @current_admin.id).where(job_type: common.id).page(params[:page]).per(10)
     end
 
+    def sales_place
+      @places = EducodeSales::Place
+      if params[:q].present?
+        @places = @places.where("name like :q", q: "%#{params[:q]}%")
+      end
+      @places = @places.page(params[:page]).per(10)
+    end
+
   end
 end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -43,7 +43,7 @@ module EducodeSales
       @follow_count_data = week_follow_count_chart(default_dates,names,x_business_ids,colors)
       if params[:follow_count_range].present?
         case params[:follow_count_range]
-        when "week"  #按周
+        when "week"   #按周
           if params[:date_week].present?
             date = params[:date_week].split(" - ")
             dates = (date[0].to_date..date[1].to_date).map { |d|
@@ -76,7 +76,6 @@ module EducodeSales
       # 已中标图表
       goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a
       sale_names = ['已中标','已签单','已回款']
-      10.times{p count_type}
        @goal_count_data = month_sale_chart(goal_default_dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
       if params[:goal_count_range].present?
         case params[:goal_count_range]

data/app/controllers/educode_sales/teachers_controller.rb

@@ -21,6 +21,8 @@ module EducodeSales
     def index
       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]}
           @more = can?(:create, EducodeSales::OperationPlan) || can?(:update, EducodeSales::Teacher) || can?(:destroy, EducodeSales::Teacher)
           gon.menus = []
           if can?(:create, EducodeSales::OperationPlan)
@@ -50,7 +52,17 @@ module EducodeSales
               @teachers = Teacher.where(is_key: false)
             end
           end
-          
+
+          public_teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.all.pluck(:Teacher_id)
+          teacher_ids = @teachers.ids
+          teacher_ids = teacher_ids + public_teacher_ids + EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id)
+          @teachers = @teachers.where(id: teacher_ids)
+
+          if params[:q].present? && params[:q][:assist].present?
+            staff_id = params[:q][:assist].to_i
+            teacher_ids = EducodeSales::TeacherAssignFollow.where(staff_id: staff_id).pluck(:teacher_id)
+            @teachers = @teachers.where(id: teacher_ids)
+          end
           if params[:q].present? && params[:q][:name].present?
             @teachers = @teachers.where("educode_sales_teachers.name like ?", "%#{params[:q][:name]}%")
           end
@@ -60,6 +72,13 @@ module EducodeSales
           if params[:q].present? && params[:q][:regist_at].present?
             @teachers = @teachers.where("educode_sales_teachers.regist_at like ?", "%#{params[:q][:regist_at]}%")
           end
+          if params[:q].present? && params[:q][:status].present?
+            if params[:q][:status] == "1"
+              @teachers = @teachers.where("educode_sales_teachers.regist_at is not null AND educode_sales_teachers.user_id is not null")
+            else
+              @teachers = @teachers.where("educode_sales_teachers.regist_at is null OR educode_sales_teachers.user_id is null")
+            end
+          end
           if params[:q].present? && params[:q][:attitude].present?
             # @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:attitude]}")
             @teachers = @teachers.joins("
@@ -105,6 +124,9 @@ module EducodeSales
     def create
       department = Department.find(params[:department_id])
       teacher = @current_admin.teachers.build(teacher_params)
+      params[:teacher_assist].each do |d|
+        teacher.teacher_assign_follows.build(staff_id: d)
+      end
       teacher.department_id = department.id
       if params[:user_id].present?
         user = User.find(params[:user_id])
@@ -147,6 +169,13 @@ module EducodeSales
       teacher = Teacher.find(params[:id])
       teacher.department_id = department.id
       teacher.assign_attributes(teacher_params)
+
+      teacher_assists = []
+      params[:teacher_assist].each do |d|
+        teacher_assists << teacher.teacher_assign_follows.find_or_initialize_by(staff_id: d)
+      end
+      teacher.teacher_assign_follows = teacher_assists
+      
       if params[:user_id].present?
         user = User.find(params[:user_id])
         teacher.user_id = user.id
@@ -171,7 +200,10 @@ module EducodeSales
     end
 
     def edit
-      @teacher = Teacher.find(params[:id])
+      load_teacher
+      gon.teacher_assist = @teacher.teacher_assign_follows.map do |d|
+        {value: d.staff_id, name: d.staff.user.full_name}
+      end
       gon.department = { value: @teacher.department_id, name: "#{@teacher.department&.school&.name}-#{@teacher.department&.name}" }
       gon.value = @teacher.department_id
       render layout: false
@@ -256,17 +288,6 @@ module EducodeSales
       render layout: false
     end
 
-    # def create_follow_record
-    #
-    # end
-    #
-    # def update_follow_record
-    #
-    # end
-    # def delete_follow_record
-    #
-    # end
-
     def show_follow_record
       @follow_up = TeacherFollow.find(params[:id])
       render layout: false
@@ -294,7 +315,7 @@ module EducodeSales
 
     private
     def teacher_params
-      params.permit(:name, :professional_title, :job, :source_id)
+      params.permit(:name, :professional_title, :job, :source_id, :wechat)
     end
 
     def load_teacher

data/app/models/educode_sales/teacher.rb

@@ -6,8 +6,9 @@ module EducodeSales
     has_many :operation_plans, dependent: :destroy
     has_many :course_subjects, dependent: :destroy
     has_many :key_person, dependent: :destroy
+    has_many :teacher_assign_follows
     belongs_to :department, optional: true
-    belongs_to :staff
+    belongs_to :staff, optional: true
     belongs_to :user, optional: true
     # belongs_to :follow_up, counter_cache: true, optional: true
     belongs_to :follow_up, class_name: 'TeacherFollow', optional: true

data/app/models/educode_sales/teacher_assign_follow.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class TeacherAssignFollow < ApplicationRecord
+    belongs_to :staff
+    belongs_to :teacher
+  end
+end

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

@@ -52,24 +52,23 @@
                 {
                   field: 'name',
                   title: '活动名称',
-                  width: 400,
                   templet: '#teachers'
                 },
                 {
                   field: 'start_at',
-                  width: 120,
+                  width: 200,
                   title: '时间',
                   sort: true,
                 },
                 {
                   field: 'days',
                   title: '天数',
-                  width: 100
+                  width: 200
                 },
                 {
                   field: 'teachers_count',
                   title: '教师数',
-                  width: 100,
+                  width: 200,
                     totalRow:true,
                   templet: '#teachers_count'
                 },
@@ -77,7 +76,7 @@
                   field: 'students_count',
                   title: '学生数',
                     totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-                  width: 100
+                  width: 200
                 },
                 {
                   title: '操作',

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

@@ -2,7 +2,7 @@
 <script type="text/html" id="teacher_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">教师列表</span>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="search_new"> 添加
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="search_new"> 添加教师
     </button>
   </div>
 </script>

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

@@ -0,0 +1,233 @@
+<div style="margin: 10px 10px 10px 10px">
+  <form class="layui-form layui-form-pane" lay-filter="search_follows">
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">所属商机</label>
+        <div class="layui-input-inline">
+          <input type="text" name="follows_business" autocomplete="off" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">单位</label>
+        <div class="layui-input-inline">
+          <input type="text" name="follows_department" autocomplete="off" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">销售人员</label>
+        <div class="layui-input-inline">
+          <%= select_tag "follows_staff_id", options_for_select(@staffs, params[:follows_staff_id]), { 'lay-filter': 'follows_staff_id', include_blank: true } %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">区域</label>
+        <div class="layui-input-inline">
+          <%= select_tag "follows_area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">跟进时间</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" id="follows_date" name="follows_date" autocomplete="off" placeholder=" - ">
+        </div>
+      </div>
+
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_follows_search">重置
+        </button>
+        <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_follows">搜 索
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+<div class="">
+  <table class="layui-hide" id="teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
+</div>
+<script type="text/html" id="toolbarDemo_follows">
+  <div class="layui-btn-container">
+    <span class="table-label">跟进动态</span>
+  </div>
+</script>
+<script type="text/html" id="currentTableBar_follows">
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">详情</a>
+</script>
+<script type="text/html" id="business">
+  <a href="javascript:void(0);" lay-event="business" class="layui-table-link">{{ d.business }}</a>
+</script>
+
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            request = layui.request,
+            dropdown = layui.dropdown,
+            miniPage = layui.miniPage,
+            laydate = layui.laydate;
+
+        var laydate = layui.laydate;
+
+        laydate.render({
+            elem: '#follows_date',
+            range: true
+        });
+
+        table = layui.table;
+        table.render({
+            elem: '#teachers_table',
+            url: '/missions/follow_ups',
+            // where: {q: form.val('search_form')},
+            toolbar: '#toolbarDemo_follows',
+            defaultToolbar: ['filter'],
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 60,
+                        title:'序号',type: 'numbers',
+                    },
+                    {
+                        field: 'description',
+                        title: '最新进展',
+                    },
+                    {
+                        field: 'advise',
+                        width: 170,
+                        title: '团队建议',
+                    },
+                    {
+                        field: 'clazz',
+                        width: 80,
+                        title: '类型'
+                    },
+                    {
+                        field: 'stage',
+                        title: '阶段',
+                        width: 90,
+                    },
+                    {
+                        field: 'key_people',
+                        width: 90,
+                        title: '关键人',
+
+                    },
+                    {
+                        field: 'staff',
+                        width: 90,
+                        title: '跟进人',
+                    },
+                    {
+                        field: 'created_at',
+                        width: 170,
+                        title: '跟进时间',
+                        sort: true,
+                    },
+                    {
+                        field: 'business',
+                        width: 150,
+                        title: '所属商机',
+                        templet:'#business'
+                    },
+                    {
+                        title: '操作',
+                        width: 80,
+                        toolbar: '#currentTableBar_follows',
+                        align: "center",
+                        fixed: 'right'
+                    }
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true,
+        });
+
+
+
+
+
+        var sort = {}, search = {};
+        table.on('sort(teachers_table)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('teachers_table', {
+                initSort: obj,
+                where: {
+                    sort: sort,
+                    q: search
+                }
+            });
+        })
+
+        // 监听搜索操作
+        form.on('submit(search_follows)', function (data) {
+            search = data.field
+            table.reload('teachers_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            return false;
+        });
+
+        form.on('submit(reset_follows_search)', function (data) {
+            var field = data.field;
+            form.val('search_follows', {
+                follows_area: "",
+                follows_date: "",
+                follows_business: "",
+                follows_department: "",
+                follows_staff_id: ""
+            })
+            return false;
+        });
+        table.on('tool(teachers_table)', function (obj) {
+            var data = obj.data;
+            id = data.id
+            if (obj.event === 'add_event') { // 监听添加操作
+                var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + data.id);
+                var openWH = miniPage.getOpenWidthHeight();
+                show_index = layer.open({
+                    title: '查看商机跟进记录',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: [openWH[0] + 'px', openWH[1] + 'px'],
+                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }  else if (obj.event === 'business') {
+                console.log(data);
+                business_id = data.business_id
+                business_name = data.business
+                content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
+                openWH = miniPage.getOpenWidthHeight();
+                index = layer.open({
+                    title: '商机列表/' + data.business + '的跟进记录',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: [openWH[0] + 'px', openWH[1] + 'px'],
+                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }
+        });
+
+    });
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>

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

@@ -79,8 +79,8 @@
     <br>
     <div class="layui-inline">
       <label class="layui-form-label">渠道</label>
-      <div class="layui-input-inline">
-        <%= select_tag "place_id", options_for_select(@places, @follow_up.place_id), include_blank: true %>
+      <div class="layui-input-inline" style="z-index: 101">
+        <div id="edit_place" style="width: 190px;"></div>
       </div>
     </div>
     <div class="layui-inline">
@@ -174,6 +174,49 @@
       }
     })
     sales_list.setValue(gon.sales)
+    var places_list = xmSelect.render({
+      el: '#edit_place',
+      remoteSearch: true,
+      clickClose: true,
+        model: {
+            icon: 'hidden',
+            label: {
+                type: 'text',
+                text: {
+                    //左边拼接的字符
+                    left: '',
+                    //右边拼接的字符
+                    right: '',
+                    //中间的分隔符
+                    separator: ', ',
+                },
+            }
+        },
+      delay: 1000,
+        radio: true,
+      paging: true,
+      pageRemote: true,
+      filterable: true,
+      remoteMethod: function (val, cb, show, pageIndex) {
+        $.ajax( '/missions/sales_place', {
+          method: 'get',
+          data: {
+            q: val,
+            page: pageIndex
+          },
+          dataType: 'json',
+          success: function (res) {
+            var data = res.data;
+            if (res.code == 0) {
+              cb(res.data, res.count);
+            } else {
+              layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+            }
+          }
+        })
+      }
+    })
+    places_list.setValue(gon.place)
 
     form.render();
     form.on('submit(update_follow_up)', function (data) {
@@ -181,8 +224,9 @@
       sales_list.getValue().forEach(function(d) {
         assign_follow.push(d.value);
       })
-      data.field.assign_follow_up = assign_follow;
-      request.authPut("missions/follow_ups/<%= @follow_up.id%>", data.field, function (res) {
+        data.field.assign_follow_up = assign_follow;
+        data.field.place_id = places_list.getValue()[0].value;
+        request.authPut("missions/follow_ups/<%= @follow_up.id%>", data.field, function (res) {
         if (res.success == false) {
           layer.alert(res.msg)
         } else {