educode_sales 0.2.7 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7b0badd6354865f88cb4016fb2b4d6399b2e19a
-  data.tar.gz: 31b712f9a174d19191dc284957db22b20e2123fd
+  metadata.gz: 4d94abe298e3376939b4f3d8f7b2bcc594f5d2c1
+  data.tar.gz: 7530fa27a99ebfb62676367f3752ceee53238a86
 SHA512:
-  metadata.gz: a2206f34ebccc685009a8d9fe25ab7c8c47941d0718af2112b2373857163ca63f258552ffe3c41ea95ce3cff98251b2f986281e6387f7d1ca202a434e7cac491
-  data.tar.gz: c183901965584cb5986133bd959b75c43cfb0c34911e9dc8ac741990baf72e4c30b9fa561eb0fd6caa542007725da64d1f093b700c221607dae2ef465891a282
+  metadata.gz: 0c2f74657f5bf026f37f10d70cb3be4077022154558c3477b729c162f1d6b1efe48fe606b178c947f43a072fc127af4995faa5bf9ced2198acf27471e40f70b6
+  data.tar.gz: a092427e3505659b6602d3bde854d4bf8b39e31d9d1f46cd188688d85d3701df3c85830d5e80c3d37843e1bccc33576a9593a176e6f573c780b0ccb9f4e48c81

data/app/controllers/educode_sales/businesses_controller.rb

@@ -149,13 +149,13 @@ module EducodeSales
         end
         format.json do
           @follow_ups = @business.follow_ups
+          @latest = @follow_ups.order(created_at: :desc).first
           if params[:field]
             @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
           else
             @follow_ups = @follow_ups.order("created_at desc")
           end
           @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
-          @latest = @follow_ups.order(created_at: :desc).first
         end
       end
     end

data/app/controllers/educode_sales/home_controller.rb

@@ -12,29 +12,29 @@ module EducodeSales
     end
 
     def search_users
-      @users = User.where("lastname like :q OR login like :q OR phone like :q or mail like :q", q: "%#{params[:q]}%").limit(20)
+      @users = User.where("concat(lastname, firstname) like :q OR login like :q OR phone like :q or mail like :q", q: "%#{params[:q]}%").limit(50)
     end
 
     def search
       if params[:type] == 'department'
        
-       @data = Department.joins(:school).where("schools.name like :q", q: "%#{params[:q]}%").limit(20)
+       @data = Department.joins(:school).where("schools.name like :q", q: "%#{params[:q]}%").limit(50)
         unless @data.present?
-          @data = Department.where("name like ?", "%#{params[:q]}%").limit(20)
+          @data = Department.where("name like ?", "%#{params[:q]}%").limit(50)
         end
       elsif params[:type] == "school"
-        data = School.where("name like ? ", "%#{params[:q]}%").limit(20)
+        data = School.where("name like ? ", "%#{params[:q]}%").limit(50)
       end
     end
 
     def search_teacher
       @data = Teacher.where("name like ? and is_key = false", "%#{params[:q]}%").limit(20)
       user_ids = @data.pluck(:user_id).compact.uniq
-      @data += User.joins(:user_extension).where.not(id: user_ids).where("identity='teacher'", user_ids).where("lastname like ?", "%#{params[:q]}%").limit(20)
+      @data += User.joins(:user_extension).where.not(id: user_ids).where("identity='teacher'", user_ids).where("lastname like ?", "%#{params[:q]}%").limit(50)
     end
 
     def search_edu_teacher
-      @data = User.joins(:user_extension).where("identity='teacher'").where("lastname like ? OR phone like ? OR mail like ?", "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%").limit(20)
+      @data = User.joins(:user_extension).where("identity='teacher'").where("concat(lastname, firstname) like :q OR phone like :q OR mail like :q", q: "%#{params[:q]}%").limit(50)
     end
 
   end

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -20,7 +20,7 @@ module EducodeSales
             when '自己'
               @sale_plans = OperationPlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
+              staff_ids = Staff.joins(department: :school).where("school.province in ?", @current_admin.areas.pluck(:name)).pluck(:id)
               @sale_plans = OperationPlan.where("staff_id in ?", staff_ids)
             else
               @sale_plans = OperationPlan
@@ -117,7 +117,16 @@ module EducodeSales
 
     def edit_week
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
+      level = @current_admin.is_admin? ? '全部' : @current_admin.role.role_areas.find_by(clazz: '运营计划').level
+      if level == '自己'
+        @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
+      elsif level == '区域'
+        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: 0).pluck(:name, :id)
+      end
+
       @sale_plan = OperationPlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
@@ -145,7 +154,15 @@ module EducodeSales
 
     def edit_month
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
+      level = @current_admin.is_admin? ? '全部' : @current_admin.role.role_areas.find_by(clazz: '运营计划').level
+      if level == '自己'
+        @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
+      elsif level == '区域'
+        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: 0).pluck(:name, :id)
+      end
       @sale_plan = OperationPlan.find(params[:id])
       @months = [Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]
       @months << @sale_plan.month.strftime("%Y-%m")

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -23,7 +23,7 @@ module EducodeSales
     end
 
     def destroy
-      follow_up = @current_admin.teacher_follows.find(params[:id])
+      follow_up = TeacherFollow.find(params[:id])
       if follow_up.destroy
         render_success
       else
@@ -32,7 +32,7 @@ module EducodeSales
     end
 
     def update
-      follow_up = @current_admin.teacher_follows.find(params[:id])
+      follow_up = TeacherFollow.find(params[:id])
       follow_up.assign_attributes(follow_up_params)
       # follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save

data/app/controllers/educode_sales/teachers_controller.rb

@@ -98,14 +98,19 @@ module EducodeSales
       end
 
       if params[:activity_id].present? && params[:user_id].present?
+        @teacher_id = EducodeSales::Teacher.find_by(name: params[:name]).id
+
         # 把老师添加到活动列表，提取判断下老师列表是否存在
         find_teacher = Teacher.find_by(user_id: params[:user_id])
         if find_teacher
           teacher = find_teacher
         end
+      end
+      if params[:activity_id].present?
+        return render json: {msg: '该教师已在活动中', success: false } if teacher.activity_teachers.find_by(activity_id: params[:activity_id]).present?
         teacher.activity_teachers.build(activity_id: params[:activity_id])
       end
-      
+
       if teacher.save
         render_success
       else
@@ -207,13 +212,13 @@ module EducodeSales
         end
         format.json do
           @follow_ups = @teacher.teacher_follows
+          @latest = @follow_ups.order(created_at: :desc).first
           if params[:field]
             @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
           else
             @follow_ups = @follow_ups.order("created_at desc")
           end
           @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
-          @latest = @follow_ups.order(created_at: :desc).first
         end
       end
     end

data/app/models/educode_sales/activity_teacher.rb

@@ -2,5 +2,7 @@ module EducodeSales
   class ActivityTeacher < ApplicationRecord
     belongs_to :activity, counter_cache: true
     belongs_to :teacher, counter_cache: true
+
+    validates :teacher_id, uniqueness: {scope: :activity_id, message: '已存在'}
   end
 end

data/app/models/educode_sales/teacher.rb

@@ -14,19 +14,25 @@ module EducodeSales
     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?
+    #       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) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
+    #       course_members.present? ? course_members[0]['count'] : 0
+    #     else
+    #       0
+    #     end
+    #   else
+    #     0
+    #   end
+    # end
     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?
-          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) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
-          course_members.present? ? course_members[0]['count'] : 0
-        else
-          0
-        end
-      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) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
+        course_members.present? ? course_members[0]['count'] : 0
     end
 
     def students_count

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

@@ -6,7 +6,7 @@
       <label class="layui-form-label required">活动名称</label>
       <div class="layui-input-block">
         <input type="text" name="name" required lay-verify="required" autocomplete="off" placeholder="请输入"
-               class="layui-input">
+               class="layui-input" id="inputFocus">
       </div>
     </div>
     <div class="layui-inline">
@@ -31,6 +31,7 @@
 </div>
 
 <script>
+    document.getElementById("inputFocus").focus();
 
     layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
         var form = layui.form,

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

@@ -15,7 +15,7 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.return_money d.return_money
     json.place d.last_follow_up&.place&.name
-    json.last_follow_person d.last_follow_up_id.present? ? EducodeSales::Staff.find(EducodeSales::Business.find_by(last_follow_up_id: d.last_follow_up_id).staff_id).user.real_name : ''
+    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_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: 300px;">
+        <input id="inputFocus" type="text" name="name" autocomplete="off" lay-verify="required" class="layui-input" style="width: 300px;">
       </div>
     </div>
     <div class="layui-inline">
