educode_sales 0.1.1 → 0.1.2

data/app/models/ability.rb

@@ -6,14 +6,10 @@
       #
       #   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/activity.rb

@@ -1,6 +1,7 @@
 module EducodeSales
   class Activity < ApplicationRecord
     belongs_to :staff
-    has_many :teachers, dependent: :restrict_with_exception
+    has_many :activity_teachers
+    has_many :teachers, through: :activity_teachers, dependent: :restrict_with_exception
   end
 end

data/app/models/educode_sales/business.rb

@@ -2,7 +2,6 @@ module EducodeSales
   class Business < ApplicationRecord
     belongs_to :staff
     belongs_to :department
-    belongs_to :place, optional: true
     belongs_to :last_follow_up, class_name: 'FollowUp', optional: true
 
     has_many :sale_plans, dependent: :destroy

data/app/models/educode_sales/course_subject.rb

@@ -1,5 +1,5 @@
 module EducodeSales
   class CourseSubject < ApplicationRecord
-    belongs_to :teacher
+    belongs_to :teacher, counter_cache: true
   end
 end

data/app/models/educode_sales/staff.rb

@@ -4,7 +4,7 @@ module EducodeSales
     belongs_to :role, optional: true
 
     has_many :market_areas, dependent: :destroy
-    has_many :sale_plans, dependent: :restrict_with_exception
+    has_many :follow_ups, 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
@@ -14,7 +14,7 @@ module EducodeSales
     has_many :places, dependent: :restrict_with_exception
     has_many :businesses
     has_many :activities
-    has_many :role_permissions, dependent: :destroy
+    has_many :sale_plans, dependent: :destroy
 
     has_many :areas, through: :market_areas
     validates :user_id, uniqueness: { message: '已存在' }
@@ -33,7 +33,7 @@ module EducodeSales
     end
 
     def month
-      if expired_at.present?
+      if expired_at.present? && enabled_at.present?
         (expired_at.year * 12 + expired_at.month) - (enabled_at.year * 12 + enabled_at.month)
       else
         nil

data/app/models/educode_sales/teacher.rb

@@ -2,11 +2,30 @@ module EducodeSales
   class Teacher < ApplicationRecord
     has_many :activity_teachers
     has_many :activities, through: :activity_teachers
+    has_many :teacher_follows, dependent: :destroy
+    has_many :operation_plans, dependent: :destroy
+    has_many :course_subjects, dependent: :destroy
     belongs_to :department, optional: true
     belongs_to :staff
     belongs_to :user, optional: true
     belongs_to :follow_up, counter_cache: true, optional: true
 
     validates :user_id, uniqueness: { allow_blank: true, message: '已存在老师列表'}
+
+
+    def teacher_used_of_department
+      if user_id.present?
+        user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
+        course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
+        if course_ids.present?
+        else
+          0
+        end
+        course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 30").select("COUNT(*) AS count")
+        course_members.present? ? course_members[0]['count'] : 0
+      else
+        0
+      end
+    end
   end
-end
+end

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

@@ -1,5 +1,6 @@
 <%#= Gon::Base.render_data %>
-<form class="layui-form " action="">
+<div class="layuimini-main">
+  <form class="layui-form  layuimini-form" action="">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
       <label class="layui-form-label required">活动名称</label>
@@ -28,8 +29,7 @@
     </div>
   </div>
 </form>
-
-
+</div>
 <script>
 
     layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
@@ -73,7 +73,7 @@
                     layer.alert(res.msg)
                 } else {
                     layer.closeAll(); //关闭所有层
-                    table.reload('place')
+                    table.reload('activities_table')
                 }
             })
             return false;

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

@@ -1,15 +1,21 @@
 <script type="text/html" id="activity_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">活动列表</span>
+    <% if can? :create, EducodeSales::Activity %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加活动</button>
+    <% end %>
   </div>
 </script>
 
 <table class="layui-hide" id="activities_table" lay-filter="activities_table"></table>
 
 <script type="text/html" id="currentTableBar">
+  <% if can? :update, EducodeSales::Activity %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+ <% if can? :destroy, EducodeSales::Activity %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
 </script>
 
 <script type="text/html" id="teachers">

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

@@ -5,7 +5,7 @@ json.data do
     json.days d.days
     json.teachers_count d.activity_teachers_count
     json.return_rate d.return_rate
-    json.students_count d.students_count
+    json.students_count d.students_count || 0
     json.course_rate d.course_rate
     json.start_at d.start_at ? d.start_at.to_s(:date) : ''
   end

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

@@ -1,5 +1,6 @@
 <%#= Gon::Base.render_data %>
-<form class="layui-form " action="">
+<div class="layuimini-main">
+<form class="layui-form  layuimini-form" action="">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
       <label class="layui-form-label required">活动名称</label>
@@ -27,7 +28,7 @@
     </div>
   </div>
 </form>
-
+</div>
 
 <script>
 
@@ -72,7 +73,7 @@
                     layer.alert(res.msg)
                 } else {
                     layer.closeAll(); //关闭所有层
-                    table.reload('place')
+                    table.reload('activities_table')
                 }
             })
             return false;

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

@@ -152,9 +152,10 @@
         request.authPut('educode_sales/follow_ups/' + parent.follow_up_id + "/update_money", data,
           function (res) {
             if (res.success) {
-              table.reload('return_money_list')
+              layer.alert('保存成功');
+              table.reload('return_money_list');
             } else {
-              layer.alert(res.msg)
+              layer.alert(res.msg);
             }
 
           })

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

@@ -13,7 +13,7 @@ json.data do
     json.reception_at d.last_follow_up&.reception_at.to_s
     json.total_amount d.last_follow_up&.total_amount
     json.return_money d.return_money
-    json.place d.place&.name
+    json.place d.last_follow_up&.place&.name
   end
 end
 json.code 0

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

@@ -3,7 +3,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">名称</label>
       <div class="layui-input-block">
-        <input type="text" name="name" autocomplete="off" lay-verify="required" class="layui-input" style="width: 240px;">
+        <input type="text" name="name" autocomplete="off" lay-verify="required" class="layui-input" style="width: 300px;">
       </div>
     </div>
     <div class="layui-inline">

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

@@ -1,5 +1,5 @@
 <h1 class="text-center m-t-20"><%= @follow_up.business.name %></h1>
-<div class="layui-form form-value">
+<form class="layui-form form-value">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
       <label class="layui-form-label">单位：</label>

data/app/views/educode_sales/home/search_users.json.jbuilder

@@ -1,7 +1,7 @@
 json.data do
   json.array! @users do |d|
     json.value d.id
-    json.name "#{d.real_name}--(#{d.login})"
+    json.name "#{d.real_name}--(#{d.mail}-#{d.phone}-#{d.login})"
   end
 end
 json.code 0

data/app/views/educode_sales/operation_plans/_monthPlan.html.erb

@@ -1,7 +1,9 @@
 <script type="text/html" id="monthPlanToolbar">
   <div class="layui-btn-container">
     <span class="table-label">月计划列表</span>
+    <% if can? :create, EducodeSales::OperationPlan %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
+    <% end %>
   </div>
 </script>
 <!--搜索-->
@@ -36,13 +38,19 @@
 <table class="layui-hide" id="monthPlanTable" lay-filter="currentTableFilter3"></table>
 
 <script type="text/html" id="currentTableBar">
+  <% if can? :read, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
+  <% end %>
+  <% if can? :update, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can? :destroy, EducodeSales::OperationPlan %>
   <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_follow">
-  <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow }}</a>
+<script type="text/html" id="show_follow2">
+  <a href="javascript:void(0);" lay-event="show_follow2" class="layui-table-link">{{ d.count }}</a>
 </script>
 
 <script>
@@ -88,12 +96,12 @@
                     },
                     {
                         field: 'school',
-                        width: 100,
+                        width: 190,
                         title: '单位'
                     },
                     {
                         field: 'department',
-                        width: 100,
+                        width: 190,
                         title: '部门'
                     },
                     {
@@ -102,10 +110,10 @@
                         title: '计划内容',
                     },
                     {
-                        field: 'follow',
+                        field: 'count',
                         width: 100,
                         title: '跟进',
-                        templet: '#show_follow'
+                        templet: '#show_follow2'
                     },
                     {
                         field: 'rate',
@@ -245,8 +253,9 @@
                     layer.full(index);
                 });
                 return false;
-            } else if (obj.event === 'show_follow') {
-                content = miniPage.getHrefContent('/educode_sales/businesses/show_follow');
+            } else if (obj.event === 'show_follow2') {
+                id = data.teacher_id
+                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.teacher_id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: 'xxxx/跟进记录',

data/app/views/educode_sales/operation_plans/_monthly.html.erb

@@ -1,7 +1,9 @@
 <script type="text/html" id="monthlyToolbar">
   <div class="layui-btn-container">
     <span class="table-label">月报列表</span>
+    <% if can? :create, EducodeSales::OperationPlan %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加月报</button>
+    <% end %>
   </div>
 </script>
 <!--搜索-->
@@ -38,12 +40,18 @@
 <table class="layui-hide" id="monthlyTable" lay-filter="currentTableFilter4"></table>
 </div>
 <script type="text/html" id="monthlyTableBar">
+  <% if can? :read, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
+  <% end %>
+  <% if can? :create, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
-  <%# if can? :audit, EducodeSales::SaleReport %>
+  <% end %>
+  <% if can? :audit, EducodeSales::OperationReport %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="audit">审查</a>
-  <%# end %>
+  <% end %>
+  <% if can? :destroy, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+   <% end %>
 </script>
 
 
@@ -228,11 +236,11 @@
             var data = obj.data;
             if (obj.event === 'edit') {
 
-                var content = miniPage.getHrefContent('/educode_sales/operation_reports/' + data.id + "/edit");
+                var content = miniPage.getHrefContent('/educode_sales/operation_reports/' + data.id + '/edit');
                 var openWH = miniPage.getOpenWidthHeight();
 
-                var index = layer.open({
-                    title: '编辑用户',
+                MonthlyIndex = layer.open({
+                    title: '编辑',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,

data/app/views/educode_sales/operation_plans/_weekPlan.html.erb

@@ -1,7 +1,9 @@
 <script type="text/html" id="weekPlanToolbar">
   <div class="layui-btn-container">
     <span class="table-label">周计划列表</span>
+     <% if can? :create, EducodeSales::OperationPlan %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
+    <% end %>
   </div>
 </script>
 <!--搜索-->
@@ -34,16 +36,22 @@
     </div>
   </div>
 </div>
-<table class="layui-hide" id="weekPlanTable" lay-filter="weekPlanTable"></table>
+<table class="layui-hide" id="weekPlanTable1" lay-filter="weekPlanTable1"></table>
 </div>
 <script type="text/html" id="week_plan_currentTableBar">
+  <% if can? :read, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
+  <% end %>
+  <% if can? :update, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can? :destroy, EducodeSales::OperationPlan %>
   <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_follow">
-  <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow }}</a>
+<script type="text/html" id="show_follow1">
+  <a href="javascript:void(0);" lay-event="show_follow1" class="layui-table-link">{{ d.count }}</a>
 </script>
 
 <script>
@@ -67,7 +75,7 @@
 
 
         table.render({
-            elem: '#weekPlanTable',
+            elem: '#weekPlanTable1',
             url: '/educode_sales/operation_plans?clazz=week',
             toolbar: '#weekPlanToolbar',
             defaultToolbar: [],
@@ -90,12 +98,12 @@
                     },
                     {
                         field: 'school',
-                        width: 100,
+                        width: 190,
                         title: '单位'
                     },
                     {
                         field: 'department',
-                        width: 100,
+                        width: 190,
                         title: '部门'
                     },
                     {
@@ -109,10 +117,10 @@
                         title: '计划内容',
                     },
                     {
-                        field: 'follow',
+                        field: 'count',
                         width: 100,
                         title: '跟进',
-                        templet: '#show_follow'
+                        templet: '#show_follow1'
                     },
                     {
                         field: 'rate',
@@ -140,10 +148,10 @@
             skin: 'line'
         });
         var sort = {}, search = {};
-        table.on('sort(weekPlanTable)', function(obj) {
+        table.on('sort(weekPlanTable1)', function(obj) {
             sort.field = obj.field;
             sort.order = obj.type;
-            table.reload('weekPlanTable', {
+            table.reload('weekPlanTable1', {
                 initSort: obj,
                 where: {
                     sort: sort,
@@ -155,7 +163,7 @@
         // 监听搜索操作
         form.on('submit(week_plan_search)', function (data) {
             search = data.field
-            table.reload('weekPlanTable', {
+            table.reload('weekPlanTable1', {
                 page: {
                     curr: 1
                 },
@@ -174,7 +182,7 @@
         /**
          * toolbar事件监听
          */
-        table.on('toolbar(weekPlanTable)', function (obj) {
+        table.on('toolbar(weekPlanTable1)', function (obj) {
             var data = obj.data;
             if (obj.event === 'add') { // 监听添加操作
                 var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_week');
@@ -200,7 +208,7 @@
         });
 
 
-        table.on('tool(weekPlanTable)', function (obj) {
+        table.on('tool(weekPlanTable1)', function (obj) {
             var data = obj.data;
              id = data.id
             if (obj.event === 'delete') {
@@ -208,7 +216,7 @@
                     console.log("aaaaa");
                     request.delete('educode_sales/operation_plans/' + data.id, {}, function (res) {
                         layer.close(index);
-                        table.reload("weekPlanTable")
+                        table.reload("weekPlanTable1")
                     })
                 });
             }
@@ -241,7 +249,7 @@
             } else if (obj.event === 'edit') {
                 content = miniPage.getHrefContent('/educode_sales/operation_plans/edit_week?id='+id);
                 openWH = miniPage.getOpenWidthHeight();
-                index = layer.open({
+                editWeek_index = layer.open({
                     title: '编辑',
                     type: 1,
                     shade: 0.2,
@@ -251,10 +259,10 @@
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content,
                     success: function (layero, index) {
-                        $("#edit_chance1").val(data.chance);
-                        $("#edit_plan1").val(data.plan);
-                        $("#edit_rate1").val(data.rate);
-                        $("#edit_week1").val(data.week);
+                        // $("#edit_chance1").val(data.chance);
+                        // $("#edit_plan1").val(data.plan);
+                        // $("#edit_rate1").val(data.rate);
+                        // $("#edit_week1").val(data.week);
                         // 重新渲染弹层中的下拉选择框select
                         form.render('select');
                     },
@@ -263,8 +271,9 @@
                     layer.full(index);
                 });
                 return false;
-            } else if (obj.event === 'show_follow') {
-                content = miniPage.getHrefContent('/educode_sales/businesses/show_follow');
+            } else if (obj.event === 'show_follow1') {
+                id = data.teacher_id
+                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.teacher_id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: 'xxxx/跟进记录',