educode_sales 0.9.55 → 0.9.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d84bb1c7e9e34758e91acc40d652ddd0d5349078f7415634e9b543354e801f7a
-  data.tar.gz: e27fd016f131694941d502c8e9111fc3eb530f8f95484af1518754966602ca80
+  metadata.gz: d43d1ba82cba7ea2e8d642794ff31eea996e7c404c814a9bd7c0b2f01ce089b2
+  data.tar.gz: 4260ff16cbd4be8cd7346d33d3ef621d8f39890f909843a8bc242a80d7670df6
 SHA512:
-  metadata.gz: be84a8610f48ec6db17c36264699f12e4de5adf8d3452b4a7ef07940c85d5003ad4f1667ae90c93f5434fbc781ada0fc08e8a2005c96267c4a74435a143bb06d
-  data.tar.gz: 78f9a6bdff957b4459d3792992c86a9bc7b53507e2f4acd51626535d9be53e474072f766196b71f6b626e896c235f90d2c18eb83ee4ec4ff540c2af82a10caf0
+  metadata.gz: b1608e8de32122e8d73a535740d92655b08c1961657d2a638690e45647a528bbf82b9631e45982024223a7ddf60c35d263c2c2e942c1b7937890cc247b7b845b
+  data.tar.gz: 26d67e6a7bb5b1a0b0e32bbbdabdc5df567012575c5518c674b7c23bb31beb13c601244e86a5269f7e85c64db123bf014fce2f80d0b6ae7b73403446ebfa1b64

data/app/controllers/educode_sales/assessments_controller.rb

@@ -41,12 +41,13 @@ module EducodeSales
               end
             end
             @year = params[:q].present? && params[:q][:assessment_year].present? ? params[:q][:assessment_year]:Time.now.year
-            @assessments_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]: '1'
+            # @assessments_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]: '1'
             @assessments = @assessments.where("assessment_year >= ? and assessment_year <= ?", "#{@year}-01-01 00:00:00".to_date, "#{@year}-12-31 23:59:00".to_date)
-            @assessments = @assessments.where(assessment: @assessments_id).order("updated_at desc")
+            @assessments = @assessments.where(assessment: params[:q][:assessment_id]) if params[:q].present? && params[:q][:assessment_id].present?
             if params[:q].present? && params[:q][:staff_id].present?
-              @assessments = @assessments.where(staff_id: params[:q][:staff_id]).order("updated_at desc")
+              @assessments = @assessments.where(staff_id: params[:q][:staff_id])
             end
+            @assessments = @assessments.page(params[:page]).per(params[:limit]).order("created_at desc")
           end
         end
     end
@@ -87,6 +88,7 @@ module EducodeSales
       begin
         assessment = AssessmentsSetting.new(params_create)
         assessment.user_id = current_user.user_id
+        assessment.total_score = (params[:first_quarter_score].to_f + params[:second_quarter_score].to_f + params[:third_quarter_score].to_f + params[:fourth_quarter_score].to_f).round(2)
         assessment.assessment_year = "#{params[:assessment_year]}-01-01"
         AssessmentsSetting.transaction do
         params[:staffs_ids].split(",").each do |d|
@@ -118,6 +120,7 @@ module EducodeSales
     # 根新
     def update
       @assessment = AssessmentsSetting.find_by(id: params[:id])
+      @assessment.total_score = (params[:first_quarter_score].to_f + params[:second_quarter_score].to_f + params[:third_quarter_score].to_f + params[:fourth_quarter_score].to_f).round(2)
       @assessment.update_attributes(params_update)
       render_success
     end
@@ -382,12 +385,16 @@ module EducodeSales
     private
       def params_create
         params.permit( :annual, :assessment,:assessment_year, :first_quarter, :second_quarter, :third_quarter, :fourth_quarter,
-                      :january, :february, :march, :april, :may, :june, :july, :august, :september, :october, :november, :december)
+                      :january, :february, :march, :april, :may, :june, :july, :august, :september, :october, :november, :december,
+                      :first_quarter_score, :second_quarter_score, :third_quarter_score, :fourth_quarter_score,
+                      :january_score, :february_score, :march_score, :april_score, :may_score, :june_score, :july_score, :august_score, :september_score, :october_score, :november_score, :december_score, :cycle)
       end
 
       def params_update
         params.permit( :annual, :first_quarter, :second_quarter, :third_quarter, :fourth_quarter,
-                      :january, :february, :march, :april, :may, :june, :july, :august, :september, :october, :november, :december)
+                      :january, :february, :march, :april, :may, :june, :july, :august, :september, :october, :november, :december,
+                      :first_quarter_score, :second_quarter_score, :third_quarter_score, :fourth_quarter_score,
+                      :january_score, :february_score, :march_score, :april_score, :may_score, :june_score, :july_score, :august_score, :september_score, :october_score, :november_score, :december_score)
       end
 
   end

data/app/controllers/educode_sales/businesses_controller.rb

@@ -55,7 +55,11 @@ module EducodeSales
             {value: d.id, name: d.name, selected: bussiness_type.include?(d.extras)}
           end
 
-          gon.business_step = Common.where(clazz: 'business_step').order("position").map do |d|
+          gon.business_step = Common.where(clazz: 'business_step', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).order("position").map do |d|
+            {value: d.id, name: d.name, selected: business_step.include?(d.name)}
+          end
+
+          gon.contract_business_step = Common.where(clazz: 'business_step').order("position").map do |d|
             {value: d.id, name: d.name, selected: business_step.include?(d.name)}
           end
 
@@ -95,7 +99,7 @@ module EducodeSales
           end
         end
         format.json do
-          if params[:q] && (params[:q][:clazz] == 'area' || params[:q][:clazz] == 'special')
+          if params[:q] && (params[:q][:clazz] == 'area' || params[:q][:clazz] == 'special' || params[:q][:clazz] == 'delete_list')
             if params[:q][:clazz] == 'special'
               school_ids = []
               # 专项商机
