educode_sales 0.4.9 → 0.5.3

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

@@ -9,9 +9,10 @@
         <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
       <% end %>
     <% end %>
+    <span class="table-label pull-right" style="padding-right: 20px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
   </div>
 </script>
-<div class="edit-table">
+<div class="edit-table tool">
   <div class="z-index">
     <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
   </div>
@@ -21,7 +22,7 @@
   <% if can? :follow, EducodeSales::Business %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
   <% end %>
-  {{#  if(d.is_latest){ }}
+  {{#  if(d.is_latest && d.flag){ }}
   <% if can? :update_follow, EducodeSales::Business %>
     <% if @current_admin.is_admin %>
       <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
@@ -288,6 +289,7 @@
               content = miniPage.getHrefContent('/missions/teachers/add_keys?follow_up_id=' + obj.data.id);
               openWH = miniPage.getOpenWidthHeight();
               is_latest = obj.data.is_latest
+              flag = obj.data.flag
               keyindex = layer.open({
                   title: '关键人',
                   type: 1,
@@ -309,6 +311,7 @@
               content = miniPage.getHrefContent('/missions/businesses/edit_plan');
               openWH = miniPage.getOpenWidthHeight();
               is_latest = obj.data.is_latest
+              flag = obj.data.flag
               plan_index = layer.open({
                   title: '回款计划',
                   type: 1,
@@ -532,4 +535,7 @@
   .z-index .layui-table-tool{
       z-index: 10000; !important;
   }
+ .tool .layui-table-tool-temp{
+      padding-right: 30px; !important;
+  }
 </style>

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

@@ -17,6 +17,7 @@ json.data do
     json.money_plans_count d.money_plans_count
     json.money d.money_plans.where(clazz: 1).sum(:amount).round(2)
     json.is_latest d.id == @latest&.id
+    json.flag d.created_at.present? ? (Time.now - d.created_at).to_f/3600 < 24 : false
   end
 end
 

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

@@ -1,6 +1,6 @@
 <h1 class="text-center m-t-20"><%= @follow_up.business.name %></h1>
 <form class="layui-form form-value">
-  <div class="layui-form-item" style="padding: 25px">
+  <div class="layui-form-item" style="padding: 10px 25px 0;">
     <div class="layui-inline">
       <label class="layui-form-label">单位：</label>
       <div class="layui-input-inline">

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

@@ -3,6 +3,7 @@
 </div>
 <div style="padding: 50px">
   <ul class="layui-timeline">
+    <%if @follow_ups.present? %>
   <%@follow_ups.each do |f| %>
   <li class="layui-timeline-item">
     <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
@@ -23,6 +24,9 @@
     </div>
   </li>
     <%end %>
+      <%else %>
+      <h1 class="layui-timeline-title" style="text-align: center">暂无跟进记录</h1>
+  <%end %>
 </ul>
 </div>
 
@@ -42,7 +46,7 @@
         var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({
-            title: '商机列表/'+ parent.business_name +'的跟进时间线',
+            title: '商机列表/'+ parent.business_name +'的跟进记录',
             type: 1,
             shade: 0.2,
             maxmin: true,

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

@@ -1,5 +1,5 @@
 <div style="padding-left: 50px">
-        <button type="button" class="layui-btn" id="file"><i class="layui-icon"></i>选择文件</button>
+        <button type="button" class="layui-btn" id="get_file"><i class="layui-icon"></i>选择文件</button>
 </div>
 <script>
     layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
@@ -17,7 +17,7 @@
         //指定允许上传的文件类型
         var business_id = parent.id
         var renderObj = upload.render({
-            elem: '#file'
+            elem: '#get_file'
             ,url: '/missions/upload_files?business_id='+business_id //此处配置你自己的上传接口即可
             ,accept: 'file' //普通文件
             ,headers: {
@@ -28,12 +28,12 @@
             }
             ,done: function(res){
                 layer.msg('导入成功');
-                table.reload('place');
+                table.reload('file');
                 layer.closeAll('loading'); //关闭loading
                 layer.close(parent.import_index)
             }
             ,error: function(index, upload){
-                table.reload('place');
+                table.reload('file');
                 layer.closeAll('loading'); //关闭loading
                 layer.alert('导入失败，请检查文件格式')
                 layer.close(parent.import_index)

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

@@ -49,4 +49,9 @@
 
     })
   })
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>

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

@@ -9,7 +9,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">周次</label>
       <div class="layui-input-inline">
-        <%= select_tag "weekly", options_for_select(@weeks), class: 'required' %>
+        <%= select_tag "weekly", options_for_select(@weeks,@week), class: 'required' %>
       </div>
     </div>
     <%if @teacher.present? %>

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

@@ -32,7 +32,8 @@
 3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <% if can? :level1_audit, EducodeSales::OperationReport %>
+  <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="给出评价、提醒、建议、办法等。"
@@ -40,7 +41,9 @@
       </div>
     </div>
     <div id="weekStar4" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <%end %>
+    <% if can? :level2_audit, EducodeSales::OperationReport %>
+  <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="给出评价、提醒、建议、办法等。"
@@ -48,7 +51,9 @@
       </div>
     </div>
     <div id="weekStar5" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <%end %>
+    <% if can? :level3_audit, EducodeSales::OperationReport %>
+  <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="给出评价、提醒、建议、办法等。"
@@ -56,11 +61,14 @@
       </div>
     </div>
     <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <%end %>
     <br>
     <div class="layui-inline m-t-10">
+      <% if (can? :level1_audit, EducodeSales::OperationReport) || (can? :level2_audit, EducodeSales::OperationReport) || (can? :level3_audit, EducodeSales::OperationReport) %>
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="audit_weekly_report"
         style="margin-left: 18px">提交
       </button>
+      <%end %>
     </div>
   </div>
 </form>
@@ -85,7 +93,7 @@
     rate.render({
       elem: '#weekStar4',
       half: true,
-      value: "<%= @sale_report.level1_score %>",
+      value: parseFloat("<%= @sale_report.level1_score || 0%>"),
       length: 5,
       choose: function(value){
         level1_score = value
@@ -94,7 +102,7 @@
     rate.render({
       elem: '#weekStar5',
       half: true,
-      value: "<%= @sale_report.level2_score %>",
+      value: parseFloat("<%= @sale_report.level2_score || 0%>"),
       length: 5,
       choose: function(value){
         level2_score = value
@@ -103,7 +111,7 @@
     rate.render({
       elem: '#weekStar6',
       half: true,
-      value: "<%= @sale_report.level3_score %>",
+      value: parseFloat("<%= @sale_report.level3_score || 0%>"),
       length: 5,
       choose: function(value){
         level3_score = value

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

@@ -31,7 +31,8 @@
 3、补充说明需要上级解决的问题和挑战。"  disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <% if @sale_report.level1_opinion.present? || @sale_report.level1_score %>
+  <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
@@ -39,7 +40,9 @@
       </div>
     </div>
     <div id="weekStar4" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <%end %>
+    <% if @sale_report.level2_opinion.present? || @sale_report.level2_score %>
+  <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
@@ -47,7 +50,9 @@
       </div>
     </div>
     <div id="weekStar5" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <%end %>
+    <% if @sale_report.level3_opinion.present? || @sale_report.level3_score %>
+  <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
@@ -55,6 +60,7 @@
       </div>
     </div>
     <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <%end %>
     <br>
   </div>
 </form>
@@ -78,28 +84,25 @@
             $ = layui.jquery,
             miniPage = layui.miniPage,
             request = layui.request;
-        table = layui.table;
+        table = layui.table
 
         rate.render({
             elem: '#weekStar4',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level1_score %>",
-            length: "<%= @sale_report.level1_score %>"
+            value: parseFloat("<%= @sale_report.level1_score || 0%>"),
         })
         rate.render({
             elem: '#weekStar5',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level2_score %>",
-            length: "<%= @sale_report.level2_score %>"
+            value: parseFloat("<%= @sale_report.level2_score || 0%>"),
         })
         rate.render({
             elem: '#weekStar6',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level3_score %>",
-            length: "<%= @sale_report.level3_score %>"
+            value: parseFloat("<%= @sale_report.level3_score || 0%>"),
         })
 
 

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

@@ -146,4 +146,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 0px; !important;
+    }
+</style>

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

@@ -1,8 +1,18 @@
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @places do |d|
     json.id d.id
     json.name d.name
-    json.area_id d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    # json.area_id d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    if d.areas.present?
+      if d.areas.ids.sort.to_s == area_ids
+        json.area_id '全国'
+      else
+        json.area_id  d.areas.pluck(:name).join("、")
+      end
+    else
+      json.area_id  ''
+    end
     json.businesses_count EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").count
     json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum(:profit_amount).round(2)
     json.return_mount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").sum(:return_money).round(2)

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

@@ -51,4 +51,9 @@
           
     })
   })
- </script>
+ </script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>

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

@@ -112,33 +112,33 @@
             },
             {
               field: 'staff',
-              width: 120,
+              width: 80,
               title: '姓名'
             },
             {
                 field: 'business_name',
-                width: 270,
+                width: 170,
                 title: '商机名称',
             },
             {
                 field: 'school',
-                width: 200,
+                width: 170,
                 title: '单位'
             },
             {
                 field: 'department',
-                width: 190,
+                width: 170,
                 title: '部门'
             },
             {
               field: 'follow_ups_count',
-              width: 100,
+              width: 80,
               title: '跟进',
               templet: '#show_follow'
             },
             {
               field: 'finish_rate',
-              width: 100,
+              width: 80,
               title: '完成率',
             },
             {

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

@@ -9,7 +9,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">周次</label>
       <div class="layui-input-inline">
-        <%= select_tag "weekly", options_for_select(@weeks), class: 'required' %>
+        <%= select_tag "weekly", options_for_select(@weeks,@week), class: 'required' %>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -134,38 +134,38 @@
             },
             {
               field: 'staff',
-              width: 120,
+              width: 80,
               title: '姓名'
             },
             {
                 field: 'business_name',
-                width: 270,
+                width: 170,
                 title: '商机名称',
             },
             {
                 field: 'school',
-                width: 200,
+                width: 170,
                 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: '完成率',
             },
             {

data/app/views/educode_sales/recycles/_business.html.erb

@@ -0,0 +1,122 @@
+<script type="text/html" id="toolbarDemo5">
+  <div class="layui-btn-container">
+    <span class="table-label">商机列表</span>
+  </div>
+</script>
+
+<table class="layui-hide" id="business" lay-filter="business"></table>
+
+<script type="text/html" id="currentTableBar5">
+  <%# if can? :update, EducodeSales::business %>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="restore">还原</a>
+  <%# end %>
+  <%# if can? :destroy, EducodeSales::business %>
+  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <%# end %>
+</script>
+
+<script type="text/html" id="showchance">
+  <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
+</script>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            miniPage = layui.miniPage;
+
+        table.render({
+            elem: '#business',
+            url: '/missions/recycles/business',
+            toolbar: '#toolbarDemo5',
+            totalRow:true,
+            defaultToolbar: [],
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        title:'序号',type: 'numbers',
+                    },
+                    {
+                        field: 'name',
+                        title: '名称'
+                    },
+                    {
+                        field: 'school',
+                        title: '单位'
+                    },
+                    {
+                        field: 'department',
+                        title: '部门'
+                    },
+                    {
+                        field: 'last_follow_person',
+                        width: 150,
+                        title: '最新跟进人'
+                    },
+                    {
+                        field: 'latest_time',
+                        title: '最新跟进时间',
+                    },
+                    {
+                        field: 'deleter',
+                        width: 90,
+                        title: '删除人',
+                    },
+                    {
+                        field: 'delete_time',
+                        title: '删除时间',
+                        sort: true,
+
+                    },
+                    {
+                        title: '操作',
+                        width: 120,
+                        toolbar: '#currentTableBar5',
+                        align: "center"
+                    }
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true
+        });
+
+        var sort = {}, search = {};
+        table.on('sort(business)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('business', {
+                initSort: obj,
+                where: {
+                    sort: sort,
+                    q: search
+                }
+            });
+        })
+
+
+        table.on('tool(business)', function (obj) {
+            var data = obj.data;
+            var id = data.id
+            if (obj.event === 'restore') {
+                layer.confirm('确定恢复' + data.name, function (index) {
+                    request.get('missions/recycles/' + data.id + '/restore_businesses', {}, function (res) {
+                        layer.close(index);
+                        table.reload("business")
+                    })
+                });
+            } else if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.name, function (index) {
+                    request.delete('missions/recycles/' + data.id, {}, function (res) {
+                        layer.close(index);
+                        table.reload("business")
+                    })
+                });
+            }
+        });
+
+    });
+</script>