educode_sales 0.9.91 → 0.9.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb711cb66d6db0b32c6c7a79c5bc38e1fb277b6b0b1b0dcb82e656d13de8b182
-  data.tar.gz: c22d6b9965826d1464f59316f9f1f50edb75b86ecb5cbe60636f06293b9a3a6d
+  metadata.gz: f1f92a8f48adc6b2fe56f49589a71871a393f2e069e6f604e26eb5724b9633dd
+  data.tar.gz: ab873e20d22410705bb24409c4992546383b23cebfc624c8f3af7d22305e65a6
 SHA512:
-  metadata.gz: 13102675d29578ec7dfdd1f410744079b543db7a39e0406d936ff27f962f56826d06e7b9c506dfce137e0a3a875351b319a811a227d05012f2fe4725b7510adf
-  data.tar.gz: 026bc860c82d11b845947de3be099b6dbc248b777a94ef479022da16018d55e763d2c060f54b91f6baa8028ab2564f4af5616134d304339654ab78f79322a204
+  metadata.gz: b3b1a7efe2acfebe6d81ec7a43c37ee352fb7482e0e39eedea0712079a7b2cb5f5671760b3ed8aa467ac0cd267f2d1ae4089ce8eebd394b6fdf848619d3bdce1
+  data.tar.gz: 7179df8352ade2a5cfb693987063be2332a98fbe8aef723ea140bb3018d7fded90a07c791df0ef3e2e5d875209187f43abb0afbce060f5400b8430a4b58eccef

data/app/controllers/educode_sales/contracts_controller.rb

@@ -491,6 +491,21 @@ module EducodeSales
       end
     end
 
+
+    def upload_products
+      xlsx = Roo::Spreadsheet.open(params[:file])
+      ods = xlsx.sheet(0)
+      rows = ods.last_row - 1
+      i = 0
+      rows.times do |r|  #行数
+        i += 1
+        next unless ods.row(r+1)[0]
+        EducodeSales::ProductCatalog.create(name: ods.row(r+1)[0].to_s.strip, item_clazz: ods.row(r+1)[1].to_s.strip, brand: ods.row(r+1)[2].to_s.strip, specification: ods.row(r+1)[3].to_s.strip, unit: ods.row(r+1)[4].to_s.strip, param: ods.row(r+1)[5].to_s.strip, source_method: ods.row(r+1)[6].to_s.strip, supplier: ods.row(r+1)[7].to_s.strip)
+      end
+      
+      render json: { succcess: true}
+    end
+
     private
     def follow_up_params
       params.permit(:o_business_deployment, :plan_signed_date, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source, :signed_clazz)

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -173,7 +173,7 @@ module EducodeSales
     def sales_analysis
       respond_to do |format|
         format.html do
-
+          
         end
         format.js do
           x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
@@ -185,6 +185,10 @@ module EducodeSales
           goal_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%m") }.uniq
           sale_names = ['已中标', '已签单', '已回款']
 
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11)
+          @staffs = staffs.map { |d| [d.user.real_name, d.id]}
+
           if params[:goal_count_range].present?
             case params[:goal_count_range]
             when "week"
@@ -482,7 +486,20 @@ module EducodeSales
       begin_at = range[0]
       end_at = range[1]
 
-      data_1 = EducodeSales::Business.joins(:last_follow_up).
+      business = EducodeSales::Business.joins(:last_follow_up)
+      if params[:sales_staff_id].present?
+        # 销售经理
+        business = business.joins("LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = educode_sales_businesses.last_follow_up_id").
+                             where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", params[:sales_staff_id], params[:sales_staff_id])
+
+      end
+
+      if params[:property].present?
+        # 客户类型
+        business = business.joins(department: [school: :school_tags]).where("school_tags.id = ?", params[:property])
+      end 
+
+      data_1 = business.
         where("educode_sales_follow_ups.clazz_id != ?", x).
         where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).
         where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", begin_at, end_at).
@@ -507,7 +524,7 @@ module EducodeSales
         last_month = month.split("-")[0]
       end
 
-      data_2 = EducodeSales::Business.joins(:last_follow_up).
+      data_2 = business.
         where("educode_sales_follow_ups.clazz_id != ?", x).
         where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).
         where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?", begin_at, end_at).
@@ -532,7 +549,7 @@ module EducodeSales
         last_month = month.split("-")[0]
       end
 
-      data_3 = EducodeSales::Business.joins(last_follow_up: :money_plans).
+      data_3 = 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 >= ? AND educode_sales_money_plans.date_at <= ?", begin_at, end_at).

data/app/helpers/educode_sales/sale_trends_helper.rb

@@ -273,13 +273,18 @@ module EducodeSales
                  end
       staff_id = staff_id.present? ? Array(staff_id) : nil
       data = Business.joins(:last_follow_up)
-                     .where("educode_sales_follow_ups.invitation_at >= ? and educode_sales_follow_ups.invitation_at <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", start_time, end_time)
+                     .where("educode_sales_follow_ups.invitation_at >= ? and educode_sales_follow_ups.invitation_at <= ?", start_time, end_time)
+      if staff_id.present?
+        data = data.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+          where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", staff_id, staff_id)
+      end
       if property.present?
         data = data.joins(department: [school: :school_tags]).where("school_tags.id = ?", property)
       end
       case type
       when "week"
-        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.invitation_at) as week").group("yearweek(educode_sales_follow_ups.invitation_at)").sum(:budget_amount)
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.invitation_at) as week").group("yearweek(educode_sales_follow_ups.invitation_at)").sum("educode_sales_follow_ups.budget_amount")
       when "quarter"
         data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.invitation_at) as quarter, year(educode_sales_follow_ups.invitation_at) as year")
         data.group_by { |d| [d.year, d.quarter] }
@@ -287,7 +292,7 @@ module EducodeSales
         data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.invitation_at) as year, month(educode_sales_follow_ups.invitation_at) as month")
         data.group_by { |d| [d.year, d.month] }
       when "year"
-        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.invitation_at) as year").group("year(educode_sales_follow_ups.invitation_at)").sum(:budget_amount)
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.invitation_at) as year").group("year(educode_sales_follow_ups.invitation_at)").sum("educode_sales_follow_ups.budget_amount")
       end
     end
 
@@ -315,13 +320,18 @@ module EducodeSales
       # actual_amount 合同额
       staff_id = staff_id.present? ? Array(staff_id) : nil
       data = Business.joins(:last_follow_up)
-                     .where("educode_sales_follow_ups.bidded_date >= ? and educode_sales_follow_ups.bidded_date <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", start_time, end_time)
+                     .where("educode_sales_follow_ups.bidded_date >= ? and educode_sales_follow_ups.bidded_date <= ? ", start_time, end_time)
+      if staff_id.present?
+        data = data.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+          where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", staff_id, staff_id)
+      end
       if property.present?
         data = data.joins(department: [school: :school_tags]).where("school_tags.id = ?", property)
       end
       case type
       when "week"
-        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.bidded_date) as week").group("yearweek(educode_sales_follow_ups.bidded_date)").sum(:actual_amount)
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.bidded_date) as week").group("yearweek(educode_sales_follow_ups.bidded_date)").sum("educode_sales_follow_ups.actual_amount")
       when "quarter"
         data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.bidded_date) as quarter, year(educode_sales_follow_ups.bidded_date) as year")
         data.group_by { |d| [d.year, d.quarter] }
@@ -329,7 +339,7 @@ module EducodeSales
         data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.bidded_date) as year, month(educode_sales_follow_ups.bidded_date) as month")
         data.group_by { |d| [d.year, d.month] }
       when "year"
-        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.bidded_date) as year").group("year(educode_sales_follow_ups.bidded_date)").sum(:actual_amount)
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.bidded_date) as year").group("year(educode_sales_follow_ups.bidded_date)").sum("educode_sales_follow_ups.actual_amount")
       end
     end
 

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

@@ -68,7 +68,7 @@
           </div>
         </div>
         <div class="layui-inline show_item_contract" 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="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
           </div>
@@ -341,7 +341,7 @@
               {
                   field: 'invitation_at',
                   width: 105,
-                  title: '招标时间',
+                  title: '计划投标时间',
                   sort: true,
                   hide: gon.filter.invitation_at
               },

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

@@ -78,7 +78,7 @@
                 </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="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
                 </div>

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

@@ -68,7 +68,7 @@
           </div>
         </div>
         <div class="layui-inline show_item_contract" 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="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
           </div>
@@ -341,7 +341,7 @@
               {
                   field: 'invitation_at',
                   width: 105,
-                  title: '招标时间',
+                  title: '计划投标时间',
                   sort: true,
                   hide: gon.filter.invitation_at
               },

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

@@ -30,12 +30,12 @@
     <div class="layui-inline">
       <label class="layui-form-label required">项目阶段</label>
       <div class="layui-input-inline">
-        <%= select_tag "stage_id", options_for_select(@stages, @follow_up.stage_id), class: 'required' %>
+        <%= select_tag "stage_id", options_for_select(@stages, @follow_up.stage_id), { 'lay-filter': 'stage_id', class: 'required' } %>
       </div>
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label">招标时间</label>
+      <label class="layui-form-label">计划投标时间</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" value="<%= @follow_up.invitation_at %>" name="invitation_at"
           id="invitation_at_edit" placeholder="请选择日期">
@@ -194,25 +194,25 @@
 <script>
     layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {
         var form = layui.form,
-            layer = layui.layer,
-            table = layui.table,
-            xmSelect = layui.xmSelect,
-            laytpl = layui.laytpl,
-            request = layui.request,
-            laydate = layui.laydate,
-            $ = layui.$;
+          layer = layui.layer,
+          table = layui.table,
+          xmSelect = layui.xmSelect,
+          laytpl = layui.laytpl,
+          request = layui.request,
+          laydate = layui.laydate,
+          $ = layui.$;
 
         flag =
-        <%=@follow_up&.clazz_id == EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>
+        <%=@follow_up&.stage_id == EducodeSales::Common.where(name:"已签单").first&.id %>
         if (flag) {
             $(".service_show").removeClass('layui-hide')
             $(".deployment_type").removeClass('layui-hide')
         }
 
-        form.on('select(clazz_id)', function (data) {
+        form.on('select(stage_id)', function (data) {
             console.log(data.value)
             const value = data.value;
-            if (value == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
+            if (value == <%= EducodeSales::Common.where(name: "已签单").first&.id %>) {
                 $(".service_show").removeClass('layui-hide')
                 $(".deployment_type").removeClass('layui-hide')
             } else {
@@ -315,12 +315,12 @@
 
         form.render();
         form.on('submit(update_follow_up)', function (data) {
-            if (data.field.clazz_id == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
+            if (data.field.stage_id == <%= EducodeSales::Common.where(name: "已签单").first&.id %>) {
                 if (data.field.service_time.length == 0) {
                     layer.msg('请选择服务期', {time: 2000, icon: 2, shade: 0.01});
                     return false;
                 }
-                if (data.field.o_business_deployment === ''){
+                if (data.field.o_business_deployment === '') {
                     layer.msg('请选择部署类型');
                     return false // 退出添加该条记录
                 }

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

@@ -80,7 +80,7 @@
                 </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="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
                 </div>

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

@@ -34,12 +34,12 @@
     <div class="layui-inline">
       <label class="layui-form-label required">项目阶段</label>
       <div class="layui-input-inline">
-        <%= select_tag "stage_id", options_for_select(@stages, @last_follow_up&.stage_id), class: 'required' %>
+        <%= select_tag "stage_id", options_for_select(@stages, @last_follow_up&.stage_id), { 'lay-filter': 'stage_id', class: 'required', } %>
       </div>
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label">招标时间</label>
+      <label class="layui-form-label">计划投标时间</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" name="invitation_at" autocomplete="off" id="invitation_at_add"
                value="<%= @last_follow_up&.invitation_at %>"
@@ -195,25 +195,26 @@
 <script>
     layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {
         var form = layui.form,
-            layer = layui.layer,
-            table = layui.table,
-            laytpl = layui.laytpl,
-            request = layui.request,
-            laydate = layui.laydate,
-            xmSelect = layui.xmSelect,
-            $ = layui.$;
+          layer = layui.layer,
+          table = layui.table,
+          laytpl = layui.laytpl,
+          request = layui.request,
+          laydate = layui.laydate,
+          xmSelect = layui.xmSelect,
+          $ = layui.$;
 
-        flag = <%=@last_follow_up&.clazz&.name == @o_name %>
+        flag =
+        <%=@last_follow_up&.stage_id == EducodeSales::Common.where(name:"已签单").first&.id %>
         if (flag) {
             console.log(flag)
             $(".service_show").removeClass('layui-hide')
             $(".deployment_type").removeClass('layui-hide')
         }
 
-        form.on('select(clazz_id)', function (data) {
+        form.on('select(stage_id)', function (data) {
             console.log(data.value)
             const value = data.value;
-            if (value == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
+            if (value == <%= EducodeSales::Common.where(name: "已签单").first&.id %>) {
                 $(".service_show").removeClass('layui-hide')
                 $(".deployment_type").removeClass('layui-hide')
             } else {
@@ -317,12 +318,12 @@
         form.render();
 
         form.on('submit(add_follow_up)', function (data) {
-            if (data.field.clazz_id == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
+            if (data.field.stage_id == <%= EducodeSales::Common.where(name: "已签单").first&.id %>) {
                 if (data.field.service_time.length == 0) {
                     layer.msg('请选择服务期', {time: 2000, icon: 2, shade: 0.01});
                     return false;
                 }
-                if (data.field.o_business_deployment === ''){
+                if (data.field.o_business_deployment === '') {
                     layer.msg('请选择部署类型', {time: 2000, icon: 2, shade: 0.01});
                     return false // 退出添加该条记录
                 }

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

@@ -157,7 +157,7 @@
               {
                 field: 'invitation_at',
                 width: 110,
-                title: '招标时间',
+                title: '计划投标时间',
               },
               {
                 field: 'bidded_date',

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

@@ -36,7 +36,7 @@
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label">招标时间：</label>
+      <label class="layui-form-label">计划投标时间：</label>
       <div class="layui-input-inline">
         <%= @follow_up.invitation_at.to_s %>
       </div>

data/app/views/educode_sales/contracts/_list.html.erb

@@ -316,7 +316,7 @@
               {
                   field: 'invitation_at',
                   width: 105,
-                  title: '招标时间',
+                  title: '计划投标时间',
                   sort: true,
               },
               {

data/app/views/educode_sales/contracts/product_list.html.erb

@@ -38,13 +38,15 @@
 </script>
 
 <script type="text/html" id="toolbar">
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" id="upload_product_btn" style="margin-left: 20px;">批量导入产品目录</button>
     <% if can? :new_product_catalog, EducodeSales::Business %>
     <a class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="add_product">添加产品目录</a>
     <% end %>
+  
 </script>
 
 <script>
-    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown', 'laytpl', 'xmSelect'],
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown', 'laytpl', 'xmSelect', 'upload'],
         function() {
             var $ = layui.jquery,
                 form = layui.form,
@@ -52,6 +54,7 @@
                 miniPage = layui.miniPage,
                 dropdown = layui.dropdown,
                 xmSelect = layui.xmSelect,
+                upload = layui.upload,
                 laydate = layui.laydate;
             var openWH = miniPage.getOpenWidthHeight();
             var data = form.val("search_form");
@@ -127,7 +130,37 @@
                 limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
                 page: true,
                 skin: 'line',
+                done: function() {
+                    if ($('#upload_product_btn').length > 0) {
+                        uploadProduct();
+                    }
+                  }
             });
+
+            function uploadProduct() {
+                upload.render({
+                    elem: '#upload_product_btn'
+                    ,url: '/missions/contracts/upload_products'
+                    ,accept: 'file' //普通文件
+                    ,acceptMime: 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/vnd.ms-excel'
+                    ,headers: {
+                    'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+                    }
+                    ,before: function(obj){ 
+                    layer.load(); 
+                    }
+                    ,done: function(res){
+                        layer.msg('导入成功');
+                        table.reload('contact_product_table');
+                        layer.closeAll('loading'); //关闭loading
+                    }
+                    ,error: function(index, upload){
+                        table.reload('file');
+                        layer.closeAll('loading'); //关闭loading
+                        layer.alert('导入失败，请检查文件格式')
+                    }
+                });
+                }
             var sort = {},
                 search = data;
             table.on('sort(contact_product_table)', function(obj) {

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

@@ -36,7 +36,7 @@
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label" style="width: 160px;">招标时间：</label>
+      <label class="layui-form-label" style="width: 160px;">计划投标时间：</label>
       <div class="layui-input-inline">
         <%= @follow_up.invitation_at.to_s %>
       </div>

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

@@ -1,4 +1,5 @@
 x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+o = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
 json.data do
   json.array! @customers do |d|
     business_ids = EducodeSales::Business.where(school_id: d.id).ids
@@ -14,23 +15,10 @@ json.data do
     json.id d.id
     json.name d.name
     json.area d.province
-    # school_property = d.school_property
-    # property = []
-    # if school_property.present?
-    #   # property << '985工程' if school_property.project_985
-    #   # property << '211工程' if school_property.project_211
-    #   property << '本科院校' if school_property.regular_college
-    #   property << '大专院校' if school_property.junior_college
-    #   property << '中专学校' if school_property.secondary_school
-    #   property << '军事院校' if school_property.military_school
-    #   property << '企业' if school_property.enterprise
-    #   property << '小学' if school_property.ele_school
-    #   property << '中学' if school_property.mid_school
-    #   property << '其他' if school_property.other
-    # end
     json.property d.school_tags.where(for_missions: true).pluck(:name).join("、")
     json.department d.departments.size
     json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
+    json.o_business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id = ?", o).where("educode_sales_businesses.school_id = ?", d.id).size
     json.follow follow_ups.size + customer_follows.size
     json.staff EducodeSales::CustomerExtension.find_by(school_id: d.id)&.customer_staff&.user&.real_name
   end

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

@@ -181,13 +181,18 @@
                         width: 160,
                         title: '性质',
                     },
-                   
+
                     {
                         field: 'business',
                         width: 60,
                         title: '商机',
                         templet: "#business"
                     },
+                    {
+                        field: 'o_business',
+                        width: 60,
+                        title: '签单'
+                    },
                     {
                         field: 'follow',
                         width: 100,

data/app/views/educode_sales/customers/list.json.jbuilder

@@ -1,4 +1,5 @@
 x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+o = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
 json.data do
   json.array! @customers do |d|
     if d['department_id']
@@ -23,8 +24,10 @@ json.data do
     json.property d.school_tags.where(for_missions: true).pluck(:name).join("、")
     if d['department_id']
       json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.department_id = ?", d['department_id']).size
+      json.o_business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id = ?", o).where("educode_sales_businesses.department_id = ?", d['department_id']).size
     else
       json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
+      json.o_business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id = ?", o).where("educode_sales_businesses.school_id = ?", d.id).size
     end
     json.unit "#{d.name}---#{d['department_name']}"
    

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

@@ -135,25 +135,13 @@
         var forecast_myChart2 = new Chart(ctx, {
             type: 'bar',
             data: <%=raw @forecast_count_data_0.to_json %>,
-            options: {
-                elements: {
-                    line: {
-                        tension: 0
-                    }
-                }
-            }
+            options: opt
         });
         var ctx = document.getElementById('forecast_myChart2_1');
         var forecast_myChart2_1 = new Chart(ctx, {
             type: 'bar',
             data: <%=raw @forecast_count_data_1.to_json %>,
-            options: {
-                elements: {
-                    line: {
-                        tension: 0
-                    }
-                }
-            }
+            options: opt
         });
         form.render();
         form.on("submit(search_sales)", function (data) {

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

@@ -15,13 +15,25 @@
               <%= select_tag "goal_count_range", options_for_select([['按月','month'],['按年','year']],params[:goal_count_range]), {'lay-filter': 'goal_count'}%>
             </div>
           </div>
-          <div class="layui-inline">
+          <div class="layui-inline m-t-10">
             <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")  %>" 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 m-t-10">
+            <label class="layui-form-label">销售人员</label>
+            <div class="layui-input-inline">
+              <%= select_tag "sales_staff_id", options_for_select(@staffs, params[:sales_staff_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 "property", options_for_select(SchoolTag.where(for_missions: true).pluck(:name, :id), params[:property]), { include_blank: true } %>
+          </div>
+        </div>
           <div class="layui-inline">
             <button type="button" id="search_bt" class="goal_count_bt layui-btn layui-btn-primary" lay-submit lay-filter="search_sales">确定
             </button>

data/config/routes.rb

@@ -38,6 +38,7 @@ EducodeSales::Engine.routes.draw do
       get :new_sales_detail
       get :select_product
       post :sales_detail
+      post :upload_products
     end
     member do
       post :advise

data/db/migrate/20210902080918_create_educode_sales_follow_ups.rb

@@ -5,7 +5,7 @@ class CreateEducodeSalesFollowUps < ActiveRecord::Migration[5.2]
       t.references :staff
       t.integer :clazz_id, comment: '项目类型'
       t.integer :stage_id, comment: '项目阶段'
-      t.date :invitation_at, comment: '招标时间'
+      t.date :invitation_at, comment: '计划投标时间'
       t.date :reception_at, comment: '验收时间'
       t.float :total_amount, comment: '总额'
       t.float :actual_amount, comment: '实际金额'

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.91'
+  VERSION = '0.9.92'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.91
+  version: 0.9.92
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-16 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
+- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -684,7 +685,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -699,8 +700,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []