educode_sales 0.9.11 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d534830cae9ef959ed6e065bb7a22a2053fdf5f6468b419cd6b2aa9d722510d
-  data.tar.gz: dc65d43f30d446b7fe4d2a22af6d18a165fd0e5b14625919ef8232e6491a3916
+  metadata.gz: 4db1ec1643645ed1b2f0aa28039be04b70269e6b24514a0519781e4b7b69ea0f
+  data.tar.gz: bf98a690a3f4b0da0780a136507b47bfd2d34ac12cb662f653e42a97bf248536
 SHA512:
-  metadata.gz: b37037787d835f6abc6d78f58f56ec5344779090f68583b04ff16f3f2e2946fdd53a043f1fcb829152c9c6402e90b610cf6e08b3d0f456053b8d3a553ae69063
-  data.tar.gz: 8ad3b95b4c49d649a43ea1b7135dd9c8f1a2ea7761657471cb235e1b9ec3b9f8dc26ef5cbf83643e0140d7eba5bd5f6d899a631bc8b84a15885197041b5daac6
+  metadata.gz: a8aa2131475a00d57a73206c74b63b8406db8297c25bd078e3765f93d2323aebc1f9e9358f492786f7e059acb6585b8d8e30426615484e390750bf1375d1a2a2
+  data.tar.gz: a7dac1cd0912e660b80b570b518a547c5720731843ec77f50331e9f83caac82acabb7e7455623c99ebd34970f5127d4437e78c00f9aa6e2453bd419bf63fe70d

data/app/controllers/educode_sales/businesses_controller.rb

@@ -81,6 +81,8 @@ module EducodeSales
             @year = params[:q][:name].split("-")[1].present? ? params[:q][:name].split("-")[1] : ''
           end
 
+          @budget_stage_ids = Common.where(clazz: '商机阶段', name: ['初步接洽', '准备方案','已交方案', '已立项']).pluck(:id)
+
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-现有商机)"
             ids = Common.where(extras: %w[a_class b_class c_class d_class e_class o_class]).pluck(:id)
             if @year == '全部'
@@ -255,6 +257,11 @@ module EducodeSales
       end
     end
 
+    def daily_paper
+      @followups = EducodeSales::FollowUp.where(staff_id: @current_admin.id).where("updated_at > ?", Time.now.beginning_of_day).order("updated_at")
+      render layout: false
+    end
+
     def create
       department = Department.find(params[:department_id])
       business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -11,7 +11,7 @@ module EducodeSales
       x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
       o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
       if (@year == '全部')
-        @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)
+        @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:total_amount).round(2)
         stage_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
         # 中标总金额， 已回款总金额
         total_return = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).select("sum(total_amount) AS total, sum(educode_sales_businesses.return_money) AS return_money")
@@ -34,7 +34,7 @@ module EducodeSales
         year_over_time = "#{@year}-12-31 23:59:59"
 
         @sale_trend = SaleTrend.find_or_create_by(year: @year)
-        @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.year = ?", @year).sum(:total_amount).round(2)
+        @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).where("educode_sales_follow_ups.year = ?", @year).sum(:total_amount).round(2)
         stage_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
 
         # 中标总金额， 已回款总金额
@@ -214,20 +214,25 @@ module EducodeSales
         end
         format.js do
           x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+          o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
           provinces = EducodeSales::Common.where(clazz: 'area').pluck(:name)
           if params[:business_count_type] == 'money' || params[:business_count_type].blank?
+            data = provinces.map { |province|
+              if params[:business_type].blank?
+                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:total_amount).round(2)
+              else
+                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id = ?", params[:business_type]).sum(:total_amount).round(2)
+              end
+            }
+            if params[:sort_by].present?
+              data.sort! { |a, b| params[:sort_by] == 'asc' ?  a <=> b  : b <=> a }
+            end
             @business_data = {
               labels: provinces,
               datasets: [
                 {
                   label: "商机总额",
-                  data: provinces.map { |province|
-                    if params[:business_type].blank?
-                      Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)
-                    else
-                      Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id = ?", params[:business_type]).sum(:total_amount).round(2)
-                    end
-                  },
+                  data: data,
                   backgroundColor: SaleTrend::COLORS[0],
                   borderColor: SaleTrend::COLORS[0],
                   borderWidth: 1
@@ -235,18 +240,22 @@ module EducodeSales
               ]
             }
           else
+            data = provinces.map { |province|
+              if params[:business_type].blank?
+                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).count
+              else
+                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id = ?", params[:business_type]).count
+              end
+            }
+            if params[:sort_by].present?
+              data.sort! { |a, b| params[:sort_by] == 'asc' ?  a <=> b  : b <=> a }
+            end
             @business_data = {
               labels: provinces,
               datasets: [
                 {
                   label: "商机数量",
-                  data: provinces.map { |province|
-                    if params[:business_type].blank?
-                      Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ?", x).count
-                    else
-                      Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id = ?", params[:business_type]).count
-                    end
-                  },
+                  data: data,
                   backgroundColor: SaleTrend::COLORS[0],
                   borderColor: SaleTrend::COLORS[0],
                   borderWidth: 1

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

@@ -5,7 +5,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">活动名称</label>
       <div class="layui-input-block">
-        <input type="text" name="name" required lay-verify="required" autocomplete="off"
+        <input type="text" name="name" required lay-verify="required"
                class="layui-input" value="<%= @activity.name %>">
       </div>
     </div>
@@ -19,7 +19,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">活动天数</label>
       <div class="layui-input-block">
-        <input type="text" name="days" required lay-verify="required" autocomplete="off"
+        <input type="text" name="days" required lay-verify="required"
                class="layui-input" value="<%= @activity.days %>">
       </div>
     </div>

data/app/views/educode_sales/activities/new.html.erb

@@ -5,7 +5,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">活动名称</label>
       <div class="layui-input-block">
-        <input type="text" name="name" required lay-verify="required" autocomplete="off" placeholder="请输入"
+        <input type="text" name="name" required lay-verify="required" placeholder="请输入"
                class="layui-input" id="inputFocus">
       </div>
     </div>
@@ -18,7 +18,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">活动天数</label>
       <div class="layui-input-block">
-        <input type="text" name="days" required lay-verify="required" autocomplete="off"
+        <input type="text" name="days" required lay-verify="required"
                class="layui-input">
       </div>
     </div>

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

@@ -4,13 +4,13 @@
       <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">
+          <input type="text" name="name" class="layui-input">
         </div>
       </div>
       <div class="layui-inline">
         <label class="layui-form-label">单位</label>
         <div class="layui-input-inline">
-          <input type="text" name="department" autocomplete="off" class="layui-input">
+          <input type="text" name="department" class="layui-input">
         </div>
       </div>
       <div class="layui-inline">
@@ -34,7 +34,7 @@
       <div class="layui-inline">
         <label class="layui-form-label">最新进展</label>
         <div class="layui-input-inline">
-          <input type="text" name="description" autocomplete="off" class="layui-input">
+          <input type="text" name="description" class="layui-input">
         </div>
       </div>
 
@@ -53,6 +53,7 @@
 <script type="text/html" id="toolbarDemo_follows">
   <div class="layui-btn-container">
     <span class="table-label">跟进动态</span>
+    <a class="layui-btn layui-btn-normal layui-btn-sm" style="margin-left: 20px;" lay-event="report_day">日报</a>
   </div>
 </script>
 <script type="text/html" id="currentTableBar_follows">
@@ -218,6 +219,24 @@
             })
             return false;
         });
+        table.on('toolbar(teachers_table)', function(obj){
+          if (obj.event === 'report_day') {
+            content = miniPage.getHrefContent('/missions/businesses/daily_paper');
+              openWH = miniPage.getOpenWidthHeight();
+              index = layer.open({
+                  title: '',
+                  type: 1,
+                  shade: 0.2,
+                  // maxmin: true,
+                  shadeClose: true,
+                  area: ['600px', '600px'],
+                  content: content
+              });
+              $(window).on("resize", function () {
+                  layer.full(index);
+              });
+            }
+        })
         table.on('tool(teachers_table)', function (obj) {
             var data = obj.data;
             id = data.id
@@ -238,7 +257,6 @@
                     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);

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

@@ -0,0 +1,27 @@
+<div style="padding: 15px;" id="day_content">
+  <h2>今日跟进动态</h2>
+  <hr>
+  <div style="height: 480px;overflow: auto;">
+    <% text = "\n" %>
+    <% @followups.each_with_index do |d, i| %>
+      <% text += "#{i+1}、**学校--**商机：#{d .description}\n" %>
+      <p style="margin-bottom: 10px;"><%= i+1 %>、**学校--**商机：<%= d .description%></p>
+    <% end %>
+  </div>
+
+  <div id="content" style="display: none;" data-content="今日跟进动态<%=text %>"></div>
+  <button type="button" onclick="copy()" style=" margin-right: 20px; float: right;" class="layui-btn layui-btn-primary">复制</button>
+</div>
+<script>
+function copy() {
+  var copyText = document.getElementById("content").dataset.content;
+  var textArea = document.createElement("textarea");
+  textArea.value = copyText;
+  document.body.appendChild(textArea);
+  textArea.select();
+  if (document.execCommand("Copy")) {
+    layer.msg('已复制到剪贴板');
+    textArea.remove();
+  }
+}
+</script>

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

@@ -17,14 +17,14 @@
               <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" value="<%=params[:name] %>">
-                  <input type="text" style="display: none" name="place_id" autocomplete="off" class="layui-input" value="<%=params[:place_id] %>">
+                  <input type="text" name="name" class="layui-input" value="<%=params[:name] %>">
+                  <input type="text" style="display: none" name="place_id" class="layui-input" value="<%=params[:place_id] %>">
                 </div>
               </div>
               <div class="layui-inline">
                 <label class="layui-form-label">单位</label>
                 <div class="layui-input-inline">
-                  <input type="text" name="department" autocomplete="off" value="<%=params[:school] %>" class="layui-input">
+                  <input type="text" name="department" value="<%=params[:school] %>" class="layui-input">
                 </div>
               </div>
               <div class="layui-inline">
@@ -92,7 +92,9 @@
             </div>
           </form>
         </div>
-        <table class="layui-hide" id="businesses_table" lay-filter="businesses_table"></table>
+        <div id="businesses_table_wraper">
+          <table class="layui-hide" id="businesses_table" lay-filter="businesses_table"></table>
+        </div>
       </div>
     </div>
   </div>
@@ -178,7 +180,7 @@
             miniPage = layui.miniPage,
             dropdown = layui.dropdown,
             laydate = layui.laydate;
-
+        var openWH = miniPage.getOpenWidthHeight();
         laydate.render({
             elem: '#date',
             range: true
@@ -188,12 +190,10 @@
             range: true
         });
 
-        // function hn() {
-        //     $("#search_bt").trigger("click");
-        // }
-        //
-        // $(document).ready(function () {
-        //     window.onload = hn;
+        // $('#businesses_table_wraper .layui-table-body').on('scroll', function(e) {
+        //   var leftPx = $(e.target).scrollLeft(); //获取表格body，滚动条距离左边的长度
+        //   var left = 'translateX(-' + leftPx + 'px)';
+        //   $('#businesses_table_wraper .layui-table-header .layui-table').css('transform', left); //设置表格header的内容反向(-)移动
         // });
 
         var is_show =
@@ -262,7 +262,7 @@
 
         var data = form.val("search_form");
         data.business_type = "<%=params[:clazz_id] %>";
-    
+
 
         table = layui.table;
         var cols_table = [
@@ -375,6 +375,13 @@
                     sort: true,
                     hide: gon.filter.bidded_date
                 },
+                {
+                    field: 'budget_money',
+                    width: 105,
+                    title: '预算金额',
+                    sort: true,
+                    hide: gon.filter.budget_money
+                },
                 {
                     field: 'signed_date',
                     width: 105,
@@ -498,10 +505,18 @@
           limits: [10,15,20,30,40,50,60,70,80,90],
           page: true,
           skin: 'line',
-          done: function (res) {
-              exportData=res.data;
-              drowpdwonRender()
-            export_drowpdwonRender()
+          done: function (res, curr, coun) {
+            exportData=res.data;
+            drowpdwonRender();
+            export_drowpdwonRender();
+            // let headerTop = $('.layui-table-header').offset().top; //获取表格头到文档顶部的距离
+            // $(".layuimini-content-page").scroll(function () {
+            //   if ((headerTop - $(".layuimini-content-page").scrollTop()) < -185) { //超过了
+            //     $('#businesses_table_wraper .layui-table-header').addClass('table-header-fixed'); //添加样式，固定住表头
+            //   } else { //没超过
+            //     $('#businesses_table_wraper .layui-table-header').removeClass('table-header-fixed'); //移除样式
+            //   }
+            // });
           }
       });
 

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

@@ -26,7 +26,7 @@ json.data do
         break
       end
     end
-
+    json.budget_money d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
     json.area d.department.school.province
     school_property = d.department.school.school_property
     property = []

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

@@ -4,7 +4,7 @@
       <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">
+          <input type="text" name="name" class="layui-input">
         </div>
       </div>
       <div class="layui-inline">

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

@@ -4,13 +4,13 @@
       <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">
+          <input type="text" name="business" 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">
+          <input type="text" name="school" class="layui-input">
         </div>
       </div>
       <div class="layui-inline">

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

@@ -4,7 +4,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">渠道名称</label>
       <div class="layui-input-block" style="line-height: 36px;">
-        <input type="text" name="name" id="name" required lay-verify="required" autocomplete="off"
+        <input type="text" name="name" id="name" required lay-verify="required"
                class="layui-input" value="<%= @place.name %>">
         <%#= text_field_tag(:name, @place.name) %>
       </div>

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

@@ -4,7 +4,7 @@
       <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">
+          <input type="text" name="name" class="layui-input">
         </div>
       </div>
       <div class="layui-inline">

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

@@ -4,7 +4,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">渠道名称</label>
       <div class="layui-input-block">
-        <input type="text" name="name" required lay-verify="required" autocomplete="off"
+        <input type="text" name="name" required lay-verify="required"
                class="layui-input" id="inputFocus">
       </div>
     </div>

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

@@ -15,6 +15,12 @@
               <%= select_tag "business_type", options_for_select(EducodeSales::Common.where(clazz: 'business_type').where.not(extras: "x_class").pluck(:name, :id), params[:business_type]), { 'lay-filter': 'clazz_id', include_blank: true } %>
             </div>
           </div>
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">顺序</label>
+            <div class="layui-input-inline">
+              <%= select_tag "sort_by",  options_for_select([['', ''], ['升序', 'asc'], ['降序', 'desc']], params[:sort_by]), { 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_area">确定
             </button>

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

@@ -10,7 +10,7 @@
       <div class="layui-inline">
         <label class="layui-form-label">用户名</label>
         <div class="layui-input-inline large-select">
-          <input type="text" class="layui-input" id="name" autocomplete="off" name="name">
+          <input type="text" class="layui-input" id="name" name="name">
         </div>
       </div>
       <div class="layui-inline">

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

@@ -4,13 +4,13 @@
       <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">
+          <input type="text" name="name" 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">
+          <input type="text" name="school" class="layui-input">
         </div>
       </div>
       <div class="layui-inline">

data/config/routes.rb

@@ -106,6 +106,7 @@ EducodeSales::Engine.routes.draw do
       get :upload_file
       get :following_businesses
       get :followed
+      get :daily_paper
     end
 
     member do

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.11'
+  VERSION = '0.9.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.13
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,6 +234,7 @@ files:
 - app/views/educode_sales/assessments/new.html.erb
 - app/views/educode_sales/assessments/progress.json.jbuilder
 - app/views/educode_sales/businesses/_follows.html.erb
+- app/views/educode_sales/businesses/daily_paper.html.erb
 - 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