educode_sales 0.5.0 → 0.5.4

data/app/controllers/educode_sales/upload_files_controller.rb

@@ -20,43 +20,50 @@ module EducodeSales
     end
 
     def create
-        upload_file = params["file"]
-        raise "未上传文件" unless upload_file
-        save_path = File.join("#{Rails.root}/public/images")
-        ext = file_ext(upload_file.original_filename)
-        local_path, digest = file_save_to_local(save_path, upload_file.tempfile, ext)
-        content_type = upload_file.content_type.presence || 'application/octet-stream'
-        disk_filename = local_path[save_path.size + 1, local_path.size]
-        @attachment = Attachment.where(disk_filename: disk_filename,
-                                       author_id: @current_admin.id).first
-        if @attachment.blank?
-          @attachment = Attachment.new
-          @attachment.filename = upload_file.original_filename
-          @attachment.description = "business"
-          @attachment.disk_filename = local_path[save_path.size + 1, local_path.size]
-          @attachment.filesize = upload_file.tempfile.size
-          @attachment.content_type = content_type
-          @attachment.digest = digest
-          @attachment.author_id = @current_admin.id
-          @attachment.container_id = params[:business_id]
-          @attachment.save!
-        else
-          logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
-        end
-        render_success
+      folder = File.join(Rails.root, "public", "images", 'educode_sales')
+      upload_file = params["file"]
+      raise "未上传文件" unless upload_file
+      save_path = File.join(folder)
+      ext = file_ext(upload_file.original_filename)
+      local_path, digest = file_save_to_local(save_path, upload_file.tempfile, ext)
+      content_type = upload_file.content_type.presence || 'application/octet-stream'
+      disk_filename = local_path[save_path.size + 1, local_path.size]
+      @attachment = Attachment.where(disk_filename: disk_filename,
+                                     author_id: @current_admin.user_id).first
+      if @attachment.blank?
+        @attachment = Attachment.new
+        @attachment.filename = upload_file.original_filename
+        @attachment.description = "business"
+        @attachment.disk_filename = local_path[save_path.size + 1, local_path.size]
+        @attachment.filesize = upload_file.tempfile.size
+        @attachment.content_type = content_type
+        @attachment.digest = digest
+        @attachment.author_id = @current_admin.user_id
+        @attachment.container_id = params[:business_id]
+        @attachment.save!
+      else
+        logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
+      end
+      render_success
     end
 
     def destroy
+      folder = File.join(Rails.root, "public", "images", 'educode_sales')
       file = Attachment.find(params[:id])
       file.destroy
-      File.delete("#{Rails.root}/public/images/" + file.disk_filename)
+      File.delete(folder +  "/" +file.disk_filename) if FileTest::exist?(folder +  "/" +file.disk_filename)
       render_success
     end
 
     def download
+      folder = File.join(Rails.root, "public", "images", 'educode_sales')
       file = Attachment.find_by_id(params[:id])
       raise "未找到文件" unless file
-      send_file("#{Rails.root}/public/images/" + file.disk_filename, filename: file.title, stream: true, type: file.content_type.presence || 'application/octet-stream')
+      send_file(folder +  "/" +file.disk_filename, filename: file.title, stream: true, type: file.content_type.presence || 'application/octet-stream')
+    end
+
+    def edu_setting name
+      EduSetting.get(name)
     end
 
 

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/common.rb

@@ -8,6 +8,7 @@ module EducodeSales
     BTYPE = 'b_class'
     CTYPE = 'c_class'
     DTYPE = 'd_class'
+    ETYPE = 'e_class'
 
     validates :name, uniqueness: {scope: :clazz, message: '已存在'}
     
@@ -25,7 +26,7 @@ module EducodeSales
     }
 
     def self.job_type_name
-      self.where(clazz: 'staff_type', name: ['销售', '运营']).pluck(:id, :name).to_h
+      self.where(clazz: 'staff_type').pluck(:id, :name).to_h
     end
 
     def self.teacher_source_name

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_follow_record.html.erb

@@ -65,13 +65,13 @@
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label">总额</label>
+      <label class="layui-form-label">总额(万)</label>
       <div class="layui-input-inline">
         <input name="total_amount" type="number" class="layui-input" value="<%= @follow_up.total_amount %>">
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">合同额</label>
+      <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
          <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
       </div>
@@ -84,7 +84,7 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">渠道分成</label>
+      <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @follow_up.divide_amount%>">
       </div>

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/file.html.erb

@@ -1,3 +1,4 @@
+<%= Gon::Base.render_data %>
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">附件信息</span>
@@ -112,20 +113,20 @@
         });
 
 
-
         table.on('tool(file)', function (obj) {
             var data = obj.data;
             var id = data.id
             name = data.disk_filename
+            folder = gon.folder
+            console.log(folder);
             if (obj.event === 'preview') {
                 if (data.content_type.split("/")[0] === "image"){
-                    // var img = "<img src='/images/" + name + "' />";
                     layer.photos({
-                        photos: { "data": [{"src": '/images/'+name}] }
+                        photos: { "data": [{"src": '/images/educode_sales/' + name}] }
                         ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
                     });
                 }else if (data.content_type.split("/")[1] === "pdf"){
-                    var pdf = '/images/' + name;
+                    var pdf = '/images/educode_sales/' + name;
                     console.log(pdf);
                     var openWH = miniPage.getOpenWidthHeight();
                     layer.open({

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
             },
@@ -604,4 +614,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>

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

@@ -90,16 +90,20 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">渠道分成</label>
+      <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
       </div>
     </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: 100">
        <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/show_follow_record.html.erb

@@ -75,7 +75,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.divide_amount %>
+        <%= @follow_up.divide_amount %>万
       </div>
     </div>
     <div class="ayui-form-item">

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_plans/index.html.erb

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

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,11 +61,14 @@
       </div>
     </div>
     <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <%end %>
     <br>
     <div class="layui-inline m-t-10">
+      <% if (can? :level1_audit, EducodeSales::OperationReport) || (can? :level2_audit, EducodeSales::OperationReport) || (can? :level3_audit, EducodeSales::OperationReport) %>
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="audit_weekly_report"
         style="margin-left: 18px">提交
       </button>
+      <%end %>
     </div>
   </div>
 </form>
@@ -85,7 +93,7 @@
     rate.render({
       elem: '#weekStar4',
       half: true,
-      value: "<%= @sale_report.level1_score %>",
+      value: parseFloat("<%= @sale_report.level1_score || 0%>"),
       length: 5,
       choose: function(value){
         level1_score = value
@@ -94,7 +102,7 @@
     rate.render({
       elem: '#weekStar5',
       half: true,
-      value: "<%= @sale_report.level2_score %>",
+      value: parseFloat("<%= @sale_report.level2_score || 0%>"),
       length: 5,
       choose: function(value){
         level2_score = value
@@ -103,7 +111,7 @@
     rate.render({
       elem: '#weekStar6',
       half: true,
-      value: "<%= @sale_report.level3_score %>",
+      value: parseFloat("<%= @sale_report.level3_score || 0%>"),
       length: 5,
       choose: function(value){
         level3_score = value

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>
@@ -78,28 +84,25 @@
             $ = layui.jquery,
             miniPage = layui.miniPage,
             request = layui.request;
-        table = layui.table;
+        table = layui.table
 
         rate.render({
             elem: '#weekStar4',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level1_score %>",
-            length: "<%= @sale_report.level1_score %>"
+            value: parseFloat("<%= @sale_report.level1_score || 0%>"),
         })
         rate.render({
             elem: '#weekStar5',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level2_score %>",
-            length: "<%= @sale_report.level2_score %>"
+            value: parseFloat("<%= @sale_report.level2_score || 0%>"),
         })
         rate.render({
             elem: '#weekStar6',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level3_score %>",
-            length: "<%= @sale_report.level3_score %>"
+            value: parseFloat("<%= @sale_report.level3_score || 0%>"),
         })
 
 

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

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

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

@@ -1,8 +1,18 @@
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @places do |d|
     json.id d.id
     json.name d.name
-    json.area_id d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    # json.area_id d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    if d.areas.present?
+      if d.areas.ids.sort.to_s == area_ids
+        json.area_id '全国'
+      else
+        json.area_id  d.areas.pluck(:name).join("、")
+      end
+    else
+      json.area_id  ''
+    end
     json.businesses_count EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").count
     json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum(:profit_amount).round(2)
     json.return_mount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").sum(:return_money).round(2)

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

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