educode_sales 0.6.2 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97a73ea8470e60cc322017425b3af50411105d237ae981f490aef1df1cd2816f
-  data.tar.gz: 3711b02d39d60076344835b00d1ff44fc152d30a0671eee314096cb817f720f0
+  metadata.gz: 10da162d2ac59ca7795046ebe7239e9c3b64851c4b0ea8fb519eaf0667cd78bf
+  data.tar.gz: faf089944ea187641184a31781c809597ca0327eb3b9af8a553391c4d07366b3
 SHA512:
-  metadata.gz: 30dda9e9c18079954c459b90f623735b7c286d8a8c0fb6c42ab32464289bdd8133f87d39d938d8d20979b5eb944b65362910d1edf675f32e82c62cefc3ebfdf5
-  data.tar.gz: 73f820c375a6035995ddcbae380fd39fd07d7db4b2d53e27637c3e6c955371b1a7fe4d4e4ed7649544090501ad2c2aefba4ce02dd6adb9a0778d7313429ba354
+  metadata.gz: 17fe4f762532aa69ab8f29e5c9c7f23aca27f0c22ac38fd7570d6a435039dd2a5b344db15104c2e15de9f0032a7e30f2b3c135cad7385bbb961cb3dd7e6eb167
+  data.tar.gz: 69fba60e0c97e2c9fbb1debf1ce4a1fab27527260ee87696b7d5861fa0c0ec6deb500efaa1eeafdebdaa3f19a0713e9ddb64c11317a608850c199e7a4bde78ec

data/app/controllers/educode_sales/businesses_controller.rb

@@ -33,15 +33,25 @@ module EducodeSales
         format.html do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
-          @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business)
+          # @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business) || can?(:show_file, EducodeSales::Business)
+          @more = true
           gon.menus = []
           gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
+          gon.business_type = Common.where(clazz: 'business_type').map do |d|
+            {value: d.id, name: d.name}
+          end
+          gon.type = params[:clazz_id].present? ? [{ value: params[:clazz_id], name: Common.find(params[:clazz_id]).name }] : []
+          gon.business_step = Common.where(clazz: 'business_step').map do |d|
+            {value: d.id, name: d.name}
+          end
           if can?(:create, EducodeSales::SalePlan)
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
           end
           gon.menus << { title: '跟进时间线', event: 'time_line' }
-          gon.menus << { title: '附件管理', event: 'file' }
+          if can?(:show_file, EducodeSales::Business)
+            gon.menus << { title: '附件管理', event: 'file' }
+          end
           if can?(:update, EducodeSales::Business)
             gon.menus << { title: '编辑', event: 'edit' }
           end
@@ -76,7 +86,9 @@ module EducodeSales
             b_id = Common.find_by(extras: EducodeSales::Common::BTYPE)&.id
             c_id = Common.find_by(extras: EducodeSales::Common::CTYPE)&.id
             d_id = Common.find_by(extras: EducodeSales::Common::DTYPE)&.id
-            ids = [a_id ,b_id ,c_id ,d_id]
+            e_id = Common.find_by(extras: EducodeSales::Common::ETYPE)&.id
+            o_id = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
+            ids = [a_id ,b_id ,c_id ,d_id ,e_id ,o_id]
             @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.clazz_id in (?)",ids)
@@ -135,12 +147,12 @@ module EducodeSales
           if params[:q].present? && params[:q][:business_type].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.clazz_id = ?", params[:q][:business_type])
+            ").where("educode_sales_follow_ups.clazz_id in (?)", params[:q][:business_type].split(",").map(&:to_i))
           end
           if params[:q].present? && params[:q][:business_step].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.stage_id = ?", params[:q][:business_step])
+            ").where("educode_sales_follow_ups.stage_id in (?)", params[:q][:business_step].split(",").map(&:to_i))
           end
           if  params[:q].present? && params[:q][:place_id].present?
             @businesses = @businesses.joins("
@@ -172,7 +184,14 @@ module EducodeSales
 
           if params[:q].present? && params[:q][:date].present?
             date = params[:q][:date].split(" - ")
-            @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1])
+            @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1] + '23:59:59')
+          end
+
+          if params[:q].present? && params[:q][:invitation_at].present?
+            date = params[:q][:invitation_at].split(" - ")
+            @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.invitation_at > ? AND educode_sales_follow_ups.invitation_at < ?", date[0] + '00:00:00', date[1] + '23:59:59')
           end
 
           if params[:sort].present? && params[:sort][:field]
@@ -193,6 +212,7 @@ module EducodeSales
             last_follow.signed_date,
             last_follow.created_at as latest_time,
             last_follow.actual_amount,
