educode_sales 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c77c9d72b776a5250acf438fad00e27b871430b26bdf994a93d1189e0aaba14
-  data.tar.gz: 6ea39f9c64190ccec5427668596827663e702ddd5a0e0d8c0fa5cace8931d1ba
+  metadata.gz: 249bcf8612e073c689b8c6f696cc3590aeffb4271b6eef3ed7b95ecc2033aba5
+  data.tar.gz: 1efd466f3e9630b9908c94d7fe6184979ab775c75946b77987a8f07e67618b64
 SHA512:
-  metadata.gz: 842442865a01e90e7aa227fd5f0b33fd994d509b9d1bad0bff8fe3ebfe59d818fd48b05fcef54c665504d0f5b0a0ec70c2efaccbdc5c017269ef507565866073
-  data.tar.gz: 365f1987a2fe002df56e11f72ba6456c1c15fefa880b06001dce1b4ae4ee1f95a92fae61b5afb3ff28c2ba51c04309b7d06f05067effee9f8aa8e618d0d38eae
+  metadata.gz: f189282b2df2c5bbae317f6ed513862721dc280885791fe5dfda7b2245894d511d0d303a2d5caaab304adb855de8f9d8e65f2c014f4212b34b347e3126854fd0
+  data.tar.gz: 6848e0f74872c5b7e53e05104a224abd58a6a4b8b374393e918ad09c20a34d83b7aa78789bc9e6c2d1091d5f06f6d057400ed0eeeaa9605637bd0abe592ffdd8

data/app/controllers/educode_sales/businesses_controller.rb

@@ -82,15 +82,17 @@ module EducodeSales
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已中标商机)"
+            stage_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.bidded_date > ? AND educode_sales_follow_ups.bidded_date < ?", "#{@year}-01-01", "#{@year}-12-31")
+            ").where("educode_sales_follow_ups.bidded_date > ? AND educode_sales_follow_ups.bidded_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids)
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已签单商机)"
+            s_stage_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.signed_date > ? AND educode_sales_follow_ups.signed_date < ?", "#{@year}-01-01", "#{@year}-12-31")
+            ").where("educode_sales_follow_ups.signed_date > ? AND educode_sales_follow_ups.signed_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids)
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已回款商机)"
@@ -122,10 +124,10 @@ module EducodeSales
             @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
           end
           if params[:q].present? && params[:q][:staff_id].present?
-            part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND staff_id = ?",params[:q][:staff_id]).ids
+            part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND educode_sales_businesses.staff_id = ?",params[:q][:staff_id]).ids
             part_b_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is not null").joins("
               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]).pluck(:business_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)
           end
@@ -172,6 +174,8 @@ module EducodeSales
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.reception_at,
+            last_follow.bidded_date,
+            last_follow.signed_date,
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
           ").page(params[:page]).per(params[:limit])
@@ -221,7 +225,7 @@ module EducodeSales
 
     def destroy
       business = Business.find(params[:id])
-      business.destroy
+      business.soft_destroy(@current_admin.id)
       render_success
     rescue ActiveRecord::DeleteRestrictionError => e
       render_failure '该商机已其它关联数据产生，暂不能删除'

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -36,7 +36,7 @@ module EducodeSales
     def destroy
       follow_up = FollowUp.find(params[:id])
       business = follow_up.business
-      if follow_up.destroy
+      if follow_up.soft_destroy(@current_admin.id)
         if follow_up.id == business.last_follow_up_id
           business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: business.follow_ups.last&.id).sum(:amount))
         end

data/app/controllers/educode_sales/plans_controller.rb

@@ -175,7 +175,7 @@ module EducodeSales
 
     def destroy
       sale_plan = SalePlan.find(params[:id])
-      if sale_plan.destroy
+      if sale_plan.soft_destroy(@current_admin.id)
         render_success
       else
         render_failure sale_plan

data/app/controllers/educode_sales/recycles_controller.rb

@@ -0,0 +1,95 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class RecyclesController < ApplicationController
+
+    def destroy
+      @recycle = Recycle.find(params[:id])
+      @recycle.destroy
+      render_success
+    end
+
+
+
+    def restore_reports
+      @recycle = Recycle.find(params[:id])
+      report_id = @recycle.source_id
+      EducodeSales::SaleReport.unscoped.find(report_id).update(deleted_at: nil)
+      @recycle.destroy
+      render_success
+    end
+
+    def restore_plans
+      @recycle = Recycle.find(params[:id])
+      plan = EducodeSales::SalePlan.unscoped.find(@recycle.source_id)
+      business = EducodeSales::Business.unscoped.find(plan.business_id)
+      Recycle.find_by(source_id: business.id).destroy if Recycle.find_by(source_id: business.id).present?
+      business.update(deleted_at: nil)
+      follow_ups = EducodeSales::FollowUp.unscoped.where(business_id: business.id)
+      follow_ups.update_all(deleted_at: nil)
+      plan.update(deleted_at: nil)
+      @recycle.destroy
+      render_success
+    end
+
+    def restore_businesses
+      @recycle = Recycle.find(params[:id])
+      business_id = @recycle.source_id
+      EducodeSales::Business.unscoped.find(business_id).update(deleted_at: nil)
+      follow_ups = EducodeSales::FollowUp.unscoped.where(business_id: business_id)
+      follow_ups.update_all(deleted_at: nil)
+      @recycle.destroy
+      render_success
+    end
+
+    def business
+      @businesses = Recycle.where(source_type:"EducodeSales::Business")
+      if params[:sort].present? && params[:sort][:field]
+        @businesses = @businesses.order("created_at #{params[:sort][:order]}")
+      else
+        @businesses = @businesses.order("educode_sales_recycles.created_at desc")
+      end
+      @businesses = @businesses.page(params[:page]).per(params[:limit])
+    end
+
+    def weekly
+      @weekly = Recycle.where(source_type:"EducodeSales::SaleReport").order(created_at: :desc).page(params[:page]).per(params[:limit])
+      if params[:sort].present? && params[:sort][:field]
+        @weekly = @weekly.order("created_at #{params[:sort][:order]}")
+      else
+        @weekly = @weekly.order("educode_sales_recycles.created_at desc")
+      end
+      @weekly = @weekly.page(params[:page]).per(params[:limit])
+    end
+
+    def monthly
+      @monthly = Recycle.where(source_type:"EducodeSales::SaleReport")
+      if params[:sort].present? && params[:sort][:field]
+        @monthly = @monthly.order("created_at #{params[:sort][:order]}")
+      else
+        @monthly = @monthly.order("educode_sales_recycles.created_at desc")
+      end
+      @monthly = @monthly.page(params[:page]).per(params[:limit])
+    end
+
+    def weekPlan
+      @weekPlans = Recycle.where(source_type:"EducodeSales::SalePlan")
+      if params[:sort].present? && params[:sort][:field]
+        @weekPlans = @weekPlans.order("created_at #{params[:sort][:order]}")
+      else
+        @weekPlans = @weekPlans.order("educode_sales_recycles.created_at desc")
+      end
+      @weekPlans = @weekPlans.page(params[:page]).per(params[:limit])
+    end
+
+    def monthPlan
+      @monthPlans = Recycle.where(source_type:"EducodeSales::SalePlan")
+      if params[:sort].present? && params[:sort][:field]
+        @monthPlans = @monthPlans.order("created_at #{params[:sort][:order]}")
+      else
+        @monthPlans = @monthPlans.order("educode_sales_recycles.created_at desc")
+      end
+      @monthPlans = @monthPlans.page(params[:page]).per(params[:limit])
+    end
+end
+end

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -30,7 +30,7 @@ module EducodeSales
 
     def destroy
       sale_report = SaleReport.find(params[:id])
-      if sale_report.destroy
+      if sale_report.soft_destroy(@current_admin.id)
         render_success
       else
         render_failure sale_report

data/app/controllers/educode_sales/staffs_controller.rb

@@ -8,7 +8,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @staffs = Staff.where(is_admin: false).page(params[:page]).per(params[:limit])
+          @staffs = Staff.where(is_admin: false, deleted_at: nil).page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -37,10 +37,10 @@ module EducodeSales
 
     def destroy
       staff = Staff.find(params[:id])
-      staff.destroy
+      staff.update(deleted_at: Time.now, expired_at: Time.now.days_ago(1))
       render_success
-    rescue ActiveRecord::DeleteRestrictionError => e
-      render_failure '该用户已有数据产生，暂不能删除'
+    # rescue ActiveRecord::DeleteRestrictionError => e
+    #   render_failure '该用户已有数据产生，暂不能删除'
     end
 
     def disable

data/app/models/concerns/deletable.rb

@@ -0,0 +1,8 @@
+module Deletable
+  extend ActiveSupport::Concern
+
+  def soft_destroy(user_id)
+    self.update(deleted_at: Time.now)
+    EducodeSales::Recycle.create(source: self, deleter_id: user_id)
+  end
+end

data/app/models/educode_sales/application_record.rb

@@ -1,5 +1,7 @@
 module EducodeSales
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
+
+
   end
 end

data/app/models/educode_sales/business.rb

@@ -1,10 +1,23 @@
 module EducodeSales
   class Business < ApplicationRecord
+
     belongs_to :staff
     belongs_to :department
     belongs_to :last_follow_up, class_name: 'FollowUp', optional: true
 
-    has_many :sale_plans, dependent: :destroy
-    has_many :follow_ups, dependent: :destroy
+    has_many :sale_plans
+    has_many :follow_ups
+
+    default_scope  -> {where(deleted_at: nil)}
+
+    def soft_destroy(user_id)
+      self.update(deleted_at: Time.now)
+      self.sale_plans.each do |d|
+        d.soft_destroy(user_id)
+      end
+      self.follow_ups.update_all(deleted_at: Time.now)
+      EducodeSales::Recycle.create(source: self, deleter_id: user_id)
+    end
+
   end
 end

data/app/models/educode_sales/follow_up.rb

@@ -1,14 +1,16 @@
 module EducodeSales
   class FollowUp < ApplicationRecord
+    include ::Deletable
     belongs_to :business, counter_cache: true
     belongs_to :place, optional: true
-    has_many :money_plans, dependent: :destroy
+    has_many :money_plans
     has_many :key_person
     has_many :teachers, through: :key_person
-    has_many :assign_follow_ups, dependent: :destroy
+    has_many :assign_follow_ups
     belongs_to :staff
     belongs_to :stage, class_name: 'Common'
     belongs_to :clazz, class_name: 'Common'
+    default_scope  -> {where(deleted_at: nil)}
 
 
   end

data/app/models/educode_sales/recycle.rb

@@ -0,0 +1,5 @@
+module EducodeSales
+  class Recycle < ApplicationRecord
+    belongs_to :source, polymorphic: true
+  end
+end

data/app/models/educode_sales/sale_plan.rb

@@ -1,9 +1,12 @@
 module EducodeSales
   class SalePlan < ApplicationRecord
+    include ::Deletable
     belongs_to :business
     belongs_to :staff
     validates :business_id, presence: true
 
     validates :month, presence: true
+
+    default_scope  -> {where(deleted_at: nil)}
   end
 end

data/app/models/educode_sales/sale_report.rb

@@ -1,5 +1,7 @@
 module EducodeSales
   class SaleReport < ApplicationRecord
+    include ::Deletable
     belongs_to :staff
+    default_scope  -> {where(deleted_at: nil)}
   end
 end

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

@@ -56,13 +56,13 @@
   </div>
 </script>
 <script type="text/html" id="return_money_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_plan_box").style.display="none";//隐藏
     }
   layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'laydate'], function () {

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

@@ -53,7 +53,7 @@
         <div class="layui-inline">
           <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_bussiness">搜索
+          <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">搜索
           </button>
         </div>
       </div>
@@ -173,11 +173,13 @@
                 field: 'bidded_date',
                 width: 105,
                 title: '中标时间',
+                  sort: true
               },
               {
                 field: 'signed_date',
                 width: 105,
                 title: '签单时间',
+                  sort: true
               },
               {
                 field: 'reception_at',
@@ -371,6 +373,13 @@
         });
       }
 
