educode_sales 0.6.1 → 0.6.5

data/app/views/educode_sales/customers/new_follow_record.html.erb

@@ -12,7 +12,7 @@
         <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id)), { include_blank: true}%>
       </div>
     </div>
-  <div class="layui-form-item " style="padding-left: 110px">
+  <div class="layui-form-item " style="padding-left: 150px">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_follow_up">提交
       </button>
     </div>

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

@@ -393,7 +393,7 @@
                 content = miniPage.getHrefContent('/missions/customers/edit_follow_record?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 editFollowIndex = layer.open({
-                    title: '编辑',
+                    title: '编辑跟进记录',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,

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

@@ -1,10 +1,10 @@
 <h1 class="text-center" style="padding: 25px"><%=@school.name %></h1>
 <form class="layui-form form-value" action="">
   <div class="layui-form-item" style="padding: 25px">
-    <div class="layui-inline">
+    <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">跟进内容：</label>
-      <div class="layui-input-inline">
-        <span><%= @follow_up.content%></span>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @follow_up.content %></pre>
       </div>
     </div>
     <br>

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

@@ -7,6 +7,7 @@ json.data do
     json.description d.description
     json.advise d.advise
     json.school d.business.department.school.name
+    json.school_id d.business.department.school.id
     json.created_at d.created_at.to_s
     json.business d.business.name
     json.business_id d.business.id

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

@@ -0,0 +1,222 @@
+<div style="margin: 10px 10px 10px 10px">
+  <form class="layui-form layui-form-pane" lay-filter="search_teachers">
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">所属商机</label>
+        <div class="layui-input-inline">
+          <input type="text" name="business" autocomplete="off" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">单位</label>
+        <div class="layui-input-inline">
+          <input type="text" name="school" autocomplete="off" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">负责人</label>
+        <div class="layui-input-inline">
+          <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true } %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-inline">
+          <%= select_tag "clazz", options_for_select(['已完成','未完成']), {  include_blank: true } %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">回款时间</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+        </button>
+        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+  <div class="layui-btn-container">
+    <span class="table-label">回款列表</span>
+  </div>
+</script>
+
+<table class="layui-hide" id="place" lay-filter="place"></table>
+
+<script type="text/html" id="currentTableBar">
+</script>
+<script type="text/html" id="business">
+  <a href="javascript:void(0);" lay-event="business" class="layui-table-link">{{ d.business }}</a>
+</script>
+
+<script type="text/html" id="school">
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</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;
+        laydate = layui.laydate;
+
+
+        laydate.render({
+            elem: '#date',
+            range: true
+        });
+
+        table.render({
+            elem: '#place',
+            url: '/missions/money_plans',
+            toolbar: '#toolbarDemo',
+            totalRow: true,
+            defaultToolbar: ['filter'],
+            initSort: {
+                field: 'date_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 80,
+                        title:'序号',type: 'numbers',
+                        totalRowText:'本页/总计'
+                    },
+                    {
+                        field: 'date_at',
+                        width: 120,
+                        sort: true,
+                        title: '回款时间'
+                    },
+                    {
+                        field: 'amount',
+                        width: 200,
+                        sort: true,
+                        totalRow:true,
+                        title: '回款金额',
+                    },
+                    {
+                        field: 'clazz',
+                        width: 100,
+                        title: '状态',
+                    },
+                    {
+                        field: 'business',
+                        title: '所属商机',
+                        templet: "#business",
+
+                    },
+                    {
+                        field: 'school',
+                        title: '单位',
+                        templet: "#school",
+                    },
+                    {
+                        field: 'staff',
+                        width: 90,
+                        title: '负责人',
+                    },
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true
+        });
+
+        var sort = {}, search = {};
+        table.on('sort(place)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('place', {
+                initSort: obj,
+                where: {
+                    sort: sort,
+                    q: search
+                }
+            });
+        })
+
+        // 监听搜索操作
+        form.on('submit(search_teachers)', function (data) {
+            search = data.field
+            table.reload('place', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            return false;
+        });
+
+        form.on('submit(reset_business_search)', function (data) {
+            var field = data.field;
+            form.val('search_teachers', {
+                area: "",
+                date: "",
+                staff_id: "",
+                clazz: "",
+                professional_title: "",
+                school: "",
+                business: ""
+            });
+            return false;
+        });
+
+        table.on('tool(place)', function (obj) {
+            var data = obj.data;
+            id = data.id
+            if (obj.event === 'add_event') { // 监听添加操作
+                var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + data.id);
+                var openWH = miniPage.getOpenWidthHeight();
+                show_index = layer.open({
+                    title: '查看商机跟进记录',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: [openWH[0] + 'px', openWH[1] + 'px'],
+                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }  else if (obj.event === 'business') {
+                console.log(data);
+                business_id = data.business_id
+                business_name = data.business
+                content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
+                openWH = miniPage.getOpenWidthHeight();
+                index = layer.open({
+                    title: '商机列表/' + data.business + '的跟进记录',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: [openWH[0] + 'px', openWH[1] + 'px'],
+                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }
+        });
+
+    });
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 0px; !important;
+    }
+</style>

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

@@ -0,0 +1,21 @@
+total_amount = 0
+json.data do
+  json.array! @money_plans do |d|
+    json.id d.id
+    json.date_at d.date_at.to_s(:date)
+    json.amount d.amount
+    total_amount += d.amount
+    json.clazz d.clazz
+    json.business d.follow_up.business.name
+    json.business_id d.follow_up.business.id
+    json.school School.find(d.follow_up.business.school_id).name
+    json.school_id School.find(d.follow_up.business.school_id).id
+    json.staff d.staff.user.real_name
+  end
+end
+
+json.totalRow do
+  json.amount total_amount.round(2).to_s + '/' + @total_amount.round(2).to_s
+end
+json.code 0
+json.count @money_plans.total_count

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

@@ -1,3 +1,22 @@
+<div style="margin: 10px 10px 10px 10px">
+  <form class="layui-form layui-form-pane" lay-filter="search_teachers">
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">渠道名称</label>
+        <div class="layui-input-inline">
+          <input type="text" name="name" autocomplete="off" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+        </button>
+        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">渠道列表</span>
@@ -35,6 +54,51 @@
             request = layui.request,
             miniPage = layui.miniPage;
 
+
+
+        var sort = {}, search = {};
+        table.on('sort(place)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('place', {
+                initSort: obj,
+                where: {
+                    sort: sort,
+                    q: search
+                }
+            });
+        })
+
+        // 监听搜索操作
+        form.on('submit(search_teachers)', function (data) {
+            search = data.field
+            table.reload('place', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            return false;
+        });
+
+        form.on('submit(reset_business_search)', function (data) {
+            var field = data.field;
+            form.val('search_teachers', {
+                area: "",
+                date: "",
+                attitude: "",
+                name: "",
+                professional_title: "",
+                regist_at: "",
+                staff_id: "",
+                status: "",
+                school: "",
+                assist: "",
+                teacher_source: ""
+            });
+            return false;
+        });
+
         table.render({
             elem: '#place',
             url: '/missions/places',
@@ -67,12 +131,26 @@
                       templet: "#business_a",
 
                   },
+                  // {
+                  //     field: 'amount',
+                  //     width: 120,
+                  //     totalRow:true,
+                  //     sort: true,
+                  //     title: '中标金额'
+                  // },
+                  {
+                      field: 'total_amount',
+                      width: 120,
+                      totalRow:true,
+                      sort: true,
+                      title: '项目总额'
+                  },
                   {
-                      field: 'amount',
+                      field: 'divide_amount',
                       width: 120,
                       totalRow:true,
                       sort: true,
-                      title: '中标金额'
+                      title: '渠道分成'
                   },
                   {
                       field: 'return_mount',

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

@@ -17,7 +17,9 @@ json.data do
     business_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.businesses_count business_count
     all_businesses_count += business_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("actual_amount - divide_amount").round(2)
+    # 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("actual_amount - divide_amount").round(2)
+    json.total_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("actual_amount").round(2)
+    json.divide_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("divide_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)
   end
 end

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

@@ -249,7 +249,8 @@
                 });
                 return false;
             } else if (obj.event === 'show_follow') {
-              id = data.business_id
+                business_id = obj.data.business_id
+                id = data.business_id
               content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
               openWH = miniPage.getOpenWidthHeight();
               index = layer.open({

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

@@ -265,7 +265,8 @@
                 });
                 return false;
             } else if (obj.event === 'show_follow') {
-              id = data.business_id
+                business_id = obj.data.business_id
+                // business_name = data.name
               content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
               openWH = miniPage.getOpenWidthHeight();
               index = layer.open({

data/app/views/educode_sales/recycles/business.json.jbuilder

@@ -5,8 +5,8 @@ json.data do
     json.name business.name
     json.school business.department.school.name
     json.department business.department.name
-    json.last_follow_person business.last_follow_up.present? ? business.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(business.staff_id).user.real_name
-    json.latest_time business.last_follow_up.present? ? business.last_follow_up.created_at.to_s : business.created_at.to_s
+    json.last_follow_person business.last_follow_up_id.present? ? EducodeSales::FollowUp.unscoped.find(business.last_follow_up_id).staff.user.real_name : EducodeSales::Staff.find(business.staff_id).user.real_name
+    json.latest_time business.last_follow_up_id.present? ? EducodeSales::FollowUp.unscoped.find(business.last_follow_up_id).created_at.to_s : business.created_at.to_s
     json.deleter EducodeSales::Staff.find(d.deleter_id).user.real_name
     json.delete_time d.created_at.to_s
   end

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

@@ -7,7 +7,7 @@
     <div class="layui-tab-item layui-show">
       <form class="layui-form line" action="">
         <% id = 0 %>
-        <% EducodeSales::Permission.all.group_by{ |d| d.clazz}.each do |k, d| %>
+        <% EducodeSales::Permission.all.order(position: :asc).group_by{ |d| d.clazz}.each do |k, d| %>
          <div class="layui-form-item">
            <label class="layui-form-label"><%= k %></label>
            <div class="layui-input-block">
@@ -36,6 +36,14 @@
             <%= radio_button_tag("business", "全部", @areas.include?("商机管理-全部"), {title: '全部列表', id: 3}) %>
           </div>
         </div>
+        <div class="layui-form-item" style="border-top: 1px solid #ddd;">
+          <label class="layui-form-label">回款管理</label>
+          <div class="layui-input-block">
+            <%= radio_button_tag("money_plan", "自己", @areas.include?("回款管理-自己"), {title: '本人负责列表', id: 16}) %>
+            <%= radio_button_tag("money_plan", "区域", @areas.include?("回款管理-区域"), {title: '本人负责区域列表', id: 17}) %>
+            <%= radio_button_tag("money_plan", "全部", @areas.include?("回款管理-全部"), {title: '全部列表', id: 18}) %>
+          </div>
+        </div>
         <div class="layui-form-item">
           <label class="layui-form-label">客户管理</label>
           <div class="layui-input-block">

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -220,7 +220,7 @@
                   </div>
             </div>
             <div class="layui-inline">
-              <button type="submit" id="search_bt" class=" follow_count_bt layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">确定
+              <button type="button" id="search_bt" class=" follow_count_bt layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">确定
               </button>
             </div>
           </div>
@@ -261,7 +261,7 @@
             </div>
           </div>
           <div class="layui-inline">
-            <button type="submit" id="search_bt" class="follow_count_bt layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">确定
+            <button type="button" id="search_bt" class="goal_count_bt layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">确定
             </button>
           </div>
         </div>
@@ -272,6 +272,41 @@
 
   </div>
 </div>
+<br>
+<br>
+<div class="layui-tab layui-tab-card " id="销售额分析" lay-filter="test1">
+  <ul class="layui-tab-title">
+    <li class="layui-this">商机区域分布</li>
+  </ul>
+  <div class="layui-tab-content" style="padding-right: 50px">
+    <div class="layui-tab-item layui-show" style="padding-left: 20px">
+      <div style="margin: 10px 10px 10px 10px">
+        <form class="layui-form layui-form-pane" lay-filter="search_form">
+          <div class="layui-form-item">
+            <div class="layui-inline m-t-10">
+              <label class="layui-form-label">维度</label>
+              <div class="layui-input-inline">
+                <%= select_tag "business_count_type", options_for_select([['按商机总额统计','money'],['按商机数量统计','count']],params[:goal_count_range]), {'lay-filter': 'goal_count'}%>
+              </div>
+            </div>
+            <div class="layui-inline m-t-10">
+              <label class="layui-form-label">商机类型</label>
+              <div class="layui-input-inline">
+                <%= select_tag "business_type", options_for_select(EducodeSales::Common.where(clazz: 'business_type').where.not(extras: "x_class").pluck(:name, :id), params[:clazz_id]), { 'lay-filter': 'clazz_id', include_blank: true } %>
+              </div>
+            </div>
+            <div class="layui-inline">
+              <button type="button" id="search_bt" class="business_bt layui-btn layui-btn-primary" lay-submit lay-filter="business_chart">确定
+              </button>
+            </div>
+          </div>
+        </form>
+      </div>
+      <canvas id="myChart3" width="960" height="200"></canvas>
+    </div>
+
+  </div>
+</div>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.css">
 <script src="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.js"></script>
   <script>
@@ -294,17 +329,6 @@
         var element = layui.element;
         laydate = layui.laydate;
 
-        $(document).ready(function () {
-            $(".follow_count_bt").click(function () {
-                layer.msg("图表绘制中...", {
-                    offset:['40%','46%']
-                })
-                layer.load(0, {});
-                setTimeout(function () {
-                    layer.closeAll('loading');
-                }, 3000);
-            });
-        });
         if(follow_type == "day"){
             $(".year").addClass('layui-hide')
             $(".month").addClass('layui-hide')
@@ -498,5 +522,61 @@
             data: <%=raw @goal_count_data.to_json %>,
             options: opt
         });
+
+        var ctx = document.getElementById('myChart3');
+        var myChart3 = new Chart(ctx, {
+            type: 'bar',
+            data: <%=raw @business_data.to_json %>,
+            options: opt
+        });
+
+        $(document).ready(function () {
+            $(".follow_count_bt").click(function () {
+                layer.load(0, {});
+                $.get('/missions/sale_trends/trends.json?follow_count_range=' + $("#follow_count_range").val() + '&date_month=' + $("#date_month").val() + '&date_week=' + $("#date_week").val() + '&date_year=' + $("#date_year").val() + '&date=' + $("#date").val()).done(function(res) {
+                    layer.closeAll('loading');
+                    var data1 = res.data1;
+                    var ctx = document.getElementById('myChart');
+                    var myChart = new Chart(ctx, {
+                        type: 'line',
+                        data: data1,
+                        options: {
+                            elements: {
+                                line: {
+                                    tension: 0
+                                }
+                            }
+                        }
+                    });
+                });
+            });
+            $(".goal_count_bt").click(function () {
+                layer.load(0, {});
+                $.get('/missions/sale_trends/trends.json?count_type=' + $("#count_type").val() + '&goal_count_range=' + $("#goal_count_range").val() + '&goal_date_month=' + $("#goal_date_month").val() + '&goal_date_year=' + $("#goal_date_year").val()).done(function(res) {
+                    layer.closeAll('loading');
+                    var data2 = res.data2;
+                    var ctx = document.getElementById('myChart2');
+                    var myChart2 = new Chart(ctx, {
+                        type: 'bar',
+                        data: data2,
+                        options: opt
+                    });
+                });
+            });
+            $(".business_bt").click(function () {
+                layer.load(0, {});
+                $.get('/missions/sale_trends/trends.json?business_count_type=' + $("#business_count_type").val() + '&business_type=' + $("#business_type").val()).done(function(res) {
+                    layer.closeAll('loading');
+                    var data3 = res.data3;
+                    var ctx = document.getElementById('myChart3');
+                    var myChart3 = new Chart(ctx, {
+                        type: 'bar',
+                        data: data3,
+                        options: opt
+                    });
+                });
+            });
+        });
+
     })
   </script>

data/app/views/educode_sales/sale_trends/trends.json.jbuilder

@@ -1,14 +1,3 @@
-my_array = [1,2,3,4,5]
-json.data do
-  json.labels my_array
-  json.datasets do
-  json.array! [1,2] do |d|
-    json.label '人名'
-    json.backgroundColor "#fff"
-    json.borderColor "#36A2EB"
-    json.pointBackgroundColor "#36A2EB"
-    json.pointBorderColor "#fff"
-    json.data my_array
-  end
-  end
-end
+json.data1 @follow_count_data
+json.data2 @goal_count_data
+json.data3 @business_data