+            (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
           ").page(params[:page]).per(params[:limit])

data/app/controllers/educode_sales/customers_controller.rb

@@ -162,6 +162,7 @@ module EducodeSales
         @school.attributes = school_params
         @school.school_property = property
         @school.save!
+        EducodeSales::CustomerExtension.create(customer_staff_id: @current_admin.id, school_id: @school.id)
       end
       render_success
     end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -34,7 +34,7 @@ module EducodeSales
           end
           if params[:q].present? && params[:q][:follows_date].present?
             date = params[:q][:follows_date].split(" - ")
-            @follow_ups = @follow_ups.where("educode_sales_follow_ups.created_at > ? AND educode_sales_follow_ups.created_at < ?", date[0], date[1])
+            @follow_ups = @follow_ups.where("educode_sales_follow_ups.created_at > ? AND educode_sales_follow_ups.created_at < ?", date[0], date[1] + '23:59:59')
           end
           if params[:q].present? && params[:q][:staff_id].present?
             @follow_ups = @follow_ups.where(staff_id: params[:q][:staff_id])

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -0,0 +1,65 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class MoneyPlansController < ApplicationController
+
+    def index
+      follow_up_ids = Business.pluck(:last_follow_up_id)
+      authorize! :read, MoneyPlan
+      respond_to do |format|
+        format.html do
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+        end
+        format.json do
+          x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+          if @current_admin.is_admin?
+            @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level
+            case level
+            when '自己'
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.staff_id)
+            when '区域'
+              a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.staff_id).ids
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+              b_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
+              ids = a_ids + b_ids
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(id: ids)
+            else
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
+            end
+          end
+
+          if params[:q].present? && params[:q][:business].present?
+            follow_up_ids = Business.where("name like ?", "%#{params[:q][:business]}%").pluck(:last_follow_up_id)
+            @money_plans = @money_plans.where(follow_up_id: follow_up_ids)
+          end
+          if params[:q].present? && params[:q][:school].present?
+            school_ids = School.where("name like ?", "%#{params[:q][:school]}%").pluck(:id)
+            follow_up_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
+            @money_plans = @money_plans.where(follow_up_id: follow_up_ids)
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            @money_plans = @money_plans.where(staff_id: params[:q][:staff_id])
+          end
+          if params[:q].present? && params[:q][:clazz].present?
+            @money_plans = @money_plans.where(clazz: params[:q][:clazz])
+          end
+          if params[:q].present? && params[:q][:date].present?
+            date = params[:q][:date].split(" - ")
+            @money_plans = @money_plans.where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at < ?", date[0], date[1] + '23:59:59')
+          end
+
+          if params[:sort].present? && params[:sort][:field]
+            @money_plans = @money_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @money_plans = @money_plans.order(date_at: :desc)
+          end
+          @total_amount = @money_plans.sum(:amount)
+          @money_plans = @money_plans.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+  end
+end

data/app/controllers/educode_sales/roles_controller.rb

@@ -16,7 +16,7 @@ module EducodeSales
 
     def create
       role = Role.new(name: params[:name])
-      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, {clazz:'Customer'}])
+      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, {clazz:'Customer'}, {clazz:'MoneyPlan'}])
       if role.save
         render_success
       else
@@ -81,6 +81,9 @@ module EducodeSales
       r = role.role_areas.find_or_initialize_by(clazz: 'Customer')
       r.level = params[:customer]
       r.save
+      r = role.role_areas.find_or_initialize_by(clazz: 'MoneyPlan')
+      r.level = params[:money_plan]
+      r.save
       render_success
     end
 

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -74,18 +74,46 @@ module EducodeSales
 
       #商机区域分布图表
       provinces = EducodeSales::Common.where(clazz: 'area').pluck(:name)
-      @business_data =  {
-        labels: provinces,
-        datasets:[
-          {
-            label: "商机总额",
-            data: provinces.map{|province| 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)},
-            backgroundColor: colors[0],
-            borderColor: colors[0],
-            borderWidth: 1
-          }
-        ]
-      }
+      if params[:business_count_type] == 'money' || params[:business_count_type].blank?
+        @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
+              },
+              backgroundColor: colors[0],
+              borderColor: colors[0],
+              borderWidth: 1
+            }
+          ]
+        }
+      else
+        @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
+              },
+              backgroundColor: colors[0],
+              borderColor: colors[0],
+              borderWidth: 1
+            }
+          ]
+        }
+      end
+
 
 
       # 已中标图表

data/app/controllers/educode_sales/staffs_controller.rb

@@ -67,14 +67,13 @@ module EducodeSales
 
     def follow_up_schools
       staff = Staff.find(params[:id])
-      # @schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at").page(params[:page]).per(params[:limit])
-      @schools = EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_teacher_follows.updated_at) AS updated_at")+EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at")
-      @count =  EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").count
+      @schools = EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{staff.id}").group("departments.school_id").select("departments.school_id, max(educode_sales_teacher_follows.updated_at) AS updated_at") + EducodeSales::Business.joins(:follow_ups, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("departments.school_id").select("departments.school_id, max(educode_sales_follow_ups.updated_at) AS updated_at")
+      @count =  EducodeSales::Business.joins(:follow_ups, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("departments.school_id").count
     end
 
     def follow_up_departments
       staff = Staff.find(params[:id])
-      @schools = EducodeSales::Business.joins(:last_follow_up, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("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 = #{staff.id}").select("departments.name, schools.name AS school, educode_sales_teacher_follows.updated_at")
+      @schools = (EducodeSales::Business.joins(:follow_ups, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.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 = #{staff.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_teacher_follows.updated_at")).uniq{|s| s.id}
     end
 
 

data/app/models/educode_sales/permission.rb

@@ -11,7 +11,8 @@ module EducodeSales
       '教师运营': 'teacher',
       '活动运营': 'activity',
       '运营计划': 'operation_plan',
-      '客户管理': 'customer'
+      '客户管理': 'customer',
+      '回款管理': 'money_plan'
     }
   end
 end

data/app/models/educode_sales/role_area.rb

@@ -9,6 +9,7 @@ module EducodeSales
       '教师运营': 'Teacher',
       '运营计划': 'Operation',
       '客户管理': 'Customer',
+      '回款管理': 'MoneyPlan'
     }
   end
 end

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

@@ -100,10 +100,16 @@
                         templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
                     },
                     {
-                        field: 'advise',
+                        field: 'business',
                         width: 120,
-                        title: '团队建议',
-                        templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
+                        title: '所属商机',
+                        templet:'#business'
+                    },
+                    {
+                        field: 'school',
+                        width: 120,
+                        title: '单位',
+                        templet:'#school'
                     },
                     {
                         field: 'clazz',
@@ -117,24 +123,18 @@
                         width: 90,
                         templet:'<div><span title="{{d.stage}}">{{d.stage}}</span></div>'
                     },
+                    {
+                        field: 'advise',
+                        width: 120,
+                        title: '团队建议',
+                        templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
+                    },
                     {
                         field: 'key_people',
                         width: 90,
                         title: '关键人',
                         templet:'<div><span title="{{d.key_people}}">{{d.key_people}}</span></div>'
                     },
-                    {
-                        field: 'business',
-                        width: 120,
-                        title: '所属商机',
-                        templet:'#business'
-                    },
-                    {
-                        field: 'school',
-                        width: 120,
-                        title: '单位',
-                        templet:'#school'
-                    },
                     {
                         field: 'staff',
                         width: 90,

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

@@ -11,6 +11,9 @@
       <label class="layui-form-label required">单位部门</label>
       <div class="layui-input-block" id="department" style="width: 300px;"></div>
     </div>
+    <div class="layui-inline" >
+      <a href="/missions/customers" style=" color: #0000FF">添加单位/部门</a>
+    </div>
     <br>
     <div class="layui-inline" style="padding-top: 20px">
       <label class="layui-form-label ">商机来源</label>

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

@@ -69,12 +69,14 @@
       <div class="layui-input-inline">
         <input name="total_amount" type="number" class="layui-input" value="<%= @follow_up.total_amount %>">
       </div>
-    </div>
+      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。    </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
          <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
       </div>
+      客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
     <br>
     <div class="layui-inline place_select">
@@ -82,7 +84,9 @@
       <div class="layui-input-inline" style="z-index: 101">
         <div id="edit_place" style="width: 190px;"></div>
       </div>
+    总额里，渠道拿到的部分。
     </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
@@ -95,14 +99,19 @@
         <div class="layui-input-inline">
           <input type="text" class="layui-input" name="year"  lay-verify="required" autocomplete="off" id="edit_year"
                  value="<%= @follow_up&.year%>"
-                 placeholder="请选择年度">      </div>
+                 placeholder="请选择年度">
+        </div>
       </div>
     </div>
     <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="z-index: 102">
         <div id="edit_assign_follow" style="width: 512px;"></div>
       </div>
+      <div class="layui-inline" style="padding: 9px 15px">
+        <label class="layui-form-label" style="padding-left: 220px"></label>
+        指定跟进人和商机创建者，同时拥有对该商机的管理权限
+      </div>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">最新进展</label>

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

@@ -2,9 +2,9 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">附件信息</span>
-    <%# if can? :create, EducodeSales::file %>
+    <% if can? :upload_file, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="upload_file">上传文件</button>
-    <%# end %>
+    <% end %>
   </div>
 </script>
 
@@ -12,8 +12,12 @@
 
 <script type="text/html" id="currentTableBar_file">
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="preview">预览</a>
-  <a href="/missions/upload_files/download?id={{d.id}}" class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="download">下载</a>
-    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% if can? :download_file, EducodeSales::Business %>
+<a href="/missions/upload_files/download?id={{d.id}}" class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="download">下载</a>
+  <% end %>
+  <% if can? :delete_file, EducodeSales::Business %>
+<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
 </script>
 
 <script type="text/html" id="showchance">

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

@@ -28,46 +28,54 @@
                 </div>
               </div>
               <div class="layui-inline">
-                <label class="layui-form-label">销售人员</label>
+                <label class="layui-form-label">最新跟进人</label>
                 <div class="layui-input-inline">
                   <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_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 "business_type", options_for_select(EducodeSales::Common.where(clazz: 'business_type').pluck(:name, :id), params[:clazz_id]), { 'lay-filter': 'clazz_id', include_blank: true } %>
+                  <div id="business_type" style="width: 190px;"></div>
                 </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 "business_step", options_for_select(EducodeSales::Common.where(clazz: 'business_step').pluck(:name, :id)), { include_blank: true } %>
+                  <div id="business_step" style="width: 190px;"></div>
                 </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">
                   <div id="index_place" style="width: 190px;"></div>
                 </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">
-                <label class="layui-form-label">起止时间</label>
+              <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" placeholder=" - ">
                 </div>
               </div>
+              <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="invitation_at" name="invitation_at" placeholder=" - ">
+                </div>
+              </div>
               <div class="layui-inline">
                 <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
                 </button>
                 <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">搜索
                 </button>
+                <a style="padding-left: 20px;color: #0000FF"  href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">展开/收起
+                </a>
               </div>
             </div>
           </form>
@@ -126,6 +134,10 @@
         elem: '#date',
         range: true
       });
+      laydate.render({
+        elem: '#invitation_at',
+        range: true
+      });
 
          var is_show = <%=params[:name].present? || params[:clazz_id].present? || params[:place_id].present? || params[:school].present? %>
       if(is_show){
@@ -135,6 +147,15 @@
           $('.businesses_list_div').addClass('layui-show');
       }
 
+        var business_type_list = xmSelect.render({
+            el: '#business_type',
+            data: gon.business_type
+        })
+        business_type_list.setValue(gon.type)
+        var business_step_list = xmSelect.render({
+            el: '#business_step',
+            data: gon.business_step
+        })
         var index_place_list = xmSelect.render({
             el: '#index_place',
             model: {
@@ -300,6 +321,13 @@
                 sort: true,
                   totalRow: true
               },
+              {
+                field: 'wait_return_money',
+                width: 100,
+                title: '待回款',
+                sort: true,
+                  totalRow: true
+              },
               {
                 field: 'place',
                 width: 160,
@@ -481,7 +509,17 @@
 
         // 监听搜索操作
         form.on('submit(search_bussiness)', function (data) {
+            var business_type = [];
+            business_type_list.getValue().forEach(function(d) {
+                business_type.push(d.value);
+            })
+            var business_step = [];
+            business_step_list.getValue().forEach(function(d) {
+                business_step.push(d.value);
+            })
             data.field.place_id = index_place_list.getValue('valueStr');
+            data.field.business_type = business_type.toString();
+            data.field.business_step = business_step.toString();
             search = data.field
             console.log(search);
             table.reload('businesses_table', {
@@ -503,13 +541,21 @@
           return false;
         });
 
+        form.on('submit(show_hide)', function (data) {
+            $(".show_item").toggle()
+            return false;
+        });
         form.on('submit(reset_business_search)', function (data) {
           var field = data.field;
           form.val('search_form', {
               name: '', department: '', staff_id: '', business_type: '', business_step: '',
-              place_id: '', date: '', area: ''
+              place_id: '', date: '', area: '', invitation_at: ''
           })
-          return false;
+            business_type_list.setValue([])
+            business_step_list.setValue([])
+            index_place_list.setValue([])
+
+            return false;
         });
 
         table.on('toolbar(businesses_table)', function (obj) {

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

@@ -6,7 +6,7 @@ json.data do
     json.department d.department.name
     json.school d.department.school.name
     json.school_id d.department.school.id
-    json.follow_ups_count d.follow_ups_count
+    json.follow_ups_count d.follow_ups.where(deleted_at: nil).size
     follow_ups_count += d.follow_ups_count
     json.follow_up_id d.last_follow_up_id
     # json.teachers_count d.follow_ups.sum(:key_people_count)
@@ -20,13 +20,14 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.actual_amount d.last_follow_up&.actual_amount
     json.return_money d.return_money
+    json.wait_return_money d.wait_return_money.to_i.round(2)
     json.place d.last_follow_up&.place&.name
     json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
     json.source d.source
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id
-    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : d.created_at.to_s
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
   end
 end