educode_sales 0.4.0 → 0.4.4

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

@@ -1,4 +1,4 @@
-<form class="layui-form layui-form-pane" action="">
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -14,36 +14,37 @@
     <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"  placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text">
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
         <textarea name="level1_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level1_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level1_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar4"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar4" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="level2_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level2_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level2_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar5"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar5" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="level3_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level3_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level3_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar6"></div>
+    <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <br>
     <div class="layui-inline m-t-10">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="audit_weekly_report"
         style="margin-left: 18px">提交
@@ -53,7 +54,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+</div>
 <script type="text/html" id="show_follow_audit">
   <a href="javascript:void(0);" lay-event="show_follow_audit" class="layui-table-link">{{ d.count }}</a>
 </script>
@@ -210,5 +213,29 @@
       ],
       page: true
     });
+      autosize();
+      function autosize(){
+          var text = $('.autosize');
+
+          text.each(function(){
+              $(this).attr('rows',1);
+              resize($(this));
+          });
+
+          text.on('input', function(){
+              resize($(this));
+          });
+
+          function resize ($text) {
+              $text.css('height', 'auto');
+              $text.css('height', $text[0].scrollHeight+'px');
+          }
+      }
   })
 </script>
+<style>
+    .autosize {
+        resize: none;
+        overflow: hidden;
+    }
+</style>

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

@@ -9,7 +9,7 @@
     {{#  } }}
   </div>
 </script>
-<form class="layui-form layui-form-pane">
+<form class="layui-form layui-form-pane" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -39,7 +39,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
+</div>
 <script type="text/html" id="show_follow_edit">
   <a href="javascript:void(0);" lay-event="show_follow_edit" class="layui-table-link">{{ d.count }}</a>
 </script>

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

@@ -1,4 +1,4 @@
-<form class="layui-form layui-form-pane" action="">
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -16,33 +16,33 @@
         <textarea name="desc" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。"  disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text">
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-                  class="layui-textarea"><%= @sale_report.level1_opinion %></textarea>
+                  class="layui-textarea autosize"><%= @sale_report.level1_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar4"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar4" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-                  class="layui-textarea"><%= @sale_report.level2_opinion %></textarea>
+                  class="layui-textarea autosize"><%= @sale_report.level2_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar5"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar5" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-                  class="layui-textarea"><%= @sale_report.level3_opinion %></textarea>
+                  class="layui-textarea autosize"><%= @sale_report.level3_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar6"></div>
+    <div id="weekStar6" style="margin-bottom: 40px"></div>
     <br>
   </div>
 </form>
@@ -51,7 +51,9 @@
   <a href="javascript:void(0);" lay-event="show_follow_show" class="layui-table-link">{{ d.count }}</a>
 </script>
 <!--表格-->
-<table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+</div>
 <!--<script type="text/html" id="currentShowWeekly">-->
 <!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>-->
 <!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>-->
@@ -69,17 +71,23 @@
         rate.render({
             elem: '#weekStar4',
             half: true,
-            readonly: true
+            readonly: true,
+            value: "<%= @sale_report.level1_score %>",
+            length: "<%= @sale_report.level1_score %>"
         })
         rate.render({
             elem: '#weekStar5',
             half: true,
-            readonly: true
+            readonly: true,
+            value: "<%= @sale_report.level2_score %>",
+            length: "<%= @sale_report.level2_score %>"
         })
         rate.render({
             elem: '#weekStar6',
             half: true,
-            readonly: true
+            readonly: true,
+            value: "<%= @sale_report.level3_score %>",
+            length: "<%= @sale_report.level3_score %>"
         })
 
 
@@ -244,8 +252,31 @@
                 });
             }
         });
+        autosize();
+        function autosize(){
+            var text = $('.autosize');
 
+            text.each(function(){
+                $(this).attr('rows',1);
+                resize($(this));
+            });
+
+            text.on('input', function(){
+                resize($(this));
+            });
+
+            function resize ($text) {
+                $text.css('height', 'auto');
+                $text.css('height', $text[0].scrollHeight+'px');
+            }
+        }
 
 
     })
 </script>
