educode_sales 0.9.24 → 0.9.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c2b7f37f4b1fda07383d7cca772b7ee22fab18ca21a73ea6865f3d09e208dbc
-  data.tar.gz: 92ab5c8bd9aa56c678d3f54e7720ba6d851d4745f16c55c6b841dd9810128471
+  metadata.gz: 23546de4bbb1afb063c383c9284ac5df3851a0b5b80ff1156b4a395d3bacdbdb
+  data.tar.gz: a4e1a21cab776582c8e5659778b81073ee5cd397e7544e8508e7d373a37fa99f
 SHA512:
-  metadata.gz: 0f823e988d77eb4aff8ad1999a4ef058beb639bba844948144e444cd70065d0835e6865801537aabe4d03c3835f7db686edec6844de218afd925a14a2134801d
-  data.tar.gz: 6009835052d5b11ce9d9609d16e2cb5e26d0cda5afb6f9bbeb3c2d8b7acd61e4a1ea1be955e9d6873143e25d5ec48e79903d3485ed42d7c4e7a8a348546f79f4
+  metadata.gz: 952ec86ff8bd23312b8b5e439c1adfebaa3547c59f5bc8f35553699f59ebc2163b64401a971a29207ceb29e3fb586f698a94d07c028fcf3ee7ed2d2fcf8d8aba
+  data.tar.gz: 16b22885432f18349e35abb396db51aad96b55ff882fbda645410e6fb7d1fc2bb59688aadebc5aab1e2ebf02a6b02417f3d55b99ebc2258850d005fb7d7e2046

data/app/controllers/educode_sales/businesses_controller.rb

@@ -34,7 +34,7 @@ module EducodeSales
           end
 
           if params[:bidded_date_year].present? && params[:bidded_date_year] != '全部'
-            gon.bidded_date = Time.new(params[:bidded_date_year]).strftime("%Y-%m-%d") + " - " + Time.new(params[:bidded_date_year]).end_of_year.strftime("%Y-%m-%d")
+            gon.bidded_date = "2015-01-01" + " - " + Time.new(params[:bidded_date_year]).end_of_year.strftime("%Y-%m-%d")
           end
           
           if params[:signed_date_year].present? && params[:signed_date_year] != '全部'
@@ -173,6 +173,12 @@ module EducodeSales
             ").where("educode_sales_follow_ups.year = ?", params[:q][:business_year])
           end
 
+          if params[:q].present? && params[:q][:o_business_deployment].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.o_business_deployment = ?", params[:q][:o_business_deployment])
+          end
+
           if params[:q].present? && params[:q][:area].present?
             p = EducodeSales::Common.find(params[:q][:area]).name
             if @current_admin.is_admin?
@@ -239,6 +245,7 @@ module EducodeSales
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.budget_amount,
+            last_follow.o_business_deployment,
             last_follow.service_time_long,
             last_follow.service_end_time,
             last_follow.service_start_time,

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -45,8 +45,7 @@ module EducodeSales
           end
           if params[:q].present? && params[:q][:area].present?
             p = EducodeSales::Common.find(params[:q][:area]).name
-            @follow_ups = @follow_ups.joins(:business).joins("
-              JOIN departments ON educode_sales_businesses.department_id = departments.id
+            @follow_ups = @follow_ups.joins(business: :department).joins("
               JOIN schools ON departments.school_id = schools.id
             ").where("province = ?", p)
           end
@@ -57,6 +56,8 @@ module EducodeSales
 
           end
 
+          @follow_ups = @follow_ups.includes(:staff, :clazz, :stage, key_person: :teacher, business: [department: :school])
+
           if params[:sort].present? && params[:sort][:field]
             @follow_ups = @follow_ups.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -22,7 +22,7 @@ module EducodeSales
         @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:total_amount).round(2)
         @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:actual_amount).round(2)
 
-        # @return_amount = Business.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)
+        @return_amount = Business.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)
         # # @return_amount = total_return[0]['return_money']&.round(2) || 0
         # @receivable_amount = @goal_amount - @return_amount
 
@@ -57,7 +57,7 @@ module EducodeSales
         # @former_return_amount = Business.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 <= ? ", year_over_time).sum(:amount).round(2)
         # @receivable_amount = @former_goal_amount - @former_return_amount
 
-        @receivable_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).select("(SUM(educode_sales_follow_ups.actual_amount) - SUM(educode_sales_businesses.return_money)) AS num")
+        @receivable_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-12-31", stage_ids).select("(SUM(educode_sales_follow_ups.actual_amount) - SUM(educode_sales_businesses.return_money)) AS num")
         @receivable_amount = @receivable_amount.present? && @receivable_amount[0]['num'] ? @receivable_amount[0]['num'].round(2) : 0
 
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)

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

@@ -142,6 +142,12 @@
                         title: '关键人',
                         templet:'<div><span title="{{d.key_people}}">{{d.key_people}}</span></div>'
                     },
