educode_sales 0.1.0 → 0.1.4

data/app/models/ability.rb

@@ -6,7 +6,6 @@
       #
       #   user ||= User.new # guest user (not logged in)
        alias_action :index, :trends, :show,  :to => :read
-       
         if staff.is_admin
           can :manage, :all
         else

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

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

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,9 @@ 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
     has_many :follow_ups, dependent: :restrict_with_exception
     has_many :teacher_follows, dependent: :restrict_with_exception
@@ -12,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: '已存在' }
@@ -31,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="place" lay-filter="currentTableFilter"></table>
+<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">
@@ -28,7 +34,7 @@
             miniPage = layui.miniPage;
 
         table.render({
-            elem: '#place',
+            elem: '#activities_table',
             url: '/educode_sales/activities',
             toolbar: '#activity_toolbar',
             defaultToolbar: [],
@@ -47,6 +53,7 @@
                 },
                 {
                   field: 'start_at',
+                  width: 180,
                   title: '时间',
                   sort: true,
                 },
@@ -85,10 +92,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 +126,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 +156,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/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_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">
@@ -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);