educode_sales 0.9.41 → 0.9.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbfbd499c3b8b9a0b17b3178a95cb9bf9599376ef9d372e04c4fc42c54d9e93d
-  data.tar.gz: 1d8c044c648874c7cc36035a0c0271bc1017d3bae1fa051e546d094cfb8a6803
+  metadata.gz: 392c1371a9b0cb569b25de476461924555a2d8b077a2864f1bc33145ae65bc61
+  data.tar.gz: 250898b5906ea9b92a41eb4bef8b9ecba8e254bcd574d37d4cdc8cdd11f25811
 SHA512:
-  metadata.gz: b8507c1f295984000ec4cd5d650c46d42efd0bba14479039da5f3cf7b2c3e63b272d38219ed175f305743029721d6e11bd293be9a7f62683924480717ef93464
-  data.tar.gz: 4c7dbc8bff6bdc3c6ffa8152a5efde7463e60ed60bfd560cef86f2d3fead6843c1ae561c62bd640e0ebacf9b43590ebf1b07d74981d7688cd5f4f87c77ee3a98
+  metadata.gz: b66b2ee6d89ef9f63bd035843df5c6724bb34108320dbd9c2af6d3706ccc91e5a3af9940bd22eca06779e2f6ecebeb9e816beea8fb78c967cfb620666e45df9d
+  data.tar.gz: 2d0f88851293f938355a04ed9c8c90dceaf126dd8df3b4cd8a18c675dbd158203132dbd9e3f504c2803c25c4bb3fc57c0086372871bd3b193fc4f3ddc55cba08

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,25 @@ 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
+              when 7
+                school_property_ids += SchoolProperty.where(mid_school: true).ids
+              when 8
+                school_property_ids += SchoolProperty.where(ele_school: true).ids
+              when 9
+                school_property_ids += SchoolProperty.where(other: true).ids
               else
               end
             end
@@ -99,7 +106,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 +134,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 +161,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 +221,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/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
@@ -53,7 +54,8 @@ module EducodeSales
       # 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(weight: 1).map { |d| {value: d.id, name: d.name, selected: tag_ids.include?(d.id) }  }
+      names = %w[本科院校 军事院校 高职院校 中职院校 中学 小学 企业 其他]
+      gon.school_properties = SchoolTag.where(for_missions: true).sort_by { |tag| names.index(tag.name) }.map { |d| { value: d.id, name: d.name, selected: tag_ids.include?(d.id) } }
       render layout: false
     end
 
@@ -67,8 +69,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
@@ -84,13 +86,13 @@ 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?
         schools = []
-        params[:school_ids].each do |d|
+        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
@@ -98,10 +100,22 @@ module EducodeSales
         staff.staff_schools.destroy_all
       end
       tags = []
-      params[:school_tag_ids].each do |tag_id|
-       tags << EducodeSales::StaffSchoolTag.find_or_initialize_by(staff_id: staff.id, school_tag_id: tag_id)
+      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)
@@ -115,14 +129,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/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
@@ -31,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/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/customers/index.html.erb

@@ -16,15 +16,15 @@
       <div class="layui-inline">
         <label class="layui-form-label">负责人</label>
         <div class="layui-input-inline">
-          <%= select_tag "staff_id", options_for_select(@staffs,params[:staff_id]), { include_blank: true } %>
+          <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_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="date" name="date" placeholder=" - ">-->
-<!--        </div>-->
-<!--      </div>-->
+      <!--      <div class="layui-inline">-->
+      <!--        <label class="layui-form-label">最后跟进</label>-->
+      <!--        <div class="layui-input-inline">-->
+      <!--          <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">-->
+      <!--        </div>-->
+      <!--      </div>-->
       <div class="layui-inline">
         <label class="layui-form-label">性质</label>
         <div class="layui-input-inline">
@@ -34,7 +34,8 @@
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
         </button>
-        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索
+        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜
+          索
         </button>
       </div>
     </div>
@@ -48,7 +49,7 @@
       <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加客户</button>
     <% end %>
     <% if can? :give, EducodeSales::Customer %>
-  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="give">分配/移交</button>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="give">分配/移交</button>
     <% end %>
     </button>
   </div>
@@ -61,17 +62,17 @@
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_department">添加部门</a>
   <% end %>
   <% if can? :create_follow, EducodeSales::Customer %>
-<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_follow">添加跟进记录</a>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_follow">添加跟进记录</a>
   <% end %>
   <% if can? :update, EducodeSales::Customer %>
-<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <% end %>
 </script>
 <script type="text/html" id="business">
-  <a href="/missions/businesses?school={{d.name}}"  class="layui-table-link">{{ d.business }}</a>
+  <a href="/missions/businesses?school={{d.name}}" class="layui-table-link">{{ d.business }}</a>
 </script>
 <script type="text/html" id="name">
-  <a href="<%= base_url%>/colleges/{{d.id}}/statistics" class="layui-table-link" target="_blank">{{ d.name }}</a>
+  <a href="<%= base_url %>/colleges/{{d.id}}/statistics" class="layui-table-link" target="_blank">{{ d.name }}</a>
 </script>
 <script type="text/html" id="department">
   <a href="javascript:void(0);" lay-event="department" class="layui-table-link">{{ d.department }}</a>
@@ -102,13 +103,16 @@
         var property_list = xmSelect.render({
             el: '#property',
             data: [
-                {value: 0, name: '985工程'},
-                {value: 1, name: '211工程'},
+                // {value: 0, name: '985工程'},
+                // {value: 1, name: '211工程'},
                 {value: 2, name: '本科院校'},
-                {value: 3, name: '大专院校'},
-                {value: 4, name: '中专学校'},
                 {value: 5, name: '军事院校'},
-                {value: 6, name: '企业'}
+                {value: 3, name: '高职院校'},
+                {value: 4, name: '中职院校'},
+                {value: 7, name: '中学'},
+                {value: 8, name: '小学'},
+                {value: 6, name: '企业'},
+                {value: 9, name: '其他'},
             ]
         })
 
@@ -191,7 +195,7 @@
             ],
 
             limit: 20,
-            limits: [10,15,20,30,40,50,60,70,80,90],
+            limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
             page: true,
         });
 
@@ -200,7 +204,6 @@
         });
 
 
-
         function edit(id) {
             var content = miniPage.getHrefContent('/missions/teachers/' + id + '/edit');
             var openWH = miniPage.getOpenWidthHeight();
@@ -262,7 +265,7 @@
         // 监听搜索操作
         form.on('submit(search_teachers)', function (data) {
             var property = [];
-            property_list.getValue().forEach(function(d) {
+            property_list.getValue().forEach(function (d) {
                 property.push(d.value);
             })
             data.field.property = property.toString();
@@ -314,15 +317,15 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
-            }else if (obj.event === 'give') {  //
+            } else if (obj.event === 'give') {  //
                 var school_ids = []
                 var checkStatus = table.checkStatus('customers_table')
-                    ,data = checkStatus.data;
-                for (var i=0,len=data.length; i<len; i++){
+                    , data = checkStatus.data;
+                for (var i = 0, len = data.length; i < len; i++) {
                     school_ids.push(data[i].id)
                 }
                 ids = school_ids
-                if(ids.length == 0){
+                if (ids.length == 0) {
                     layer.msg('请选择客户')
                     return
                 }
@@ -361,7 +364,6 @@
         });
 
 
-
         table.on('tool(customers_table)', function (obj) {
             var data = obj.data;
             id = data.id
@@ -427,7 +429,7 @@
 
             } else if (obj.event === 'courses') {
                 teacher_id = data.id
-                content = miniPage.getHrefContent('/missions/teachers/add_courses?id='+data.id);
+                content = miniPage.getHrefContent('/missions/teachers/add_courses?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '课程方向',
@@ -487,7 +489,7 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
-            }  else if (obj.event === 'follow' || obj.event === 'name' ||obj.event === 'department' ) {
+            } else if (obj.event === 'follow' || obj.event === 'name' || obj.event === 'department') {
                 id = data.id
                 time = data.last_follow_time || ''
                 content = miniPage.getHrefContent('/missions/customers/show_follow?id=' + data.id);
@@ -515,7 +517,8 @@
     });
 </script>
 <style>
-    .layui-table-tool-temp{
-        padding-right: 30px; !important;
+    .layui-table-tool-temp {
+        padding-right: 30px;
+    !important;
     }
 </style>

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

@@ -1,7 +1,7 @@
 x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
 json.data do
   json.array! @customers do |d|
-    business_ids = EducodeSales::Business.where(school_id:  d.id).ids
+    business_ids = EducodeSales::Business.where(school_id: d.id).ids
     follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
     customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
     a_last_follow_time = follow_ups.last&.created_at&.to_s
@@ -17,13 +17,16 @@ json.data do
     school_property = d.school_property
     property = []
     if school_property.present?
-    property << '985工程' if school_property.project_985
-    property << '211工程' if school_property.project_211
-    property << '本科院校' if school_property.regular_college
-    property << '大专院校' if school_property.junior_college
-    property << '中专学校' if school_property.secondary_school
-    property << '军事院校' if school_property.military_school
-    property << '企业' if school_property.enterprise
+      # property << '985工程' if school_property.project_985
+      # property << '211工程' if school_property.project_211
+      property << '本科院校' if school_property.regular_college
+      property << '大专院校' if school_property.junior_college
+      property << '中专学校' if school_property.secondary_school
+      property << '军事院校' if school_property.military_school
+      property << '企业' if school_property.enterprise
+      property << '小学' if school_property.ele_school
+      property << '中学' if school_property.mid_school
+      property << '其他' if school_property.other
     end
     json.property property.join("、")
     json.department d.departments.size

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>
@@ -59,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">
@@ -141,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)
@@ -156,22 +180,63 @@
                 tag_ids.push(d.value);
               })
             }
-            data.field['school_ids'] = schools;
-            data.field['area_ids'] = area_ids;
-            data.field['school_tag_ids'] = tag_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')
+            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/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.41'
+  VERSION = '0.9.43'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.41
+  version: 0.9.43
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-06 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,6 +221,7 @@ 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
@@ -491,6 +493,7 @@ files:
 - 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
@@ -499,7 +502,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -514,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: []