@@ -18,6 +18,7 @@
   </div>
 </div>
 <script>
+    document.getElementById("inputFocus").focus();
   layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
     var form = layui.form,
       layer = layui.layer,

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

@@ -122,19 +122,19 @@
       });
 
       form.render();
-    
+
       form.on('submit(add_follow_up)', function (data) {
           console.log(data);
           data.field.business_id = "<%= @business.id %>";
           console.log(data.field.business_id);
-          request.authPut("educode_sales/businesses/" + data.field.business_id +"/updateMoney/", {
-              return_money: 0
-          }, function (res) {
-              if (res.success == false) {
-                  layer.alert(res.msg)
-              } else {
-              }
-          })
+          // request.authPut("educode_sales/businesses/" + data.field.business_id +"/updateMoney/", {
+          //     return_money: 0
+          // }, function (res) {
+          //     if (res.success == false) {
+          //         layer.alert(res.msg)
+          //     } else {
+          //     }
+          // })
           request.authPost("educode_sales/follow_ups", data.field, function (res) {
           if (res.success == false) {
             layer.alert(res.msg)

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

@@ -149,12 +149,19 @@
               }
             ]
           ],
-          height: 400,
+          height: 520,
           limit: 20,
           page: true,
-          skin: 'line'
+          skin: 'line',
+          // done: function (obj, first) {
+          //     //切换分页时候回调事件
+          //     // console.log(obj);
+          //     console.log(first);
+          //     // if (first != 1) {
+          //     //     //第一次进入不调用
+          //     // }
+          // }
       });
-
       table.on('sort(sale_plan_follow_table)', function(obj) {
         table.reload('sale_plan_follow_table', {
           initSort: obj,
@@ -172,7 +179,7 @@
             var content = miniPage.getHrefContent('/educode_sales/businesses/new_follow_record?id=' + parent.id);
           var openWH = miniPage.getOpenWidthHeight();
           sale_plan_index = layer.open({
-            title: '添加',
+            title: '添加商机跟进记录',
             type: 1,
             shade: 0.2,
             maxmin: true,
@@ -207,7 +214,7 @@
               var content = miniPage.getHrefContent('/educode_sales/businesses/show_follow_record?follow_up_id=' + data.id);
               var openWH = miniPage.getOpenWidthHeight();
               var index = layer.open({
-                title: '查看',
+                title: '查看商机跟进记录',
                 type: 1,
                 shade: 0.2,
                 maxmin: true,
@@ -223,7 +230,7 @@
             var content = miniPage.getHrefContent('/educode_sales/businesses/edit_follow_record?follow_up_id=' + data.id);
             var  openWH = miniPage.getOpenWidthHeight();
               sale_plan_edit_open = layer.open({
-                title: '编辑',
+                title: '编辑商机跟进记录',
                 type: 1,
                 shade: 0.2,
                 maxmin: true,

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

@@ -118,12 +118,12 @@
                     },
                     {
                         field: 'rate',
-                        width: 100,
+                        width: 80,
                         title: '完成率',
                     },
                     {
                         field: 'updated_at',
-                        width: 150,
+                        width: 170,
                         title: '更新时间',
                         sort: true,
                     },

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

@@ -129,12 +129,12 @@
                     },
                     {
                         field: 'rate',
-                        width: 100,
+                        width: 80,
                         title: '完成率',
                     },
                     {
                         field: 'updated_at',
-                        width: 150,
+                        width: 170,
                         title: '更新时间',
                         sort: true,
                     },

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

@@ -11,9 +11,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">教师</label>
       <div class="layui-input-inline">
-        <%#= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
-        <%= select_tag "teacher_id", options_for_select(@teachers), class: 'required' %>
-
+        <%= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

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

@@ -19,9 +19,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">教师</label>
       <div class="layui-input-inline">
-        <%#= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
-        <%= select_tag "teacher_id", options_for_select(@teachers), class: 'required' %>
-
+        <%= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

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

@@ -72,6 +72,7 @@
                 } else {
                     layer.close(parent.new_monthly_index)
                     layer.close(parent.monthPlanIndex)
+                    layer.close(parent.teacherindex2)
                     table.reload('monthPlanTable')
                     table.reload("newMonthlyTable")
                 }

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

@@ -21,7 +21,7 @@
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">个人总结</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder="此处填写要点：
+        <textarea name="content" id="inputFocus" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
 3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
@@ -49,6 +49,8 @@
 
 
 <script>
+    document.getElementById("inputFocus").focus();
+
     layui.use(['rate', 'table'], function () {
         var rate = layui.rate,
             form = layui.form,
@@ -128,7 +130,7 @@
                 },
                 {
                     title: '操作',
-                    minWidth: 150,
+                    minWidth: 190,
                     toolbar: '#currentMonthly',
                     align: "center"
                 }

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

@@ -78,6 +78,7 @@
                 } else {
                     layer.close(parent.add_new_weeklyIndex)
                     layer.close(parent.new_weelPlan_index)
+                    layer.close(parent.teacherindex1)
                     table.reload("weekPlanTable1")
                     table.reload("newWeeklyTable")
                 }

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

@@ -21,7 +21,7 @@
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">个人总结</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder="此处填写要点：
+        <textarea name="content" id="inputFocus" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
 3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
@@ -46,6 +46,7 @@
   <a href="javascript:void(0);" lay-event="show_follow_newWeekly" class="layui-table-link">{{ d.count }}</a>
 </script>
 <script>
+    document.getElementById("inputFocus").focus();
     layui.use(['rate', 'table', 'request', 'form', 'miniPage', 'jquery'], function () {
         var rate = layui.rate,
             form = layui.form,
@@ -129,7 +130,7 @@
                     },
                 {
                     title: '操作',
-                    minWidth: 150,
+                    minWidth: 190,
                     toolbar: '#currentWeekly',
                     align: "center"
                 }

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

@@ -5,7 +5,7 @@
       <label class="layui-form-label required">渠道名称</label>
       <div class="layui-input-block">
         <input type="text" name="name" required lay-verify="required" autocomplete="off"
-               class="layui-input">
+               class="layui-input" id="inputFocus">
       </div>
     </div>
     <div class="layui-form-item">
@@ -23,6 +23,7 @@
 
 
 <script>
+    document.getElementById("inputFocus").focus();
 
     layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
         var form = layui.form,

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

@@ -182,7 +182,7 @@
               var openWH = miniPage.getOpenWidthHeight();
               from_sales = true
               sindex = layer.open({
-                  title: '添加计划',
+                  title: '添加月计划',
                   type: 1,
                   shade: 0.2,
                   maxmin: true,
@@ -207,7 +207,7 @@
                 content = miniPage.getHrefContent('/educode_sales/plans/show_month?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
-                    title: '查看',
+                    title: '查看月计划',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,
@@ -226,7 +226,7 @@
                 from_sales = true;
                 plan_id = data.id
                 sindex = layer.open({
-                    title: '编辑',
+                    title: '编辑月计划',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,

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

@@ -189,7 +189,7 @@
             var content = miniPage.getHrefContent('/educode_sales/plans/new_week');
             var openWH = miniPage.getOpenWidthHeight();
             sindex = layer.open({
-              title: '添加计划',
+              title: '添加周计划',
               type: 1,
               shade: 0.2,
               maxmin: true,
@@ -223,7 +223,7 @@
                 content = miniPage.getHrefContent('/educode_sales/plans/show_week?id='+ id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
-                  title: '查看',
+                  title: '查看周计划',
                   type: 1,
                   shade: 0.2,
                   maxmin: true,
@@ -242,7 +242,7 @@
                 content = miniPage.getHrefContent('/educode_sales/plans/edit_week?id='+ id);
                 openWH = miniPage.getOpenWidthHeight();
                 sindex = layer.open({
-                    title: '编辑',
+                    title: '编辑周计划',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,

data/app/views/educode_sales/plans/new_monthly.html.erb

@@ -28,7 +28,7 @@
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">个人总结</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder="此处填写要点：
+        <textarea name="content" id="inputFocus" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
 3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
@@ -58,6 +58,8 @@
   <% end %>
 </script>
 <script>
+    document.getElementById("inputFocus").focus();
+
     layui.use(['rate', 'table', 'request', 'form', 'miniPage', 'jquery'], function () {
         var rate = layui.rate,
         form = layui.form,

data/app/views/educode_sales/plans/new_weekly.html.erb

@@ -26,7 +26,7 @@
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">个人总结</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder="此处填写要点：
+        <textarea name="content" id="inputFocus" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
 3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
@@ -56,6 +56,8 @@
   <% end %>
 </script>
 <script>
+    document.getElementById("inputFocus").focus();
+
     layui.use(['rate', 'table', 'request', 'form', 'miniPage', 'jquery'], function () {
         var rate = layui.rate,
         form = layui.form,

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

@@ -4,7 +4,7 @@
     <div class="layui-form-item">
       <label class="layui-form-label required">角色名称</label>
       <div class="layui-input-block">
-        <input type="text" class="layui-input" lay-verify="required" lay-reqtext="名称不能为空" name="name" placeholder="">
+        <input type="text" id="inputFocus" class="layui-input" lay-verify="required" lay-reqtext="名称不能为空" name="name" placeholder="">
       </div>
     </div>
     <hr>
@@ -17,7 +17,9 @@
 </div>
 
 <script>
-  layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput'], function () {
+    document.getElementById("inputFocus").focus();
+
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput'], function () {
     var form = layui.form,
       layer = layui.layer,
       table = layui.table,

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -148,7 +148,7 @@
                 </div>
               </div>
             </div>
-
+            <div class="layui-row layui-col-space30" >
             <div class="layui-col-xs3">
               <div class="panel layui-bg-number">
                 <div class="panel-body">
@@ -162,6 +162,7 @@
               </div>
             </div>
           </div>
+          </div>
         </div>
       </div>
     </div>

data/app/views/educode_sales/sessions/login.html.erb

@@ -1,6 +1,6 @@
 <div class="login-main">
   <div class="login-top">
-    <span>头歌营销支撑系统</span>
+    <span>头歌营销系统</span>
     <span class="bg1"></span>
     <span class="bg2"></span>
   </div>

data/app/views/educode_sales/teachers/add_keys.html.erb

@@ -279,6 +279,7 @@
           request.delete('educode_sales/key_person/'+ data.id, {}, function(res) {
             layer.close(index);
             table.reload("key_person")
+            table.reload("sale_plan_follow_table")
           })
         });
       }

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

@@ -353,7 +353,7 @@
                 var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_week?teacher_id=' + obj.data.id);
                 var openWH = miniPage.getOpenWidthHeight();
 
-                sindex = layer.open({
+                teacherindex1 = layer.open({
                     title: '添加周计划',
                     type: 1,
                     shade: 0.2,
@@ -369,7 +369,7 @@
             } else if (obj.event === 'addMonth') {
                 var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_month?teacher_id=' + obj.data.id);
                 var openWH = miniPage.getOpenWidthHeight();
-                sindex = layer.open({
+                teacherindex2 = layer.open({
                     title: '添加月计划',
                     type: 1,
                     shade: 0.2,

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

@@ -126,7 +126,7 @@
                 var content = miniPage.getHrefContent('/educode_sales/teachers/new_follow_record?id=' +parent.id);
                 var openWH = miniPage.getOpenWidthHeight();
                 sale_plan_index = layer.open({
-                    title: '添加',
+                    title: '添加教师跟进记录',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,
@@ -163,7 +163,7 @@
                 var content = miniPage.getHrefContent('/educode_sales/teachers/show_follow_record?id=' + id);
                 var openWH = miniPage.getOpenWidthHeight();
                 sale_plan_index1 = layer.open({
-                    title: '查看',
+                    title: '查看教师跟进记录',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,
@@ -183,7 +183,7 @@
                 content = miniPage.getHrefContent('/educode_sales/teachers/edit_follow_record?id='+ obj.data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 edit_index1 = layer.open({
-                    title: '编辑',
+                    title: '编辑教师跟进记录',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,

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

@@ -9,7 +9,7 @@ json.data do
     json.contact EducodeSales::Common.find_by(id: d.follow_id).name
     json.staff d.staff.user.real_name
     json.students_count d.students_count
-    json.courses_count d.courses_count
+    json.courses_count Course.joins(:course_members).where(course_members: {user_id: d.teacher&.user_id}).distinct("course_id").count
     json.evaluates_count d.evaluates_count
     json.course_shixuns_count d.course_shixuns_count
     json.shixuns_count d.shixuns_count

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.2.7'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.1
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails