educode_sales 0.5.2 → 0.5.6

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

@@ -85,12 +85,12 @@
     <br>
     <div class="layui-inline">
       <label class="layui-form-label">渠道</label>
-      <div class="layui-input-inline">
-        <%= select_tag "place_id", options_for_select(@places, @last_follow_up&.place_id), include_blank: true %>
+      <div class="layui-input-inline" style="z-index: 101">
+        <div id="place" style="width: 190px;"></div>
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">渠道分成</label>
+      <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
       </div>
@@ -182,18 +182,63 @@
           })
         }
       })
+      var place_list = xmSelect.render({
+        el: '#place',
+        remoteSearch: true,
+          model: {
+              icon: 'hidden',
+              label: {
+                  type: 'text',
+                  text: {
+                      //左边拼接的字符
+                      left: '',
+                      //右边拼接的字符
+                      right: '',
+                      //中间的分隔符
+                      separator: ', ',
+                  },
+              }
+          },
+        clickClose: true,
+        delay: 1000,
+        paging: true,
+          radio: true,
+        pageRemote: true,
+        filterable: true,
+        remoteMethod: function (val, cb, show, pageIndex) {
+          $.ajax( '/missions/sales_place', {
+            method: 'get',
+            data: {
+              q: val,
+              page: pageIndex
+            },
+            dataType: 'json',
+            success: function (res) {
+                var data = res.data;
+                if (res.code == 0) {
+                  cb(res.data, res.count);
+                } else {
+                  layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                }
+
+            }
+          })
+        }
+      })
 
       sales_list.setValue(gon.sales);
