educode_sales 0.4.9 → 0.5.3

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -23,6 +23,124 @@ module EducodeSales
       @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).sum(:total_amount).round(2)
       b = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name).pluck(:id)
       @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).sum(:total_amount).round(2)
+
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      names = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
+      x_business_ids = []
+      default_dates = (7.day.ago.to_date..Date.today).to_a #默认时间范围
+      Business.all.each do |d|
+        if d.last_follow_up&.clazz&.id == x
+          x_business_ids << d.id
+        end
+      end
+      colors = ['#44D7B6','#4CACFF','#F7B500','#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF', '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)']
+      @follow_count_range = params[:follow_count_range] || "day"
+      @goal_count_range = params[:goal_count_range] || "day"
+      # 商机跟进数图表
+      @follow_count_data = day_follow_count_chart(default_dates,names,x_business_ids,colors)
+      if params[:follow_count_range].present?
+        case params[:follow_count_range]
+        when "week"
+        when "month"  #按月
+          if params[:date_month].present?
+            # (Date.new(2020,12,1)..Date.new(2021,12,1)).map { |d| d.strftime("%Y-%m")}.uniq
+            date = params[:date_month].split(" - ")
+            dates = ((date[0]+"-01").to_date..(date[1]+"-01").to_date).map { |d| d.strftime("%Y-%m")}.uniq
+            @follow_count_data = month_follow_count_chart(dates,names,x_business_ids,colors)
+          end
+        when "year"   #按年
+          if params[:date_year].present?
+            date = params[:date_year].split(" - ")
+            dates = (date[0]..date[1]).to_a
+            @follow_count_data = year_follow_count_chart(dates,names,x_business_ids,colors)
+          end
+        else          #按天
+          if params[:date].present?
+            date = params[:date].split(" - ")
+            dates = (date[0].to_date..date[1].to_date).to_a
+            @follow_count_data = day_follow_count_chart(dates,names,x_business_ids,colors)
+          end
+        end
+      end
+
+
+      # 已中标图表
+      goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a
+      sale_names = ['已中标','已签单','已回款']
+       @goal_count_data =
+      {
+        labels: goal_default_dates,
+        datasets: sale_names.map do |name|{
+                     label: name,
+                     data: goal_default_dates.map{ |d|
+                       case sale_names.index(name)
+                       when 0
+                         Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", stage_ids).sum(:total_amount).round(2)
+                       when 1
+                         Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", s_stage_ids).sum(:total_amount).round(2)
+                       else
+                         Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
+                       end
+                     },
+                     backgroundColor: colors[sale_names.index(name)],
+                     borderColor: colors[sale_names.index(name)],
+                     borderWidth: 1
+                   }
+        end
+      }
+      if params[:goal_count_range].present?
+        case params[:goal_count_range]
+        when "week"
+        when "month"  #按月
+          if params[:goal_date_month].present?
+            date = params[:goal_date_month].split(" - ")
+            dates = ((date[0]+"-01").to_date..(date[1]+"-01").to_date).map { |d| d.strftime("%Y-%m")}.uniq
+            @goal_count_data =  {
+              labels: dates,
+              datasets: sale_names.map do |name|{
+                           label: name,
+                           data: dates.map{ |d|
+                             case sale_names.index(name)
+                             when 0
+                               Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", stage_ids).sum(:total_amount).round(2)
+                             when 1
+                               Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", s_stage_ids).sum(:total_amount).round(2)
+                             else
+                               Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
+                             end                           },
+                           backgroundColor: colors[sale_names.index(name)],
+                           borderColor: colors[sale_names.index(name)],
+                           borderWidth: 1
+                         }
+              end
+            }
+          end
+          else   #按年
+          if params[:goal_date_year].present?
+            date = params[:goal_date_year].split(" - ")
+            dates = (date[0]..date[1]).to_a
+            @goal_count_data =  {
+              labels: dates,
+              datasets:sale_names.map do |name| {
+                           label: name,
+                           data: dates.map{ |d|
+                             case sale_names.index(name)
+                             when 0
+                               Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01-01", "#{d}-12-31", stage_ids).sum(:total_amount).round(2)
+                             when 1
+                               Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01-01", "#{d}-12-31", s_stage_ids).sum(:total_amount).round(2)
+                             else
+                               Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01-01", "#{d}-12-31").sum(:amount).round(2)
+                             end                           },
+                           backgroundColor: colors[sale_names.index(name)],
+                           borderColor: colors[sale_names.index(name)],
+                           borderWidth: 1
+                         }
+              end
+            }
+          end
+        end
+      end
     end
 
     def sale_trends
@@ -44,5 +162,58 @@ module EducodeSales
       params.permit(:chance_money, :ballot_money, :sign_money, :returned_money)
     end
 
+    def day_follow_count_chart(dates,names,x_business_ids,colors)
+      {
+        labels: dates,
+        datasets:names.map do |name|
+          {
+            hidden: names.index(name) < 3 ? false : true,
+            label: name[0],
+            data: dates.map{ |d| @follow_up = FollowUp.where(staff_id: name[1], created_at: d.beginning_of_day..d.end_of_day).where.not(business: x_business_ids).count },
+            backgroundColor: "#fff",
+            pointBorderColor: "#fff",
+            borderColor: colors[names.index(name)%15],
+            pointBackgroundColor: colors[names.index(name)%15],
+            borderWidth: 1
+          }
+        end
+      }
+    end
+    def month_follow_count_chart(dates,names,x_business_ids,colors)
+      {
+        labels: dates,
+        datasets:names.map do |name|
+          {
+            hidden: names.index(name) < 3 ? false : true,
+            label: name[0],
+            data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01", "#{d}-31").where.not(business: x_business_ids).count },
+            backgroundColor: "#fff",
+            pointBorderColor: "#fff",
+            borderColor: colors[names.index(name)%15],
+            pointBackgroundColor: colors[names.index(name)%15],
+            borderWidth: 1
+          }
+        end
+      }
+    end
+    def year_follow_count_chart(dates,names,x_business_ids,colors)
+      {
+        labels: dates,
+        datasets:names.map do |name|
+          {
+            hidden: names.index(name) < 3 ? false : true,
+            label: name[0],
+            data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01-01", "#{d}-12-31").where.not(business: x_business_ids).count },
+            backgroundColor: "#fff",
+            pointBorderColor: "#fff",
+            borderColor: colors[names.index(name)%15],
+            pointBackgroundColor: colors[names.index(name)%15],
+            borderWidth: 1
+          }
+        end
+      }
+    end
+
+
   end
 end

data/app/controllers/educode_sales/sales_controller.rb

@@ -14,6 +14,10 @@ module EducodeSales
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @a_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name)
           @b_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name)
+          @c_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::CTYPE)&.name)
+          @d_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::DTYPE)&.name)
+          @e_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::ETYPE)&.name)
+          @o_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::OTYPE)&.name)
           @x = Common.find_by(extras: EducodeSales::Common::XTYPE)
           @step_ids = Common.where(name: %w(已中标 已签单 已验收 回款中 服务中 已结束), clazz: 'business_step').pluck(:id)
           

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/controllers/educode_sales/upload_files_controller.rb

@@ -8,49 +8,62 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @files = Attachment.where(description: "business", container_id:params[:business_id]).page(params[:page]).per(params[:limit])
+          @files = Attachment.where(description: "business", container_id:params[:business_id])
+          if params[:sort].present? && params[:sort][:field]
+            @files = @files.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @files = @files.order("created_on desc")
+          end
+          @files = @files.page(params[:page]).per(params[:limit])
         end
       end
     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_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,13 +1,14 @@
+<%= Gon::Base.render_data %>
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">附件信息</span>
-    <%# if can? :create, EducodeSales::Place %>
+    <%# if can? :create, EducodeSales::file %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="upload_file">上传文件</button>
     <%# end %>
   </div>
 </script>
 
-<table class="layui-hide" id="place" lay-filter="currentTableFilter"></table>
+<table class="layui-hide" id="file" lay-filter="file"></table>
 
 <script type="text/html" id="currentTableBar_file">
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="preview">预览</a>
@@ -31,7 +32,7 @@
 
         var business_id = parent.id
         table.render({
-            elem: '#place',
+            elem: '#file',
             url: '/missions/upload_files?business_id='+business_id,
             toolbar: '#toolbarDemo',
             defaultToolbar: [],
@@ -44,7 +45,6 @@
                     },
                     {
                         field: 'name',
-                        width: 500,
                         title: '文件名'
                     },
                     {
@@ -53,18 +53,20 @@
                         title: '文件大小',
                     },
                     {
-                        field: 'upload_time',
-                        width: 300,
-                        title: '上传时间'
+                        field: 'created_on',
+                        width: 200,
+                        title: '上传时间',
+                        sort: true
                     },
                     {
                         field: 'upload_person',
-                        width: 120,
+                        width: 80,
                         totalRow:true,
                         title: '上传人',
                     },
                     {
                         title: '操作',
+                        width: 200,
                         toolbar: '#currentTableBar_file',
                         align: "center"
                     }
@@ -76,7 +78,20 @@
         });
 
 
-        table.on('toolbar(currentTableFilter)', function (obj) {
+        var sort = {};
+        table.on('sort(file)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('file', {
+                initSort: obj,
+                where: {
+                    sort: sort
+                }
+            });
+        })
+
+
+        table.on('toolbar(file)', function (obj) {
             if (obj.event === 'upload_file') {  //
                 id =parent.id
                 var content = miniPage.getHrefContent('/missions/businesses/upload_file');
@@ -98,20 +113,20 @@
         });
 
 
-
-        table.on('tool(currentTableFilter)', function (obj) {
+        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/business_file/' + name;
                     console.log(pdf);
                     var openWH = miniPage.getOpenWidthHeight();
                     layer.open({
@@ -130,7 +145,7 @@
                 layer.confirm('确定删除' + data.name, function (index) {
                     request.delete('missions/upload_files/' + data.id + '?disk_filename=' + data.disk_filename, {}, function (res) {
                         layer.close(index);
-                        table.reload("place")
+                        table.reload("file")
                     })
                 });
             }

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,13 +173,13 @@
                 field: 'bidded_date',
                 width: 105,
                 title: '中标时间',
-                sort: true
+                  sort: true
               },
               {
                 field: 'signed_date',
                 width: 105,
                 title: '签单时间',
-                sort: true
+                  sort: true
               },
               {
                 field: 'reception_at',
@@ -335,14 +335,14 @@
           title: '商机列表/'+name+'的附件信息',
           type: 1,
           shade: 0.2,
-          maxmin: true,
+          // maxmin: true,
           shadeClose: true,
           area: [openWH[0] + 'px', openWH[1] + 'px'],
           offset: [openWH[2] + 'px', openWH[3] + 'px'],
           content: content
         });
         $(window).on("resize", function () {
-          layer.full(sindex);
+          // layer.full(sindex);
         });
       }
 
@@ -373,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) {
@@ -390,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
             },
@@ -606,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

@@ -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: 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>