educode_sales 0.7.4 → 0.7.7

data/app/views/layouts/educode_sales/application.html.erb

@@ -62,10 +62,6 @@
                 <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/2.市场态势.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>销售态势</a>
               </dd>
             <% end %>
-            <% if can? :sales, EducodeSales::Staff %>
-              <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/3.销售分工.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售分工</a>
-              </dd>
-            <% end %>
             <% if can? :read, EducodeSales::Business %>
               <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>商机管理</a>
               </dd>
@@ -84,9 +80,13 @@
             <% if can? :read, EducodeSales::SalePlan %>
               <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/6.销售计划.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售计划</a></dd>
             <% end %>
-<!--            <dd>-->
-<!--              <a href="/missions/results" class="<%#= current?('layui-this', results_path) %>"><i style="padding-right: 35px"></i><%#= image_tag "educode_sales/6.销售计划.png", size: "15" %>-->
-<!--                <i style="font-size: 25px;  padding-right: 15px"></i>绩效考核</a></dd>-->
+            <% if can?(:show, EducodeSales::AssessmentsSetting) || can?(:show_result, EducodeSales::AssessmentsSetting) %>
+<!--              <dd><a href="/missions/assessments" class="<%#= current?('layui-this', assessments_path) %>"><i  style="padding-right: 35px"></i><%#= image_tag "educode_sales/assessment.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>绩效考核</a></dd>-->
+            <% end %>
+            <% if can? :sales, EducodeSales::Staff %>
+              <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/3.销售分工.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售分工</a>
+              </dd>
+            <% end %>
             <% if @current_admin.is_admin %>
               <dd>
                 <a href="/missions/recycles" class="<%= current?('layui-this', recycles_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/回收站.png", size: "15" %>
@@ -103,11 +103,6 @@
                 <a href="/missions/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/8.运营态势.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营态势</a>
               </dd>
             <% end %>
-            <% if can? :operations, EducodeSales::Staff %>
-              <dd>
-                <a href="/missions/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/9.运营分工.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营分工</a>
-              </dd>
-            <% end %>
             <% if can? :read, EducodeSales::Teacher %>
               <dd><a href="/missions/teachers" class="<%= current?('layui-this', teachers_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/10.教师运营.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>教师运营</a></dd>
             <% end %>
@@ -119,6 +114,11 @@
                 <a href="/missions/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/12.运营计划.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营计划</a>
               </dd>
             <% end %>
+            <% if can? :operations, EducodeSales::Staff %>
+              <dd>
+                <a href="/missions/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/9.运营分工.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营分工</a>
+              </dd>
+            <% end %>
           </dl>
         </li>
         <% if @current_admin.is_admin %>

data/app/views/layouts/educode_sales/login.html.erb

@@ -16,5 +16,5 @@
   <%= yield %>
 </div>
 <div class="footer">
-  ©版权所有 2021 头歌<span class="padding-5">|</span><a target="_blank" href="http://www.educoder.net">头歌官网</a>
+  ©版权所有 <%= Time.now.year %> 头歌<span class="padding-5">|</span><a target="_blank" href="http://www.educoder.net">头歌官网</a>
 </div>

data/config/routes.rb

@@ -14,9 +14,11 @@ EducodeSales::Engine.routes.draw do
   get :sales_place, to: "home#sales_place"
   get :staff_schools, to: "home#staff_schools"
 
+
   resources :sessions do
   end
 
+
   resources :customer_extensions do
   end
   resources :customer_follows do
@@ -142,6 +144,15 @@ EducodeSales::Engine.routes.draw do
       get :my_month
     end
   end
+
+  ######
+  resources :assessments do
+    collection do
+      get :progress  # 考核完成情况
+      post :get_export_data # 导出数据
+    end
+  end
+
   resources :operation_plans do
     collection do
       get :operation

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -7,9 +7,17 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       t.timestamps
     end
     if EducodeSales::Permission.last.nil?
+      #绩效考核权限
+      EducodeSales::Permission.find_or_create_by(name: '查看人员任务列表', subject: 'AssessmentsSetting', action: 'show', clazz: 'assessments_setting', position: '191')
+      EducodeSales::Permission.find_or_create_by(name: '添加人员任务列表', subject: 'AssessmentsSetting', action: 'create', clazz: 'assessments_setting', position: '192')
+      EducodeSales::Permission.find_or_create_by(name: '编辑人员任务列表', subject: 'AssessmentsSetting', action: 'edit', clazz: 'assessments_setting', position: '193')
+      EducodeSales::Permission.find_or_create_by(name: '删除人员任务列表', subject: 'AssessmentsSetting', action: 'destroy', clazz: 'assessments_setting', position: '194')
+      EducodeSales::Permission.find_or_create_by(name: '查看指标完成情况', subject: 'AssessmentsSetting', action: 'show_result', clazz: 'assessments_setting', position: '195')
+      EducodeSales::Permission.find_or_create_by(name: '导出指标完成情况', subject: 'AssessmentsSetting', action: 'export_result', clazz: 'assessments_setting', position: '196')
+
+      #导出商机
       EducodeSales::Permission.create(name: '导出商机', subject: 'Business', action: 'export_business', clazz: 'business', position: '11')
 
-
       #附件管理权限
       EducodeSales::Permission.create(name: '查看附件', subject: 'Business', action: 'show_file', clazz: 'business', position: '11')
       EducodeSales::Permission.create(name: '上传附件', subject: 'Business', action: 'upload_file', clazz: 'business', position: '11')

data/db/migrate/20220402020233_create_educode_sales_assessments_settings.rb

@@ -0,0 +1,27 @@
+class CreateEducodeSalesAssessmentsSettings < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_assessments_settings do |t|
+      t.references :user
+      t.date :assessment_year
+      t.integer :assessment
+      t.integer :annual
+      t.integer :first_quarter
+      t.integer :second_quarter
+      t.integer :third_quarter
+      t.integer :fourth_quarter
+      t.integer :january
+      t.integer :february
+      t.integer :march
+      t.integer :april
+      t.integer :may
+      t.integer :june
+      t.integer :july
+      t.integer :august
+      t.integer :september
+      t.integer :october
+      t.integer :november
+      t.integer :december
+    end
+  end
+
+end

data/db/migrate/20220411021641_add_new_column_assessments_settings.rb

@@ -0,0 +1,20 @@
+class AddNewColumnAssessmentsSettings < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_assessments_settings, :annual_progress, :string
+    add_column :educode_sales_assessments_settings, :first_quarter_progress, :string
+    add_column :educode_sales_assessments_settings, :second_quarter_progress, :string
+    add_column :educode_sales_assessments_settings, :third_quarter_progress, :string
+    add_column :educode_sales_assessments_settings, :fourth_quarter_progress, :string
+    add_column :educode_sales_assessments_settings, :january_progress, :string
+    add_column :educode_sales_assessments_settings, :february_progress, :string
+    add_column :educode_sales_assessments_settings, :march_progress, :string
+    add_column :educode_sales_assessments_settings, :april_progress, :string
+    add_column :educode_sales_assessments_settings, :may_progress, :string
+    add_column :educode_sales_assessments_settings, :june_progress, :string
+    add_column :educode_sales_assessments_settings, :july_progress, :string
+    add_column :educode_sales_assessments_settings, :august_progress, :string
+    add_column :educode_sales_assessments_settings, :october_progress, :string
+    add_column :educode_sales_assessments_settings, :november_progress, :string
+    add_column :educode_sales_assessments_settings, :december_progress, :string
+  end
+end

data/db/migrate/20220413090940_add_september_progress_to_assessment_settings.rb

