educode_sales 0.9.40 → 0.9.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41be1a85301a5d440bb31501f01a0ff9db5158f0890c5096916ff238ffc34e38
-  data.tar.gz: 81a70162b88c7d09eaf90b4181177f757d993264761d65ec376e7719307da53e
+  metadata.gz: d635995859ce768ee96b28509c5094efbc03e8d98ca1b6fe59e52bc4696ef41e
+  data.tar.gz: 8010219ab35845df3329179cf6e8f2e56e224b5d60781a2ff4b80999efcc0c1c
 SHA512:
-  metadata.gz: 99f2999ebcb569c813f3251d060e0347a5a2e488ae1f778d4a51b594ff03416854f7ef9ae8cc0fe5a433f95417801a7549c16e56f1c8a96d0e031a6ec2b9539b
-  data.tar.gz: 62a7671b59dbb8ffb5ad827d310ead46aecf6c5de76b6151d4d6c0c56a81c6835a490c4171d4ee55e40317af0098e30ad87ebab6e9be0be112442a0c15747ddc
+  metadata.gz: 3939a32d342b6ce49488569f52a67902fad404502dfae2262a1f4b37a3275ec63728e36a1d03feebba2cbf20590de4ceac237a09d5b053dc10510e5506eb20f5
+  data.tar.gz: 37ba20f22853d9cd00c82c5a1f472157fa37fbfe8cfac77cb868b707142ab6d36b8e93f1ecb4f9cd6dec9f478ed9b406cfb06a68115812b6e7dd0a3e67d40391

data/app/controllers/educode_sales/businesses_controller.rb

@@ -95,20 +95,42 @@ module EducodeSales
           end
         end
         format.json do
-          if @current_admin.is_admin?
-            @businesses = Business
+          if params[:q] && (params[:q][:clazz] == 'area' || params[:q][:clazz] == 'special')
+            if params[:q][:clazz] == 'special'
+            school_ids = []
+            # 专项商机
+            school_tag_ids = @current_admin.staff_school_tags.pluck(:school_tag_id)
+            school_ids = SchoolTagMiddle.where(school_tag_id: school_tag_ids).pluck(:school_id)
+            @businesses = Business.joins("JOIN departments AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
+          elsif params[:q][:clazz] == 'area'
+            school_ids = []
+            # 区域管理商机
+            school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+            @businesses = Business.joins("JOIN departments  AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
+          end
           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)
-            when '区域'
-              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_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)
-            else
+            if @current_admin.is_admin?
               @businesses = Business
+            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)
+              when '区域'
+              
+                school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+                if can?(:special, EducodeSales::Business)
+                # 专项商机
+                  school_tag_ids = @current_admin.staff_school_tags.pluck(:school_tag_id)
+                  tag_school_ids = SchoolTagMiddle.where(school_tag_id: school_tag_ids).pluck(:school_id)
+                  school_ids += tag_school_ids
+                end
+                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
             end
           end
           if params[:q].present? && params[:q][:name].present?
@@ -116,8 +138,6 @@ module EducodeSales
           end
 
           # @budget_stage_ids = Common.where(clazz: '商机阶段', name: ['初步接洽', '准备方案','已交方案', '已立项']).pluck(:id)
-
-
           if params[:q] && params[:q][:signed_date].present?
             date = params[:q][:signed_date].split(" - ")
             @businesses = @businesses.joins("
@@ -178,6 +198,12 @@ module EducodeSales
             ").where("educode_sales_follow_ups.year = ?", params[:q][:business_year])
           end
 
+          if params[:q].present? && params[:q][:year].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.year <= ?", params[:q][:year])
+          end
+
           if params[:q].present? && params[:q][:o_business_deployment].present?
             @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
@@ -538,6 +564,12 @@ module EducodeSales
             ").where("educode_sales_follow_ups.year = ?", params[:business_year])
           end
 
+          if params[:year].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.year <= ?", params[:year])
+          end
+
           if params[:all].present?
             @businesses = @businesses
           end

data/app/controllers/educode_sales/customers_controller.rb

@@ -6,38 +6,39 @@ module EducodeSales
     def new_department
       render layout: false
     end
+
     def create_department
-        department_name = params[:department_name].to_s.strip
-        school = School.find(params[:school_id])
+      department_name = params[:department_name].to_s.strip
+      school = School.find(params[:school_id])
 
-        return render_failure('部门名称重复') if school.departments.exists?(name: department_name)
+      return render_failure('部门名称重复') if school.departments.exists?(name: department_name)
 
-        ActiveRecord::Base.transaction do
-          department = school.departments.create!(name: department_name, is_auth: 1)
-          ApplyAddDepartment.create!(school_id: school.id, status: 1, name: department.name,
-                                     department_id: department.id, user_id: current_user.id)
-        end
+      ActiveRecord::Base.transaction do
+        department = school.departments.create!(name: department_name, is_auth: 1)
+        ApplyAddDepartment.create!(school_id: school.id, status: 1, name: department.name,
+                                   department_id: department.id, user_id: current_user.id)
+      end
 
-        render_success
+      render_success
     end
 
     def edit_department
       @department = Department.find(params[:id])
       render layout: false
     end
+
     def update_department
       department = Department.find(params[:id])
       department.update(name: params[:department_name])
       render_success
     end
 
-
     def index
       authorize! :read, Customer
       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]}
+          @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
         end
         format.json do
           if @current_admin.is_admin?
@@ -46,11 +47,11 @@ module EducodeSales
             level = @current_admin.role.role_areas.find_by(clazz: '客户管理').level
             case level
             when '自己'
-              school_ids = CustomerExtension.where(customer_staff_id:  @current_admin.id).pluck(:school_id)
+              school_ids = CustomerExtension.where(customer_staff_id: @current_admin.id).pluck(:school_id)
               @customers = School.where(id: school_ids)
             when '区域'
               a_school_ids = School.where(province: @current_admin.areas.pluck(:name)).ids
-              b_school_ids = CustomerExtension.where(customer_staff_id:  @current_admin.id).pluck(:school_id)
+              b_school_ids = CustomerExtension.where(customer_staff_id: @current_admin.id).pluck(:school_id)
               school_ids = a_school_ids + b_school_ids + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
               @customers = School.where(id: school_ids)
             else
@@ -59,7 +60,7 @@ module EducodeSales
           end
           part_a_ids = CustomerFollow.all.pluck(:school_id)
           part_b_ids = Business.where(id: EducodeSales::FollowUp.pluck(:business_id)).pluck(:school_id)
-          ids = part_a_ids + part_b_ids  + CustomerAdd.all.pluck(:school_id)
+          ids = part_a_ids + part_b_ids + CustomerAdd.all.pluck(:school_id)
           @customers = @customers.where(id: ids)
           if params[:q].present? && params[:q][:name].present?
             @customers = @customers.where("schools.name like ?", "%#{params[:q][:name]}%")
@@ -77,19 +78,19 @@ module EducodeSales
             property.each do |p|
               case p
               when 0
-                school_property_ids += SchoolProperty.where( project_985: true ).ids
+                school_property_ids += SchoolProperty.where(project_985: true).ids
               when 1
-                school_property_ids += SchoolProperty.where( project_211: true ).ids
+                school_property_ids += SchoolProperty.where(project_211: true).ids
               when 2
-                school_property_ids += SchoolProperty.where( regular_college: true ).ids
+                school_property_ids += SchoolProperty.where(regular_college: true).ids
               when 3
-                school_property_ids += SchoolProperty.where( junior_college: true ).ids
+                school_property_ids += SchoolProperty.where(junior_college: true).ids
               when 4
-                school_property_ids += SchoolProperty.where( secondary_school: true ).ids
+                school_property_ids += SchoolProperty.where(secondary_school: true).ids
               when 5
-                school_property_ids += SchoolProperty.where( military_school: true ).ids
+                school_property_ids += SchoolProperty.where(military_school: true).ids
               when 6
-                school_property_ids += SchoolProperty.where( enterprise: true ).ids
+                school_property_ids += SchoolProperty.where(enterprise: true).ids
               else
               end
             end
@@ -99,7 +100,7 @@ module EducodeSales
           if params[:q].present? && params[:q][:date].present?
             ids = EducodeSales::CustomerFollow.all.pluck(:school_id)
             @customers = @customers.where(id: ids)
-            school_ids =[]
+            school_ids = []
             date = params[:q][:date].split(" - ")
             @customers.each do |d|
               business_ids = EducodeSales::Business.where(school_id: d.id).ids
@@ -127,7 +128,7 @@ module EducodeSales
 
     def give
       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]}
+      @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
       render layout: false
     end
 
@@ -154,7 +155,6 @@ module EducodeSales
       @departments = @departments.page(params[:page]).per(params[:limit])
     end
 
-
     def new_follow_record
       @school = School.find(params[:id])
       render layout: false
@@ -215,17 +215,45 @@ module EducodeSales
                                                      junior_college: params[:junior_college].present? ? 1 : 0,
                                                      secondary_school: params[:secondary_school].present? ? 1 : 0,
                                                      military_school: params[:military_school].present? ? 1 : 0,
+                                                     other: params[:other].present? ? 1 : 0,
+                                                     mid_school: params[:mid_school].present? ? 1 : 0,
+                                                     ele_school: params[:ele_school].present? ? 1 : 0,
                                                      enterprise: params[:enterprise].present? ? 1 : 0)
         @school.attributes = school_params
         @school.school_property = property
         @school.save!
+
+        #先删除全部的标签，再添加标签
+        missions_school_tags = SchoolTag.where(for_missions: true)
+        SchoolTagMiddle.where(school_id: @school.id, school_tag_id: missions_school_tags.ids).destroy_all
+        #保存学校标签
+
+        keys = %w[regular_college junior_college secondary_school military_school other mid_school ele_school enterprise]
+        names = {
+          "regular_college" => "本科院校",
+          "junior_college" => "高职院校",
+          "secondary_school" => "中职院校",
+          "military_school" => "军事院校",
+          "other" => "其他",
+          "mid_school" => "中学",
+          "ele_school" => "小学",
+          "enterprise" => "企业"
+        }
+        property.attributes.each do |key, value|
+          next unless key.in?(keys)
+          next unless value.to_s == "true"
+          school_tag = SchoolTag.find_by_name(names[key])
+          if school_tag.present?
+            SchoolTagMiddle.create(school_id: @school.id, school_tag_id: school_tag.id)
+          end
+        end
+
       end
       render_success
     end
 
     private
 
-
     def school_property_params
       params.permit(:project_985, :project_211, :regular_college, :junior_college, :secondary_school, :military_school, :enterprise)
     end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -88,7 +88,7 @@ module EducodeSales
         follow_up.clazz_changed = last_follow_up.clazz_id != follow_up.clazz_id
         if follow_up.clazz_changed 
           clazz_changes = "#{last_follow_up.clazz.extras.split('_')[0]}-#{follow_up.clazz.extras.split('_')[0]}"
-          business_clazz_change = @business.business_clazz_changes.find_or_initialize_by clazz_changed: clazz_changes
+          business_clazz_change = EducodeSales::BusinessClazzChange.find_or_initialize_by(business_id: @business.id, clazz_changed: clazz_changes)
           business_clazz_change.save unless business_clazz_change.persisted?
         end
       end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -38,7 +38,7 @@ module EducodeSales
         year_over_time = "#{@year}-12-31 23:59:59"
 
         @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.year = ?", @year).sum(:total_amount).round(2)
+        @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.year <= ?", @year).sum(:total_amount).round(2)
         stage_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
 
         # 中标总金额， 已回款总金额
@@ -61,9 +61,9 @@ module EducodeSales
         @receivable_amount = @receivable_amount.present? && @receivable_amount[0]['num'] ? @receivable_amount[0]['num'].round(2) : 0
 
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)
-        @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).where("educode_sales_follow_ups.year = ?", @year).sum(:total_amount).round(2)
+        @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).where("educode_sales_follow_ups.year <= ?", @year).sum(:total_amount).round(2)
         b = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name).pluck(:id)
-        @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).where("educode_sales_follow_ups.year = ?", @year).sum(:total_amount).round(2)
+        @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).where("educode_sales_follow_ups.year <= ?", @year).sum(:total_amount).round(2)
       end
 
     end

data/app/controllers/educode_sales/staffs_controller.rb

@@ -45,6 +45,7 @@ module EducodeSales
 
     def edit
       @staff = Staff.find(params[:id])
+      @permissions = @staff.permissions.pluck(:id)
       gon.area_ids = @staff.area_ids
       gon.areas = Common.where(clazz: 'area').map { |d| { value: d.id, title: d.name } } #.unshift({value: -1, title: '全国'})
       gon.school_ids = @staff.staff_schools.ids
@@ -52,6 +53,8 @@ module EducodeSales
       # gon.school_ids = School.all.ids
       # gon.schools = School.all.first(100).map { |d| { value: d.id, title: d.name } } #.unshift({value: -1, title: '全国'})
       @staff_types = Common.where(clazz: 'staff_type').pluck(:name, :id)
+      tag_ids = @staff.staff_school_tags.pluck(:school_tag_id)
+      gon.school_properties = SchoolTag.where(for_missions: true).map { |d| { value: d.id, name: d.name, selected: tag_ids.include?(d.id) } }
       render layout: false
     end
 
@@ -65,8 +68,8 @@ module EducodeSales
       impressionist(staff, params)
       staff.update(deleted_at: Time.now, expired_at: Time.now.days_ago(1))
       render_success
-    # rescue ActiveRecord::DeleteRestrictionError => e
-    #   render_failure '该用户已有数据产生，暂不能删除'
+      # rescue ActiveRecord::DeleteRestrictionError => e
+      #   render_failure '该用户已有数据产生，暂不能删除'
     end
 
     def disable
@@ -82,18 +85,37 @@ module EducodeSales
       staff.assign_attributes(role_id: params[:role_id], job_type: params[:job_type], enabled_at: params[:enabled_at])
       staff.expired_at = staff.enabled_at.months_since(params[:month].to_i)
       commons = []
-      params[:area_ids].each do |d|
+      params[:area_ids].to_s.split(",").each do |d|
         commons << Common.find(d)
       end
       staff.areas = commons
       if params[:school_ids].present?
-        staff.staff_schools.destroy_all
-        params[:school_ids].each do |d|
-          staff.staff_schools.create(school_id: d)
+        schools = []
+        params[:school_ids].to_s.split(",").each do |d|
+          schools << EducodeSales::StaffSchool.find_or_initialize_by(staff_id: staff.id, school_id: d)
         end
+        staff.staff_schools = schools
       else
         staff.staff_schools.destroy_all
       end
+      tags = []
+      params[:school_tag_ids].to_s.split(",").each do |tag_id|
+        tags << EducodeSales::StaffSchoolTag.find_or_initialize_by(staff_id: staff.id, school_tag_id: tag_id)
+      end
+      #人员额外权限
+      permissions = []
+      if params[:permission].present?
+        params[:permission].each do |d|
+          d[1].each do |c|
+            permissions << Permission.find_by(subject: d[0], action: c[1])
+          end
+        end
+      end
+      staff.staff_permissions.delete_all
+      permissions.each do |permission|
+        staff.staff_permissions.create(staff_id:staff.id, permission_id:permission.id)
+      end
+      staff.staff_school_tags = tags
       params[:current_admin] = @current_admin.id
       impressionist(staff, params)
       if staff.save
@@ -106,14 +128,13 @@ module EducodeSales
     def follow_up_schools
       staff = Staff.find(params[:id])
       @schools = EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{staff.id}").group("departments.school_id").select("departments.school_id, max(educode_sales_teacher_follows.updated_at) AS updated_at") + EducodeSales::Business.joins(:follow_ups, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("departments.school_id").select("departments.school_id, max(educode_sales_follow_ups.updated_at) AS updated_at")
-      @count =  EducodeSales::Business.joins(:follow_ups, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("departments.school_id").count
+      @count = EducodeSales::Business.joins(:follow_ups, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("departments.school_id").count
     end
 
     def follow_up_departments
       staff = Staff.find(params[:id])
-      @schools = (EducodeSales::Business.joins(:follow_ups, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_follow_ups.updated_at") + EducodeSales::Teacher.joins(:follow_up, [department: :school]).where("educode_sales_teacher_follows.staff_id = #{staff.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_teacher_follows.updated_at")).uniq{|s| s.id}
+      @schools = (EducodeSales::Business.joins(:follow_ups, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_follow_ups.updated_at") + EducodeSales::Teacher.joins(:follow_up, [department: :school]).where("educode_sales_teacher_follows.staff_id = #{staff.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_teacher_follows.updated_at")).uniq { |s| s.id }
     end
 
-
   end
 end

data/app/models/ability.rb

@@ -9,7 +9,7 @@
         if staff.is_admin
           can :manage, :all
         else
-          staff.role.permissions.each do |ps|
+          staff.all_permissions.each do |ps|
             can ps.action.to_sym, "EducodeSales::#{ps.subject}".constantize
             # level = @current_admin.role.role_areas.find_by(clazz: 'name')&.level
             # if level == '自己'

data/app/models/educode_sales/business_clazz_change.rb

@@ -1,7 +1,7 @@
 module EducodeSales
   class BusinessClazzChange < ApplicationRecord
     belongs_to :business
-    validates :clazz_changed, uniqueness: { message: '已存在' }
+    validates :clazz_changed, uniqueness: {scope: :business_id, message: '已存在' }
 
 
 

data/app/models/educode_sales/staff.rb

@@ -5,6 +5,10 @@ module EducodeSales
 
     is_impressionable
 
+
+    has_many :staff_permissions, dependent: :destroy
+    has_many :permissions, through: :staff_permissions
+
     has_many :follow_ups, dependent: :destroy
     has_many :operation_plans, dependent: :destroy
     has_many :operation_reports, dependent: :destroy
@@ -19,6 +23,8 @@ module EducodeSales
 
     has_many :login_histories, dependent: :destroy
 
+    has_many :staff_school_tags, dependent: :destroy
+
     has_many :market_areas, dependent: :destroy
     has_many :areas, through: :market_areas
     validates :user_id, uniqueness: { message: '已存在' }
@@ -29,6 +35,11 @@ module EducodeSales
       "login_user_#{self.id}"
     end
 
+    def all_permissions
+      ids = Array(self.role&.permissions&.ids) + self.permissions.ids
+      Permission.where(id: ids)
+    end
+
     def check_login_status(request)
       unless Rails.cache.data.get(self.last_login_key)
         # 第二天还在线访问，记用户登录一次

data/app/models/educode_sales/staff_permission.rb

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

data/app/models/educode_sales/staff_school_tag.rb

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

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

@@ -151,6 +151,12 @@
     <% end %>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right at-btn" lay-event="followes"> 我的关注</button>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right my-btn" lay-event="mine"> 我的商机</button>
+    <% if can?(:special, EducodeSales::Business) %>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right s-btn" lay-event="special">专项管理商机</button>
+   <% end %>
+   <% if can?(:area_manage, EducodeSales::Business) %>
+   <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right area-btn" lay-event="area">区域管理商机</button>
+   <% end %>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right all-btn" lay-event="all"> 全部商机</button>
   </div>
 </script>
@@ -330,6 +336,9 @@
         data.business_type = business_type_list.getValue('valueStr')
         data.business_step = business_step_list.getValue('valueStr');
         data.staff_id = staff_list.getValue('valueStr');
+        <% if params[:year].present? %>
+        data.year = "<%= params[:year] %>";
+        <% end %>
 
         table = layui.table;
         var cols_table = [
@@ -723,6 +732,9 @@
             data.business_type = business_type.toString();
             data.business_step = business_step.toString();
             data.staff_id = staff_list.getValue('valueStr');
+            <% if params[:year].present? %>
+            data.year = "<%= params[:year] %>";
+            <% end %>
             layer.load(0, {});
             request.authPost("/missions/businesses/get_export_data", {
                 name: data.name,
@@ -739,10 +751,10 @@
                 date_at: data.date_at,
                 bidded_date: data.bidded_date,
                 business_year: data.business_year,
+                year: data.year,
                 mine: search['clazz'] == 'me' ? true : '',
                 is_follow: search['clazz'] == 'followes' ? true : '',
             }, function (res) {
-                console.log(res.data);
                 data = res.data
                 table.exportFile(business_table.config.id,data, type);
                 layer.closeAll('loading');
@@ -937,6 +949,9 @@
             data.field.staff_id = staff_list.getValue('valueStr');
             data.field.business_type = business_type.toString();
             data.field.business_step = business_step.toString();
+            <% if params[:year].present? %>
+            data.field.year = "<%= params[:year] %>";
+            <% end %>
              if (search['clazz']) {
               data.field['clazz'] = search['clazz']
              }
@@ -961,6 +976,10 @@
               $(".my-btn").addClass("selected-btn");
             } else if (search['clazz'] == 'followes') {
               $(".at-btn").addClass("selected-btn");
+            } else if (search['clazz'] == 'special') {
+              $(".s-btn").addClass("selected-btn");
+            } else if (search['clazz'] == 'area') {
+              $(".area-btn").addClass("selected-btn");
             } else {
               $(".all-btn").addClass("selected-btn");
             }
@@ -1083,6 +1102,40 @@
                 $(".my-btn").addClass("selected-btn");
                 return false;
             }
+            else if (obj.event === 'special') {
+                search = {"clazz": "special"}
+                business_type_list.setValue([])
+                table.reload('businesses_table', {
+                    url: '/missions/businesses',
+                    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: ''
+                })
+                $(".s-btn").addClass("selected-btn");
+                return false;
+            }
+            else if (obj.event === 'area') {
+                search = {"clazz": "area"}
+                business_type_list.setValue([])
+                table.reload('businesses_table', {
+                    url: '/missions/businesses',
+                    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: ''
+                })
+                $(".area-btn").addClass("selected-btn");
+                return false;
+            }
             else if (obj.event === 'delete') {
                 var checkStatus = table.checkStatus('currentTableId'),
                     data = checkStatus.data;

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

@@ -32,21 +32,30 @@
     <div class="layui-form-item">
       <label class="layui-form-label required">学校性质：</label>
       <div class="layui-input-block">
-        <input type="checkbox" name="project_985" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_985 %> title="985工程">
-        <input type="checkbox" name="project_211" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_211 %> title="211工程" >
         <input type="checkbox" name="regular_college" lay-skin="primary" value="1" <%= 'checked' if @school_property&.regular_college %> title="本科院校">
+        <input type="checkbox" name="military_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.military_school %> title="军事院校">
+        <input type="checkbox" name="junior_college" lay-skin="primary" value="1" <%= 'checked' if @school_property&.junior_college %> title="高职院校">
+
       </div>
     </div>
     <div class="layui-form-item">
       <div class="layui-input-block">
-        <input type="checkbox" name="junior_college" lay-skin="primary" value="1" <%= 'checked' if @school_property&.junior_college %> title="大专院校">
-        <input type="checkbox" name="secondary_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.secondary_school %> title="中专院校" >
-        <input type="checkbox" name="military_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.military_school %> title="军事院校">
+        <input type="checkbox" name="secondary_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.secondary_school %> title="中职院校" >
+        <input type="checkbox" name="mid_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.mid_school %> title="中学" >
+        <input type="checkbox" name="ele_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.ele_school %> title="小学" >
+
       </div>
     </div>
     <div class="layui-form-item">
       <div class="layui-input-block">
         <input type="checkbox" name="enterprise" lay-skin="primary" value="1" <%= 'checked' if @school_property&.enterprise %> title="企业">
+        <input type="checkbox" name="other" lay-skin="primary" value="1" <%= 'checked' if @school_property&.other %> title="其他">
+      </div>
+    </div>
+    <div class="layui-form-item" style="display: none;">
+      <div class="layui-input-block">
+        <input type="checkbox" style="display: none;" name="project_985" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_985 %> title="985工程">
+        <input type="checkbox" style="display: none;" name="project_211" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_211 %> title="211工程" >
       </div>
     </div>
     <div class="layui-inline" style="padding-left: 120px">

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -98,7 +98,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>现有商机<a href="/missions/businesses?name=(销售态势-<%=@year %>-现有商机)&type=1&business_year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>现有商机<a href="/missions/businesses?name=(销售态势-<%=@year %>-现有商机)&type=1&year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @business_amount.round(2) %>万</h1>
@@ -150,7 +150,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>A类商机<a href="/missions/businesses?type=a&business_year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>A类商机<a href="/missions/businesses?type=a&year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @a_amount %>万</h1>
@@ -201,7 +201,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>B类商机<a href="/missions/businesses?type=b&business_year=<%= @year %>" style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>B类商机<a href="/missions/businesses?type=b&year=<%= @year %>" style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @b_amount %>万</h1>

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

@@ -1,6 +1,6 @@
 <%= Gon::Base.render_data %>
 <div class="layuimini-main" style="height: 100%;">
-  <div class="layui-form layuimini-form">
+  <form class="layui-form " action="">
     <h4>编辑人员</h4>
     <div class="layui-form-item">
       <label class="layui-form-label required">姓名</label>
@@ -35,7 +35,15 @@
       <div class="layui-input-inline" style="">
         <div id="edit_assign_follow" style="width: 1140px;"></div>
       </div>
+    </div>
+    <% if can?(:special, EducodeSales::Business) %>
+    <div class="layui-form-item">
+      <label class="layui-form-label">专项客户类型</label>
+      <div class="layui-input-inline">
+        <div id="school_properties" style="width: 600px;"></div>
       </div>
+    </div>
+    <% end %>
     <div class="layui-form-item">
       <label class="layui-form-label required">生效日期</label>
       <div class="layui-input-block">
@@ -51,13 +59,37 @@
                                           @staff.month), { 'lay-filter': 'month' } %>
       </div>
     </div>
-
-    <hr>
     <div class="layui-form-item">
+      <label class="layui-form-label required">额外权限:</label>
+    </div>
+
+<!--    <form class="layui-form " action="">-->
+      <% id = 0 %>
+      <% EducodeSales::Permission.all.order(position: :asc).group_by{ |d| d.clazz}.each do |k, d| %>
+        <div class="layui-form-item">
+          <label class="layui-form-label"><%= k %></label>
+          <div class="layui-input-block">
+            <% d.each do |p| %>
+              <% id += 1 %>
+              <%= check_box_tag "permission[#{p.subject}][]", p.action, @permissions.include?(p.id), {title: p.name, id: "#{id}_" } %>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+
+<!--      <div class="m-t-20">-->
+<!--        <div class="layui-input-block">-->
+<!--          <button type="submit" class="layui-btn" lay-submit="" lay-filter="role">提交</button>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </form>-->
+    <div class="m-t-20">
       <div class="layui-input-block">
-        <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确定保存</button>
+        <button type="submit" class="layui-btn" lay-submit="" lay-filter="role">提交</button>
       </div>
     </div>
+  </form>
+
   </div>
 </div>
 <script type="text/html" id="edit_currentTableBar">
@@ -78,7 +110,13 @@
         laydate.render({
             elem: '#day'
         });
-
+        if (document.getElementById("school_properties")) {
+          var school_properties_list = xmSelect.render({
+            el: '#school_properties',
+            data: gon.school_properties,
+            filterable: true,
+          })
+        }
 
         var parentIndex = layer.index;
         transfer.render({
@@ -127,7 +165,7 @@
         sales_list.setValue(gon.schools)
 
         //监听提交
-        form.on('submit(saveBtn)', function (data) {
+        form.on('submit(role)', function (data) {
             var area_ids = []
             layui.each(transfer.getData('area_list'), function (i, v) {
                 area_ids.push(v.value)
@@ -136,21 +174,69 @@
             sales_list.getValue().forEach(function(d) {
                 schools.push(d.value);
             })
-            data.field['school_ids'] = schools;
-            data.field['area_ids'] = area_ids;
-            request.authPut("missions/staffs/" + parent.staff_id, data.field, function (res) {
-                console.log(res.success == false)
-                if (res.success == false) {
-                    layer.alert(res.msg)
-                } else {
-                    layer.close(parent.index);
-                    parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('staff_filter')
+            var tag_ids = [];
+            if (document.getElementById("school_properties")) {
+              school_properties_list.getValue().forEach(function(d) {
+                tag_ids.push(d.value);
+              })
+            }
+            data.field['school_ids'] = schools.join(",");
+            data.field['area_ids'] = area_ids.join(",");
+            data.field['school_tag_ids'] = tag_ids.join(",");
+            // request.authPut("missions/staffs/" + parent.staff_id, data.field, function (res) {
+            //     console.log(res.success == false)
+            //     if (res.success == false) {
+            //         layer.alert(res.msg)
+            //     } else {
+            //         layer.close(parent.index);
+            //         parent.layer.close(parent.layer.getFrameIndex(window.name))
+            //         parent.table.reload('staff_filter')
+            //     }
+            // })
+            Rails.ajax({
+                url: '/missions/staffs/'+ parent.staff_id,
+                type: 'PUT',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+                },
+                data: $.param(data.field, true),
+                success: function (res) {
+                    if (res.success == false) {
+                        layer.alert(res.msg)
+                    } else {
+                                layer.close(parent.index);
+                                parent.layer.close(parent.layer.getFrameIndex(window.name))
+                                parent.table.reload('staff_filter')
+                    }
                 }
             })
             return false;
         });
 
+        // form.render();
+        // form.on('submit(role)', function (data) {
+        //     Rails.ajax({
+        //         url: '/missions/roles/'+ parent.role_id,
+        //         type: 'PUT',
+        //         headers: {
+        //             'Content-Type': 'application/json',
+        //             'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+        //         },
+        //         data: $.param(data.field, true),
+        //         success: function (res) {
+        //             if (res.success == false) {
+        //                 layer.alert(res.msg)
+        //             } else {
+        //                 layer.close(parent.index);
+        //                 parent.layer.close(parent.layer.getFrameIndex(window.name))
+        //                 parent.table.reload('role')
+        //             }
+        //         }
+        //     })
+        //     return false;
+        // })
+
 
     });
 </script>

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -30,6 +30,9 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       EducodeSales::Permission.create(name: '删除跟进记录(本人创建)', subject: 'Business', action: 'self_delete_follow', clazz: 'business', position: '10')
 
       EducodeSales::Permission.create(name: '合并商机', subject: 'Business', action: 'merge_business', clazz: 'business', position: '12')
+      EducodeSales::Permission.create(name: '专项管理商机', subject: 'Business', action: 'special', clazz: 'business', position: '13')
+      EducodeSales::Permission.create(name: '区域管理商机', subject: 'Business', action: 'area_manage', clazz: 'business', position: '14')
+      
       #回款管理权限
       EducodeSales::Permission.create(name: '查看回款列表', subject: 'MoneyPlan', action: 'read', clazz: 'money_plan', position: '15')
 

data/db/migrate/20230206080303_create_educode_sales_staff_school_tags.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesStaffSchoolTags < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_staff_school_tags do |t|
+      t.references :staff
+      t.references :school_tag
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230209102302_create_educode_sales_staff_permissions.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesStaffPermissions < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_staff_permissions do |t|
+      t.references :staff
+      t.references :permission
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.40'
+  VERSION = '0.9.42'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.40
+  version: 0.9.42
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
+- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -220,7 +221,9 @@ files:
 - app/models/educode_sales/sale_report.rb
 - app/models/educode_sales/sale_trend.rb
 - app/models/educode_sales/staff.rb
+- app/models/educode_sales/staff_permission.rb
 - app/models/educode_sales/staff_school.rb
+- app/models/educode_sales/staff_school_tag.rb
 - app/models/educode_sales/teacher.rb
 - app/models/educode_sales/teacher_assign_follow.rb
 - app/models/educode_sales/teacher_follow.rb
@@ -489,6 +492,8 @@ files:
 - db/migrate/20221107122147_change_divide_rate_follow_ups.rb
 - db/migrate/20230115080730_add_origin_business_id_to_follow_ups.rb
 - db/migrate/20230117144025_create_educode_sales_business_clazz_changes.rb
+- db/migrate/20230206080303_create_educode_sales_staff_school_tags.rb
+- db/migrate/20230209102302_create_educode_sales_staff_permissions.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -497,7 +502,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -512,8 +517,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []