educode_sales 0.5.1 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 249bcf8612e073c689b8c6f696cc3590aeffb4271b6eef3ed7b95ecc2033aba5
-  data.tar.gz: 1efd466f3e9630b9908c94d7fe6184979ab775c75946b77987a8f07e67618b64
+  metadata.gz: c060696641e16a80fea2b02631788112e85082b8ccba0a037a2635d6563dbe24
+  data.tar.gz: 07230a0582b71a0ebfceddc1ce347a667651f778fed3640a0c82b22ee952f620
 SHA512:
-  metadata.gz: f189282b2df2c5bbae317f6ed513862721dc280885791fe5dfda7b2245894d511d0d303a2d5caaab304adb855de8f9d8e65f2c014f4212b34b347e3126854fd0
-  data.tar.gz: 6848e0f74872c5b7e53e05104a224abd58a6a4b8b374393e918ad09c20a34d83b7aa78789bc9e6c2d1091d5f06f6d057400ed0eeeaa9605637bd0abe592ffdd8
+  metadata.gz: 110a25d3261f894f5ce6c5fed8e08d7afd62dd186ce6e18a10fe8d7f68033f03e48e2bdeca23df1408495e608899fc1383e5f3a0da25f1c13736b04488179820
+  data.tar.gz: 876c22dbca43a2624dbb2407cd5520c1ea0e044d696b4e3adb9571d65220560b0de3c13ecb337a9d914097b93cce6373db0a598dc5be440bbd925ee8744f995e

data/app/controllers/educode_sales/businesses_controller.rb

@@ -4,7 +4,7 @@ module EducodeSales
   class BusinessesController < ApplicationController
 
     def file
-      @root = Rails.root
+      gon.folder = edu_setting('attachment_folder') + '/'
       render layout: false
     end
     def upload_file
@@ -176,6 +176,7 @@ module EducodeSales
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
+            last_follow.actual_amount,
             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])
@@ -319,5 +320,8 @@ module EducodeSales
       params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
     end
 
+    def edu_setting name
+      EduSetting.get(name)
+    end
   end
 end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -132,7 +132,8 @@ module EducodeSales
         )
         teacher.save
         key_peprson = KeyPerson.new(teacher_params)
-        key_peprson.teacher = teacher
+        teacher_id = EducodeSales::Teacher.find_by(name: user.real_name, department_id: user.department_id).id
+        key_peprson.teacher_id = teacher_id
       end
 
       follow_up.key_person << key_peprson

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -78,7 +78,17 @@ module EducodeSales
     end
 
     def new_weekly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @name = @current_admin.user.real_name
       sale_plans = OperationPlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: Time.now.strftime('%W').to_i, staff_id: @current_admin.id)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
@@ -95,7 +105,17 @@ module EducodeSales
     end
 
     def new_monthly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @name = @current_admin.user.real_name
       sale_plans = OperationPlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", staff_id: @current_admin.id, weekly: nil)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -68,7 +68,17 @@ module EducodeSales
     def show
       @sale_report = OperationReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
@@ -81,7 +91,17 @@ module EducodeSales
     def edit
       @sale_report = OperationReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
@@ -118,7 +138,17 @@ module EducodeSales
     def audit
       @sale_report = OperationReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 

data/app/controllers/educode_sales/plans_controller.rb

@@ -86,7 +86,17 @@ module EducodeSales
     end
 
     def new_weekly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @name = @current_admin.user.real_name
       sale_plans = SalePlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: Time.now.strftime('%W').to_i, staff_id: @current_admin.id)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
@@ -104,7 +114,17 @@ module EducodeSales
     end
 
     def new_monthly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @name = @current_admin.user.real_name
       sale_plans = SalePlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", staff_id: @current_admin.id, weekly: nil)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0

data/app/controllers/educode_sales/roles_controller.rb

@@ -35,6 +35,11 @@ module EducodeSales
       render layout: false
     end
 
+    def rename
+      @name = Role.find(params[:id]).name
+      render layout: false
+    end
+
     def update_role
       role = Role.find(params[:id])
       if role.update(name: params[:name])

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -24,7 +24,17 @@ module EducodeSales
     def show
       @sale_report = SaleReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
@@ -86,7 +96,17 @@ module EducodeSales
     def edit
       @sale_report = SaleReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
@@ -123,7 +143,17 @@ module EducodeSales
     def audit
       @sale_report = SaleReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -16,13 +16,85 @@ module EducodeSales
       @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.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)
+      @actual_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(:actual_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.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)
+      @actual_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(:actual_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: 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: 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)
+
+      count_type = params[:count_type] || "actual_amount"
+      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 = (30.day.ago.to_date..Date.today).map { |d| d.strftime("%Y-%W")}.uniq #默认时间范围
+      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)' ,'rgba(255, 0, 250, 1)']
+      @follow_count_range = params[:follow_count_range] || "week"
+      @goal_count_range = params[:goal_count_range] || "month"
+      # 商机跟进数图表
+      @follow_count_data = week_follow_count_chart(default_dates,names,x_business_ids,colors)
+      if params[:follow_count_range].present?
+        case params[:follow_count_range]
+        when "week"  #按周
+          if params[:date_week].present?
+            date = params[:date_week].split(" - ")
+            dates = (date[0].to_date..date[1].to_date).map { |d|
+              d.strftime("%Y-%W")}.uniq
+            @follow_count_data = week_follow_count_chart(dates,names,x_business_ids,colors)
+          end
+        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 = ['已中标','已签单','已回款']
+      10.times{p count_type}
+       @goal_count_data = month_sale_chart(goal_default_dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
+      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 =  month_sale_chart(dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
+          end
+          else        #按年
+          if params[:goal_date_year].present?
+            date = params[:goal_date_year].split(" - ")
+            dates = (date[0]..date[1]).to_a
+            @goal_count_data = year_sale_chart(dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
+          end
+        end
+      end
     end
 
     def sale_trends
@@ -44,5 +116,129 @@ 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.with_index do |name,i|
+          {
+            hidden: i < 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: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2
+          }
+        end
+      }
+    end
+    def week_follow_count_chart(dates,names,x_business_ids,colors)
+      {
+        labels: dates,
+        datasets:names.map.with_index do |name,i|
+          {
+            hidden: i < 3 ? false : true,
+            label: name[0],
+            data: dates.map{ |d|
+              d = d.split("-")
+              year = d[0].to_i
+              week = d[1].to_i
+               if week == 0
+                 @follow_up = 0
+               else
+                 @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", Date.commercial(year,week).strftime("%Y-%m-%d"), Date.commercial(year,week,7).strftime("%Y-%m-%d")).where.not(business: x_business_ids).count
+               end
+               },
+            backgroundColor: "#fff",
+            pointBorderColor: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2
+          }
+        end
+      }
+    end
+    def month_follow_count_chart(dates,names,x_business_ids,colors)
+      {
+        labels: dates,
+        datasets:names.map.with_index do |name,i|
+          {
+            hidden: i < 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: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2,
+          }
+        end
+      }
+    end
+    def year_follow_count_chart(dates,names,x_business_ids,colors)
+      {
+        labels: dates,
+        datasets:names.map.with_index do |name,i|
+          {
+            hidden: i < 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: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2
+          }
+        end
+      }
+    end
+
+    def month_sale_chart(dates,names,colors,x,stage_ids,s_stage_ids,count_type)
+      {
+        labels: dates,
+        datasets: names.map.with_index do |name,i|{
+          label: name,
+          data: dates.map{ |d|
+            case i
+            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(count_type).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(count_type).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[i],
+          borderColor: colors[i],
+          borderWidth: 1
+        }
+        end
+      }
+    end
+
+    def year_sale_chart(dates,names,colors,x,stage_ids,s_stage_ids,count_type)
+      {
+        labels: dates,
+        datasets:names.map.with_index do |name,i| {
+          label: name,
+          data: dates.map{ |d|
+            case i
+            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(count_type).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(count_type).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[i],
+          borderColor: colors[i],
+          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/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", "files", '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", "files", '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", "files", '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/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/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/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,21 +113,19 @@
         });
 
 
-
         table.on('tool(file)', function (obj) {
             var data = obj.data;
             var id = data.id
             name = data.disk_filename
+            folder = gon.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": '/files/educode_sales/' + name}] }
                         ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
                     });
                 }else if (data.content_type.split("/")[1] === "pdf"){
-                    var pdf = '/images/' + name;
-                    console.log(pdf);
+                    var pdf = '/files/educode_sales/' + name;
                     var openWH = miniPage.getOpenWidthHeight();
                     layer.open({
                         title: data.name,