educode_sales 0.1.1 → 0.1.5

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/money_plan.rb

@@ -12,10 +12,10 @@ module EducodeSales
     private
 
     def update_return_money
-      if self.clazz == '已完成'
+      if follow_up.business.last_follow_up_id == self.follow_up_id
+        follow_up.business.update(return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: self.follow_up_id).sum(:amount))
+      else
         follow_up.update(return_money: follow_up.money_plans.where(clazz: '已完成').sum(:amount))
-        all_follow_ups_ids = follow_up.business.follow_ups.pluck(:id)
-        follow_up.business.update(return_money: EducodeSales::MoneyPlan.where(clazz: '已完成', follow_up_id: all_follow_ups_ids).sum(:amount))
       end
     end
   end

data/app/models/educode_sales/operation_plan.rb

@@ -2,5 +2,7 @@ module EducodeSales
   class OperationPlan < ApplicationRecord
     belongs_to :staff
     belongs_to :teacher
+
+    validates :month, presence: true
   end
 end

data/app/models/educode_sales/place.rb

@@ -3,5 +3,6 @@ module EducodeSales
     belongs_to :staff
     has_many :place_areas, dependent: :destroy
     has_many :areas, through: :place_areas
+    has_many :follow_ups, dependent: :restrict_with_exception
   end
 end

data/app/models/educode_sales/sale_plan.rb

@@ -2,5 +2,7 @@ module EducodeSales
   class SalePlan < ApplicationRecord
     belongs_to :business
     belongs_to :staff
+
+    validates :month, presence: 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,10 +5,10 @@ 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
 end
 json.code 0
-json.count @activities.size
+json.count @activities.total_count

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_follow_record.html.erb

@@ -17,7 +17,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">项目类型</label>
       <div class="layui-input-inline">
-         <%= select_tag "clazz_id", options_for_select(@clazz, @follow_up.clazz), class: 'required' %>
+         <%= select_tag "clazz_id", options_for_select(@clazz, @follow_up.clazz_id), class: 'required' %>
       </div>
     </div>
     <div class="layui-inline">
@@ -51,7 +51,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">实额</label>
       <div class="layui-input-inline">
-         <input name="actual_amount" type="number" class="layui-input" value="<%= @follow_up.total_amount %>">
+         <input name="actual_amount" type="number" class="layui-input" value="<%= @follow_up.actual_amount %>">
       </div>
     </div>
     <br>

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

@@ -39,7 +39,7 @@
 
 <script type="text/html" id="return_money_select">
   <div class="layui-input-block table-select">
-    <select name="sex" lay-filter="return_money_select">
+    <select name="clazz" lay-filter="return_money_select">
       {{# layui.each(['未完成', '已完成'], function(i, data) { }}
       {{# if (data == d.clazz) { }}
       <option value="{{data}}" selected="{{d.clazz}}">{{data}}</option>
@@ -81,9 +81,10 @@
         if (res.success == false) {
           layer.alert(res.msg)
         } else {
-          layer.close(parent.plan_index);
+          // layer.close(parent.plan_index);
           parent.table.reload('sale_plan_follow_table');
           parent.table.reload('businesses_table');
+          table.reload('return_money_list');
         }
       })
       return false;
@@ -146,23 +147,27 @@
 
     table.on('tool(return_money_list)', function (obj) {
       var data = obj.data;
-      data.clazz = clazz;
+      data.clazz = clazz ? clazz : obj.data.clazz;
       data.plan_id = obj.data.id
       if (obj.event === 'edit') {
         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');
+              table.reload("sale_plan_follow_table");
+              table.reload("businesses_table");
             } else {
-              layer.alert(res.msg)
+              layer.alert(res.msg);
             }
-
           })
       } else if (obj.event == 'delete') {
         layer.confirm('确定删除回款金额为' + data.amount + "的计划", function (index) {
           request.delete('educode_sales/follow_ups/' + parent.follow_up_id + "/delete_money?plan_id=" + data.id, {}, function (res) {
             layer.close(index);
-            table.reload("return_money_list")
+            table.reload("return_money_list");
+            table.reload("sale_plan_follow_table");
+            table.reload("businesses_table");
           })
         });
       }

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

@@ -1,4 +1,4 @@
-<div class="edit-table">
+<div class="min-height-table">
   <div style="margin: 10px 10px 10px 10px">
     <form class="layui-form layui-form-pane" lay-filter="search_form">
       <div class="layui-form-item">

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

@@ -13,8 +13,9 @@ 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
+json.count @businesses.total_count
 json.msg 'succcess'

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.json.jbuilder

@@ -18,4 +18,4 @@ json.data do
 end
 
 json.code 0
-json.count @follow_ups.count
+json.count @follow_ups.total_count

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/businesses/unfinish_plans.json.jbuilder

@@ -11,4 +11,4 @@ json.data do
 end
 
 json.code 0
-json.count @plans.count
+json.count @plans.total_count

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

@@ -10,4 +10,4 @@ json.data do
 end
 
 json.code 0
-json.count @commons.size
+json.count @commons.total_count

data/app/views/educode_sales/follow_ups/money_plans.json.jbuilder

@@ -8,4 +8,4 @@ json.data do
 end
 
 json.code 0
-json.count @money_plans.count
+json.count @money_plans.total_count

data/app/views/educode_sales/follow_ups/teachers.json.jbuilder

@@ -13,4 +13,4 @@ json.data do
 end
 
 json.code 0
-json.count @teachers.count
+json.count @teachers.total_count

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,10 +1,13 @@
 <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>
 <!--搜索-->
+<div class="layuimini-main min-height-table" id="o_month_table_wraper">
 <form class="layui-form layui-form-pane" lay-filter="month_plan_form_filter">
   <div class="layui-form-item">
     <div class="layui-inline">
@@ -34,15 +37,21 @@
   </div>
 </form>
 <table class="layui-hide" id="monthPlanTable" lay-filter="currentTableFilter3"></table>
-
+</div>
 <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 +97,12 @@
                     },
                     {
                         field: 'school',
-                        width: 100,
+                        width: 190,
                         title: '单位'
                     },
                     {
                         field: 'department',
-                        width: 100,
+                        width: 190,
                         title: '部门'
                     },
                     {
@@ -102,10 +111,10 @@
                         title: '计划内容',
                     },
                     {
-                        field: 'follow',
+                        field: 'count',
                         width: 100,
                         title: '跟进',
-                        templet: '#show_follow'
+                        templet: '#show_follow2'
                     },
                     {
                         field: 'rate',
@@ -173,7 +182,7 @@
                 console.log("a");
                 var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_month');
                 var openWH = miniPage.getOpenWidthHeight();
-                var index = layer.open({
+                monthPlanIndex = layer.open({
                     title: '添加计划',
                     type: 1,
                     shade: 0.2,
@@ -228,7 +237,7 @@
             } else if (obj.event === 'edit') {
                 content = miniPage.getHrefContent('/educode_sales/operation_plans/edit_month?id='+data.id);
                 openWH = miniPage.getOpenWidthHeight();
-                index = layer.open({
+                indexOfmonthPlan = layer.open({
                     title: '编辑',
                     type: 1,
                     shade: 0.2,
@@ -245,11 +254,12 @@
                     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/跟进记录',
+                    title: data.teacher_name + '/跟进记录',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,