educode_sales 0.6.3 → 0.6.7

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

@@ -20,7 +20,7 @@
                     <h5>商机目标</h5>
                   </div>
                   <div class="panel-content y-t-10">
-                    <h1 class="no-margins" id="chance_money_value"><%= @sale_trend.chance_money %>万</h1>
+                    <h1 class="no-margins" id="chance_money_value"><%=@sale_trend.present? ? @sale_trend.chance_money : EducodeSales::SaleTrend.sum(:chance_money)%>万</h1>
                     <div id="chance_money_field" class="layui-hide">
                       <input type="text" name="chance_money" autocomplete="off"
                         class="layui-input" id="chance_money">
@@ -39,7 +39,7 @@
                     <h5>中标目标</h5>
                   </div>
                   <div class="panel-content y-t-10">
-                    <h1 class="no-margins" id="ballot_money_value"><%= @sale_trend.ballot_money %>万</h1>
+                    <h1 class="no-margins" id="ballot_money_value"><%=@sale_trend.present? ? @sale_trend.ballot_money : EducodeSales::SaleTrend.sum(:ballot_money)%>万</h1>
                     <div id="ballot_money_field" class="layui-hide">
                       <input type="text" name="ballot_money" autocomplete="off" class="layui-input" id="ballot_money">
                     </div>
@@ -57,7 +57,7 @@
                     <h5>签单目标</h5>
                   </div>
                   <div class="panel-content y-t-10">
-                    <h1 class="no-margins" id="sign_money_value"><%= @sale_trend.sign_money %>万</h1>
+                    <h1 class="no-margins" id="sign_money_value"><%=@sale_trend.present? ? @sale_trend.sign_money : EducodeSales::SaleTrend.sum(:sign_money)%>万</h1>
                      <div id="sign_money_field" class="layui-hide">
                        <input type="text" name="sign_money" autocomplete="off" class="layui-input" id="sign_money">
                      </div>
@@ -75,7 +75,7 @@
                     <h5>回款目标</h5>
                   </div>
                   <div class="panel-content y-t-10">
-                    <h1 class="no-margins" id="returned_money_value"><%= @sale_trend.returned_money %>万</h1>
+                    <h1 class="no-margins" id="returned_money_value"><%=@sale_trend.present? ? @sale_trend.returned_money : EducodeSales::SaleTrend.sum(:returned_money)%>万</h1>
                     <div id="returned_money_field" class="layui-hide">
                       <input type="text" name="returned_money" autocomplete="off" class="layui-input" id="returned_money">
                     </div>
@@ -88,7 +88,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>现有商机<a href="/missions/businesses?name=(销售态势-现有商机)"  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"><%= @business_amount %>万</h1>
@@ -195,12 +195,12 @@
   </div>
 </form>
 <br>
-<div class="layui-tab layui-tab-card" id="商机跟进数">
+<div class="" id="商机跟进数">
   <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 class="" style="padding-right: 50px">
+    <div class=" 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">
@@ -213,14 +213,14 @@
             <div class="layui-inline">
               <label class="layui-form-label">时间范围</label>
               <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 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] %>">
+                  <input type="text"  class="layui-input month layui-hide" id="date_month" name="date_month" placeholder=" - " value="<%=params[:date_month] %>" autocomplete="off" >
+                  <input type="text"  class="layui-input year layui-hide" id="date_year" name="date_year" placeholder=" - " value="<%=params[:date_year] %>" autocomplete="off">
+                  <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)   %>" autocomplete="off">
+                  <input type="text"  class="layui-input day layui-hide" id="date" name="date" placeholder=" - " value="<%=params[:date] %>" autocomplete="off">
                   </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>
@@ -232,12 +232,12 @@
 </div>
 <br>
 <br>
-<div class="layui-tab layui-tab-card " id="销售额分析" lay-filter="test1">
+<div class=" " 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 class="" style="padding-right: 50px">
+    <div class=" 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">
@@ -256,12 +256,12 @@
           <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].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] %>">
+              <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")  %>" autocomplete="off">
+              <input type="text"  class="layui-input goal_year layui-hide" id="goal_date_year" name="goal_date_year" placeholder=" - " value="<%=params[:goal_date_year] %>" autocomplete="off">
             </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>
@@ -274,17 +274,79 @@
 </div>
 <br>
 <br>
