educode_sales 0.4.3 → 0.4.7

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

@@ -1,4 +1,11 @@
-<form class="layui-form layui-form-pane" action="">
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
+<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>
+      <span><%= @area%></span>
+    </div>
+  </div>
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -9,41 +16,47 @@
       <label style="margin-left: 100px">运营教师:</label>
       <span><%= @sale_report.client%></span>
     </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= @sale_report.created_at %></span>
+      <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <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 +66,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 +225,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,14 @@
     {{#  } }}
   </div>
 </script>
-<form class="layui-form layui-form-pane">
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
+<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>
+      <span><%= @area%></span>
+    </div>
+  </div>
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -19,6 +26,11 @@
       <label style="margin-left: 100px">运营教师:</label>
       <span><%= @sale_report.client%></span>
     </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= @sale_report.created_at %></span>
+      <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">
@@ -39,7 +51,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,11 @@
-<form class="layui-form layui-form-pane" action="">
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
+<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>
+      <span><%= @area%></span>
+    </div>
+  </div>
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -8,6 +15,11 @@
       <label style="margin-left: 100px">运营教师:</label>
       <span><%= @sale_report.client%></span>
     </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= @sale_report.created_at %></span>
+      <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">
@@ -16,33 +28,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 +63,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 +83,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 +264,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

@@ -76,32 +76,34 @@
             elem: '#monthPlanTable',
             url: '/missions/plans?clazz=month',
             toolbar: '#monthPlanToolbar',
-            defaultToolbar: [],
+            defaultToolbar: ['filter'],
+            totalRow:true,
             cols: [
                 [
                     {
                 field: 'id',
-                width: 80,
+                width: 60,
                 title:'序号',type: 'numbers',
+                        totalRowText:"合计",
               },
               {
                 field: 'staff',
-                width: 100,
+                width: 90,
                 title: '姓名'
               },
               {
                 field: 'business_name',
-                width: 280,
+                width: 160,
                 title: '商机名称',
               },
               {
                 field: 'school',
-                width: 190,
+                width: 170,
                 title: '单位'
               },
               {
                 field: 'department',
-                width: 190,
+                width: 170,
                 title: '部门'
               },
               {
@@ -116,13 +118,14 @@
               },
               {
                 field: 'follow_ups_count',
-                width: 100,
+                width: 60,
                 title: '跟进',
                 templet: '#show_follow'
               },
               {
                 field: 'finish_rate',
-                width: 100,
+                width: 80,
+                  totalRow:true,
                 title: '完成率',
               },
               {

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

@@ -78,31 +78,41 @@
       elem: '#monthlyTable',
       url: '/missions/sale_reports?clazz=month',
       toolbar: '#monthly_Toolbar',
-      defaultToolbar: [],
+        defaultToolbar: ['filter'],
+        totalRow:true,
       cols: [
         [{
             field: 'id',
             width: 60,
             title:'序号',type: 'numbers',
+            totalRowText:"合计",
           },
           {
             field: 'staff',
-            width: 100,
+            width: 90,
             title: '姓名'
           },
+            {
+                field: 'month',
+                width: 100,
+                title: '月份'
+            },
           {
             field: 'finish_rate',
-            width: 100,
+            width: 80,
+              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,22 +76,24 @@
           elem: '#weekPlanTable',
           url: '/missions/plans?clazz=week',
           toolbar: '#weekPlanToolbar',
-          defaultToolbar: [],
+            totalRow:true,
+            defaultToolbar: ['filter'],
           cols: [
             [
               {
                 field: 'id',
-                width: 80,
+                width: 60,
                 title:'序号',type: 'numbers',
+                  totalRowText: '合计'
               },
               {
                 field: 'staff',
-                width: 100,
+                width: 90,
                 title: '姓名'
               },
               {
                 field: 'business_name',
-                width: 280,
+                width: 160,
                 title: '商机名称',
               },
               {
@@ -111,7 +113,7 @@
               },
               {
                 field: 'weekly',
-                width: 100,
+                width: 60,
                 title: '周次',
               },
               {
@@ -121,14 +123,15 @@
               },
               {
                 field: 'follow_ups_count',
-                width: 100,
+                width: 60,
                 title: '跟进',
                 templet: '#show_follow'
               },
               {
                 field: 'finish_rate',
-                width: 100,
+                width: 80,
                 title: '完成率',
+                  totalRow:true,
               },
               {
                 field: 'updated_at',

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

@@ -79,32 +79,42 @@
         elem: '#weeklyTable',
         url: '/missions/sale_reports?clazz=week',
         toolbar: '#weeklyToolbar',
-        defaultToolbar: [],
+          defaultToolbar: ['filter'],
+          totalRow:true,
         cols: [
           [
             {
               field: 'id',
               width: 60,
               title:'序号',type: 'numbers',
+                totalRowText:"合计",
             },
             {
               field: 'staff',
-              width: 100,
+              width: 90,
               title: '姓名'
             },
+            {
+              field: 'weekly',
+              width: 60,
+              title: '周次'
+            },
             {
               field: 'finish_rate',
-              width: 100,
+              width: 80,
               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/edit_month.html.erb

@@ -8,7 +8,7 @@
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">商机</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="width: 500px">
         <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), class: 'required' %>
       </div>
     </div>

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

@@ -16,7 +16,7 @@
     <% end %>
     <div class="layui-inline">
       <label class="layui-form-label">商机</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="width: 500px">
         <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), class: 'required' %>
       </div>
     </div>

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_month.html.erb

@@ -8,7 +8,7 @@
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="width: 500px">
          <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
       </div>
     </div>

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

@@ -6,7 +6,14 @@
     <% end %>
   </div>
 </script>
-<form class="layui-form layui-form-pane">
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
+<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>
+      <span><%= @area %></span>
+    </div>
+  </div>
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -23,6 +30,11 @@
       <span><%= @total_amount %>万</span>
        <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
     </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= Time.now %></span>
+       <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">
@@ -42,7 +54,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_week.html.erb

@@ -14,7 +14,7 @@
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="width: 500px">
         <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
       </div>
     </div>