educode_sales 0.4.9 → 0.5.3

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

@@ -1,5 +1,10 @@
 businesses_a_count = 0
 businesses_b_count = 0
+businesses_c_count = 0
+businesses_d_count = 0
+businesses_e_count = 0
+businesses_o_count = 0
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @staffs do |d|
     part_a_ids = EducodeSales::Business.where("educode_sales_businesses.last_follow_up_id is null AND staff_id = ?",d.id).ids
@@ -11,23 +16,52 @@ json.data do
     json.id d.id
     json.name d.user.real_name
     json.role d.role&.name
-    json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    # json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    if d.areas.present?
+      if d.areas.ids.sort.to_s == area_ids
+        json.area '全国'
+      else
+        json.area  d.areas.pluck(:name).join("、")
+      end
+    else
+      json.area  ''
+    end
     business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).count
     businesses_a_count += business_a
     json.business_a business_a
     business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).count
     businesses_b_count += business_b
     json.business_b business_b
+    business_c = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @c_clazz&.id).count
+    businesses_c_count += business_c
+    json.business_c business_c
+    business_d = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @d_clazz&.id).count
+    businesses_d_count += business_d
+    json.business_d business_b
+    business_e = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @e_clazz&.id).count
+    businesses_e_count += business_e
+    json.business_e business_b
+    business_o = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @o_clazz&.id).count
+    businesses_o_count += business_o
+    json.business_o business_o
     json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
     json.return_money  @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ?", @x).sum("educode_sales_businesses.return_money").round(2)
     json.a_clazz_id @a_clazz&.id
     json.b_clazz_id @b_clazz&.id
+    json.c_clazz_id @c_clazz&.id
+    json.d_clazz_id @d_clazz&.id
+    json.e_clazz_id @e_clazz&.id
+    json.o_clazz_id @o_clazz&.id
   end
 end
 
 json.totalRow do
   json.business_a businesses_a_count.to_s
   json.business_b businesses_b_count.to_s
+  json.business_c businesses_c_count.to_s
+  json.business_d businesses_d_count.to_s
+  json.business_e businesses_e_count.to_s
+  json.business_o businesses_o_count.to_s
 end
 json.code 0
 json.count @staffs.total_count

data/app/views/educode_sales/sales/operations.json.jbuilder

@@ -1,12 +1,22 @@
 departments_count = 0
 schools_count = 0
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @staffs do |d|
     json.id d.id
     json.name d.user.real_name
     json.role d.role&.name
     json.job_type EducodeSales::Common.job_type_name[d.job_type]
-    json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    # json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    if d.areas.present?
+      if d.areas.ids.sort.to_s == area_ids
+        json.area '全国'
+      else
+        json.area  d.areas.pluck(:name).join("、")
+      end
+    else
+      json.area  ''
+    end
     departments = EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(educode_sales_follow_ups.staff_id) AS count")[0]&.send('count') + EducodeSales::Teacher.joins(:follow_up).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(educode_sales_teacher_follows.staff_id) AS count")[0]&.send('count') || 0
     json.departments departments
     schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count'] + EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count']

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

@@ -137,4 +137,9 @@
     });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 0px; !important;
+    }
+</style>

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

@@ -1,15 +1,25 @@
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @staffs do |d|
     json.id d.id
     json.name d.user.real_name
     json.role d.role&.name
-    json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
     json.job_type EducodeSales::Common.job_type_name[d.job_type]
     json.month d.month
     json.enabled_at d.enabled_at ? d.enabled_at.to_s(:date) : ''
     json.expired_at d.enabled_at ? "#{d.enabled_at.to_s(:date)}-#{d.expired_at.to_s(:date)}" : ''
+    if d.areas.present?
+      if d.areas.ids.sort.to_s == area_ids
+        json.area '全国'
+      else
+        json.area  d.areas.pluck(:name).join("、")
+      end
+    else
+      json.area  ''
+    end
   end
 end
 
+
 json.code 0
 json.count @staffs.total_count

data/app/views/educode_sales/teachers/add_keys.html.erb

@@ -116,13 +116,13 @@
   </div>
 </script>
 <script type="text/html" id="key_person_tabar">
