educode_sales 1.10.58 → 1.10.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666b9ec9b763cfce87df4b2b6a2304625100ba52d94df0cd806fe36266062b3c
-  data.tar.gz: 494c7222e60d7114c95cd6f213fd11bb5070e2b6f40d45bfdaa3fa880c7e4a0f
+  metadata.gz: d8e7d99a35f1c2905d166e4644cba3607d02f8dbc7a998b361b2c22955df75a0
+  data.tar.gz: 897fd624ffd57dbc1ea3da2de4a3e9c19c2fe979e425d46515fb44cea2533110
 SHA512:
-  metadata.gz: 9cc7914ec32c5e3cda9fa353bf35ddba314450b75f7401d1063469ab4f10b117437a4a93392783ddd7049e21f6012b1faba947be5b05874fd4b235c327c553c4
-  data.tar.gz: c5276a5f2d6ea22604cea8d6f81acb320f8e8ec7975138741e8e5ab6326f7f368f210a9b983fa0ab48688709de0053ad923a1043eab701b3ab19dac08910c1fc
+  metadata.gz: 2eaa9f36661e787d056d8f4d4a9445c90d7e4d12ada69e94233dd215ac6da96d477b065dc281c9a97f6267bc3ad8119c771f9d8ef86467992b97eafc3cfd04ac
+  data.tar.gz: '0974f6a51e7c44078b2c55a86bce052599a3cec4c40048359c7ffb2b97e91357cc8a291e6c82986beb938f5cb4fce8361c576b33fac14a672a98e61a79f5fe49'

data/app/assets/javascripts/educode_sales/application.js

@@ -17,3 +17,4 @@
 //= require_tree ./extent
 //= require ./jquery.cxselect
 //= require ./table2excel
+//= require ./functions.js

data/app/assets/javascripts/educode_sales/functions.js

@@ -0,0 +1,24 @@
+layui.define(function(exports){
+    let functions = {
+        initTableColumnsFilter: function (tableId, cols) {
+            var local = layui.data('table-filter-' + tableId);
+            layui.each(cols, function(index, item) {
+                if (item.field !== 'undefined' && item.field in local) {
+                    item.hide = local[item.field];
+                }
+            });
+            return cols;
+        },
+        observerTableColumnFilter: function (that) {
+            that.elem.next().on('mousedown', 'input[lay-filter="LAY_TABLE_TOOL_COLS"]+', function(){
+                var input = $(this).prev()[0];
+                layui.data ('table-filter-'+ that.id, {
+                    key: input.name,
+                    value: input.checked
+                });
+            });
+        }
+    // 其他公共方法...
+    };
+    exports('functions', functions);
+});

data/app/controllers/educode_sales/application_controller.rb

@@ -5,11 +5,19 @@ module EducodeSales
     before_action :authenticate_request
 
 
-    def is_commissioner_above?
-      return  true  if @current_admin.is_admin?
-      ["销售总监", "副总", "生态运营总监", "方案总监", "售后总监", "课程组总监"].include? @current_admin.role.name
+    def is_commissioner_above?(clazz_type="business")
+      return true  if @current_admin.is_admin?
+      case clazz_type
+      when "business"
+        can?(:all_business, EducodeSales::BusinessDeliverSubject)
+      when "shixun"
+        can?(:all_shixun, EducodeSales::BusinessDeliverSubject)
+      when "subject"
+        can?(:all_subject, EducodeSales::BusinessDeliverSubject)
+      end
     end
 
+
     def subject_members
       common = Common.find_by(clazz: 'staff_type', name: '课程')
       @manages = Staff.joins(:user).where(job_type: common.id.to_i).where.not(role_id: 11).map { |d| {name: d.user.real_name, value: d.id}}

data/app/controllers/educode_sales/business_courses_controller.rb

@@ -5,11 +5,20 @@ module EducodeSales
   # 商机交付课程
   class BusinessCoursesController < ApplicationController
     include BusinessCoursesHelper
-    include? SubjectHelper
+    include SubjectHelper
     before_action :subject_members, :subject_url
+    before_action :have_permission?, only: %i(index new create edit)
+
+    # 查看cancancan Gem优化代码
+    def have_permission?
+      have_permission = can?(:business, EducodeSales::BusinessDeliverSubject) || can?(:all_business, EducodeSales::BusinessDeliverSubject)
+
+      have_permission || @current_admin.is_admin ? "" : authorize!(:business, BusinessDeliverSubject)
+    end
+
+
 
     def index
-      authorize! :business, BusinessDeliverSubject
       respond_to do |format|
         format.html do
         end
@@ -50,7 +59,6 @@ module EducodeSales
     end
 
     def edit
-      authorize! :business, BusinessDeliverSubject
       if params[:id]
         # 查询商机信息 和交付状态等
         @item = BusinessDeliverSubject.joins(:business)
@@ -73,7 +81,6 @@ module EducodeSales
     end
 
     def update
-      authorize! :business, BusinessDeliverSubject
       # 开启事务
       ActiveRecord::Base.transaction do
         @business = BusinessDeliverSubject.find_by(id: params[:id])
@@ -108,7 +115,6 @@ module EducodeSales
     end
 
     def new
-      authorize! :business, BusinessDeliverSubject
       staffs = Staff.where.not(role_id: 11).includes(:user)
       @businesses = Business
       # 要求只能是已签单的商机
@@ -118,7 +124,6 @@ module EducodeSales
     end
 
     def create
-      authorize! :business, BusinessDeliverSubject
       # 开启事务
       ActiveRecord::Base.transaction do
         item = BusinessDeliverSubject.find_by(business_id: params[:business][:business_id])
@@ -149,10 +154,16 @@ module EducodeSales
           @businesses = Business.joins(:last_follow_up, :school)
                                 .where("educode_sales_businesses.name LIKE '%#{params[:q]}%' and educode_sales_follow_ups.stage_id = #{stage_id} ")
                                 .where("educode_sales_businesses.id not in (?) ", BusinessDeliverSubject.pluck(:business_id).map(&:to_i)) # todo 数组中包含nil会导致查询失败，无法找到数据
-                                .select("educode_sales_businesses.*, schools.name as s_name, schools.id as s_id")
 
+
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          @staffs = Staff.find(current_user.id)
+          if @staffs.present? && common.id.to_i == @staffs.job_type.to_i
+            @businesses = @businesses.where(staff_id:current_user.id)
+          end
           @count = @businesses.count("educode_sales_businesses.id")
-          @businesses = @businesses.page(params[:page]).per(10)
+          @businesses = @businesses.select("educode_sales_businesses.*, schools.name as s_name, schools.id as s_id")
+                                   .page(params[:page]).per(10)
           render json: {
             data: @businesses,
             code: 0

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -79,6 +79,10 @@ module EducodeSales
 
           end
 
+          if params[:q].present? && params[:q][:staff].present?
+            @follow_ups = @follow_ups.joins(business: [staff: :user]).where("CONCAT(users.lastname, users.firstname) like ?", "%#{params[:q][:staff]}%")
+          end
+
           @follow_ups = @follow_ups.includes(:staff, :clazz, :stage, key_person: :teacher, business: [department: :school])
 
           if params[:sort].present? && params[:sort][:field]