educode_sales 0.2.5 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 384aa48b4fd48766ddfc7db4adcf12f640b9adbf
-  data.tar.gz: 7761bc4921a22238d59836aa55c08ee27f3387f9
+  metadata.gz: adac2dac455b86334fc478e4f84454fe0596f15b
+  data.tar.gz: ab4d5c46df6d081c3b193f94aba90d6f644bb35e
 SHA512:
-  metadata.gz: b71058d21d50127f1bf6526ecdd4c3b843fe426d3988f0289c101979bda12df16980aceae09f3b344458c089bc4bc840a384a4f540388c8bfa5ed1742cf191f4
-  data.tar.gz: 234eb2e4fccc311cc35d88d2da52366364cce6bead12233ab83e856943f744599772650555e76389d53a57e86479ebbde7a64882a23c46bec1436fd1984e4e8c
+  metadata.gz: d6c23010d60071f32bad83b9ae20e8ffe767e06120db34992faef60d58aca8f1f1e1b690b0421ecf54cd35fd126948c8dad429aa1e386af64aad7b8ca6522482
+  data.tar.gz: 0a863555c19683cc7516bf77468df8cc296af577d8e7a87d5f2fc588005b2f4c59325062d617ae70af64929060cf9f1328b80a0ee70af5c196574dbd24743f84

data/app/assets/stylesheets/educode_sales/layuimini.css

@@ -214,8 +214,10 @@
   /*position: fixed;*/
   overflow: hidden;
   bottom: 0px !important;
-  top: 60px !important;
+  top: 0px !important;
   transition: all .2s;
+  padding-top: 60px;
+  padding-bottom: 0px !important;
 }
 
 /**选择配色方案 */

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

@@ -7,11 +7,11 @@ module EducodeSales
       follow_up = @teacher.teacher_follows.build(follow_up_params)
       follow_up.staff = @current_admin
       if @teacher.user_id.present?
-        course_ids = CourseMember.where(user_id: @teacher.user_id).where.not(role: 4).pluck(:course_id)
+        course_ids = CourseMember.joins(:course).where(user_id: @teacher.user_id, courses:{is_delete: 0}).where.not(role: 4).pluck(:course_id)
         follow_up.course_shixuns_count = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).pluck(:shixun_id).uniq.count
-        follow_up.shixuns_count = ShixunMember.where(user_id: @teacher.user_id, role: 1).count
+        follow_up.shixuns_count = ShixunMember.where(user_id: @teacher.user_id).count
         follow_up.students_count = CourseMember.where(course_id: course_ids, role: 4).count
-        follow_up.evaluates_count = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).count
+        follow_up.evaluates_count = Course.where(id: course_ids).inject(0) { |i, d| i += d.evaluate_count }
         follow_up.courses_count = course_ids.size
       end
       if follow_up.save

data/app/controllers/educode_sales/teachers_controller.rb

@@ -103,9 +103,8 @@ module EducodeSales
         if find_teacher
           teacher = find_teacher
         end
-        teacher.activity_teachers.build(activity_id: params[:activity_id])
       end
-      
+      teacher.activity_teachers.build(activity_id: params[:activity_id])
       if teacher.save
         render_success
       else
@@ -207,13 +206,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.created_at.to_s
         end
       end
     end

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

@@ -48,6 +48,7 @@
                 {
                   field: 'name',
                   title: '活动名称',
+                  width: 300,
                   templet: '#teachers'
                 },
                 {
@@ -80,6 +81,7 @@
                 }
               ]
             ],
+            height: 700,
             limit: 20,
             page: true
         });

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/activities/show_teachers.html.erb

@@ -13,9 +13,9 @@
 </script>
 <script type="text/html" id="name">
   {{# if (d.login) { }}
-  <a href="/users/{{d.login}}" class="layui-table-link" target="_blank">{{ d.name }}</a>
+  <a href="<%= base_url%>/users/{{d.login}}" class="layui-table-link" target="_blank">{{ d.name }}</a>
   {{# } else {}}
-  <a href="/users/{{d.login}}" class="">{{ d.name }}</a>
+  <a href="<%= base_url%>/users/{{d.login}}" class="">{{ d.name }}</a>
   {{# }}}
 </script>
 <script type="text/html" id="courses">
@@ -113,7 +113,7 @@
                     templet: "#follow"
                 },
                 {
-                    field: 'actives',
+                    field: 'teacher_used',
                     width: 120,
                     title: '学院渗透率',
                 },

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

@@ -58,7 +58,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道</label>
       <div class="layui-input-inline">
-        <%= select_tag "place_id", options_for_select(@places, @follow_up.place_id) %>
+        <%= select_tag "place_id", options_for_select(@places, @follow_up.place_id), include_blank: true %>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -197,6 +197,7 @@
               }
             ]
           ],
+          height: 600,
           limit: 20,
           page: true,
           skin: 'line'

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

@@ -15,7 +15,8 @@ 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

@@ -62,7 +62,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道</label>
       <div class="layui-input-inline">
-        <%= select_tag "place_id", options_for_select(@places, @last_follow_up&.place_id) %>
+        <%= select_tag "place_id", options_for_select(@places, @last_follow_up&.place_id), include_blank: true %>
       </div>
     </div>
     <div class="layui-inline">
@@ -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/commons/index.html.erb

@@ -49,6 +49,7 @@
           }
         ]
       ],
+      height: 700,
       limit: 20,
       page: true,
       skin: 'line'

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

@@ -136,6 +136,7 @@
                     }
                 ]
             ],
+            height: 600,
             limit: 20,
             page: true,
             skin: 'line'

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

@@ -164,6 +164,7 @@
                     });
                 })
             },
+            height: 600,
             limit: 20,
             page: true
         });

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

@@ -147,6 +147,7 @@
                     }
                 ]
             ],
+            height: 600,
             limit: 20,
             page: true,
             skin: 'line'

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

@@ -165,6 +165,7 @@
                     });
                 })
             },
+            height: 600,
             limit: 20,
             page: true,
         });

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

@@ -22,7 +22,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"><%= @sale_plan.content %></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -22,7 +22,7 @@
         <textarea name="desc" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

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

@@ -30,7 +30,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"><%= @sale_plan.content %></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -22,7 +22,7 @@
         <textarea name="desc" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

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

@@ -18,7 +18,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">
@@ -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,10 +21,10 @@
     <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"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">
@@ -49,6 +49,8 @@
 
 
 <script>
+    document.getElementById("inputFocus").focus();
+
     layui.use(['rate', 'table'], function () {
         var rate = layui.rate,
             form = layui.form,

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

@@ -25,7 +25,7 @@
         <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">
@@ -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,10 +21,10 @@
     <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"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">
@@ -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,

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

@@ -22,7 +22,7 @@
         <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"><%= @sale_report.content %></textarea>
       </div>
     </div>
     <div class="layui-inline m-t-10">

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

@@ -74,6 +74,7 @@
                   }
                 ]
             ],
+            height: 700,
             limit: 20,
             page: true
         });

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

@@ -140,6 +140,7 @@
               }
               ]
             ],
+            height: 600,
             limit: 20,
             page: true,
         });
@@ -181,7 +182,7 @@
               var openWH = miniPage.getOpenWidthHeight();
               from_sales = true
               sindex = layer.open({
-                  title: '添加计划',
+                  title: '添加月计划',
                   type: 1,
                   shade: 0.2,
                   maxmin: true,
@@ -206,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,
@@ -225,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/_monthly.html.erb

@@ -169,6 +169,7 @@
           });
         })
       },
+      height: 600,
       limit: 20,
       page: true
     });

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

@@ -145,6 +145,7 @@
               }
             ]
           ],
+          height: 600,
           limit: 20,
           page: true,
           skin: 'line'
@@ -188,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,
@@ -222,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,
@@ -241,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/_weekly.html.erb

@@ -170,6 +170,7 @@
               });
             })
           },
+          height: 600,
           limit: 20,
           page: true
         });

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

@@ -18,7 +18,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"><%= @sale_plan.content %></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -28,7 +28,7 @@
         <textarea name="desc" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

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

@@ -26,7 +26,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"><%= @sale_plan.content %></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -31,7 +31,7 @@
         <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"><%= @sale_report.content %></textarea>
       </div>
     </div>
     <div class="layui-inline m-t-10">

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

@@ -18,7 +18,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -28,10 +28,10 @@
     <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"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline m-t-10">
@@ -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_week.html.erb

@@ -24,7 +24,7 @@
         <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -26,10 +26,10 @@
     <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"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline m-t-10">
@@ -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/index.html.erb

@@ -47,6 +47,7 @@
         align: "center"
         }]
       ],
+      height: 700,
       limit: 20,
       page: true
     })

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_reports/edit.html.erb

@@ -26,7 +26,7 @@
         <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"><%= @sale_report.content %></textarea>
       </div>
     </div>
     <div class="layui-inline m-t-10">

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/sales/index.html.erb

@@ -59,6 +59,7 @@
           }
         ]
       ],
+      height: 700,
       limit: 20,
       page: true
     });

data/app/views/educode_sales/sales/operations.html.erb

@@ -61,6 +61,7 @@
                 },
                 ]
             ],
+            height: 700,
             limit: 20,
             page: true
         });

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/staffs/index.html.erb

@@ -72,6 +72,7 @@
           }
         ]
       ],
+      height: 700,
       limit: 20,
       page: true,
       skin: 'line'

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

@@ -75,6 +75,7 @@
                     parent.table.reload('teachers_table')
                     parent.table.reload('weekPlanTable1')
                     parent.table.reload('monthPlanTable')
+                    parent.table.reload('sale_plan_follow_table')
                 }
             })
 

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

@@ -226,6 +226,7 @@
                 }
               ]
             ],
+            height: 600,
             limit: 20,
             page: true,
         });
@@ -352,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,
@@ -368,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/index.json.jbuilder

@@ -17,7 +17,7 @@ json.data do
     json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).distinct("course_id").count : 0
     json.actives d.actives
     json.students d.students_count
-    json.regist_at d.regist_at && d.user_id ? d.regist_at.to_s(:date) : ''
+    json.regist_at d.user.present? ? d.user.created_on.to_s(:date) : ''
     json.teacher_used d.teacher_used_of_department
   end
 end

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

@@ -152,11 +152,10 @@
             if (res.success == false) {
               layer.alert(res.msg)
             } else {
-                layer.closeAll();
-                table.reload('show_teachers_table');
-                table.reload('activities_table');
-                table.reload('teachers_table');
-
+              table.reload('show_teachers_table');
+              table.reload('activities_table');
+              table.reload('teachers_table');
+              layer.close(parent.index)
             }
           })
           return false;

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

@@ -13,7 +13,7 @@ json.data do
     json.evaluates_count d.evaluates_count
     json.course_shixuns_count d.course_shixuns_count
     json.shixuns_count d.shixuns_count
-    json.is_latest d.created_at.to_s.eql?@latest
+    json.is_latest d.id == @latest.id
   end
 end
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.2.5'
+  VERSION = '0.2.9'
 end

metadata

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