educode_sales 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49cd6d76f9cd164f4672b75479bacf2d6c6c2837a8bd100074d43a5ad687d08d
-  data.tar.gz: 503d5d4c354452464da72ef216f9ad9c9ddb7da20e450ada871bb813913f3fc7
+  metadata.gz: 8cd066340676e40c41aa18730eacf453f8bf228ceb4416179f0e916581525999
+  data.tar.gz: a30becf3c8cc2c925c21b66948d429a241d3750289f5e921ab3c0cde5aeea3f4
 SHA512:
-  metadata.gz: 8eead6ddaeb216468798a82db5f674a1582a5f641f4be378c8635e500c98d06e5297c9850a62477ddf644c895d9c10d5de5f287fd3dad7c22ae789768631d42c
-  data.tar.gz: 3d258a4889bc94043a6af1d20dc54520b01ac0593f357e38d590b70c77e0e6bfafb387a15530fed83fa1f3b4aa7040038f4f2de218e41bd43dcb0d282c9d50fb
+  metadata.gz: adabc609d925eb080964dc566815134c5384f258fde90b7008296ceacf178a1435be37c553f49291844ce7043f6dfc4745f7713da687f40da40871acc67a6f8e
+  data.tar.gz: 042b06433756725fad2b2bd4bb612bca89616f3e18e6055e5c2df4a89d8ece4810f9fe80899047a52c86d60c6e263b14bdb92ee9107efe63bb662ee51dd73041

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -0,0 +1,64 @@
+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
+          if @current_admin.is_admin?
+            @money_plans = MoneyPlan.where(follow_up_id: follow_up_ids)
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level
+            case level
+            when '自己'
+              @money_plans = MoneyPlan.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.where(id: ids)
+            else
+              @money_plans = MoneyPlan.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.created_at > ? AND educode_sales_money_plans.created_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(created_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("departments.school_id").select("departments.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("departments.school_id").select("departments.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("departments.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/index.html.erb

@@ -28,7 +28,7 @@
                 </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>
@@ -58,7 +58,7 @@
                 </div>
               </div>
               <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" id="date" name="date" placeholder=" - ">
                 </div>
@@ -189,6 +189,10 @@
           defaultToolbar: ['filter'],
           toolbar: '#bussinessBar',
           totalRow: true,//开启合并行
+          initSort: {
+              field: 'latest_time' //排序字段，对应 cols 设定的各字段名
+              ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+          },
           cols: [
             [
               {

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

@@ -121,6 +121,7 @@
                     field: 'description',
                     width: 120,
                     title: '最新进展',
+                    templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
                 },
               {
                 field: 'invitation_at',