@@ -0,0 +1,5 @@
+class AddSeptemberProgressToAssessmentSettings < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_assessments_settings, :september_progress, :string
+  end
+end

data/db/migrate/20220418033025_add_staff_id_to_sets.rb

@@ -0,0 +1,5 @@
+class AddStaffIdToSets < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_assessments_settings, :staff_id, :integer
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.7.4'
+  VERSION = '0.7.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.7
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -99,6 +99,7 @@ files:
 - app/assets/images/educode_sales/8.运营态势.png
 - app/assets/images/educode_sales/9.运营分工.png
 - app/assets/images/educode_sales/a.png
+- app/assets/images/educode_sales/assessment.png
 - app/assets/images/educode_sales/favicon.ico
 - app/assets/images/educode_sales/icon-ext.png
 - app/assets/images/educode_sales/icon-login.png
@@ -111,6 +112,7 @@ files:
 - app/assets/images/educode_sales/loginbg.png
 - app/assets/images/educode_sales/logo.png
 - app/assets/images/educode_sales/money_plans.png
+- app/assets/images/educode_sales/top_page.png
 - app/assets/images/educode_sales/回收站.png
 - app/assets/images/educode_sales/客户管理.png
 - app/assets/javascripts/educode_sales/application.js
@@ -138,6 +140,7 @@ files:
 - app/assets/stylesheets/educode_sales/public.css
 - app/controllers/educode_sales/activities_controller.rb
 - app/controllers/educode_sales/application_controller.rb
+- app/controllers/educode_sales/assessments_controller.rb
 - app/controllers/educode_sales/businesses_controller.rb
 - app/controllers/educode_sales/commons_controller.rb
 - app/controllers/educode_sales/customer_extensions_controller.rb
@@ -166,6 +169,7 @@ files:
 - app/controllers/educode_sales/upload_files_controller.rb
 - app/helpers/educode_sales/activities_helper.rb
 - app/helpers/educode_sales/application_helper.rb
+- app/helpers/educode_sales/assessments_help.rb
 - app/helpers/educode_sales/business_helper.rb
 - app/helpers/educode_sales/follow_up_helper.rb
 - app/helpers/educode_sales/home_helper.rb
@@ -178,6 +182,7 @@ files:
 - app/models/educode_sales/activity.rb
 - app/models/educode_sales/activity_teacher.rb
 - app/models/educode_sales/application_record.rb
+- app/models/educode_sales/assessments_setting.rb
 - app/models/educode_sales/assign_follow_up.rb
 - app/models/educode_sales/business.rb
 - app/models/educode_sales/business_export_record.rb
@@ -215,6 +220,14 @@ files:
 - app/views/educode_sales/activities/index.json.jbuilder
 - app/views/educode_sales/activities/new.html.erb
 - app/views/educode_sales/activities/show_teachers.html.erb
+- app/views/educode_sales/assessments/_progress.html.erb
+- app/views/educode_sales/assessments/_setup.html.erb
+- app/views/educode_sales/assessments/edit.html.erb
+- app/views/educode_sales/assessments/get_export_data.json.jbuilder
+- app/views/educode_sales/assessments/index.html.erb
+- app/views/educode_sales/assessments/index.json.jbuilder
+- 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/edit.html.erb
 - app/views/educode_sales/businesses/edit_follow_record.html.erb
@@ -432,6 +445,10 @@ files:
 - db/migrate/20220125033552_create_educode_sales_customer_adds.rb
 - db/migrate/20220314053856_add_service_start_time_to_follow_ups.rb
 - db/migrate/20220314074354_add_service_time_long_to_follow_ups.rb
+- db/migrate/20220402020233_create_educode_sales_assessments_settings.rb
+- db/migrate/20220411021641_add_new_column_assessments_settings.rb
+- db/migrate/20220413090940_add_september_progress_to_assessment_settings.rb
+- db/migrate/20220418033025_add_staff_id_to_sets.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb