educode_sales 0.9.66 → 0.9.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c77ba5bbfa29534697eba58c7d999ffbe0834fb358aae6b3e923278e5f16475e
-  data.tar.gz: 78b061d50d1bd7bff1e58e2dfdc4bcf23ac85661980324dfce85b0dd961d8dac
+  metadata.gz: 5df645421c2aa112db563a37427dc4371924632bbca76efa21b74acec0911793
+  data.tar.gz: bcc515a472ec5c92f66b9bb833dcfe4ca4e2330634df6bfb0b9b058501a90f90
 SHA512:
-  metadata.gz: 4567e920c14a07085963ca478f9629def13a74ab78e5d0f1c8a9559e5c32f9e1e2ebed39bef4396a1f3d1e5e6e8b42ea5dd18128c8be6275b5c91430d59b32f2
-  data.tar.gz: dc98da54f8926781094902266a9eeaae2e0d1f6cab8837c27795bccab0d031da4946f19246baefdd11534af288a9afc37aa3e4ecf865a22d7d0a6a499870b809
+  metadata.gz: ee2b4439e08af8c4ca6810fc5fe5ef04d0d410c38a6bc32c8ca3bdcc0caea46e1ce3ac29b178c2c632f5edddd5190046f47e00605a1c33496e7e7a4c9aeb7c89
+  data.tar.gz: 41c923fe3dd2dd68df2c141add67467fd52b1ffc5bc5ac36a010272cb38b75d1cab760f6e136b24d32c22642dee5f19f84da10c279d9b22d12eb728e4b66d4e9

data/app/controllers/educode_sales/activities_controller.rb

@@ -16,6 +16,10 @@ module EducodeSales
             if params[:q][:clazz_id].present?
               @activities = @activities.where(clazz_id: params[:q][:clazz_id])
             end
+
+            if params[:q][:state_id].present?
+              @activities = @activities.where(state_id: params[:q][:state_id])
+            end
             
             if params[:q][:name].present?
               @activities = @activities.where("educode_sales_activities.name like ?", "%#{params[:q][:name]}%")
@@ -48,18 +52,24 @@ module EducodeSales
 
     def edit
       @activity = Activity.find(params[:id])
+      @clazz = ['全国会议', '区域会议', '单校会议', '国赛', '省赛', '夏令营']
       manage_ids = @activity.manages.pluck(:staff_id)
       assist_ids = @activity.assists.pluck(:staff_id)
       gon.staff_manage = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: manage_ids.include?(d.id)}}
       gon.assists = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: assist_ids.include?(d.id)}}
       gon.experts = @activity.experts.map { |d| {name: d.name, value: d.user_id || d.name, selected: true}}
+
+      gon.invitation_list = @activity.invitations.map { |d| {name: d.name, value: d.user_id || d.name, selected: true}}
+
+      sale_id = @activity.sales_id || @activity.staff_id
+
+      gon.sales_manage = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: d.id == sale_id }}
       render layout: false
     end
 
     def create
       activity = @current_admin.activities.new(activity_params)
-
-      # render_success
+      activity.sales_id = @current_admin.id
       if activity.save
         params[:staff_manage_id].each do |d|
           EducodeSales::ActivityStaff.create(staff_id: d, clazz_id: 'manage', activity_id: activity.id)
@@ -75,6 +85,14 @@ module EducodeSales
             EducodeSales::ActivityStaff.create(name: d[1], clazz_id: 'expert', activity_id: activity.id)
           end
         end
+        params[:invitation_ids].each do |d|
+          if d[0].to_i > 0
+            u = User.find(d[0].to_i)
+            EducodeSales::ActivityStaff.create(name: u.real_name, clazz_id: 'invitation', user_id: d[0].to_i, activity_id: activity.id)
+          else
+            EducodeSales::ActivityStaff.create(name: d[1], clazz_id: 'invitation', activity_id: activity.id)
+          end
+        end
         if params[:attachment_id].present?
           attachment = @current_admin.user.attachments.find(params[:attachment_id])
           attachment.container = activity
@@ -88,10 +106,22 @@ module EducodeSales
 
     def update
       activity = Activity.find(params[:id])
-      activity.assign_attributes(name: params[:name], start_at: params[:start_at], days: params[:days])
+      activity.assign_attributes(
+        state_id: params[:state_id],
+        name: params[:name], 
+        start_at: params[:start_at], days: params[:days],
+        sponsor: params[:sponsor],
+        linkman: params[:linkman],
+        phone: params[:phone],
+        scale: params[:scale],
+        address: params[:address],
+        meeting_form: params[:meeting_form],
+        sales_id: params[:sales_id] || @current_admin.id
+       )
       manages = []
       experts = []
       assists = []
+      invitations = []
       params[:staff_manage_id].each do |d|
         manages << EducodeSales::ActivityStaff.find_or_initialize_by(staff_id: d, clazz_id: 'manage', activity_id: activity.id)
       end
@@ -107,9 +137,18 @@ module EducodeSales
           experts << EducodeSales::ActivityStaff.find_or_initialize_by(name: d[1], clazz_id: 'expert', activity_id: activity.id)
         end
       end
+      params[:invitation_ids].each do |d|
+        if d[0].to_i > 0
+          u = User.find(d[0].to_i)
+          invitations << EducodeSales::ActivityStaff.find_or_initialize_by(name: u.real_name, clazz_id: 'invitation', user_id: d[0].to_i, activity_id: activity.id)
+        else
+          invitations << EducodeSales::ActivityStaff.find_or_initialize_by(name: d[1], clazz_id: 'invitation', activity_id: activity.id)
+        end
+      end
       activity.manages = manages
       activity.assists = assists
       activity.experts = experts
+      activity.invitations = invitations
 
       if params[:attachment_id].present?
         if activity.attachment&.id && activity.attachment&.id != params[:attachment_id].to_i
@@ -163,10 +202,39 @@ module EducodeSales
       end
     end
 
+    def new_follow_up
+      @activity = Activity.find(params[:id])
+      render layout: false
+    end
+
+    def follow_up
+      activity = Activity.find(params[:id])
+      follow_up =  EducodeSales::ActivityFollowUp.new(activity_id: activity.id, staff_id: @current_admin.id, description: params[:description], info_id: params[:info_id])
+      if follow_up.save
+        activity.last_follow_up_id = follow_up.id
+        activity.save
+        render_success
+      else
+        render_failure follow_up
+      end
+      
+    end
+
+    def follow_ups
+      @data = ActivityFollowUp.includes(:staff, activity: :staff)
+
+      if params[:sort].present? && params[:sort][:field]
+        @data = @data.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+      else
+        @data = @data.order("created_at desc")
+      end
+      @data = @data.distinct.page(params[:page]).per(params[:limit])
+    end
+
     private
 
     def activity_params
-      params.permit(:name, :start_at, :days, :staff_assist_id, :staff_manage_id, :clazz_id, :expert)
+      params.permit(:name, :start_at, :days, :staff_assist_id, :staff_manage_id, :clazz_id, :expert, :state_id, :sponsor, :linkman, :phone, :scale, :address, :meeting_form)
     end
 
   end

data/app/controllers/educode_sales/businesses_controller.rb

@@ -297,6 +297,24 @@ module EducodeSales
 
           @business_count = @businesses.distinct.count
           # mysql -select
+          watch_sql = " "
+          unless @current_admin.is_admin?
+            # 保密和战略商机，只有自己，指定人员或管理员才有权限查看
+            watch_sql = " LEFT JOIN educode_sales_business_watches ON educode_sales_business_watches.business_id = educode_sales_businesses.id
+            LEFT JOIN educode_sales_business_levels ON educode_sales_business_levels.business_id = educode_sales_businesses.id"
+            @businesses = @businesses.where("educode_sales_business_levels.id IS NULL OR (educode_sales_business_levels.id IS NOT NULL AND educode_sales_businesses.staff_id = #{@current_admin.id}) OR educode_sales_business_levels.level_id NOT IN (1,2) OR (educode_sales_business_levels.level_id IN (1, 2) AND educode_sales_business_watches.staff_id = #{@current_admin.id})")
+          end
+          if params[:q][:level_id].present?
+           
+            if @current_admin.is_admin?
+              watch_sql = " JOIN educode_sales_business_levels ON educode_sales_business_levels.business_id = educode_sales_businesses.id"
+              @businesses = @businesses.where("educode_sales_business_levels.level_id = ?", params[:q][:level_id])
+            else
+              watch_sql = " JOIN educode_sales_business_watches ON educode_sales_business_watches.business_id = educode_sales_businesses.id
+              JOIN educode_sales_business_levels ON educode_sales_business_levels.business_id = educode_sales_businesses.id AND educode_sales_business_levels.level_id = #{params[:q][:level_id].to_i}"
+              @businesses = @businesses.where("(educode_sales_businesses.staff_id = #{@current_admin.id}) OR educode_sales_business_levels.level_id NOT IN (1,2) OR (educode_sales_business_levels.level_id IN (1, 2) AND educode_sales_business_watches.staff_id = #{@current_admin.id})" )
+            end
+          end
           @businesses = @businesses.select("
             distinct
             educode_sales_businesses.*,
@@ -326,6 +344,7 @@ module EducodeSales
               WHERE educode_sales_follow_ups.deleted_at IS NULL
               GROUP BY educode_sales_follow_ups.business_id
             ) AS total_follow_ups ON educode_sales_businesses.id = total_follow_ups.business_id
+            #{watch_sql}
           ").includes(:users, last_follow_up: [:clazz, :assign_follow_ups]).page(params[:page]).per(params[:limit])
 
         end
@@ -369,6 +388,13 @@ module EducodeSales
 
     def edit
       @business = Business.find(params[:id])
+      levels = @business.business_levels.pluck(:level_id)
+      staff_ids = @business.business_watches.pluck(:staff_id)
+
+      gon.is_secret = levels.include?("保密型") || levels.include?("战略型")
+
+      gon.levels = EducodeSales::BusinessLevel.level_ids.keys.map { |d| {name: d, value: d, selected: levels.include?(d)}}
+      gon.watche_ids = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: staff_ids.include?(d.id)}}
       gon.department = {value: @business.department_id, name: "#{@business.department.school.name}-#{@business.department.name}"}
       gon.value = @business.department_id
       render layout: false
@@ -377,6 +403,26 @@ module EducodeSales
     def update
       business = Business.find(params[:id])
       department = Department.find(params[:department_id])
+      if @current_admin.is_admin?
+        if params[:level_ids]
+          levels = []
+          params[:level_ids].split(",").each do |d|
+            levels << business.business_levels.find_or_initialize_by(level_id: d)
+          end
+          business.business_levels = levels
+
+          if params[:watch_ids].blank? || !params[:level_ids].split(",").include?('保密型') && !params[:level_ids].split(",").include?('战略型')
+            business.business_watches.destroy_all
+          else
+            staffs = []
+            params[:watch_ids].split(",").each do |d|
+              staffs << business.business_watches.find_or_initialize_by(staff_id: d)
+            end
+            business.business_watches = staffs
+          end
+        end
+      end
+
       if business.update(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
         if params[:merge_business_ids].present?
           merge_business =  Business.where(id: params[:merge_business_ids].split(","))
@@ -457,6 +503,16 @@ module EducodeSales
       load_business
       respond_to do |format|
         format.html do
+          unless @current_admin.is_admin?
+            levels = @business.business_levels.pluck(:level_id)
+            staff_ids = @business.business_watches.pluck(:staff_id)
+
+            if levels.include?("保密型") || levels.include?("战略型")
+              if !staff_ids.include?(@current_admin.id) && @business.staff_id != @current_admin.id && @business.last_follow_up&.staff_id != @current_admin.id
+                return render "no_permission", layout: false
+              end
+            end
+          end
           render layout: false
         end
         format.json do
@@ -499,8 +555,22 @@ module EducodeSales
     def show_follow_record
       follow_up_id = params[:follow_up_id]
       @follow_up = FollowUp.find(follow_up_id)
+
+      @business = Business.find(@follow_up.business_id)
+      # 保密商机限制查看
+      unless @current_admin.is_admin?
+        levels = @business.business_levels.pluck(:level_id)
+        staff_ids = @business.business_watches.pluck(:staff_id)
+
+        if levels.include?("保密型") || levels.include?("战略型")
+          if !staff_ids.include?(@current_admin.id) && @business.staff_id != @current_admin.id && @business.last_follow_up&.staff_id != @current_admin.id
+            return render "no_permission", layout: false
+          end
+        end
+      end
+
       id = @follow_up.id
-      @follow_ups = Business.find(@follow_up.business_id).follow_ups
+      @follow_ups = @business.follow_ups
       ids = @follow_ups.ids
       size = ids.size
       ids = ids.reverse
@@ -546,6 +616,17 @@ module EducodeSales
       @business = Business.find(params[:business_id])
       respond_to do |format|
         format.html do
+          # 保密商机限制查看
+          unless @current_admin.is_admin?
+            levels = @business.business_levels.pluck(:level_id)
+            staff_ids = @business.business_watches.pluck(:staff_id)
+
+            if levels.include?("保密型") || levels.include?("战略型")
+              if !staff_ids.include?(@current_admin.id) && @business.staff_id != @current_admin.id && @business.last_follow_up&.staff_id != @current_admin.id
+                return render "no_permission", layout: false
+              end
+            end
+          end
           @follow_ups = @business.follow_ups.order(created_at: :desc)
           @latest = @follow_ups.present? ? @follow_ups[0] : nil
           render layout: false

data/app/models/educode_sales/activity.rb

@@ -3,13 +3,26 @@ module EducodeSales
     belongs_to :staff
     has_many :activity_teachers, dependent: :destroy
     has_many :teachers, through: :activity_teachers, dependent: :restrict_with_exception
-    has_many :manages, -> {where("educode_sales_activity_staffs.clazz_id = 0")}, dependent: :destroy, class_name: 'ActivityStaff' 
-    has_many :assists, -> {where("educode_sales_activity_staffs.clazz_id = 1")}, dependent: :destroy, class_name: 'ActivityStaff' 
-    has_many :experts , -> {where("educode_sales_activity_staffs.clazz_id = 2")}, dependent: :destroy, class_name: 'ActivityStaff' 
-    has_many :activity_staffs
+    has_many :manages, -> {where("educode_sales_activity_staffs.clazz_id = 0")}, dependent: :destroy, class_name: 'ActivityStaff'
+    has_many :assists, -> {where("educode_sales_activity_staffs.clazz_id = 1")}, dependent: :destroy, class_name: 'ActivityStaff'
+    has_many :experts , -> {where("educode_sales_activity_staffs.clazz_id = 2")}, dependent: :destroy, class_name: 'ActivityStaff'
+    has_many :invitations , -> {where("educode_sales_activity_staffs.clazz_id = 3")}, dependent: :destroy, class_name: 'ActivityStaff'
+    
+    has_many :activity_staffs, dependent: :destroy
+    has_many :activity_follow_ups, dependent: :destroy
+
+    belongs_to :sales, class_name: 'Staff', optional: true
 
     has_one :attachment, as: :container, dependent: :destroy
 
     enum clazz_id: ['全国会议', '区域会议', '单校会议', '国赛', '省赛', '夏令营']
+    enum state_id: {
+      '策划中': 1,
+      '筹备中': 2,
+      '实施中': 3,
+      '已结束': 4,
+      '已撤销': 5,
+      '已推迟': 6
+    }
   end
 end

data/app/models/educode_sales/activity_follow_up.rb

@@ -0,0 +1,13 @@
+module EducodeSales
+  class ActivityFollowUp < ApplicationRecord
+    belongs_to :staff
+    belongs_to :activity
+
+    enum info_id: {
+      '': nil,
+      '跟进信息': 1,
+      '团队建议': 2,
+      '评价': 3,
+    }
+  end
+end

data/app/models/educode_sales/activity_staff.rb

@@ -4,6 +4,6 @@ module EducodeSales
     belongs_to :staff, optional: true
     belongs_to :user, optional: true
 
-    enum clazz_id: ['manage', 'assist', 'expert']
+    enum clazz_id: ['manage', 'assist', 'expert', 'invitation']
   end
 end

data/app/models/educode_sales/business.rb

@@ -11,6 +11,8 @@ module EducodeSales
     has_many :sale_plans
     has_many :follow_ups
     has_many :business_clazz_changes
+    has_many :business_levels, dependent: :destroy
+    has_many :business_watches, dependent: :destroy
 
     #关联关注
     has_many :users,:class_name => 'EducodeSales::BusinessRelationShip',foreign_key: 'business_id',:dependent => :destroy
@@ -18,6 +20,7 @@ module EducodeSales
     #每次查询时 默认的查询条件
     default_scope  -> {where(deleted_at: nil)}
 
+
     def soft_destroy(user_id)
       self.update(deleted_at: Time.now, state_id: 2)
       self.sale_plans.each do |d|

data/app/models/educode_sales/business_level.rb

@@ -0,0 +1,11 @@
+module EducodeSales
+    class BusinessLevel < ApplicationRecord
+      belongs_to :business
+
+      enum level_id: {
+        '保密型': 1,
+        '战略型': 2
+      }
+    end
+  end
+  

data/app/models/educode_sales/business_watch.rb

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

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

@@ -0,0 +1,208 @@
+<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="name" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">最新进展</label>
+        <div class="layui-input-inline">
+          <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">
+          <%= select_tag "sales_id", options_for_select(EducodeSales::Staff.all.map{|d| [d.user&.real_name, d.id]}), { include_blank: true } %>
+        </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="activity_followp_table" style="min-height: 300px;" lay-filter="activity_followp_table"></table>
+</div>
+<script type="text/html" id="currentTableBar_follows">
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
+</script>
+<script type="text/html" id="teacher_name">
+  {{# if (d.login) { }}
+    <a href="<%= base_url%>/users/{{d.login}}" class="layui-table-link" target="_blank">{{ d.teacher }}</a>
+  {{# } else {}}
+    <a href="javascript:;" class="">{{ d.teacher }}</a>
+  {{# }}}
+</script>
+<script type="text/html" id="school">
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</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: '#activity_followp_table',
+            url: '/missions/activities/follow_ups',
+            defaultToolbar: ['filter'],
+            initSort: {
+              field: 'created_at' ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
+            cols: [
+                [
+                  {
+                      field: 'id',
+                      width: 60,
+                      title:'序号',type: 'numbers',
+                  },
+                  {
+                      field: 'description',
+                      title: '最新进展',
+                      width: 300,
+                      templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
+                  },
+                  {
+                      width: 120,
+                      title: '活动名称',
+                      field: 'name'
+                  },
+                  {
+                    field: 'state_id',
+                    width: 150,
+                    title: '活动状态',
+                  },
+                  {
+                    field: 'staff',
+                    width: 150,
+                    title: '销售经理',
+                  },
+                  {
+                    field: 'staff_manage',
+                    title: '生态经理',
+                    width: 150,
+                  },
+                  {
+                    field: 'info_id',
+                    width: 160,
+                    title: '信息类型',
+                  },
+                  {
+                    field: 'follow_up',
+                    width: 120,
+                    title: '最新跟进人',
+                  },
+                  {
+                    field: 'created_at',
+                    width: 180,
+                    title: '跟进时间',
+                    sort: true,
+                  },
+                  {
+                      field: 'advise',
+                      width: 120,
+                      title: '团队建议',
+                      templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
+                  },
+                //  {
+                 //     title: '操作',
+                  //    width: 80,
+                //      toolbar: '#currentTableBar_follows',
+                 //     align: "center",
+                 //     fixed: 'right'
+                //  }
+                ]
+            ],
+            limit: 20,
+            page: true,
+            limits: [10,15,20,30,40,50,60,70,80,90]
+        });
+
+        var sort = {}, search = {};
+        table.on('sort(activity_followp_table)', function (obj) {
+          sort.field = obj.field;
+          sort.order = obj.type;
+          table.reload('activity_followp_table', {
+            initSort: obj,
+            where: {
+              sort: sort,
+              q: search
+            }
+          });
+        })
+
+        // 监听搜索操作
+        form.on('submit(search_follows)', function (data) {
+          search = data.field
+          table.reload('activity_followp_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', {
+            name: "",
+            description: "",
+            staff_id: ""
+          })
+          return false;
+        });
+
+
+        table.on('tool(activity_followp_table)', function (obj) {
+          var data = obj.data;
+          id = data.teacher_id;
+          if (obj.event === 'detail') { // 监听添加操作
+            content = miniPage.getHrefContent('/missions/teachers/show_follow?id=' + data.teacher_id);
+            openWH = miniPage.getOpenWidthHeight();
+            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);
+            });
+          }
+        });
+
+    });
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>