educode_sales 0.4.1 → 0.4.5

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

@@ -86,9 +86,14 @@
                 title: '时间',
                 sort: true
               },
+                {
+                    field: 'staff',
+                    width: 100,
+                    title: '跟进人',
+                },
               {
                 field: 'clazz',
-                width: 60,
+                width: 120,
                 title: '类型',
               },
               {
@@ -120,12 +125,12 @@
               {
                 field: 'actual_amount',
                 width: 100,
-                title: '实额',
+                title: '合同额',
               },
               {
-                field: 'divide_rate',
-                width: 80,
-                title: '分成',
+                field: 'divide_amount',
+                width: 100,
+                title: '渠道分成',
               },
               {
                 field: 'money',
@@ -138,11 +143,6 @@
                 title: '回款计划',
                 templet: '#edit_plan'
               },
-              {
-                field: 'staff',
-                width: 100,
-                title: '跟进人',
-              },
               {
                 field: 'place',
                 width: 200,

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

@@ -9,11 +9,11 @@ json.data do
     json.reception_at d.reception_at&.to_s(:date)
     json.total_amount d.total_amount
     json.actual_amount d.actual_amount
-    json.divide_rate d.divide_rate ? "#{d.divide_rate}%" : ""
+    json.divide_amount d.divide_amount ? d.divide_amount : ""
     json.staff d.staff.user.real_name
     json.place d.place&.name
     json.money_plans_count d.money_plans_count
-    json.money d.money_plans.where(clazz: 1).sum(:amount)
+    json.money d.money_plans.where(clazz: 1).sum(:amount).round(2)
     json.is_latest d.id == @latest&.id
   end
 end

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

@@ -47,7 +47,7 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">实额：</label>
+      <label class="layui-form-label">合同额：</label>
       <div class="layui-input-inline">
         <%= @follow_up.actual_amount %>万
       </div>
@@ -60,9 +60,9 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">分成：</label>
+      <label class="layui-form-label">渠道分成：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.divide_rate %>%
+        <%= @follow_up.divide_amount %>
       </div>
     </div>
     <div class="ayui-form-item">
@@ -72,7 +72,7 @@
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">商机说明：</label>
+      <label class="layui-form-label">最新进展：</label>
       <div class="layui-input-block" style="padding-right: 20px;">
         <pre><%= @follow_up.description %></pre>
       </div>
@@ -83,5 +83,17 @@
         <pre><%= @follow_up.advise %></pre>
       </div>
     </div>
+    <div class="layui-form-item layui-form-text">
+      <label class="layui-form-label">时间：</label>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @follow_up.created_at.to_s %></pre>
+      </div>
+    </div>
+    <div class="layui-form-item layui-form-text">
+      <label class="layui-form-label">跟进人：</label>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @follow_up.staff.user.real_name %></pre>
+      </div>
+    </div>
   </div>
 </form>

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

@@ -77,6 +77,7 @@
             elem: '#monthPlanTable',
             url: '/missions/operation_plans?clazz=month',
             toolbar: '#monthPlanToolbar',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
                 [
@@ -84,6 +85,7 @@
                         field: 'id',
                         width: 80,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
@@ -114,12 +116,14 @@
                         field: 'count',
                         width: 100,
                         title: '跟进',
+                        totalRow:true,
                         templet: '#show_follow2'
                     },
                     {
-                        field: 'rate',
+                        field: 'finish_rate',
                         width: 80,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'updated_at',

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

@@ -79,26 +79,35 @@
             url: '/missions/operation_reports?clazz=month',
             toolbar: '#monthlyToolbar',
             defaultToolbar: [],
+            totalRow:true,
             cols: [
                 [
                     {
                         field: 'id',
                         width: 80,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
                         width: 100,
                         title: '姓名'
                     },
+                    {
+                        field: 'month',
+                        width: 100,
+                        title: '月份'
+                    },
                     {
                         field: 'finish_rate',
                         width: 100,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'client',
                         width: 100,
+                        totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                         title: '运营教师'
                     },
                     {
@@ -130,6 +139,11 @@
                             return '<div class="star3"></div>'
                         }
                     },
+                    {
+                        field: 'created_at',
+                        width: 300,
+                        title: '提交时间',
+                    },
                     {
                         title: '操作',
                         minWidth: 220,

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

@@ -78,6 +78,7 @@
             elem: '#weekPlanTable1',
             url: '/missions/operation_plans?clazz=week',
             toolbar: '#weekPlanToolbar',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
                 [
@@ -85,6 +86,7 @@
                         field: 'id',
                         width: 80,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
@@ -125,12 +127,14 @@
                         field: 'count',
                         width: 100,
                         title: '跟进',
+                        totalRow:true,
                         templet: '#show_follow1'
                     },
                     {
-                        field: 'rate',
+                        field: 'finish_rate',
                         width: 80,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'updated_at',

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

@@ -79,6 +79,7 @@
             elem: '#weeklyTable',
             url: '/missions/operation_reports?clazz=week',
             toolbar: '#weeklyToolbar',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
                 [
@@ -86,20 +87,28 @@
                         field: 'id',
                         width: 80,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
                         width: 100,
                         title: '姓名'
                     },
+                    {
+                        field: 'weekly',
+                        width: 100,
+                        title: '周次'
+                    },
                     {
                         field: 'finish_rate',
                         width: 100,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'client',
                         width: 100,
+                        totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                         title: '运营教师'
                     },
                     {
@@ -131,6 +140,11 @@
                             return '<div class="star3"></div>'
                         }
                     },
+                    {
+                        field: 'created_at',
+                        width: 300,
+                        title: '提交时间',
+                    },
                     {
                         title: '操作',
                         minWidth: 220,

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

@@ -1,3 +1,4 @@
+counts = 0
 json.data do
   json.array! @sale_plans do |d|
     json.id d.id
@@ -9,11 +10,18 @@ json.data do
     json.week d.weekly
     json.teacher_id d.teacher_id
     json.content d.content.truncate(30)
-    json.count d.teacher.teacher_follows_count
-    json.rate "#{d.finish_rate}%"
+    count = d.teacher.teacher_follows_count
+    json.count count
+    counts += count
+    json.finish_rate "#{d.finish_rate}%"
     json.updated_at d.updated_at.to_s
   end
 end
 
+json.totalRow do
+  sum = @sale_plans.inject(0) { |score, i| score + i.finish_rate}
+  json.finish_rate ( @sale_plans.size > 0 ? (sum.to_f / @sale_plans.size).round(2).to_s : '0' ) + '%'
+  json.count counts.to_s
+end
 json.code 0
 json.count @sale_plans.total_count

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

@@ -4,7 +4,7 @@
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
   </div>
 </script>
-<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>
@@ -35,7 +35,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newMonthlyTable" lay-filter="newMonthlyToolbar"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newMonthlyTable" lay-filter="newMonthlyToolbar"></table>
+</div>
 
 <script type="text/html" id="currentMonthly">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>

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

@@ -4,7 +4,7 @@
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
   </div>
 </script>
-<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>
@@ -35,7 +35,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyToolbar"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyToolbar"></table>
+</div>
 
 <script type="text/html" id="currentWeekly">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>

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/index.json.jbuilder

@@ -11,8 +11,15 @@ json.data do
     json.level2_score d.level2_score || 0
     json.level3_score d.level3_score || 0
     json.updated_at d.updated_at.to_s
+    json.weekly d.weekly
+    json.created_at d.created_at.to_s
+    json.month d.month.strftime("%Y-%m")
   end
 end
 
+json.totalRow do
+  sum = @sale_reports.inject(0) { |score, i| score + i.finish_rate}
+  json.finish_rate ( @sale_reports.size > 0 ? (sum.to_f / @sale_reports.size).round(2).to_s : '0' ) + '%'
+end
 json.code 0
 json.count @sale_reports.total_count

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

@@ -34,6 +34,7 @@
             elem: '#place',
             url: '/missions/places',
             toolbar: '#toolbarDemo',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
               [
@@ -41,6 +42,7 @@
                       field: 'id',
                       width: 80,
                       title:'序号',type: 'numbers',
+                      totalRowText:'合计',
                   },
                   {
                       field: 'name',
@@ -54,16 +56,19 @@
                   {
                       field: 'businesses_count',
                       width: 120,
+                      totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                       title: '商机'
                   },
                   {
                       field: 'amount',
                       width: 120,
+                      totalRow:true,
                       title: '中标'
                   },
                   {
                       field: 'return_mount',
                       width: 120,
+                      totalRow:true,
                       title: '回款',
                   },
                   {

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

@@ -77,12 +77,14 @@
             url: '/missions/plans?clazz=month',
             toolbar: '#monthPlanToolbar',
             defaultToolbar: [],
+            totalRow:true,
             cols: [
                 [
                     {
                 field: 'id',
                 width: 80,
                 title:'序号',type: 'numbers',
+                        totalRowText:"合计",
               },
               {
                 field: 'staff',
@@ -123,6 +125,7 @@
               {
                 field: 'finish_rate',
                 width: 100,
+                  totalRow:true,
                 title: '完成率',
               },
               {