+        function hn(){
+            $("#search_bt").trigger("click");
+        }
+        $(document).ready(function(){
+            window.onload=hn;
+        });
+
 
       var sort = {}, search = {};
       table.on('sort(businesses_table)', function (obj) {
@@ -388,7 +397,8 @@
         // 监听搜索操作
         form.on('submit(search_bussiness)', function (data) {
           search = data.field
-          table.reload('businesses_table', {
+            console.log(search);
+            table.reload('businesses_table', {
             page: {
                 curr: 1
             },

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

@@ -97,9 +97,13 @@
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="z-index: 10000">
        <div id="assign_follow" style="width: 512px;"></div>
       </div>
+       <div class="layui-inline" style="padding: 9px 15px">
+         <label class="layui-form-label" style="padding-left: 220px"></label>
+           指定跟进人和商机创建者，同时拥有对该商机的管理权限
+       </div>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">最新进展</label>

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

@@ -1,7 +1,6 @@
 <script type="text/html" id="toolbarDemo_follow">
   <div class="layui-btn-container">
     <span class="table-label">跟进记录</span>
-    <span class="table-label" style="padding-left: 200px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="time_line"> 时间线视图>></button>
     <% if can? :add_follow, EducodeSales::Business %>
       <% if @current_admin.is_admin %>
@@ -10,9 +9,10 @@
         <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
       <% end %>
     <% end %>
+    <span class="table-label pull-right" style="padding-right: 20px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
   </div>
 </script>
-<div class="edit-table">
+<div class="edit-table tool">
   <div class="z-index">
     <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
   </div>
@@ -289,6 +289,7 @@
               content = miniPage.getHrefContent('/missions/teachers/add_keys?follow_up_id=' + obj.data.id);
               openWH = miniPage.getOpenWidthHeight();
               is_latest = obj.data.is_latest
+              flag = obj.data.flag
               keyindex = layer.open({
                   title: '关键人',
                   type: 1,
@@ -310,6 +311,7 @@
               content = miniPage.getHrefContent('/missions/businesses/edit_plan');
               openWH = miniPage.getOpenWidthHeight();
               is_latest = obj.data.is_latest
+              flag = obj.data.flag
               plan_index = layer.open({
                   title: '回款计划',
                   type: 1,
@@ -533,4 +535,7 @@
   .z-index .layui-table-tool{
       z-index: 10000; !important;
   }
+ .tool .layui-table-tool-temp{
+      padding-right: 30px; !important;
+  }
 </style>

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

@@ -1,5 +1,5 @@
 <div style="padding-left: 50px">
-        <button type="button" class="layui-btn" id="file"><i class="layui-icon"></i>选择文件</button>
+        <button type="button" class="layui-btn" id="get_file"><i class="layui-icon"></i>选择文件</button>
 </div>
 <script>
     layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
@@ -17,7 +17,7 @@
         //指定允许上传的文件类型
         var business_id = parent.id
         var renderObj = upload.render({
-            elem: '#file'
+            elem: '#get_file'
             ,url: '/missions/upload_files?business_id='+business_id //此处配置你自己的上传接口即可
             ,accept: 'file' //普通文件
             ,headers: {
@@ -28,12 +28,12 @@
             }
             ,done: function(res){
                 layer.msg('导入成功');
-                table.reload('place');
+                table.reload('file');
                 layer.closeAll('loading'); //关闭loading
                 layer.close(parent.import_index)
             }
             ,error: function(index, upload){
-                table.reload('place');
+                table.reload('file');
                 layer.closeAll('loading'); //关闭loading
                 layer.alert('导入失败，请检查文件格式')
                 layer.close(parent.import_index)

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

@@ -32,7 +32,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::OperationReport %>
+  <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="给出评价、提醒、建议、办法等。"
@@ -40,7 +41,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 can? :level2_audit, EducodeSales::OperationReport %>
+  <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="给出评价、提醒、建议、办法等。"
@@ -48,7 +51,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 can? :level3_audit, EducodeSales::OperationReport %>
+  <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="给出评价、提醒、建议、办法等。"
@@ -56,6 +61,7 @@
       </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/operation_reports/show.html.erb

@@ -31,7 +31,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 @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">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
@@ -39,7 +40,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
@@ -47,7 +50,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
@@ -55,6 +60,7 @@
       </div>
     </div>
     <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <%end %>
     <br>
   </div>
 </form>