educode_sales 0.5.0 → 0.5.1

data/app/views/educode_sales/recycles/monthPlan.json.jbuilder

@@ -0,0 +1,16 @@
+json.data do
+  json.array! @monthPlans do |d|
+    next if EducodeSales::SalePlan.unscoped.find(d.source_id).weekly.present?
+    json.id d.id
+    json.name EducodeSales::SalePlan.unscoped.find(d.source_id).staff.user.real_name
+    json.month EducodeSales::SalePlan.unscoped.find(d.source_id).month.strftime("%Y-%m")
+    json.weekly EducodeSales::SalePlan.unscoped.find(d.source_id).weekly
+    json.plan EducodeSales::SalePlan.unscoped.find(d.source_id).content
+    json.update_at EducodeSales::SalePlan.unscoped.find(d.source_id).updated_at.to_s
+    json.deleter EducodeSales::Staff.find(d.deleter_id).user.real_name
+    json.delete_time d.created_at.to_s
+  end
+end
+
+json.code 0
+json.count @monthPlans.total_count

data/app/views/educode_sales/recycles/monthly.json.jbuilder

@@ -0,0 +1,15 @@
+json.data do
+  json.array! @monthly do |d|
+    next if EducodeSales::SaleReport.unscoped.find(d.source_id).weekly.present?
+    json.id d.id
+    json.name EducodeSales::SaleReport.unscoped.find(d.source_id).staff.user.real_name
+    json.month EducodeSales::SaleReport.unscoped.find(d.source_id).month.strftime('%Y-%m')
+    json.plan EducodeSales::SaleReport.unscoped.find(d.source_id).content
+    json.update_at EducodeSales::SaleReport.unscoped.find(d.source_id).updated_at.to_s
+    json.deleter EducodeSales::Staff.find(d.deleter_id).user.real_name
+    json.delete_time d.created_at.to_s
+  end
+end
+
+json.code 0
+json.count @monthly.total_count

data/app/views/educode_sales/recycles/weekPlan.json.jbuilder

@@ -0,0 +1,16 @@
+json.data do
+  json.array! @weekPlans do |d|
+    next if EducodeSales::SalePlan.unscoped.find(d.source_id).weekly.nil?
+    json.id d.id
+    json.name EducodeSales::SalePlan.unscoped.find(d.source_id).staff.user.real_name
+    json.month EducodeSales::SalePlan.unscoped.find(d.source_id).month.strftime("%Y-%m")
+    json.weekly EducodeSales::SalePlan.unscoped.find(d.source_id).weekly
+    json.plan EducodeSales::SalePlan.unscoped.find(d.source_id).content
+    json.update_at EducodeSales::SalePlan.unscoped.find(d.source_id).updated_at.to_s
+    json.deleter EducodeSales::Staff.find(d.deleter_id).user.real_name
+    json.delete_time d.created_at.to_s
+  end
+end
+
+json.code 0
+json.count @weekPlans.total_count

data/app/views/educode_sales/recycles/weekly.json.jbuilder

@@ -0,0 +1,15 @@
+json.data do
+  json.array! @weekly do |d|
+    next if EducodeSales::SaleReport.unscoped.find(d.source_id).weekly.nil?
+    json.id d.id
+    json.name EducodeSales::SaleReport.unscoped.find(d.source_id).staff.user.real_name
+    json.weekly EducodeSales::SaleReport.unscoped.find(d.source_id).weekly
+    json.plan EducodeSales::SaleReport.unscoped.find(d.source_id).content
+    json.update_at EducodeSales::SaleReport.unscoped.find(d.source_id).updated_at.to_s
+    json.deleter EducodeSales::Staff.find(d.deleter_id).user.real_name
+    json.delete_time d.created_at.to_s
+  end
+end
+
+json.code 0
+json.count @weekly.total_count

data/app/views/educode_sales/sale_reports/audit.html.erb

@@ -36,7 +36,8 @@
 3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <% if can? :level1_audit, EducodeSales::SaleReport %>
+  <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
         <textarea name="level1_opinion" placeholder="给出评价、提醒、建议、办法等。"
@@ -44,7 +45,10 @@
       </div>
     </div>
     <div id="weekStar4" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <% end %>
+
+  <% if can? :level2_audit, EducodeSales::SaleReport %>
+  <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="level2_opinion" placeholder="给出评价、提醒、建议、办法等。"
@@ -52,7 +56,10 @@
       </div>
     </div>
     <div id="weekStar5" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <% end %>
+
+    <% if can? :level3_audit, EducodeSales::SaleReport %>
+  <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="level3_opinion" placeholder="给出评价、提醒、建议、办法等。"
@@ -60,6 +67,8 @@
       </div>
     </div>
     <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <% end %>
+
     <br>
     <div class="layui-inline m-t-10">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="audit_weekly_report"

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -35,6 +35,7 @@
 3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
+    <% if @sale_report.level1_opinion.present? || @sale_report.level1_score %>
     <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
@@ -43,7 +44,9 @@
       </div>
     </div>
     <div id="weekStar4" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <%end %>
+    <% if @sale_report.level2_opinion.present? || @sale_report.level2_score  %>
+  <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
@@ -51,7 +54,9 @@
       </div>
     </div>
     <div id="weekStar5" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <%end %>
+    <% if @sale_report.level3_opinion.present? || @sale_report.level3_score  %>
+  <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
@@ -59,6 +64,7 @@
       </div>
     </div>
     <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <%end %>
     <br>
   </div>
 </form>

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 () {

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>

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

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.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2021-11-12 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,6 +282,17 @@ 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
@@ -359,6 +374,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