+                    {
+                        field: 'tel',
+                        width: 90,
+                        title: '联系方式',
+                        templet:'<div><span title="{{d.tel}}">{{d.tel}}</span></div>'
+                    },
                     {
                         field: 'staff',
                         width: 90,
@@ -195,15 +201,15 @@
                 },
                 where: {q: search, sort: sort}
             }, 'data');
-            table.reload('businesses_table', {
-                page: {
-                    curr: 1
-                },
-                where: {q: search, sort: sort}
-            }, 'data');
-            form.val('search_form', {
-                name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area , description: data.field.description
-            })
+            // table.reload('businesses_table', {
+            //     page: {
+            //         curr: 1
+            //     },
+            //     where: {q: search, sort: sort}
+            // }, 'data');
+            // form.val('search_form', {
+            //     name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area , description: data.field.description
+            // })
             return false;
         });
 

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

@@ -19,8 +19,8 @@
     <% text += "二、本月已组织会议 \n\n"%>
     <% text += "三、客户跟进情况 \n"%>
     <% @followups.each_with_index do |d, i| %>
-      <% text += "#{i+1}、**学校--**商机：#{d .description}\n" %>
-      <p><%= i+1 %>、**学校--**商机：<%= d .description%></p>
+      <% text += "#{i+1}、#{d.business&.department&.school&.name}--**商机：#{d.description}\n" %>
+      <p><%= i+1 %>、<%= d.business&.department&.school&.name %>--**商机：<%= d.description%></p>
     <% end %>
 
     <% text += "\n四、需要协助支持事宜 \n\n"%>

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

@@ -94,9 +94,14 @@
                 </div>
               </div>
               <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
-                <label class="layui-form-label">编号</label>
+                <label class="layui-form-label">部署类型</label>
                 <div class="layui-input-inline">
-                  <input type="text" class="layui-input" id="number" name="number" placeholder=" - " autocomplete="off">
+                  <select name="o_business_deployment">
+                    <option value=""></option>
+                    <option value="1">公有云</option>
+                    <option value="2">私有云</option>
+                    <option value="3">混合云</option>
+                  </select>
                 </div>
               </div>
               <div class="layui-inline">
@@ -225,8 +230,8 @@
           value: gon.date_at
         });
 
-        
-        
+
+
         // $('#businesses_table_wraper .layui-table-body').on('scroll', function(e) {
         //   var leftPx = $(e.target).scrollLeft(); //获取表格body，滚动条距离左边的长度
         //   var left = 'translateX(-' + leftPx + 'px)';
@@ -246,7 +251,7 @@
             el: '#business_type',
             data: gon.business_type
         })
-       
+
         var business_step_list = xmSelect.render({
             el: '#business_step',
             data: gon.business_step
@@ -299,7 +304,6 @@
 
         var data = form.val("search_form");
         data.business_year = gon.business_year;
-
         data.business_type = business_type_list.getValue('valueStr')
         data.business_step = business_step_list.getValue('valueStr');
 
@@ -547,6 +551,7 @@
         var business_table = table.render({
             elem: '#businesses_table',
             url: '/missions/businesses',
+            autoSort: false,
             where: {q: data},
             toolbar: '#bussinessBar',
             defaultToolbar: ['filter'],
@@ -864,11 +869,10 @@
 
 
 
-      var sort = {}, search = {};
-      <% if params[:name].present? %>
-      search.name = "<%= params[:name] %>";
-      <% end %>
+      var sort = {}, search = data;
+
       table.on('sort(businesses_table)', function (obj) {
+        var data = form.val("search_form");
         sort.field = obj.field;
         sort.order = obj.type;
         table.reload('businesses_table', {
@@ -905,15 +909,15 @@
             },
             where: {q: search, sort: sort}
           }, 'data');
-            table.reload('teachers_table', {
-                page: {
-                    curr: 1
-                },
-                where: {q: search, sort: sort}
-            }, 'data');
-            form.val('search_follows', {
-                name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
-            })
+            // table.reload('teachers_table', {
+            //     page: {
+            //         curr: 1
+            //     },
+            //     where: {q: search, sort: sort}
+            // }, 'data');
+            // form.val('search_follows', {
+            //     name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
+            // })
             if (search['clazz'] == 'me') {
               $(".my-btn").addClass("selected-btn");
             } else if (search['clazz'] == 'followes') {

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

@@ -19,13 +19,9 @@ json.data do
     json.reception_at d.last_follow_up&.reception_at.to_s
     json.bidded_date d.last_follow_up&.bidded_date.to_s
     json.signed_date d.last_follow_up&.signed_date.to_s
+    json.o_business_deployment  EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].to_h.invert[d.last_follow_up&.o_business_deployment]
     json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
-    EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].each do |m|
-      if d.last_follow_up&.o_business_deployment == m[1]
-        json.o_business_deployment m[0]
-        break
-      end
-    end
+  
     json.divide_rate d.divide_rate
     json.divide_money d.divide_amount
     json.budget_amount d.budget_amount #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0

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

@@ -1,4 +1,4 @@
-<form class="layui-form layuimini-form " id="custom_data" data-required="true" action="">
+<div class="layui-form layuimini-form " id="custom_data" data-required="true">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
       <label class="layui-form-label required">客户：</label>
@@ -30,7 +30,7 @@
       </div>
     </div>
     <div class="layui-form-item">
-      <label class="layui-form-label">学校性质：</label>
+      <label class="layui-form-label required">学校性质：</label>
       <div class="layui-input-block">
         <input type="checkbox" name="project_985" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_985 %> title="985工程">
         <input type="checkbox" name="project_211" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_211 %> title="211工程" >
@@ -54,7 +54,7 @@
       </button>
     </div>
   </div>
-</form>
+</div>
 
 
 <script>
@@ -339,6 +339,13 @@
         form.on('submit(data-reset-btn)', function (data) {
             data.field.province = $("#province option:selected").text(); //获取选中的项
             data.field.city = $("#city option:selected").text(); //获取选中的项
+            if (data.field.enterprise == undefined && data.field.junior_college == undefined &&
+            data.field.military_school == undefined && data.field.project_211 == undefined && data.field.project_985 == undefined
+            && data.field.regular_college == undefined && data.field.secondary_school == undefined) {
+              layer.alert("请选择学校性质");
+              return false;
+            }
+         
             request.authPut("missions/customers/" + <%= @school.id %>, data.field, function (res) {
                 if (res.success === false) {
                     layer.alert(res.msg)

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

@@ -11,8 +11,9 @@ json.data do
     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 key_people(teacher_ids)
+    # teacher_ids = d.key_person.pluck(:teacher_id)
+    json.tel d.key_person.pluck(:tel).select { |d| d.present?  }.join("、")
+    json.key_people d.key_person.map { |d| d.teacher.name }.join("、")# key_people(teacher_ids)
 
   end
 end

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

@@ -25,15 +25,20 @@
       </form>
     </div>
     <canvas id="myChart" width="960" height="400"></canvas>
+    <div class="two-header" style="margin-top: 30px;">
+      <table id="followup_table" lay-filter="followup_table"></table>
+    </div>
   </div>
 </div>
 <script>
-    layui.use(['form', 'jquery', 'request', 'element'], function () {
-       form = layui.form;
+    layui.use(['form', 'jquery', 'request', 'element', 'table'], function () {
+      var table = layui.table,
+      form = layui.form;
+      chart_data = <%=raw @follow_count_data.to_json %>;
       var ctx = document.getElementById('myChart');
        myChart = new Chart(ctx, {
           type: 'line',
-          data: <%=raw @follow_count_data.to_json %>,
+          data: chart_data,
           options: {
             elements: {
               line: {
@@ -42,12 +47,46 @@
             }
           }
       });
+   
+    
       form.render();
+
+      function renderTable(chart_data) {
+        var labels = [];
+        fields = [
+          {field: 'col0', title: '姓名', width:100}
+        ];
+        chart_data.labels.forEach(function(d, i) {
+          labels.push(d);
+          fields.push({title: d.split("(").join("<br/>").replace(")", ""), field: 'col' + (i + 1), width:160,  align: 'center'})
+        })
+        var table_data = [];
+        chart_data.datasets.forEach(function(d, i) {
+          var value = {}
+          value['col0'] = d.label;
+          d.data.forEach(function(v, i1) {
+            value['col' + (i1 + 1)] = v;
+          })
+          table_data.push(value);
+        })
+        table.render({
+          elem: '#followup_table',
+          height: 312,
+          url: '',
+          limit: 30,
+          page: true,
+          data: table_data,
+          cols: [fields]
+        });
+      }
+
+      renderTable(chart_data);
       laydate.render({
         elem: '#date',
         range: true
       });
 
+     
       laydate.render({
         elem: '#date_week',
         range: true
@@ -101,7 +140,8 @@
             } else {
               myChart.data.datasets = res.data.datasets;
               myChart.data.labels = res.data.labels;
-              myChart.update()
+              myChart.update();
+              renderTable(res.data);
             }
           }
         });

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

@@ -54,9 +54,9 @@
         </div>
         </div>
         <div class="layui-input-inline" style="width: 300px;">
-          <label class="layui-form-label ">联系方式</label>
+          <label class="layui-form-label required">联系方式</label>
           <div class="layui-input-block">
-            <input type="text" class="layui-input" name="tel" autocomplete="off" value=""
+            <input type="text" class="layui-input" name="tel" autocomplete="off" value="" lay-verify="required"
                    id="tel" placeholder="请输入联系方式">
           </div>
         </div>

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

@@ -297,4 +297,7 @@
     .ul-down .layui-icon-down{
         display: none;!important;
     }
+    .two-header thead .layui-table-cell {
+      height: auto;
+    }
 </style>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.24'
+  VERSION = '0.9.26'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.24
+  version: 0.9.26
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails