educode_sales 0.4.2 → 0.4.6

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: '完成率',
               },
               {

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

@@ -79,30 +79,40 @@
       url: '/missions/sale_reports?clazz=month',
       toolbar: '#monthly_Toolbar',
       defaultToolbar: [],
+        totalRow:true,
       cols: [
         [{
             field: 'id',
             width: 60,
             title:'序号',type: 'numbers',
+            totalRowText:"合计",
           },
           {
             field: 'staff',
             width: 100,
             title: '姓名'
           },
+            {
+                field: 'month',
+                width: 100,
+                title: '月份'
+            },
           {
             field: 'finish_rate',
             width: 100,
+              totalRow:true,
             title: '完成率',
           },
           {
             field: 'client',
             width: 100,
+              totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
             title: '覆盖客户'
           },
           {
             field: 'amount',
             width: 100,
+              totalRow:true,
             title: '项目金额'
           },
           {
@@ -134,6 +144,11 @@
               return '<div class="star3"></div>'
             }
           },
+            {
+                field: 'created_at',
+                width: 300,
+                title: '提交时间',
+            },
           {
             title: '操作',
               minWidth: 220,

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

@@ -76,6 +76,7 @@
           elem: '#weekPlanTable',
           url: '/missions/plans?clazz=week',
           toolbar: '#weekPlanToolbar',
+            totalRow:true,
           defaultToolbar: [],
           cols: [
             [
@@ -83,6 +84,7 @@
                 field: 'id',
                 width: 80,
                 title:'序号',type: 'numbers',
+                  totalRowText: '合计'
               },
               {
                 field: 'staff',
@@ -91,7 +93,7 @@
               },
               {
                 field: 'business_name',
-                width: 280,
+                width: 180,
                 title: '商机名称',
               },
               {
@@ -129,6 +131,7 @@
                 field: 'finish_rate',
                 width: 100,
                 title: '完成率',
+                  totalRow:true,
               },
               {
                 field: 'updated_at',

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

@@ -80,31 +80,41 @@
         url: '/missions/sale_reports?clazz=week',
         toolbar: '#weeklyToolbar',
         defaultToolbar: [],
+          totalRow:true,
         cols: [
           [
             {
               field: 'id',
               width: 60,
               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: '覆盖客户'
             },
             {
               field: 'amount',
               width: 100,
+                totalRow:true,
               title: '项目金额'
             },
             {
@@ -135,7 +145,13 @@
               templet: function (d) {
                 return '<div class="star3"></div>'
               }
+
             },
+              {
+                  field: 'created_at',
+                  width: 300,
+                  title: '提交时间',
+              },
             {
               title: '操作',
                 minWidth: 220,

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

@@ -15,5 +15,9 @@ json.data do
   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' ) + '%'
+end
 json.code 0
 json.count @sale_plans.total_count

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

@@ -6,7 +6,7 @@
     <% end %>
   </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>
@@ -42,7 +42,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newmonthlyTable" lay-filter="newmonthlyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newmonthlyTable" lay-filter="newmonthlyTable"></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/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">
+<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>
@@ -40,7 +40,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/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/index.json.jbuilder

@@ -10,8 +10,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/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>
@@ -117,43 +119,42 @@
         },
         {
           field: 'staff',
-          width: 120,
+          width: 80,
           title: '姓名'
         },
         {
             field: 'business_name',
-            width: 270,
+            width: 150,
             title: '商机名称',
         },
         {
             field: 'school',
-            width: 200,
+            width: 120,
             title: '单位'
         },
         {
             field: 'department',
-            width: 190,
+            width: 170,
             title: '部门'
         },
         {
           field: 'weekly',
-          width: 100,
+          width: 80,
           title: '周次',
         },
         {
           field: 'follow_ups_count',
-          width: 100,
+          width: 80,
           title: '跟进',
           templet: '#show_follow'
         },
         {
           field: 'finish_rate',
-          width: 100,
+          width: 80,
           title: '完成率',
         },
         {
           field: 'content',
-          width: 300,
           title: '计划内容',
         },
         {
@@ -166,7 +167,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/sales/index.html.erb

@@ -26,10 +26,12 @@
       elem: '#table',
       url: '/missions/sales',
       cellMinWidth: 80,
+        totalRow:true,
       cols: [
         [{
             field: 'id',
             title:'序号',type: 'numbers',
+            totalRowText:'合计',
             width: 80
           }, {
             field: 'name',
@@ -42,19 +44,23 @@
             field: 'business_a',
             title: 'A类商机',
             templet: "#business_a",
+            totalRow:true,
             width: 120
           }, {
             field: 'business_b',
             title: 'B类商机',
             templet: "#business_b",
+            totalRow:true,
             width: 120
           }, {
             field: 'goal',
             title: '中标金额',
+            totalRow:true,
             width: 120
           }, {
             field: 'return_money',
             title: '回款',
+            totalRow:true,
             width: 120
           }
         ]

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

@@ -1,17 +1,33 @@
+businesses_a_count = 0
+businesses_b_count = 0
 json.data do
   json.array! @staffs do |d|
+    part_a_ids = EducodeSales::Business.where("educode_sales_businesses.last_follow_up_id is null AND staff_id = ?",d.id).ids
+    part_b_ids = EducodeSales::Business.where("educode_sales_businesses.last_follow_up_id is not null").joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.staff_id = ?", d.id).pluck(:business_id)
+    business_ids = part_a_ids + part_b_ids
+    @businesses = EducodeSales::Business.where(id:business_ids)
     json.id d.id
     json.name d.user.real_name
     json.role d.role&.name
     json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
-    json.business_a d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).count
-    json.business_b d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).count
-    json.goal d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
-    json.return_money  d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ?", @x).sum("educode_sales_businesses.return_money").round(2)
+    business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).count
+    businesses_a_count += business_a
+    json.business_a business_a
+    business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).count
+    businesses_b_count += business_b
+    json.business_b business_b
+    json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
+    json.return_money  @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ?", @x).sum("educode_sales_businesses.return_money").round(2)
     json.a_clazz_id @a_clazz&.id
     json.b_clazz_id @b_clazz&.id
   end
 end
 
+json.totalRow do
+  json.business_a businesses_a_count.to_s
+  json.business_b businesses_b_count.to_s
+end
 json.code 0
 json.count @staffs.total_count

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

@@ -11,14 +11,10 @@
 <script type="text/html" id="currentTableBar">
 </script>
 <script type="text/html" id="school">
-  <div class="layui-text">
     <a href="javascript:void(0);" lay-event="school" class="layui-table-link">{{d.schools}}</a>
-  </div>
 </script>
 <script type="text/html" id="xschool">
-  <div class="layui-text">
     <a href="javascript:void(0);" lay-event="xschool" class="layui-table-link">{{d.departments}}</a>
-  </div>
 </script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element'], function () {
@@ -32,10 +28,12 @@
             elem: '#oper_table',
             url: '/missions/sales/operations',
             defaultToolbar: [],
+            totalRow:true,
             cols: [
                 [{
                     field: 'id',
                     title:'序号',type: 'numbers',
+                    totalRowText:'合计',
                     width: 80
                 }, {
                     field: 'name',
@@ -52,11 +50,13 @@
                     field: 'schools',
                     title: '跟进学校',
                     templet: "#school",
+                    totalRow:true,
                     width: 120
                 }, {
                     field: 'departments',
                     title: '跟进二级学院',
                     templet: "#xschool",
+                    totalRow:true,
                     width: 120
                 },
                 ]