educode_sales 0.1.0 → 0.1.1

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -0,0 +1,6 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class TeacherFollowsController < ApplicationController
+  end
+end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -21,11 +21,23 @@ module EducodeSales
     def index
       respond_to do |format|
         format.html do
-          
-          # @teachers = Teacher.joins(:user).map { |d| [d.user.real_name, d.id] }
         end
         format.json do
-          @teachers = Teacher.where(is_key: false)
+          if @current_admin.is_admin?
+            @teachers = Teacher.where(is_key: false)
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '教师运营').level
+            case level
+            when '自己'
+              @teachers = Teacher.where(is_key: false)
+              @teachers = @teachers.where(staff_id: @current_admin.id)
+            when '区域'
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+              @teachers = Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where(is_key: false).where("departments.school_id in (?) OR educode_sales_teachers.staff_id = #{@current_admin.id}", school_ids)
+            else
+              @teachers = Teacher.where(is_key: false)
+            end
+          end
           
           if params[:q].present? && params[:q][:name].present?
             @teachers = @teachers.where("educode_sales_teachers.name like ?", "%#{params[:q][:name]}%")
@@ -36,8 +48,8 @@ module EducodeSales
           if params[:q].present? && params[:q][:regist_at].present?
             @teachers = @teachers.where("educode_sales_teachers.regist_at like ?", "%#{params[:q][:regist_at]}%")
           end
-          if params[:q].present? && params[:q][:key_attitude].present?
-            @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:key_attitude]}")
+          if params[:q].present? && params[:q][:attitude].present?
+            @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:attitude]}")
           end
           if params[:q].present? && params[:q][:teacher_source].present?
             @teachers = @teachers.where("educode_sales_teachers.source_id = ?", "#{params[:q][:teacher_source]}")

data/app/models/ability.rb

@@ -6,11 +6,14 @@
       #
       #   user ||= User.new # guest user (not logged in)
        alias_action :index, :trends, :show,  :to => :read
-       
+       p "----------"
+       p staff.is_admin
         if staff.is_admin
           can :manage, :all
         else
           staff.role.permissions.each do |ps|
+            p ps.action
+            p "EducodeSales::#{ps.subject}".constantize
             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/common.rb

@@ -14,6 +14,7 @@ module EducodeSales
       '课堂建设': 'course_build',
       '跟进手段': 'contact',
       '人员类型': 'staff_type',
+      '开课计划': 'course_plan',
       '区域': 'area'
     }
 

data/app/models/educode_sales/staff.rb

@@ -5,6 +5,8 @@ module EducodeSales
 
     has_many :market_areas, dependent: :destroy
     has_many :sale_plans, dependent: :restrict_with_exception
+    has_many :operation_plans, dependent: :restrict_with_exception
+    has_many :operation_reports, dependent: :restrict_with_exception
     has_many :sale_reports, dependent: :restrict_with_exception
     has_many :follow_ups, dependent: :restrict_with_exception
     has_many :teacher_follows, dependent: :restrict_with_exception

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

@@ -5,7 +5,7 @@
   </div>
 </script>
 
-<table class="layui-hide" id="place" lay-filter="currentTableFilter"></table>
+<table class="layui-hide" id="activities_table" lay-filter="activities_table"></table>
 
 <script type="text/html" id="currentTableBar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
@@ -28,7 +28,7 @@
             miniPage = layui.miniPage;
 
         table.render({
-            elem: '#place',
+            elem: '#activities_table',
             url: '/educode_sales/activities',
             toolbar: '#activity_toolbar',
             defaultToolbar: [],
@@ -47,6 +47,7 @@
                 },
                 {
                   field: 'start_at',
+                  width: 180,
                   title: '时间',
                   sort: true,
                 },
@@ -85,10 +86,18 @@
             page: true
         });
 
-        /**
-         * toolbar事件监听
-         */
-        table.on('toolbar(currentTableFilter)', function (obj) {
+      var sort = {};
+      table.on('sort(activities_table)', function (obj) {
+        sort.field = obj.field;
+        sort.order = obj.type;
+        table.reload('activities_table', {
+          initSort: obj,
+          where: {
+            sort: sort
+          }
+        });
+      })
+        table.on('toolbar(activities_table)', function (obj) {
           if (obj.event === 'add') { // 监听添加操作
             var content = miniPage.getHrefContent('/educode_sales/activities/new');
             var openWH = miniPage.getOpenWidthHeight();
@@ -111,7 +120,7 @@
           }
         });
 
-        table.on('tool(currentTableFilter)', function (obj) {
+        table.on('tool(activities_table)', function (obj) {
             var data = obj.data;
             var id = data.id
             if (obj.event === 'edit') {
@@ -141,7 +150,7 @@
                 layer.confirm('确定删除' + data.name, function (index) {
                     request.delete('educode_sales/activities/' + data.id, {}, function (res) {
                         layer.close(index);
-                        table.reload("place")
+                        table.reload("activities_table")
                     })
                 });
             } else if (obj.event === 'teachers') {

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

@@ -65,14 +65,22 @@
 <script type="text/html" id="bussinessBar">
   <div class="layui-btn-container">
     <span class="table-label">商机列表</span>
+    <% if can? :create, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加商机</button>
+    <% end %>
   </div>
 </script>
 <script type="text/html" id="currentTableBar">
+  <% if can? :create, EducodeSales::SalePlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addWeek">添加周计划</a>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addMonth">添加月计划</a>
+  <% end %>
+  <% if can? :update, EducodeSales::Business %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can? :destroy, EducodeSales::SalePlan %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
 </script>
 <script type="text/html" id="show_keys">
   <a href="javascript:void(0);" lay-event="show_keys" class="layui-table-link">{{ d.teachers_count }}</a>
@@ -83,154 +91,146 @@
 
 
 <script>
-    layui.use('laydate', function () {
-        var laydate = layui.laydate;
-        //执行一个laydate实例
-        laydate.render({
-            elem: '#date',
-            range: true //或 range: '~' 来自定义分割字符
-        });
-    })
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
+      var $ = layui.jquery,
+        form = layui.form,
+        request = layui.request,
+        miniPage = layui.miniPage,
+        laydate = layui.laydate;
 
-    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
-        var $ = layui.jquery,
-            form = layui.form,
-            request = layui.request,
-            miniPage = layui.miniPage;
+      laydate.render({
+        elem: '#date',
+        range: true 
+      });
 
-        table = layui.table;
-        table.render({
-            elem: '#businesses_table',
-            url: '/educode_sales/businesses',
-            where: {q: form.val('search_form')},
-            toolbar: '#bussinessBar',
-            defaultToolbar: [],
-            cols: [
-                [
-                    {
-                        field: 'id',
-                        width: 60,
-                        title: '序号',
-                    },
-                    {
-                        field: 'name',
-                        width: 170,
-                        title: '名称'
-                    },
-                    {
-                        field: 'school',
-                        width: 200,
-                        title: '单位',
-                    },
-                    {
-                        field: 'department',
-                        width: 140,
-                        title: '部门'
-                    },
-                    {
-                        field: 'follow_ups_count',
-                        title: '跟进',
-                        width: 60,
-                        templet: '#show_follow'
-                    },
-                    {
-                        field: 'teachers_count',
-                        width: 100,
-                        title: '关键人',
-                        templet: '#show_keys'
+      table = layui.table;
+      table.render({
+          elem: '#businesses_table',
+          url: '/educode_sales/businesses',
+          where: {q: form.val('search_form')},
+          toolbar: '#bussinessBar',
+          defaultToolbar: [],
+          cols: [
+            [
+              {
+                field: 'id',
+                width: 60,
+                title: '序号',
+              },
+              {
+                field: 'name',
+                width: 170,
+                title: '名称'
+              },
+              {
+                field: 'school',
+                width: 200,
+                title: '单位',
+              },
+              {
+                field: 'department',
+                width: 140,
+                title: '部门'
+              },
+              {
+                field: 'follow_ups_count',
+                title: '跟进',
+                width: 60,
+                templet: '#show_follow'
+              },
+              {
+                field: 'teachers_count',
+                width: 100,
+                title: '关键人',
+                templet: '#show_keys'
+              },
+              {
+                field: 'clazz',
+                width: 80,
+                title: '类型'
+              },
+              {
+                field: 'stage',
+                width: 100,
+                title: '阶段'
+              },
+              {
+                field: 'invitation_at',
+                width: 120,
+                title: '招标时间',
+                sort: true
+              },
+              {
+                field: 'reception_at',
+                width: 120,
+                title: '验收时间',
+                sort: true
+              },
+              {
+                field: 'total_amount',
+                width: 100,
+                title: '总额(万)',
+                sort: true
+              },
+              {
+                field: 'return_money',
+                width: 100,
+                title: '回款(万)',
+                sort: true
+              },
+              {
+                field: 'place',
+                width: 110,
+                title: '渠道'
+              },
+              {
+                title: '操作',
+                minWidth: 300,
+                toolbar: '#currentTableBar',
+                align: "center",
+                fixed: 'right'
+              }
+            ]
+          ],
+          page: true,
+          skin: 'line'
+      });
 
-                    },
-                    {
-                        field: 'clazz',
-                        width: 80,
-                        title: '类型'
-                    },
-                    {
-                        field: 'stage',
-                        width: 100,
-                        title: '阶段'
-                    },
-                    {
-                        field: 'invitation_at',
-                        width: 120,
-                        title: '招标时间',
-                        sort: true
-                    },
-                    {
-                        field: 'reception_at',
-                        width: 120,
-                        title: '验收时间',
-                        sort: true
-                    },
-                    {
-                        field: 'total_amount',
-                        width: 100,
-                        title: '总额(万)',
-                        sort: true
-                    },
-                    {
-                        field: 'return_money',
-                        width: 100,
-                        title: '回款(万)',
-                        sort: true
-                    },
-                    {
-                        field: 'place',
-                        width: 110,
-                        title: '渠道'
-                    },
-                    {
-                        title: '操作',
-                        minWidth: 300,
-                        toolbar: '#currentTableBar',
-                        align: "center",
-                        fixed: 'right'
-                    }
-                ]
-            ],
-            page: true,
-            skin: 'line'
+      var sort = {}, search = {};
+      table.on('sort(businesses_table)', function (obj) {
+        sort.field = obj.field;
+        sort.order = obj.type;
+        table.reload('businesses_table', {
+          initSort: obj,
+          where: {
+              sort: sort,
+              q: search
+          }
         });
-
-        var sort = {}, search = {};
-        table.on('sort(businesses_table)', function (obj) {
-            sort.field = obj.field;
-            sort.order = obj.type;
-            table.reload('businesses_table', {
-                initSort: obj,
-                where: {
-                    sort: sort,
-                    q: search
-                }
-            });
-        })
+      })
 
         // 监听搜索操作
         form.on('submit(search_bussiness)', function (data) {
-            console.log(search);
-            search = data.field
-            table.reload('businesses_table', {
-                page: {
-                    curr: 1
-                },
-                where: {q: search, sort: sort}
-            }, 'data');
+          search = data.field
+          table.reload('businesses_table', {
+            page: {
+                curr: 1
+            },
+            where: {q: search, sort: sort}
+          }, 'data');
 
-            return false;
+          return false;
         });
 
         form.on('submit(reset_business_search)', function (data) {
-            var field = data.field;
-            form.val('search_form', {
-                name: '', department: '', staff_id: '', business_type: '', business_step: '',
-                place_id: '', date: '', area: ''
-            })
-            return false;
+          var field = data.field;
+          form.val('search_form', {
+              name: '', department: '', staff_id: '', business_type: '', business_step: '',
+              place_id: '', date: '', area: ''
+          })
+          return false;
         });
 
-        /**
-         * toolbar事件监听
-         */
         table.on('toolbar(businesses_table)', function (obj) {
             if (obj.event === 'add') { // 监听添加操作
                 var content = miniPage.getHrefContent('/educode_sales/businesses/new');
@@ -348,11 +348,7 @@
                     shadeClose: true,
                     area: [openWH[0] + 'px', openWH[1] + 'px'],
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
-                    content: content,
-                    success: function (layero, index) {
-                        // 重新渲染弹层中的下拉选择框select
-                        // form.render('select');
-                    }
+                    content: content
                 });
                 $(window).on("resize", function () {
                     layer.full(index);