educode_sales 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09889c1d05306828a3d6dba9b149cdd6600ada4a043c545bfb6914521fdbfe43'
-  data.tar.gz: 9ee3dfb7975c1270ea5adfd43b3cc0bee417a0cb7c544628486465037afd4166
+  metadata.gz: e75cbf87f4530e2665dd16d6fa56d82a14a0479ba0ce6f9f2cb39f5282ddb034
+  data.tar.gz: b4ab6a572903f23688eeb0441f66776f43ca4cabc70467cb013fff2f1c922473
 SHA512:
-  metadata.gz: 6acf74a3a544e7cc6fc44809976f549fe4f0ca55cc9e96e91044daf2a0b0acddf4807deda3967cb00310c8403fab92930f5f01fb7d17125ca904746a93b30e3d
-  data.tar.gz: 480ec2fc713a76af3cf6207805ee11c805cdeeaa50daefae6b148c70b976140b0ab01ba29aa4bc263b8b6fe9a6ef077c5dae8035acbbc219c5a32c2449cee336
+  metadata.gz: 05cac4d3624e3c08a12957400aef7a091ef51b7edd288e767a6f31f8f8bdfdab6af587335abac527005ed657d115d8a938ef6a8e62f0c6c33514041857335309
+  data.tar.gz: d23d1bd4ce8bcb827e5423e01351eb5c661b95cb64f4c61076cf974752c360b35587c74263e69f6a6392255d08686edc77a4e5813032534f00663afe8724ca2b

data/app/controllers/educode_sales/businesses_controller.rb

@@ -3,6 +3,30 @@ require_dependency "educode_sales/application_controller"
 module EducodeSales
   class BusinessesController < ApplicationController
 
+    def file
+      @root = Rails.root
+      render layout: false
+    end
+    def upload_file
+      render layout: false
+    end
+    def time_line
+      @business = Business.find(params[:business_id])
+      respond_to do |format|
+        format.html do
+          @follow_ups = @business.follow_ups.order(created_at: :desc)
+          # @latest = @follow_ups.order(created_at: :desc).first
+          # if params[:field]
+          #   @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
+          # else
+          #   @follow_ups = @follow_ups.order("created_at desc")
+          # end
+          # @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+          render layout: false
+        end
+      end
+    end
+
     def index
       authorize! :read, Business
       respond_to do |format|
@@ -15,6 +39,8 @@ module EducodeSales
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
           end
+          gon.menus << { title: '跟进时间线', event: 'time_line' }
+          gon.menus << { title: '附件管理', event: 'file' }
           if can?(:update, EducodeSales::Business)
             gon.menus << { title: '编辑', event: 'edit' }
           end
@@ -40,6 +66,36 @@ module EducodeSales
             end
           end
 
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-现有商机)"
+            a_id = Common.find_by(extras: EducodeSales::Common::ATYPE)&.id
+            b_id = Common.find_by(extras: EducodeSales::Common::BTYPE)&.id
+            c_id = Common.find_by(extras: EducodeSales::Common::CTYPE)&.id
+            d_id = Common.find_by(extras: EducodeSales::Common::DTYPE)&.id
+            ids = [a_id ,b_id ,c_id ,d_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.clazz_id in (?)",ids)
+          end
+
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-已中标商机)"
+            @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 < ?", "#{Time.now.year}-01-01", "#{Time.now.year}-12-31")
+          end
+
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-已签单商机)"
+            @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 < ?", "#{Time.now.year}-01-01", "#{Time.now.year}-12-31")
+          end
+
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-已回款商机)"
+            x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+            @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ? AND educode_sales_businesses.return_money > 0", "#{Time.now.year}-01-01", "#{Time.now.year}-12-31").joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where.not("educode_sales_follow_ups.clazz_id = ?",x_id)
+          end
+
           if params[:q].present? && params[:q][:all].present?
             @businesses = @businesses
           end
@@ -51,7 +107,7 @@ module EducodeSales
           end
 
           @businesses = @businesses
-          if params[:q].present? && params[:q][:name].present?
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-已中标商机)" && params[:q][:name] != "(销售态势-已签单商机)" && params[:q][:name] != "(销售态势-已回款商机)" && params[:q][:name] != "(销售态势-现有商机)"
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:department].present?
@@ -213,7 +269,16 @@ module EducodeSales
     end
 
     def show_follow_record
-      @follow_up = FollowUp.find(params[:follow_up_id])
+      follow_up_id = params[:follow_up_id]
+      @follow_up = FollowUp.find(follow_up_id)
+      id = @follow_up.id
+      @follow_ups = Business.find(@follow_up.business_id).follow_ups
+      ids = @follow_ups.ids
+      size = ids.size
+      ids = ids.reverse
+      index = ids.index(id)
+      @next_id = (index != size - 1 && size > 1) ? ids[index + 1] : 0
+      @pre_id = (index != 0 && size > 1) ? ids[index - 1] : 0
       render layout: false
     end
 

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -156,7 +156,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date)
     end
 
     def teacher_params

data/app/controllers/educode_sales/home_controller.rb

@@ -34,7 +34,7 @@ module EducodeSales
     end
 
     def search_operation_teacher
-      @data = Teacher.where("name like ? and is_key = false", "%#{params[:q]}%").limit(20)
+      @data = @current_admin.teachers.where("name like ? and is_key = false", "%#{params[:q]}%").limit(20)
     end
 
     def search_edu_teacher

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -54,11 +54,11 @@ module EducodeSales
       @teacher = Teacher.find_by(id: params[:teacher_id])
       week = Time.now.strftime('%W').to_i
       if week > 3
-        @weeks = [week, week - 1, week - 2]
+        @weeks = [[week+2,week+2], [week+1,week+1], [week.to_s + '  本周',week], [week - 1,week - 1], [week - 2,week - 2]]
       elsif week == 2
-        @weeks = [week, week - 1]
+        @weeks = [[week.to_s + '  本周',week], [week - 1,week - 1]]
       else
-        @weeks = [week]
+        @weeks = [[week.to_s + '  本周',week]]
       end
       @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       render layout: false
@@ -135,7 +135,7 @@ module EducodeSales
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
         if week > 3
-          @weeks = [week, week - 1, week - 2]
+          @weeks = [week+2, week+1, week, week - 1, week - 2]
         elsif week == 2
           @weeks = [week, week - 1]
         else
@@ -143,6 +143,13 @@ module EducodeSales
         end
         @weeks << @sale_plan.weekly
         @weeks = @weeks.uniq.sort
+        @weeks = @weeks.map do |d|
+          if d == week
+            ["#{d}  本周", d]
+          else
+            [d, d]
+          end
+        end
       end
       @months = [Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]
       @months << @sale_plan.month.strftime("%Y-%m")

data/app/controllers/educode_sales/operations_controller.rb

@@ -4,7 +4,7 @@ module EducodeSales
   class OperationsController < ApplicationController
 
     def trends
-      @years = (1..(Time.now.year - 2014)).map { |d| 2014 + d }
+      @years = (1..(Time.now.year - 2014)).reverse_each.map { |d| 2014 + d }
       @year = params[:year] ? params[:year] : Time.now.year
       @operation_trend = OperationTrend.find_or_create_by(year: @year)
       @inc_users_count = User.where("created_on > ? AND created_on <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").count

data/app/controllers/educode_sales/plans_controller.rb

@@ -72,14 +72,14 @@ module EducodeSales
       @business = Business.find_by(id: params[:business_id])
       week = Time.now.strftime('%W').to_i
       if week > 3
-        @weeks = [week, week - 1, week - 2]
+        @weeks = [[week+2,week+2], [week+1,week+1], [week.to_s + '  本周',week], [week - 1,week - 1], [week - 2,week - 2]]
       elsif week == 2
-        @weeks = [week, week - 1]
+        @weeks = [[week.to_s + '  本周',week], [week - 1,week - 1]]
       else
-        @weeks = [week]
+        @weeks = [[week.to_s + '  本周',week]]
       end
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
-      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id)
+      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
       @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
       render layout: false
     end
@@ -97,7 +97,7 @@ module EducodeSales
     def new_month
       @business = Business.find_by(id: params[:business_id])
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
-      @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id)
+      @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
       @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
       render layout: false
     end
@@ -132,13 +132,13 @@ module EducodeSales
 
     def edit_week
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
-      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id)
+      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
       @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
       @sale_plan = SalePlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
         if week > 3
-          @weeks = [week, week - 1, week - 2]
+          @weeks = [week+2, week+1, week, week - 1, week - 2]
         elsif week == 2
           @weeks = [week, week - 1]
         else
@@ -146,6 +146,13 @@ module EducodeSales
         end
         @weeks << @sale_plan.weekly
         @weeks = @weeks.uniq.sort
+        @weeks = @weeks.map do |d|
+          if d == week
+            ["#{d}  本周", d]
+          else
+            [d, d]
+          end
+        end
       end
       @months = [Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]
       @months << @sale_plan.month.strftime("%Y-%m")
@@ -180,7 +187,7 @@ module EducodeSales
 
     def edit_month
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
-      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id)
+      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
       @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
       @sale_plan = SalePlan.find(params[:id])
       @finish_rates = []

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -7,7 +7,7 @@ module EducodeSales
     def trends
       # authorize! :trends,  EducodeSales::SaleTrend
       @year = params[:year] ? params[:year] : Time.now.year
-      @years = (1..(Time.now.year - 2014)).map { |d| 2014 + d }
+      @years = (1..(Time.now.year - 2014)).reverse_each.map { |d| 2014 + d }
       year_time = "#{@year}-01-01 00:00:00"
       year_over_time = "#{@year}-12-31 23:59:59"
       x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
@@ -15,13 +15,13 @@ module EducodeSales
       @sale_trend = SaleTrend.find_or_create_by(year: @year)
       @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:total_amount).round(2)
       stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-      @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.created_at <= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, year_over_time, stage_ids).sum(:total_amount).round(2)
+      @goal_amount = 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 (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).sum(:total_amount).round(2)
       s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-      @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.created_at <= ?  AND educode_sales_follow_ups.stage_id IN (?)", year_time, year_over_time, s_stage_ids).sum(:total_amount).round(2)
+      @service_amount = 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 (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids).sum(:total_amount).round(2)
       @return_amount = 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 <= ? ", year_time, year_over_time).sum(:amount).round(2)
-      a = Common.where(clazz: '商机类型', name: 'A类-有预算主推').pluck(:id)
+      a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)
       @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: 'B类-有预算不主推').pluck(:id)
+      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)
     end
 

data/app/controllers/educode_sales/sales_controller.rb

@@ -12,8 +12,8 @@ module EducodeSales
         end
         format.json do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
-          @a_clazz = Common.find_by(clazz: 'business_type', name: 'A类-有预算主推')
-          @b_clazz = Common.find_by(clazz: 'business_type', name: 'B类-有预算不主推')
+          @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)
           @x = Common.find_by(extras: EducodeSales::Common::XTYPE)
           @step_ids = Common.where(name: %w(已中标 已签单 已验收 回款中 服务中 已结束), clazz: 'business_step').pluck(:id)
           

data/app/controllers/educode_sales/upload_files_controller.rb

@@ -0,0 +1,99 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class UploadFilesController < ApplicationController
+
+    def index
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          @files = Attachment.where(description: "business", container_id:params[:business_id]).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
+    end
+
+    def destroy
+      file = Attachment.find(params[:id])
+      file.destroy
+      File.delete("#{Rails.root}/public/images/" + file.disk_filename)
+      render_success
+    end
+
+    def download
+      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')
+    end
+
+
+    def file_ext(file_name)
+      ext = ''
+      exts = file_name.split(".")
+      if exts.size > 1
+        ext = ".#{exts.last}"
+      end
+      ext
+    end
+
+    def file_save_to_local(save_path, temp_file, ext)
+      unless Dir.exists?(save_path)
+        FileUtils.mkdir_p(save_path) ##不成功这里会抛异常
+      end
+
+      digest = md5_file(temp_file)
+      digest = "#{digest}_#{(Time.now.to_f * 1000).to_i}"
+      local_file_path = File.join(save_path, digest) + ext
+      save_temp_file(temp_file, local_file_path)
+
+      [local_file_path, digest]
+    end
+
+
+    def md5_file(temp_file)
+      md5 = Digest::MD5.new
+      temp_file.rewind
+      while (buffer = temp_file.read(8192))
+        md5.update(buffer)
+      end
+      md5.hexdigest
+    end
+
+    def save_temp_file(temp_file, save_file_path)
+      File.open(save_file_path, 'wb') do |f|
+        temp_file.rewind
+        while (buffer = temp_file.read(8192))
+          f.write(buffer)
+        end
+      end
+    end
+
+  end
+end

data/app/models/educode_sales/common.rb

@@ -4,6 +4,10 @@ module EducodeSales
 
     XTYPE = "x_class"
     OTYPE = 'o_class'
+    ATYPE = 'a_class'
+    BTYPE = 'b_class'
+    CTYPE = 'c_class'
+    DTYPE = 'd_class'
 
     validates :name, uniqueness: {scope: :clazz, message: '已存在'}
     

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

@@ -41,6 +41,21 @@
           id="invitation_at_edit" placeholder="请选择日期">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">中标时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" value="<%= @follow_up.bidded_date %>" name="bidded_date"
+          id="invitation_at_edit" placeholder="请选择日期">
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">签单时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" value="<%= @follow_up.signed_date %>" name="signed_date"
+          id="invitation_at_edit" placeholder="请选择日期">
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">验收时间</label>
       <div class="layui-input-inline">

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

@@ -0,0 +1,140 @@
+<script type="text/html" id="toolbarDemo">
+  <div class="layui-btn-container">
+    <span class="table-label">附件信息</span>
+    <%# if can? :create, EducodeSales::Place %>
+    <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>
+
+<script type="text/html" id="currentTableBar_file">
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="preview">预览</a>
+  <a href="/missions/upload_files/download?id={{d.id}}" class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="download">下载</a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+</script>
+
+<script type="text/html" id="showchance">
+  <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
+</script>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            upload = layui.upload;
+        miniPage = layui.miniPage;
+
+
+        var business_id = parent.id
+        table.render({
+            elem: '#place',
+            url: '/missions/upload_files?business_id='+business_id,
+            toolbar: '#toolbarDemo',
+            defaultToolbar: [],
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 80,
+                        title:'序号',type: 'numbers',
+                    },
+                    {
+                        field: 'name',
+                        width: 500,
+                        title: '文件名'
+                    },
+                    {
+                        field: 'size',
+                        width: 100,
+                        title: '文件大小',
+                    },
+                    {
+                        field: 'upload_time',
+                        width: 300,
+                        title: '上传时间'
+                    },
+                    {
+                        field: 'upload_person',
+                        width: 120,
+                        totalRow:true,
+                        title: '上传人',
+                    },
+                    {
+                        title: '操作',
+                        toolbar: '#currentTableBar_file',
+                        align: "center"
+                    }
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true
+        });
+
+
+        table.on('toolbar(currentTableFilter)', function (obj) {
+            if (obj.event === 'upload_file') {  //
+                id =parent.id
+                var content = miniPage.getHrefContent('/missions/businesses/upload_file');
+                var openWH = miniPage.getOpenWidthHeight();
+                import_index = layer.open({
+                    title: '上传文件',
+                    type: 1,
+                    shade: 0.2,
+                    shadeClose: true,
+                    area: ['200px', '100px'],
+                    offset: 'auto',
+                    closeBtn: 0,
+                    content: content,
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }
+        });
+
+
+
+        table.on('tool(currentTableFilter)', function (obj) {
+            var data = obj.data;
+            var id = data.id
+            name = data.disk_filename
+            if (obj.event === 'preview') {
+                if (data.content_type.split("/")[0] === "image"){
+                    // var img = "<img src='/images/" + name + "' />";
+                    layer.photos({
+                        photos: { "data": [{"src": '/images/'+name}] }
+                        ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
+                    });
+                }else if (data.content_type.split("/")[1] === "pdf"){
+                    var pdf = '/images/' + name;
+                    console.log(pdf);
+                    var openWH = miniPage.getOpenWidthHeight();
+                    layer.open({
+                        title: data.name,
+                        type: 2,
+                        area: ['1000px', '750px'],
+                        fixed: false, //不固定
+                        maxmin: true,
+                        content: pdf
+                    });
+                }else{
+                    layer.msg("附件不支持预览，请下载查看！")
+                }
+                return false;
+            }else if (obj.event === 'delete') {
+                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")
+                    })
+                });
+            }
+        });
+
+    });
+</script>

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

@@ -5,7 +5,7 @@
         <div class="layui-inline">
           <label class="layui-form-label">商机名称</label>
           <div class="layui-input-inline">
-            <input type="text" name="name" autocomplete="off" class="layui-input">
+            <input type="text" name="name" autocomplete="off" class="layui-input" value="<%=params[:name] %>">
           </div>
         </div>
         <div class="layui-inline">
@@ -169,6 +169,18 @@
                 title: '招标时间',
                 sort: true
               },
+              {
+                field: 'bidded_date',
+                width: 105,
+                title: '中标时间',
+                sort: true
+              },
+              {
+                field: 'signed_date',
+                width: 105,
+                title: '签单时间',
+                sort: true
+              },
               {
                 field: 'reception_at',
                 width: 105,
@@ -248,6 +260,12 @@
             case 'edit':
               edit(id);
               break;
+            case 'file':
+              file(id, elem.data('name'));
+              break;
+            case 'time_line':
+              time_line(id, elem.data('name'));
+              break;
             case 'delete':
               deleteBusiness(id, elem.data('name'));
               break;
@@ -292,6 +310,41 @@
           layer.full(sindex);
         });
       }
+      function time_line(id,name) {
+        var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + id);
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = layer.open({
+            title: '商机列表/'+name+'的跟进时间线',
+          type: 1,
+          shade: 0.2,
+          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);
+        });
+      }
+      function file(id, name) {
+          id = id
+          var content = miniPage.getHrefContent('/missions/businesses/file?business_id=' + id);
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = layer.open({
+          title: '商机列表/'+name+'的附件信息',
+          type: 1,
+          shade: 0.2,
+          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);
+        });
+      }
 
       function month(id) {
         var content = miniPage.getHrefContent('/missions/plans/new_month?business_id=' + id);
@@ -533,6 +586,7 @@
                 });
             } else if (obj.event === 'show_follow') {
                 business_id = obj.data.id
+                 business_name = data.name
                 content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({