@@ -110,6 +114,8 @@ module EducodeSales
 
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
               @businesses = Business.joins("JOIN departments  AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
+            elsif params[:q][:clazz] == 'delete_list'
+              @businesses = Business.unscoped.where.not(deleted_at: nil)
             end
           else
             if @current_admin.is_admin?
@@ -180,11 +186,21 @@ module EducodeSales
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
             ").where("educode_sales_follow_ups.staff_id = ?", params[:q][:staff_id]).ids
             business_ids = part_a_ids + part_b_ids
-            @businesses = EducodeSales::Business.where(id:business_ids)
+            if params[:q][:clazz] == 'delete_list'
+              @businesses = EducodeSales::Business.unscoped.where(id:business_ids)
+            else
+              @businesses = EducodeSales::Business.where(id:business_ids)
+            end
           end
           if params[:q].present? && params[:q][:business_type].present?
             @businesses = @businesses.where("educode_sales_businesses.clazz_id in (?)", params[:q][:business_type].split(",").map(&:to_i))
           end
+          if params[:q].present? && params[:q][:contract].present?
+            contract_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(: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.stage_id in (?)", contract_ids)
+          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

data/app/models/educode_sales/assessments_setting.rb

@@ -4,10 +4,35 @@ module EducodeSales
     belongs_to :staff
     belongs_to :user
 
-
-    CLAZZ = {7 => '中标指标', 1 => '签单指标', 2 => '回款指标', 3 => '拜访量', 4 => '新增商机数', 5 => '大v建课指标', 6 => '课堂使用指标'}
-
-
+    enum cycle: ['按季', '按月']
+
+
+    CLAZZ = {
+             7 => '销售指标', 1 => '签单指标', 2 => '回款指标', 3 => '商机跟进', 4 => '商机挖掘-A类商机', 5 => '商机挖掘-B类商机', 6 => '客户拜访-线下拜访', 8 => '客户拜访-线上拜访',
+             9 => '注册数据-学生', 10 => '注册数据-老师', 11 => '会议组织-区域性会议', 12 => '会议组织-单校会议', 13 => '生态合作-虚拟教研室', 14 => '生态合作-特软', 15 => '生态合作-大V合作',
+             16 => '重要事项', 17 => '临时任务'
+            }
+
+
+
+    def unit_name
+      case self.assessment
+      when 1, 2, 7
+        '万元'
+      when 3
+        '条'
+      when 4, 5
+        '项'
+      when 6, 8, 11, 12
+        '次'
+      when 9, 10, 15
+        '人'
+      when 16, 17
+        '件'
+      when 13, 14
+        '个人'
+      end
+    end
     # todo  签单金额 : assessment_id(1)
     # todo 回款金额  : assessment_id(2)
     # todo 拜访量  : assessment_id(3)
@@ -17,15 +42,6 @@ module EducodeSales
 
 
 
-
-
-
-
-
-
-
-
-
   end
 end
 

data/app/views/educode_sales/assessments/_finished.html.erb

@@ -35,7 +35,7 @@
 </div>
 <script type="text/html" id="progress_Toolbar">
   <div class="layui-btn-container">
-    <span class="table-label">指标完成情况   单位：万元</span>
+    <span class="table-label">指标完成情况</span>
     <% if can?(:export_result, EducodeSales::AssessmentsSetting) %>
       <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm data-count-edit export_more-btn pull-right" style="color: #0000FF;" data-name="export" data-id="export">
         导出<i class="layui-icon layui-icon-down  layui-nav-more" style="font-size: 12px"></i></button>
@@ -76,7 +76,7 @@
           ,{field: 'name', title: '考核人员', width: 120, rowspan: 6,fixed:'left'}
           ,{field: 'year', align: 'center', title: '考核年度', width: 100, rowspan: 6}
           ,{field: 'assessment', title: '指标类型', width: 120, rowspan: 6}
-          ,{field: 'name', title: '绩效分', width: 120, rowspan: 6}
+          // ,{field: 'name', title: '分值', width: 120, rowspan: 6}
           ,{align: 'center', title: '年度任务', colspan: 5}
           ,{align: 'center', title: '一季度任务', colspan: 4}
           ,{align: 'center', title: '二季度任务', colspan: 5}
@@ -93,26 +93,26 @@
           ,{field: 'quarter_1', title: '任务', width: 100, totalRow:true}
           ,{field: 'progress_1', title: '完成', width: 100, totalRow:true}
           ,{field: 'rate_1', title: '完成率', width: 100, totalRow:true}
-          ,{field: 'score_1', title: '绩效得分', width: 100, totalRow:true}
+          ,{field: 'score_1', title: '分值', width: 100, totalRow:true}
 
           ,{field: 'quarter_2', title: '任务', width: 100, totalRow:true}
           ,{field: 'quarter_2_total', title: '累计任务', width: 100, totalRow:true}
           ,{field: 'progress_2', title: '完成', width: 100, totalRow:true}
           ,{field: 'rate_2', title: '完成率', width: 100, totalRow:true}
-          ,{field: 'score_2', title: '绩效得分', width: 100, totalRow:true}
+          ,{field: 'score_2', title: '分值', width: 100, totalRow:true}
 
 
           ,{field: 'quarter_3', title: '任务', width: 100, totalRow:true}
           ,{field: 'quarter_3_total', title: '累计任务', width: 100, totalRow:true}
           ,{field: 'progress_3', title: '完成', width: 100, totalRow:true}
           ,{field: 'rate_3', title: '完成率', width: 100, totalRow:true}
-          ,{field: 'score_3', title: '绩效得分', width: 100, totalRow:true}
+          ,{field: 'score_3', title: '分值', width: 100, totalRow:true}
 
           ,{field: 'quarter_4', title: '任务', width: 100, totalRow:true}
           ,{field: 'quarter_4_total', title: '累计任务', width: 100, totalRow:true}
           ,{field: 'progress_4', title: '完成', width: 100, totalRow:true}
           ,{field: 'rate_4', title: '完成率', width: 100, totalRow:true}
-          ,{field: 'score_4', title: '绩效得分', width: 100, totalRow:true}
+          ,{field: 'score_4', title: '分值', width: 100, totalRow:true}
 
         ]]
     });