+<style>
+    .autosize {
+        resize: none;
+        overflow: hidden;
+    }
+</style>

data/app/views/educode_sales/sale_reports/audit.html.erb

@@ -1,4 +1,4 @@
-<form class="layui-form layui-form-pane" action="">
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -18,36 +18,37 @@
     <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"  placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text">
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
         <textarea name="level1_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level1_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level1_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar4"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar4" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="level2_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level2_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level2_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar5"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar5" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="level3_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level3_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level3_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar6"></div>
+    <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <br>
     <div class="layui-inline m-t-10">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="audit_weekly_report"
         style="margin-left: 18px">提交
@@ -57,7 +58,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+</div>
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
@@ -205,5 +208,29 @@
       ],
       page: true
     });
+      autosize();
+      function autosize(){
+          var text = $('.autosize');
+
+          text.each(function(){
+              $(this).attr('rows',1);
+              resize($(this));
+          });
+
+          text.on('input', function(){
+              resize($(this));
+          });
+
+          function resize ($text) {
+              $text.css('height', 'auto');
+              $text.css('height', $text[0].scrollHeight+'px');
+          }
+      }
   })
 </script>
+<style>
+    .autosize {
+        resize: none;
+        overflow: hidden;
+    }
+</style>

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

@@ -9,7 +9,7 @@
     {{#  } }}
   </div>
 </script>
-<form class="layui-form layui-form-pane">
+<form class="layui-form layui-form-pane" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -43,7 +43,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
+</div>
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -1,4 +1,4 @@
-<form class="layui-form layui-form-pane" action="">
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -20,39 +20,41 @@
         <textarea name="desc" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text">
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-          class="layui-textarea"><%= @sale_report.level1_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level1_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar4"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar4" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-          class="layui-textarea"><%= @sale_report.level2_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level2_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar5"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar5" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-          class="layui-textarea"><%= @sale_report.level3_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level3_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar6"></div>
+    <div id="weekStar6" style="margin-bottom: 40px"></div>
     <br>
   </div>
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+</div>
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
@@ -166,7 +168,31 @@
     ],
     page: true
   });
-  })
 
 
+      autosize();
+      function autosize(){
+          var text = $('.autosize');
+
+          text.each(function(){
+              $(this).attr('rows',1);
+              resize($(this));
+          });
+
+          text.on('input', function(){
+              resize($(this));
+          });
+
+          function resize ($text) {
+              $text.css('height', 'auto');
+              $text.css('height', $text[0].scrollHeight+'px');
+          }
+      }
+  })
 </script>
+<style>
+    .autosize {
+        resize: none;
+        overflow: hidden;
+    }
+</style>

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

@@ -12,10 +12,8 @@ json.data do
     json.teacher_follows_count d.teacher_follows_count
     json.activities_count d.activity_teachers_count
     json.source EducodeSales::Common.teacher_source_name[d.source_id]
-    # a_id = EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).present? ? EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).attitude_id : 73
-    # json.attitude EducodeSales::TeacherFollow.find_by(teacher_id: d.id).present? ? EducodeSales::Common.find(EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).attitude_id).name : ''
     json.attitude d.follow_up&.attitude&.name
-    json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).distinct("course_id").count : 0
+    json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).where("is_delete = 0 and role != 4  and excellent = 0 and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct(:course_id).count : 0
     json.actives d.actives
     json.students d.students_count
     json.regist_at d.user.present? ? d.user.created_on.to_s(:date) : ''

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

@@ -8,8 +8,9 @@ json.data do
     json.course_build EducodeSales::Common.find_by(id: d.course_build_id).name
     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 Course.joins(:course_members).where(course_members: {user_id: d.teacher&.user_id}).distinct("course_id").count
+    json.students_count d.teacher&.students_count
+    # json.courses_count Course.joins(:course_members).where(course_members: {user_id: d.teacher&.user_id}).distinct("course_id").count
+    json.courses_count Course.joins(:course_members).where(course_members: {user_id: d.teacher&.user_id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct(:course_id).count
     json.evaluates_count d.evaluates_count
     json.course_shixuns_count d.course_shixuns_count
     json.shixuns_count d.shixuns_count