educode_sales 0.1.2 → 0.1.7

data/app/controllers/educode_sales/teachers_controller.rb

@@ -73,7 +73,7 @@ module EducodeSales
             @teachers = @teachers.where("created_at > ? AND created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.page(params[:page]).per(params[:per_page])
+          @teachers = @teachers.order("created_at desc").page(params[:page]).per(params[:limit])
 
         end
       end
@@ -144,7 +144,7 @@ module EducodeSales
 
     def unfinish_plans
       load_teacher
-      @plans = @teacher.operation_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:per_page])
+      @plans = @teacher.operation_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:limit])
     end
 
     def course_subject
@@ -206,7 +206,7 @@ module EducodeSales
           else
             @follow_ups = @follow_ups.order("created_at desc")
           end
-          @follow_ups = @follow_ups.page(params[:page]).per(params[:per_page])
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -244,7 +244,7 @@ module EducodeSales
     def course_list
       user = User.find_by(id: params[:user_id])
       if user
-      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).page(params[:page]).per(params[:per_page])
+      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).page(params[:page]).per(params[:limit])
       else
         @courses = Course.none
       end
@@ -253,7 +253,7 @@ module EducodeSales
 
     def activities
       teacher = Teacher.find(params[:id])
-      @activities = teacher.activities.page(params[:page]).per(params[:per_page]) 
+      @activities = teacher.activities.page(params[:page]).per(params[:limit])
     end
 
     private

data/app/models/educode_sales/common.rb

@@ -29,5 +29,9 @@ module EducodeSales
     def self.key_attitude_name
       self.where(clazz: 'key_attitude').pluck(:id, :name).to_h
     end
+
+    def self.teacher_attitude_name
+      self.where(clazz: 'teacher_attitude').pluck(:id, :name).to_h
+    end
   end
 end

data/app/models/educode_sales/follow_up.rb

@@ -2,7 +2,7 @@ module EducodeSales
   class FollowUp < ApplicationRecord
     belongs_to :business, counter_cache: true
     belongs_to :place, optional: true
-    has_many :money_plans
+    has_many :money_plans, dependent: :destroy
     has_many :key_person
     has_many :teachers, through: :key_person
     belongs_to :staff

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

@@ -18,11 +18,20 @@ module EducodeSales
         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?
+          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
-        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
+
+    def students_count
+      if user_id.present?
+        course_ids = CourseMember.where.not(role: "STUDENT").where(user_id: user_id).pluck(:course_id)
+        CourseMember.where(course_id: course_ids, role: "STUDENT").count
       else
         0
       end

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

@@ -60,7 +60,7 @@
                 {
                   field: 'days',
                   title: '天数',
-                  width: 80
+                  width: 100
                 },
                 {
                   field: 'teachers_count',
@@ -68,14 +68,6 @@
                   width: 100,
                   templet: '#teachers_count'
                 },
-                // {
-                //     field: 'return_rate',
-                //     title: '回访率',
-                // },
-                // {
-                //     field: 'course_rate',
-                //     title: '建课率',
-                // },
                 {
                   field: 'students_count',
                   title: '学生数',

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

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

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>
@@ -66,6 +66,7 @@
       <div class="layui-input-inline">
         <input name="divide_rate" class="layui-input" value="<%= @follow_up.divide_rate%>">
       </div>
+      <span style="margin-top: 10px; float:left;">%</span>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">自我小结</label>

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,7 +147,7 @@
 
     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,
@@ -154,16 +155,19 @@
             if (res.success) {
               layer.alert('保存成功');
               table.reload('return_money_list');
+              table.reload("sale_plan_follow_table");
+              table.reload("businesses_table");
             } else {
               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

@@ -17,4 +17,5 @@ json.data do
   end
 end
 json.code 0
+json.count @businesses.total_count
 json.msg 'succcess'

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

@@ -194,6 +194,7 @@
                 request.authDelete("educode_sales/follow_ups/" + data.id, {}, function() {
                   obj.del();
                   layer.close(index);
+                    table.reload("businesses_table");
                 })
               });
           } else if (obj.event === 'show') { // 监听添加操作

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/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/operation_plans/_monthPlan.html.erb

@@ -7,6 +7,7 @@
   </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">
@@ -36,7 +37,7 @@
   </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>
@@ -181,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,
@@ -236,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,
@@ -258,7 +259,7 @@
                 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,

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

@@ -7,7 +7,7 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main edit-table" id="monthly_table_wraper">
+<div class="layuimini-main min-height-table" id="o_monthly_table_wraper">
 
 <form class="layui-form layui-form-pane" lay-filter="monthly_form_filter">
   <div class="layui-form-item">
@@ -139,7 +139,7 @@
                     }
                 ]
             ],   done: function (res) {
-                $("#monthly_table_wraper .star1").each(function (i) {
+                $("#o_monthly_table_wraper .star1").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level1_score,
@@ -147,7 +147,7 @@
                         readonly: true
                     });
                 })
-                $("#monthly_table_wraper .star2").each(function (i) {
+                $("#o_monthly_table_wraper .star2").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level2_score,
@@ -155,7 +155,7 @@
                         readonly: true
                     });
                 })
-                $("#monthly_table_wraper .star3").each(function (i) {
+                $("#o_monthly_table_wraper .star3").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level3_score,

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

@@ -7,8 +7,8 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main edit-table" id="week_table_wraper">
-<div class="layui-form layui-form-pane edit-table" lay-filter="week_plan_form_filter">
+<div class="layuimini-main min-height-table" id="o_week_table_wraper">
+<div class="layui-form layui-form-pane" lay-filter="week_plan_form_filter">
   <div class="layui-form-item">
     <div class="layui-inline">
       <label class="layui-form-label">人员</label>
@@ -106,6 +106,11 @@
                         width: 190,
                         title: '部门'
                     },
+                    {
+                        field: 'month',
+                        width: 100,
+                        title: '月份',
+                    },
                     {
                         field: 'week',
                         width: 100,
@@ -187,7 +192,7 @@
             if (obj.event === 'add') { // 监听添加操作
                 var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_week');
                 var openWH = miniPage.getOpenWidthHeight();
-                var index = layer.open({
+                new_weelPlan_index = layer.open({
                     title: '添加计划',
                     type: 1,
                     shade: 0.2,
@@ -276,7 +281,7 @@
                 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,

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

@@ -7,8 +7,7 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main edit-table" id="sales_weelky_table">
-
+<div class="layuimini-main min-height-table" id="o_sales_weelky_table">
 <form class="layui-form layui-form-pane" lay-filter="weekly_plan_form_filter">
   <div class="layui-form-item">
     <div class="layui-inline">
@@ -141,7 +140,7 @@
                     }
                 ]
             ], done: function (res) {
-                $("#sales_weelky_table .star1").each(function (i) {
+                $("#o_sales_weelky_table .star1").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level1_score,
@@ -149,7 +148,7 @@
                         readonly: true
                     });
                 })
-                $("#sales_weelky_table .star2").each(function (i) {
+                $("#o_sales_weelky_table .star2").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level2_score,
@@ -157,7 +156,7 @@
                         readonly: true
                     });
                 })
-                $("#sales_weelky_table .star3").each(function (i) {
+                $("#o_sales_weelky_table .star3").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level3_score,