educode_sales 0.9.24 → 0.9.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c2b7f37f4b1fda07383d7cca772b7ee22fab18ca21a73ea6865f3d09e208dbc
-  data.tar.gz: 92ab5c8bd9aa56c678d3f54e7720ba6d851d4745f16c55c6b841dd9810128471
+  metadata.gz: 7326e12d52dc97f7f251f63b033f3c470591be1100f6f9bd06ab057e9a21bd14
+  data.tar.gz: 80817718f3efdcb1a247095f468123ad1111d996dffe3f858cd6b29aab0f52ad
 SHA512:
-  metadata.gz: 0f823e988d77eb4aff8ad1999a4ef058beb639bba844948144e444cd70065d0835e6865801537aabe4d03c3835f7db686edec6844de218afd925a14a2134801d
-  data.tar.gz: 6009835052d5b11ce9d9609d16e2cb5e26d0cda5afb6f9bbeb3c2d8b7acd61e4a1ea1be955e9d6873143e25d5ec48e79903d3485ed42d7c4e7a8a348546f79f4
+  metadata.gz: 4430c0f16dac2deda9e833d7962020fd8727a60d43b3823b631ac7cc5196d40c0bbd66b8170ac114e6cdf5dc197978f3674dfe2d5dad720963baefce8537f76a
+  data.tar.gz: 34fb199238d1d1181e1b07fb8f2e00371e271aa9cc3689af2a916dbeb089f9a2624a0c14140de4cbc550d9faa04a03525db1c9407e9b5d3ae439e8d8152946f9

data/app/controllers/educode_sales/businesses_controller.rb

@@ -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/views/educode_sales/businesses/_follows.html.erb

@@ -195,15 +195,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/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/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.25'
 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.25
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2022-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails