educode_sales 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 249bcf8612e073c689b8c6f696cc3590aeffb4271b6eef3ed7b95ecc2033aba5
-  data.tar.gz: 1efd466f3e9630b9908c94d7fe6184979ab775c75946b77987a8f07e67618b64
+  metadata.gz: 1ae794ee6831f1fab6465eb9290de9f3155b4a32e13acafe865500e42decaff6
+  data.tar.gz: cb2e8ea7a97b6cd04942343417a7d427f18657dec46ddc2805d11a876a8672f1
 SHA512:
-  metadata.gz: f189282b2df2c5bbae317f6ed513862721dc280885791fe5dfda7b2245894d511d0d303a2d5caaab304adb855de8f9d8e65f2c014f4212b34b347e3126854fd0
-  data.tar.gz: 6848e0f74872c5b7e53e05104a224abd58a6a4b8b374393e918ad09c20a34d83b7aa78789bc9e6c2d1091d5f06f6d057400ed0eeeaa9605637bd0abe592ffdd8
+  metadata.gz: 72e214c3bca3382997cc389f36eb92747a96323ef141f255154aff068b20c9e5488fe24de4a028bbcb67a6d4c8d457713d078c6c5a70d8be08c311e3402363f4
+  data.tar.gz: f570a34ca2014691e28f95c758a204a82f3953118deccc89b22650476fc32ca7f5cf7a003758023796f2deccb980fbb609cfd0f99a141cafd027c06f8293ef18

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
@@ -319,5 +319,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

@@ -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 = ['#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)+1],
+                     borderColor: colors[sale_names.index(name)+1],
+                     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)+1],
+                           borderColor: colors[sale_names.index(name)+1],
+                           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)+1],
+                           borderColor: colors[sale_names.index(name)+1],
+                           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)%10],
+            pointBackgroundColor: colors[names.index(name)%10],
+            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)%10],
+            pointBackgroundColor: colors[names.index(name)%10],
+            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)%10],
+            pointBackgroundColor: colors[names.index(name)%10],
+            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,9 +20,10 @@ module EducodeSales
     end
 
     def create
+      folder = edu_setting('attachment_folder')
         upload_file = params["file"]
         raise "未上传文件" unless upload_file
-        save_path = File.join("#{Rails.root}/public/images")
+        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'
@@ -47,16 +48,22 @@ module EducodeSales
     end
 
     def destroy
+      folder = edu_setting('attachment_folder')
       file = Attachment.find(params[:id])
       file.destroy
-      File.delete("#{Rails.root}/public/images/" + file.disk_filename)
+      File.delete(folder.to_s + '/' + file.disk_filename) if FileTest::exist?(folder.to_s + '/' + file.disk_filename)
       render_success
     end
 
     def download
+      folder = edu_setting('attachment_folder')
       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.to_s + '/' + 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/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": '/business_file/' + name}] }
                         ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
                     });
                 }else if (data.content_type.split("/")[1] === "pdf"){
-                    var pdf = '/images/' + name;
+                    var pdf = '/business_file/' + name;
                     console.log(pdf);
                     var openWH = miniPage.getOpenWidthHeight();
                     layer.open({

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

@@ -614,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,7 +97,7 @@
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline" style="z-index: 10000">
+      <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">

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

@@ -64,9 +64,11 @@
     <%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>
@@ -91,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
@@ -100,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
@@ -109,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

@@ -84,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>