+      place_list.setValue(gon.place);
       form.render();
 
       form.on('submit(add_follow_up)', function (data) {
-        var assign_follow = [];
+          var assign_follow = [];
         sales_list.getValue().forEach(function(d) {
           assign_follow.push(d.value);
         })
         data.field.assign_follow_up = assign_follow;
         data.field.business_id = "<%= @business.id %>";
-        request.authPost("missions/follow_ups", data.field, function (res) {
+        data.field.place_id = place_list.getValue('valueStr');
+          request.authPost("missions/follow_ups", data.field, function (res) {
           if (res.success == false) {
             layer.alert(res.msg)
           } else {

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

@@ -74,7 +74,7 @@
 
       table.render({
           elem: '#sale_plan_follow_table',
-          url: '/missions/businesses/show_follow?id=' + parent.id ,
+          url: '/missions/businesses/show_follow?id=' + parent.business_id ,
           toolbar: '#toolbarDemo_follow',
           defaultToolbar: ['filter'],
           cols: [
@@ -198,7 +198,7 @@
       table.on('toolbar(sale_plan_follow_table)', function (obj) {
         if (obj.event === 'add') { // 监听添加操作
             business_id = parent.business_id
-            var content = miniPage.getHrefContent('/missions/businesses/new_follow_record?id=' + parent.id);
+            var content = miniPage.getHrefContent('/missions/businesses/new_follow_record?id=' + parent.business_id);
           var openWH = miniPage.getOpenWidthHeight();
           sale_plan_index = layer.open({
             title: '添加商机跟进记录',
@@ -220,7 +220,7 @@
             layer.closeAll()
             business_id = parent.business_id
             business_name = parent.business_name
-            var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + id);
+            var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + parent.business_id);
             var openWH = miniPage.getOpenWidthHeight();
             sindex = layer.open({
                 title: '商机列表/'+ parent.business_name +'的跟进时间线',
@@ -335,7 +335,7 @@
        // 未完成计划
          table.render({
             elem: '#unfinish_table',
-            url: '/missions/businesses/' + parent.id + "/unfinish_plans",
+            url: '/missions/businesses/' + parent.business_id + "/unfinish_plans",
             toolbar: '#unfinish_table_tabar',
             defaultToolbar: [],
             cols: [

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

@@ -75,7 +75,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.divide_amount %>
+        <%= @follow_up.divide_amount %>万
       </div>
     </div>
     <div class="ayui-form-item">

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

@@ -43,7 +43,7 @@
     function demo(){
         layer.closeAll()
         business_id = parent.business_id
-        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
+        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + parent.business_id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({
             title: '商机列表/'+ parent.business_name +'的跟进记录',

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

@@ -0,0 +1,19 @@
+json.data do
+  json.array! @follow_ups do |d|
+    json.id d.id
+    json.clazz d.clazz.name
+    json.stage d.stage.name
+    json.staff d.staff.user.real_name
+    json.description d.description
+    json.advise d.advise
+    json.created_at d.created_at.to_s
+    json.business d.business.name
+    json.business_id d.business.id
+    teacher_ids = d.key_person.pluck(:teacher_id)
+    json.key_people EducodeSales::Teacher.where(id: teacher_ids).pluck(:name).join('、')
+
+  end
+end
+
+json.code 0
+json.count @follow_ups.total_count

data/app/views/educode_sales/home/sales_place.json.jbuilder

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @places do |d|
+    json.value d.id
+    json.name d.name
+  end
+end
+json.count (@places.total_count/10 + 1)
+json.code 0
+json.msg "success"

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

@@ -17,6 +17,11 @@
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
   <% end %>
 </script>
+<script type="text/html" id="business_a">
+  <div class="layui-text">
+    <a href="/missions/businesses?place_id={{d.id}}">{{d.businesses_count}}</a>
+  </div>
+</script>
 
 <script type="text/html" id="showchance">
   <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
@@ -56,20 +61,25 @@
                   {
                       field: 'businesses_count',
                       width: 120,
-                      totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-                      title: '商机'
+                      totalRow: true,
+                      sort: true,
+                      title: '商机',
+                      templet: "#business_a",
+
                   },
                   {
                       field: 'amount',
                       width: 120,
                       totalRow:true,
-                      title: '中标'
+                      sort: true,
+                      title: '中标金额'
                   },
                   {
                       field: 'return_mount',
                       width: 120,
                       totalRow:true,
-                      title: '回款',
+                      sort: true,
+                      title: '回款金额',
                   },
                   {
                       title: '操作',

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

@@ -1,3 +1,4 @@
+all_businesses_count = 0
 area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @places do |d|
@@ -13,11 +14,16 @@ json.data do
     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
+    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(: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)
   end
 end
 
+json.totalRow do
+  json.businesses_count all_businesses_count.to_s
+end
 json.code 0
 json.count @places.total_count

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

@@ -1,6 +1,6 @@
 <div class="layui-tab" lay-filter="sale_tab">
   <ul class="layui-tab-title">
-    <li class="layui-this" data="business">商机列表</li>
+    <li class="layui-this" data="business">商机</li>
     <li  data="week">周计划</li>
     <li data="weekly">周报</li>
     <li data="month">月计划</li>

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

@@ -101,7 +101,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>已中标<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                    <h5>已中标（总额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @goal_amount %>万</h1>
@@ -114,7 +114,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>已签单<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                    <h5>已签单（总额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @service_amount %>万</h1>
@@ -148,6 +148,32 @@
                 </div>
               </div>
             </div>
+            <div class="layui-col-xs3">
+              <div class="panel layui-bg-number">
+                <div class="panel-body">
+                  <div class="panel-title">
+                    <h5>已中标（合同额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                  </div>
+                  <div class="panel-content y-t-10">
+                    <h1 class="no-margins"><%= @actual_goal_amount %>万</h1>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="layui-col-xs3">
+              <div class="panel layui-bg-number">
+                <div class="panel-body">
+                  <div class="panel-title">
+                    <h5>已签单（合同额）<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                  </div>
+                  <div class="panel-content y-t-10">
+                    <h1 class="no-margins"><%= @actual_service_amount %>万</h1>
+                  </div>
+                </div>
+              </div>
+            </div>
+
             <div class="layui-row layui-col-space30" >
             <div class="layui-col-xs3">
               <div class="panel layui-bg-number">
@@ -181,7 +207,7 @@
             <div class="layui-inline m-t-10">
               <label class="layui-form-label">视图</label>
               <div class="layui-input-inline">
-                <%= select_tag "follow_count_range", options_for_select([['按天','day'],['按月','month'],['按年','year']],params[:follow_count_range]), {'lay-filter': 'follow_count'}%>
+                <%= select_tag "follow_count_range", options_for_select([['按天','day'],['按周','week'],['按月','month'],['按年','year']],params[:follow_count_range] || 'week'), {'lay-filter': 'follow_count'}%>
               </div>
             </div>
             <div class="layui-inline">
@@ -189,7 +215,8 @@
               <div class="layui-input-inline">
                   <input type="text"  class="layui-input month layui-hide" id="date_month" name="date_month" placeholder=" - " value="<%=params[:date_month] %>" >
                   <input type="text"  class="layui-input year layui-hide" id="date_year" name="date_year" placeholder=" - " value="<%=params[:date_year] %>">
-                  <input type="text"  class="layui-input day" id="date" name="date" placeholder=" - " value="<%=params[:date] %>">
+                  <input type="text"  class="layui-input week " id="date_week" name="date_week" placeholder=" - " value="<%=params[:date_week].present? ? params[:date_week] : (Time.now - 30.days).beginning_of_week.to_s(:date) + ' - ' + Time.now.end_of_week.to_s(:date)   %>">
+                  <input type="text"  class="layui-input day layui-hide" id="date" name="date" placeholder=" - " value="<%=params[:date] %>">
                   </div>
             </div>
             <div class="layui-inline">
@@ -203,6 +230,8 @@
     </div>
   </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>
@@ -212,6 +241,12 @@
       <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 "count_type", options_for_select([['按合同额统计','actual_amount'],['按总额统计','total_amount']],params[:count_type]), {'lay-filter': 'count_type'}%>
+            </div>
+          </div>
           <div class="layui-inline m-t-10">
             <label class="layui-form-label">视图</label>
             <div class="layui-input-inline">
@@ -221,7 +256,7 @@
           <div class="layui-inline">
             <label class="layui-form-label">时间范围</label>
             <div class="layui-input-inline">
-              <input type="text"  class="layui-input goal_month " id="goal_date_month" name="goal_date_month" placeholder=" - " value="<%=params[:goal_date_month] %>">
+              <input type="text"  class="layui-input goal_month " id="goal_date_month" name="goal_date_month" placeholder=" - " value="<%=params[:goal_date_month].present? ? params[:goal_date_month] : Time.now.year.to_s + "-01"  + " - " + Time.now.strftime("%Y-%m")  %>">
               <input type="text"  class="layui-input goal_year layui-hide" id="goal_date_year" name="goal_date_year" placeholder=" - " value="<%=params[:goal_date_year] %>">
             </div>
           </div>
@@ -262,27 +297,34 @@
         $(document).ready(function () {
             $(".follow_count_bt").click(function () {
                 layer.msg("图表绘制中...", {
-                    time: 0, //不自动关闭
                     offset:['40%','46%']
                 })
                 layer.load(0, {});
                 setTimeout(function () {
                     layer.closeAll('loading');
-                }, 10000);
+                }, 3000);
             });
         });
         if(follow_type == "day"){
             $(".year").addClass('layui-hide')
             $(".month").addClass('layui-hide')
+            $(".week").addClass('layui-hide')
             $(".day").removeClass('layui-hide')
         }else if(follow_type == "month"){
             $(".year").addClass('layui-hide')
+            $(".week").addClass('layui-hide')
             $(".month").removeClass('layui-hide')
             $(".day").addClass('layui-hide')
+        }else if(follow_type == "week"){
+            $(".year").addClass('layui-hide')
+            $(".day").addClass('layui-hide')
+            $(".week").removeClass('layui-hide')
+            $(".month").addClass('layui-hide')
         }else {
             $(".year").removeClass('layui-hide')
             $(".month").addClass('layui-hide')
             $(".day").addClass('layui-hide')
+            $(".week").addClass('layui-hide')
         }
 
         if(goal_type == "year"){
@@ -326,43 +368,30 @@
         // 时间选择器
         laydate.render({
             elem: '#date',
-            min: -15
-            ,max: 15,
             range: true
         });
         laydate.render({
-            type: 'week',
             elem: '#date_week',
-            min: -90
-            ,max: 0,
             range: true
         });
         laydate.render({
             type: 'month',
             elem: '#date_month',
-            min: -365
-            ,max: 0,
             range: true
         });
         laydate.render({
             type: 'year',
             elem: '#date_year',
-            min: -3660
-            ,max: 366,
             range: true
         });
         laydate.render({
             type: 'year',
             elem: '#goal_date_year',
-            min: -3660
-            ,max: 366,
             range: true
         });
         laydate.render({
             type: 'month',
             elem: '#goal_date_month',
-            min: -365
-            ,max: 0,
             range: true
         });
 
@@ -378,15 +407,24 @@
           if(value == "month"){
               $(".year").addClass('layui-hide')
               $(".day").addClass('layui-hide')
+              $(".week").addClass('layui-hide')
               $(".month").removeClass('layui-hide')
           }else if(value == "year"){
               $(".month").addClass('layui-hide')
               $(".day").addClass('layui-hide')
+              $(".week").addClass('layui-hide')
               $(".year").removeClass('layui-hide')
+          }else if(value == "week"){
+              $(".month").addClass('layui-hide')
+              $(".day").addClass('layui-hide')
+              $(".week").removeClass('layui-hide')
+              $(".year").addClass('layui-hide')
           }else {
               $(".month").addClass('layui-hide')
               $(".year").addClass('layui-hide')
               $(".day").removeClass('layui-hide')
+              $(".week").addClass('layui-hide')
+
           }
         })
 
@@ -424,19 +462,41 @@
             }
         });
 
+
+        var opt = {
+            events: false,
+            tooltips: {
+                enabled: false
+            },
+            hover: {
+                animationDuration: 0
+            },
+            animation: {
+                duration: 1,
+                onComplete: function () {
+                    var chartInstance = this.chart,
+                        ctx = chartInstance.ctx;
+                    ctx.font = Chart.helpers.fontString(Chart.defaults.global.defaultFontSize, Chart.defaults.global.defaultFontStyle, Chart.defaults.global.defaultFontFamily);
+                    ctx.textAlign = 'center';
+                    ctx.textBaseline = 'bottom';
+
+                    this.data.datasets.forEach(function (dataset, i) {
+                        var meta = chartInstance.controller.getDatasetMeta(i);
+                        meta.data.forEach(function (bar, index) {
+                            var data = dataset.data[index];
+                            ctx.fillText(data, bar._model.x, bar._model.y - 5);
+                        });
+                    });
+                }
+            }
+        };
+
+
         var ctx = document.getElementById('myChart2');
         var myChart2 = new Chart(ctx, {
             type: 'bar',
             data: <%=raw @goal_count_data.to_json %>,
-            options: {
-                scales: {
-                    yAxes: [{
-                        ticks: {
-                            beginAtZero:true
-                        }
-                    }]
-                }
-            }
+            options: opt
         });
     })
   </script>

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

@@ -66,42 +66,42 @@
             templet: "#business_a",
             totalRow:true,
             sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'business_b',
             title: 'B类商机',
             templet: "#business_b",
             totalRow:true,sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'business_c',
             title: 'C类商机',
             templet: "#business_c",
             totalRow:true,sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'business_d',
             title: 'D类商机',
             templet: "#business_d",
             totalRow:true,sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'business_e',
             title: 'E类商机',
             templet: "#business_e",
             totalRow:true,sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'business_o',
             title: 'O类商机',
             templet: "#business_o",
             totalRow:true,sort:true,
-            width: 120
+            width: 100
           },
             {
             field: 'goal',
@@ -110,7 +110,7 @@
             width: 120
           }, {
             field: 'return_money',
-            title: '回款',
+            title: '回款金额',
             totalRow:true,sort:true,
             width: 120
           }

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

@@ -51,12 +51,14 @@
                     title: '跟进学校',
                     templet: "#school",
                     totalRow:true,
+                    sort: true,
                     width: 120
                 }, {
                     field: 'departments',
                     title: '跟进二级学院',
                     templet: "#xschool",
                     totalRow:true,
+                    sort: true,
                     width: 120
                 },
                 ]

data/app/views/educode_sales/teachers/course_list.json.jbuilder

@@ -19,5 +19,5 @@ json.data do
   end
 end
 json.code 0
-json.count @courses.total_count
+json.count @courses.present? ? @courses.total_count : 0
 json.msg 'succcess'