-<div class="layui-tab layui-tab-card " id="销售额分析" lay-filter="test1">
+<div class=" " 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 class="" style="padding-right: 50px">
+    <div class=" 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>
+<div class=" " id="销售人员跟进分析" lay-filter="test1">
+  <ul class="layui-tab-title">
+    <li class="layui-this">销售人员跟进分析</li>
+  </ul>
+  <div class="" style="padding-right: 50px">
+    <div class=" 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 "customer_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">
+                <% options =  [['上周','last_week'],['本周','this_week'],['上月','last_month'],['本月','this_month'],['去年','last_year'],['今年','this_year'],['全部','all'],['自定义','diy']]%>
+                <%= select_tag "customer_time_range", options_for_select(options,'this_year'), { 'lay-filter': 'customer_time_range'} %>
+              </div>
+            </div>
+            <div class="layui-inline m-t-10 layui-hide diy_range" id="diy_range">
+              <label class="layui-form-label">自定义范围</label>
+              <div class="layui-input-inline">
+                <input type="text"   class="layui-input" id="customer_date" name="customer_date" placeholder=" - " autocomplete="off">
+              </div>
+            </div>
+            <div class="layui-inline">
+              <button type="button" id="search_bt" class="customer_bt layui-btn layui-btn-primary" lay-submit lay-filter="customer_chart">确定
+              </button>
+            </div>
+          </div>
+        </form>
+      </div>
+      <canvas id="myChart4" 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>
@@ -307,17 +369,15 @@
         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);
-            });
-        });
+        form.on('select(customer_time_range)', function(data){
+            const value = data.value;
+            if(value == "diy"){
+                $(".diy_range").removeClass("layui-hide")
+            }else {
+                $(".diy_range").addClass('layui-hide')
+            }
+        })
+
         if(follow_type == "day"){
             $(".year").addClass('layui-hide')
             $(".month").addClass('layui-hide')
@@ -383,6 +443,10 @@
             elem: '#date',
             range: true
         });
+        laydate.render({
+            elem: '#customer_date',
+            range: true
+        });
         laydate.render({
             elem: '#date_week',
             range: true
@@ -518,5 +582,53 @@
             data: <%=raw @business_data.to_json %>,
             options: opt
         });
+
+        var ctx = document.getElementById('myChart4');
+        var myChart4 = new Chart(ctx, {
+            type: 'bar',
+            data: <%=raw @customer_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;
+                    myChart.data = data1
+                    myChart.update()
+                });
+            });
+            $(".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;
+                     myChart2.data = data2
+                    myChart2.update()
+
+                });
+            });
+            $(".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;
+                    myChart3.data = data3
+                    myChart3.update()
+                });
+            });
+            $(".customer_bt").click(function () {
+                layer.load(0, {});
+                $.get('/missions/sale_trends/trends.json?customer_count_type=' + $("#customer_count_type").val() + '&customer_time_range=' + $("#customer_time_range").val()).done(function(res) {
+                    layer.closeAll('loading');
+                    var data4 = res.data4;
+                    myChart4.data = data4
+                    myChart4.update()
+                });
+            });
+        });
+
     })
   </script>

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

@@ -1,14 +1,4 @@
-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
+json.data4 @customer_data

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

@@ -77,10 +77,12 @@
             field: 'id',
             title:'序号',type: 'numbers',
             totalRowText:'合计',
+            fixed: 'left',
             width: 80
           }, {
             field: 'name',
             title: '姓名',
+            fixed: 'left',
             width: 100
           }, {
             field: 'area',

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

@@ -36,7 +36,7 @@ json.data do
       business_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 = ?", @d_clazz&.id).count
       business_e = @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 = ?", @e_clazz&.id).count
       business_o = @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 = ?", @o_clazz&.id).count
-      school_count = EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
+      school_count = EducodeSales::CustomerExtension.joins(:school).where(customer_staff_id: d.id).size
       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(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", @x).where.not("educode_sales_money_plans.clazz!= ?", 1).sum(:amount).round(2)
       json.school_count school_count
@@ -58,7 +58,7 @@ json.data do
       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).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", "#{@year}-01-01", "#{@year}-12-31").sum(:total_amount).round(2)
       json.return_money @businesses.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", @x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").sum(:amount).round(2)
       json.school_count school_count
-      follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").where(staff_id: d.id).pluck(:business_id).uniq).pluck(:school_id)).uniq.size
+      follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").where(staff_id: d.id).pluck(:business_id).uniq).pluck(:school_id)).uniq.size
       json.follow_school_count follow_school_count
       json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size + EducodeSales::FollowUp.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size
       follow_school_rate = (follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0).round(2)

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

@@ -17,9 +17,9 @@ json.data do
     else
       json.area  ''
     end
-    departments = EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(educode_sales_follow_ups.staff_id) AS count")[0]&.send('count') + EducodeSales::Teacher.joins(:follow_up).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(educode_sales_teacher_follows.staff_id) AS count")[0]&.send('count') || 0
+    departments = (EducodeSales::Business.joins(:follow_ups, [department: :school]).where("educode_sales_follow_ups.staff_id = #{d.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_follow_ups.updated_at") + EducodeSales::Teacher.joins(:follow_up, [department: :school]).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_teacher_follows.updated_at")).uniq{|s| s.id}.size
     json.departments departments
-    schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count'] + EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count']
+    schools = EducodeSales::Business.joins(:follow_ups, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count'] + EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count']
     json.schools schools
     departments_count += departments
     schools_count += schools

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

@@ -19,44 +19,44 @@
           <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @person&.professional_title), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">导流来源</label>
         <div class="layui-input-inline">
           <%= select_tag "teacher_source", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">态度</label>
         <div class="layui-input-inline">
 
           <%= select_tag "attitude", options_for_select(EducodeSales::Common.where(clazz: 'teacher_attitude').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">注册时间</label>
         <div class="layui-input-inline">
           <input type="text" class="layui-input" id="time" placeholder="请选择时间" autocomplete="off" name="regist_at">
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">注册状态</label>
         <div class="layui-input-inline">
           <%= select_tag "status", options_for_select([["已注册","1"],["未注册","0"]]), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">区域</label>
         <div class="layui-input-inline">
           <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">起止时间</label>
         <div class="layui-input-inline">
           <input type="text" class="layui-input" id="date" name="date" autocomplete="off" placeholder=" - ">
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">教研助理</label>
         <div class="layui-input-inline">
           <%= select_tag "assist", options_for_select(@staffs, params[:assist]), { 'lay-filter': 'assist', include_blank: true } %>
@@ -68,6 +68,8 @@
         </button>
         <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_teachers">搜 索
         </button>
+        <a style="padding-left: 20px;color: #0000FF"  href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">高级搜索
+        </a>
       </div>
     </div>
   </form>
@@ -150,12 +152,14 @@
                     width: 60,
                     title:'序号',type: 'numbers',
                     totalRowText:'合计',
+                    fixed: 'left'
 
                 },
                 {
                     field: 'name',
                     width: 80,
                     title: '姓名',
+                    fixed: 'left',
                     templet: "#name"
                 },
                 {
@@ -409,6 +413,10 @@
             })
             return false;
         });
+        form.on('submit(show_hide)', function (data) {
+            $(".show_item").toggle()
+            return false;
+        });
         /**
          * toolbar事件监听
          */

data/app/views/layouts/educode_sales/application.html.erb

@@ -9,12 +9,15 @@
   <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
   <%= stylesheet_link_tag "educode_sales/application", media: "all" %>
   <%= javascript_include_tag "educode_sales/application" %>
+  <script src="https://cdn.jsdelivr.net/npm/cxselect@1.4.0/js/jquery.cxselect.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/cxselect@1.4.0/js/jquery.cxselect.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.js"></script>
 </head>
 <body class="" id="body">
 <div class="layui-layout layui-layout-admin " >
   <div class="layui-header">
     <a href="/missions">
-      <div class="layui-hide-xs layui-bg-black layuimini-logo layui-logo">
+      <div class="layui-bg-black layuimini-logo layui-logo" id="head_a">
       <%= image_tag "educode_sales/logo.png", class: 'header-logo' %>
       <span class="app-title">营销系统</span>
     </div>
@@ -22,6 +25,7 @@
 
 
     <ul class="layui-nav i_class" style="left: 200px">
+      <%= image_tag "educode_sales/logo.png", class: 'header-logo tubiao layui-hide-sm layui-hide-xs' %>
       <li class="layui-nav-item layui-show-xs-inline-block " lay-header-event="menuLeft">
         <a href="javascript:;"> <i id="leftEnumIcon" class="layui-icon layui-icon-shrink-right"></i></a>
       </li>
@@ -45,7 +49,7 @@
     </ul>
   </div>
 
-  <div class="layui-side layui-bg-black">
+  <div class="layui-side layui-bg-black" id="head_b">
     <div class="layui-side-scroll ">
       <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
       <ul class="layui-nav layui-nav-tree ul"
@@ -66,6 +70,10 @@
               <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>商机管理</a>
               </dd>
             <% end %>
+            <% if can? :read, EducodeSales::MoneyPlan %>
+              <dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>回款计划</a>
+              </dd>
+            <% end %>
             <% if can? :read, EducodeSales::Customer %>
               <dd><a href="/missions/customers" class="<%= current?('layui-this', customers_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/客户管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>客户管理</a>
               </dd>
@@ -205,6 +213,10 @@
                     $(".i_class").animate({left: '200px'},"fast");
                     $(".layui-nav-item").addClass('layui-nav-itemed')
                     $("#logout").removeClass('layui-nav-itemed')
+                    $("#head_b").removeClass('layui-hide-xs')
+                    $("#head_a").removeClass('layui-hide-xs')
+                    $(".tubiao").addClass('layui-hide')
+                    $(".tubiao").addClass('layui-hide-xs')
                 }
 
                 function menuHide(btn) {
@@ -212,6 +224,10 @@
                     btn.removeClass('layui-icon-shrink-right').addClass('layui-icon-spread-left');
                     body.addClass('layuimini-mini');
                     $(".i_class").animate({left: '60px'});
+                    $("#head_b").addClass('layui-hide-xs')
+                    $("#head_a").addClass('layui-hide-xs')
+                    $(".tubiao").removeClass('layui-hide')
+                    $(".tubiao").removeClass('layui-hide-xs')
                 }
             }
         });

data/config/routes.rb

@@ -20,6 +20,8 @@ EducodeSales::Engine.routes.draw do
   end
   resources :customer_follows do
   end
+  resources :money_plans do
+  end
 
   resources :customers do
     collection do
@@ -80,6 +82,8 @@ EducodeSales::Engine.routes.draw do
 
   resources :businesses do
     collection do
+      get :export_records
+      get :add_export_records
       get :show_keys
       get :add_keys
       get :show_follow

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -7,6 +7,16 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       t.timestamps
     end
     if EducodeSales::Permission.last.nil?
+      EducodeSales::Permission.create(name: '导出商机', subject: 'Business', action: 'export_business', clazz: 'business', position: '11')
+
+
+      #附件管理权限
+      EducodeSales::Permission.create(name: '查看附件', subject: 'Business', action: 'show_file', clazz: 'business', position: '11')
+      EducodeSales::Permission.create(name: '上传附件', subject: 'Business', action: 'upload_file', clazz: 'business', position: '11')
+      EducodeSales::Permission.create(name: '下载附件', subject: 'Business', action: 'download_file', clazz: 'business', position: '11')
+      EducodeSales::Permission.create(name: '删除附件', subject: 'Business', action: 'delete_file', clazz: 'business', position: '11')
+      #回款管理权限
+      EducodeSales::Permission.create(name: '查看回款列表', subject: 'MoneyPlan', action: 'read', clazz: 'money_plan', position: '15')
 
       #客户管理权限
       EducodeSales::Permission.create(name: '查看客户', subject: 'Customer', action: 'read', clazz: 'customer')

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.6.3'
+  VERSION = '0.6.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.7
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ files:
 - app/assets/images/educode_sales/loading-2.gif
 - app/assets/images/educode_sales/loginbg.png
 - app/assets/images/educode_sales/logo.png
+- app/assets/images/educode_sales/money_plans.png
 - app/assets/images/educode_sales/回收站.png
 - app/assets/images/educode_sales/客户管理.png
 - app/assets/javascripts/educode_sales/application.js
@@ -145,6 +146,7 @@ files:
 - app/controllers/educode_sales/home_controller.rb
 - app/controllers/educode_sales/import_teachers_controller.rb
 - app/controllers/educode_sales/key_person_controller.rb
+- app/controllers/educode_sales/money_plans_controller.rb
 - app/controllers/educode_sales/operation_plans_controller.rb
 - app/controllers/educode_sales/operation_reports_controller.rb
 - app/controllers/educode_sales/operations_controller.rb
@@ -175,6 +177,7 @@ files:
 - app/models/educode_sales/application_record.rb
 - app/models/educode_sales/assign_follow_up.rb
 - app/models/educode_sales/business.rb
+- app/models/educode_sales/business_export_record.rb
 - app/models/educode_sales/common.rb
 - app/models/educode_sales/course_subject.rb
 - app/models/educode_sales/customer.rb
@@ -210,6 +213,8 @@ files:
 - app/views/educode_sales/businesses/edit.html.erb
 - app/views/educode_sales/businesses/edit_follow_record.html.erb
 - app/views/educode_sales/businesses/edit_plan.html.erb
+- app/views/educode_sales/businesses/export_records.html.erb
+- app/views/educode_sales/businesses/export_records.json.jbuilder
 - app/views/educode_sales/businesses/file.html.erb
 - app/views/educode_sales/businesses/index.html.erb
 - app/views/educode_sales/businesses/index.json.jbuilder
@@ -253,6 +258,8 @@ files:
 - app/views/educode_sales/home/search_teacher.json.jbuilder
 - app/views/educode_sales/home/search_users.json.jbuilder
 - app/views/educode_sales/home/statistics.html.erb
+- app/views/educode_sales/money_plans/index.html.erb
+- app/views/educode_sales/money_plans/index.json.jbuilder
 - app/views/educode_sales/operation_plans/_monthPlan.html.erb
 - app/views/educode_sales/operation_plans/_monthly.html.erb
 - app/views/educode_sales/operation_plans/_weekPlan.html.erb