-  {{#  if(parent.is_latest){ }}
+  {{#  if(parent.is_latest && parent.flag){ }}
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">保存</a>
   <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="delete">删除</a>
   {{#  } }}
 </script>
 <script>
-  if(!parent.is_latest){
+  if(!parent.is_latest || !parent.flag){
       document.getElementById("show_follow_box").style.display="none";//隐藏
   }
   layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'laydate', 'selectInput'], function () {
@@ -144,7 +144,7 @@
       $(document).on('click','#new_teacher1',function(){
           var content = miniPage.getHrefContent('/missions/teachers/new');
           var openWH = miniPage.getOpenWidthHeight();
-          sindex = layer.open({
+          teacher_uni_index = layer.open({
               id:"a",
               title: '添加老师',
               type: 1,

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

@@ -52,7 +52,7 @@
       </div>
 
       <div class="layui-inline">
-        <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
         </button>
         <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_teachers">搜 索
         </button>
@@ -588,4 +588,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>

data/app/views/educode_sales/teachers/new.html.erb

@@ -156,6 +156,7 @@
               table.reload('teachers_table');
               layer.close(parent.index)
               layer.close(parent.sindex)
+              layer.close(parent.teacher_uni_index)
             }
           })
           return false;

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

@@ -3,8 +3,8 @@ json.data do
     json.id d.id
     json.name d.filename
     json.size d.filesize < 1000000 ? (d.filesize.to_f / 1000).round(2).to_s + 'KB' : (d.filesize.to_f / 1000000).round(2).to_s + 'MB'
-    json.upload_time d.created_on.to_s
-    json.upload_person EducodeSales::Staff.find(d.author_id).user.real_name
+    json.created_on d.created_on.to_s
+    json.upload_person d.author.real_name
     json.disk_filename d.disk_filename
     json.content_type d.content_type
   end

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

@@ -69,6 +69,9 @@
             <% 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 %>
+            <% 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"%><i  style="font-size: 25px;  padding-right: 15px"></i>回收站</a></dd>
+              <%end %>
           </dl>
         </li>
         <li class="layui-nav-item layui-nav-itemed menu-li">

data/config/routes.rb

@@ -77,6 +77,21 @@ EducodeSales::Engine.routes.draw do
   resources :places do
   end
 
+  resources :recycles do
+    collection do
+      get :monthly
+      get :weekly
+      get :monthPlan
+      get :weekPlan
+      get :business
+    end
+    member do
+      get :restore_plans
+      get :restore_reports
+      get :restore_businesses
+    end
+  end
+
   resources :plans do
     collection do
       get :new_week
@@ -188,6 +203,9 @@ EducodeSales::Engine.routes.draw do
   end
 
   resources :roles do
+    collection do
+      get :rename
+    end
     member do
       put :view
       put :update_role

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -26,6 +26,9 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       EducodeSales::Permission.create(name: '编辑计划', subject: 'SalePlan', action: 'update', clazz: 'sale_plan')
       EducodeSales::Permission.create(name: '删除计划', subject: 'SalePlan', action: 'destroy', clazz: 'sale_plan')
       EducodeSales::Permission.create(name: '审查报告', subject: 'SaleReport', action: 'audit', clazz: 'sale_plan')
+      EducodeSales::Permission.create(name: '填写大区意见', subject: 'SaleReport', action: 'level1_audit', clazz: 'sale_plan')
+      EducodeSales::Permission.create(name: '填写总监意见', subject: 'SaleReport', action: 'level2_audit', clazz: 'sale_plan')
+      EducodeSales::Permission.create(name: '填写副总意见', subject: 'SaleReport', action: 'level3_audit', clazz: 'sale_plan')
 
       EducodeSales::Permission.create(name: '查看渠道', subject: 'Place', action: 'read', clazz: 'place')
       EducodeSales::Permission.create(name: '添加渠道', subject: 'Place', action: 'create', clazz: 'place')
@@ -52,6 +55,9 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       EducodeSales::Permission.create(name: '编辑计划', subject: 'OperationPlan', action: 'update', clazz: 'operation_plan')
       EducodeSales::Permission.create(name: '删除计划', subject: 'OperationPlan', action: 'destroy', clazz: 'operation_plan')
       EducodeSales::Permission.create(name: '审查报告', subject: 'OperationReport', action: 'audit', clazz: 'operation_plan')
+      EducodeSales::Permission.create(name: '填写大区意见', subject: 'OperationReport', action: 'level1_audit', clazz: 'operation_plan')
+      EducodeSales::Permission.create(name: '填写总监意见', subject: 'OperationReport', action: 'level2_audit', clazz: 'operation_plan')
+      EducodeSales::Permission.create(name: '填写副总意见', subject: 'OperationReport', action: 'level3_audit', clazz: 'operation_plan')
 
       EducodeSales::Permission.create(name: '查看活动', subject: 'Activity', action: 'read', clazz: 'activity')
       EducodeSales::Permission.create(name: '添加活动', subject: 'Activity', action: 'create', clazz: 'activity')

data/db/migrate/20211109015617_create_educode_sales_recycles.rb

@@ -0,0 +1,25 @@
+class CreateEducodeSalesRecycles < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_recycles do |t|
+      t.string :source_type
+      t.integer :source_id
+      t.integer :deleter_id
+
+      t.timestamps
+    end
+    add_column :educode_sales_businesses, :deleted_at, :datetime
+    add_column :educode_sales_follow_ups, :deleted_at, :datetime
+    add_column :educode_sales_sale_plans, :deleted_at, :datetime
+    add_column :educode_sales_sale_reports, :deleted_at, :datetime
+    add_column :educode_sales_operation_plans, :deleted_at, :datetime
+    add_column :educode_sales_operation_reports, :deleted_at, :datetime
+    add_column :educode_sales_teachers, :deleted_at, :datetime
+    add_column :educode_sales_activities, :deleted_at, :datetime
+    add_column :educode_sales_money_plans, :deleted_at, :datetime
+    add_column :educode_sales_place_areas, :deleted_at, :datetime
+    add_column :educode_sales_places, :deleted_at, :datetime
+    add_column :educode_sales_teacher_follows, :deleted_at, :datetime
+    add_column :educode_sales_staffs, :deleted_at, :datetime
+    
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.4.9'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.3
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ files:
 - app/assets/images/educode_sales/loading-2.gif
 - app/assets/images/educode_sales/loginbg.png
 - app/assets/images/educode_sales/logo.png
+- app/assets/images/educode_sales/回收站.png
 - app/assets/javascripts/educode_sales/application.js
 - app/assets/javascripts/educode_sales/extent/miniPage.js
 - app/assets/javascripts/educode_sales/extent/request.js
@@ -145,6 +146,7 @@ files:
 - app/controllers/educode_sales/operations_controller.rb
 - app/controllers/educode_sales/places_controller.rb
 - app/controllers/educode_sales/plans_controller.rb
+- app/controllers/educode_sales/recycles_controller.rb
 - app/controllers/educode_sales/roles_controller.rb
 - app/controllers/educode_sales/sale_reports_controller.rb
 - app/controllers/educode_sales/sale_trends_controller.rb
@@ -163,6 +165,7 @@ files:
 - app/jobs/educode_sales/application_job.rb
 - app/mailers/educode_sales/application_mailer.rb
 - app/models/ability.rb
+- app/models/concerns/deletable.rb
 - app/models/educode_sales/activity.rb
 - app/models/educode_sales/activity_teacher.rb
 - app/models/educode_sales/application_record.rb
@@ -180,6 +183,7 @@ files:
 - app/models/educode_sales/permission.rb
 - app/models/educode_sales/place.rb
 - app/models/educode_sales/place_area.rb
+- app/models/educode_sales/recycle.rb
 - app/models/educode_sales/role.rb
 - app/models/educode_sales/role_area.rb
 - app/models/educode_sales/role_permission.rb
@@ -278,10 +282,22 @@ files:
 - app/views/educode_sales/plans/show_monthly.html.erb
 - app/views/educode_sales/plans/show_week.html.erb
 - app/views/educode_sales/plans/show_weekly.html.erb
+- app/views/educode_sales/recycles/_business.html.erb
+- app/views/educode_sales/recycles/_monthPlan.html.erb
+- app/views/educode_sales/recycles/_monthly.html.erb
+- app/views/educode_sales/recycles/_weekPlan.html.erb
+- app/views/educode_sales/recycles/_weekly.html.erb
+- app/views/educode_sales/recycles/business.json.jbuilder
+- app/views/educode_sales/recycles/index.html.erb
+- app/views/educode_sales/recycles/monthPlan.json.jbuilder
+- app/views/educode_sales/recycles/monthly.json.jbuilder
+- app/views/educode_sales/recycles/weekPlan.json.jbuilder
+- app/views/educode_sales/recycles/weekly.json.jbuilder
 - app/views/educode_sales/roles/edit.html.erb
 - app/views/educode_sales/roles/index.html.erb
 - app/views/educode_sales/roles/index.json.jbuilder
 - app/views/educode_sales/roles/new.html.erb
+- app/views/educode_sales/roles/rename.html.erb
 - app/views/educode_sales/sale_reports/audit.html.erb
 - app/views/educode_sales/sale_reports/edit.html.erb
 - app/views/educode_sales/sale_reports/index.json.jbuilder
@@ -289,6 +305,7 @@ files:
 - app/views/educode_sales/sale_reports/show.html.erb
 - app/views/educode_sales/sale_trends/operations.html.erb
 - app/views/educode_sales/sale_trends/trends.html.erb
+- app/views/educode_sales/sale_trends/trends.json.jbuilder
 - app/views/educode_sales/sales/index.html.erb
 - app/views/educode_sales/sales/index.json.jbuilder
 - app/views/educode_sales/sales/operations.html.erb
@@ -359,6 +376,7 @@ files:
 - db/migrate/20211018054256_add_extras_to_commons.rb
 - db/migrate/20211022085324_add_teacher_used_to_teachers.rb
 - db/migrate/20211102085743_add_bidded_date_educode_sales_follow_ups.rb
+- db/migrate/20211109015617_create_educode_sales_recycles.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb