educode_sales 0.4.0 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beaaef9ad85e45c39ff91fc919a392c864872b7c3c6b5ad40cbff4ca931ab7b8
-  data.tar.gz: c99241524289cd79e31c992e85921aa706962253a60d08ecb10dece9215d9120
+  metadata.gz: bbb707c74c7909b2a42a4cc3eaf395677a436c8a210db16ba31cfb5abb0c9cdd
+  data.tar.gz: 7c08a37d777b84396fc415076c6fa768eb0bd9dc56d9e6307451832212141a71
 SHA512:
-  metadata.gz: 7abc3483c8e33f0385e1a77edaed2c60b8db9dbf06ae41679cbd379a74a168a3f5869b2a5bd49e2e5e95dd0c90fea504668433841970239ca453031a1ba04bc5
-  data.tar.gz: fe192afb0f2a09d6b924c5901c2aac1bc1d83046ffe4cd3fe20152df2084b19afc5bba62dc71816f68d30418ca2b35c060037b7acf5ab44b3d86f5d45a647d9e
+  metadata.gz: d96671e32dfe8e9469c6f93927cf453d86861004d123bbbc01b1118295e7827fd37a1b039ac629a51803d1132341afed7b58fb630919387251253481377d7720
+  data.tar.gz: '0628d9062d5c4b72851dc9cbb0f997169cb395713c3e20263c7b32df369ef323c79370955dffb428b88ff33d9cb297e0ebd3720b1c6bb1f04fdeeb198fbf49ad'

data/app/controllers/educode_sales/businesses_controller.rb

@@ -40,6 +40,18 @@ module EducodeSales
             end
           end
 
+          if params[:q].present? && params[:q][:all].present?
+            @businesses = @businesses
+          end
+
+          if params[:q].present? && params[:q][:mine].present?
+            ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+            ids1 = FollowUp.where(id: ids).pluck(:business_id)
+            # ids2 = Business.where(staff_id: @current_admin.id).pluck(:id)
+            # @businesses = Business.where(id: ids1+ids2)
+            @businesses =@businesses.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
+          end
+
           @businesses = @businesses
           if params[:q].present? && params[:q][:name].present?
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
@@ -80,7 +92,6 @@ module EducodeSales
             @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1])
           end
 
-
           if params[:sort].present? && params[:sort][:field]
             @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
@@ -89,6 +100,8 @@ module EducodeSales
 
           @business_count = @businesses.count
 
+
+
           @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
@@ -177,6 +190,7 @@ module EducodeSales
 
     def new_follow_record
       load_business
+      @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       @stages = Common.where(clazz: 'business_step').order("position").pluck(:name, :id)
       @places = Place.order("created_at desc").pluck(:name, :id)
@@ -201,6 +215,7 @@ module EducodeSales
     end
 
     def edit_follow_record
+      @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @follow_up = FollowUp.find(params[:follow_up_id])
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       @stages = Common.where(clazz: 'business_step').order("position").pluck(:name, :id)
@@ -222,7 +237,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_rate, :description, :advise, :place_id)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
     end
 
   end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -11,7 +11,7 @@ module EducodeSales
         follow_up.assign_follow_ups.build(staff_id: d)
       end
       
-      follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
+      follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) if follow_up.actual_amount
       if follow_up.save
         if @business.last_follow_up.present?
           @business.last_follow_up.key_person.each do |d|
@@ -54,7 +54,7 @@ module EducodeSales
         assign_follow_ups << follow_up.assign_follow_ups.find_or_initialize_by(staff_id: d)
       end
       follow_up.assign_follow_ups = assign_follow_ups
-      follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
+      follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
         render_success
       else
@@ -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_rate, :description, :advise, :place_id)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
     end
 
     def teacher_params

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -20,8 +20,8 @@ module EducodeSales
             when '自己'
               @sale_plans = OperationPlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_plans = OperationPlan.where("staff_id in ?", staff_ids)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              @sale_plans = OperationPlan.where("staff_id in (?)", staff_ids)
             else
               @sale_plans = OperationPlan
             end

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -17,8 +17,8 @@ module EducodeSales
             when '自己'
               @sale_reports = OperationReport.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
-              @sale_reports = OperationReport.where("staff_id in ?", staff_ids)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              @sale_reports = OperationReport.where("staff_id in (?)", staff_ids)
             else
               @sale_reports = OperationReport
             end

data/app/controllers/educode_sales/places_controller.rb

@@ -9,7 +9,7 @@ module EducodeSales
         end
         format.json do
           @places = Place.page(params[:page]).per(params[:limit])
-          @x = Common.find_by(clazz: '商机类型', name: 'X类')&.id
+          @x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
           @stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
         end
       end

data/app/controllers/educode_sales/plans_controller.rb

@@ -21,8 +21,8 @@ module EducodeSales
             when '自己'
               @sale_plans = SalePlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
-              @sale_plans = SalePlan.where("staff_id in ?", staff_ids)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              @sale_plans = SalePlan.where("staff_id in (?)", staff_ids)
             else
               @sale_plans = SalePlan
             end

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -50,8 +50,8 @@ module EducodeSales
             when '自己'
               @sale_reports = SaleReport.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
-              @sale_reports = SaleReport.where("staff_id in ?", staff_ids)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              @sale_reports = SaleReport.where("staff_id in (?)", staff_ids)
             else
               @sale_reports = SaleReport
             end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -9,15 +9,15 @@ module EducodeSales
       @year = params[:year] ? params[:year] : Time.now.year
       @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
       year_time = "#{@year}-01-01 00:00:00"
-      x = Common.find_by(clazz: '商机类型', name: 'X类')&.id
-      o = Common.find_by(clazz: '商机类型', name: 'O类')&.id
+      x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+      o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
       @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).where("educode_sales_follow_ups.created_at >= ?", year_time).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.stage_id IN (?)", year_time, 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.stage_id IN (?)", year_time, 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("educode_sales_money_plans.date_at >= ?", year_time).sum(: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 >= ?", year_time).sum(:amount).round(2)
       a = Common.where(clazz: '商机类型', name: 'A类').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)

data/app/controllers/educode_sales/sales_controller.rb

@@ -14,7 +14,7 @@ module EducodeSales
           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类')
-          @x = Common.find_by(clazz: 'business_type', name: 'X类')
+          @x = Common.find_by(extras: EducodeSales::Common::XTYPE)
           @step_ids = Common.where(name: %w(已中标 已签单 已验收 回款中 服务中 已结束), clazz: 'business_step').pluck(:id)
           
           @staffs = Staff.where(job_type: common.id).page(params[:page]).per(params[:limit])

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -34,7 +34,7 @@ module EducodeSales
     def update
       follow_up = TeacherFollow.find(params[:id])
       follow_up.assign_attributes(follow_up_params)
-      # follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
+      # follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_amount.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
         render_success
       else

data/app/controllers/educode_sales/teachers_controller.rb

@@ -280,7 +280,7 @@ module EducodeSales
     def course_list
       user = User.find_by(id: params[:user_id])
       if user
-      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).distinct("course_id").page(params[:page]).per(params[:limit])
+      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct("course_id").page(params[:page]).per(params[:limit])
       else
         @courses = Course.none
       end

data/app/models/educode_sales/common.rb

@@ -2,6 +2,8 @@ module EducodeSales
   class Common < ApplicationRecord
     acts_as_list scope: [:clazz]
 
+    XTYPE = "x_class"
+    OTYPE = 'o_class'
 
     validates :name, uniqueness: {scope: :clazz, message: '已存在'}
     

data/app/models/educode_sales/teacher.rb

@@ -37,7 +37,7 @@ module EducodeSales
 
     def students_count
       if user_id.present?
-        course_ids = CourseMember.where.not(role: "STUDENT").where(user_id: user_id).pluck(:course_id)
+        course_ids = Course.joins(:course_members).where(course_members: {user_id: user_id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct("course_id").pluck(:course_id)
         CourseMember.where(course_id: course_ids, role: "STUDENT").count
       else
         0

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

@@ -17,9 +17,9 @@
     <br>
     <div class="layui-inline">
       <label class="layui-form-label required">项目类型</label>
-      <%if  EducodeSales::FollowUp.where(business_id: @follow_up.business.id,clazz_id: EducodeSales::Common.find_by(name: "O类").id).count >= 2 %>
+      <%if  EducodeSales::FollowUp.where(business_id: @follow_up.business.id,clazz_id: EducodeSales::Common.find_by(name: @o_name).id).count >= 2 %>
         <div class="layui-input-inline">
-          <%= select_tag "clazz_id", options_for_select([['O类',EducodeSales::Common.find_by(name: "O类").id]]),:disabled => true, class: 'required' %>
+          <%= select_tag "clazz_id", options_for_select([[@o_name,EducodeSales::Common.find_by(name: @o_name).id]]),:disabled => true, class: 'required' %>
         </div>
       <%else %>
         <div class="layui-input-inline">
@@ -56,9 +56,9 @@
       </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" value="<%= @follow_up.actual_amount %>">
+         <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
       </div>
     </div>
     <br>
@@ -69,11 +69,10 @@
       </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_rate" class="layui-input" value="<%= @follow_up.divide_rate%>">
+        <input name="divide_amount" class="layui-input" value="<%= @follow_up.divide_amount%>">
       </div>
-      <span style="margin-top: 10px; float:left;">%</span>
     </div>
     <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
@@ -82,7 +81,7 @@
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label required">商机说明</label>
+      <label class="layui-form-label required">最新进展</label>
       <div class="layui-input-block">
         <textarea name="description" lay-verify="required" placeholder="此处可以填写：
 1、有无预算；

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

@@ -68,6 +68,8 @@
     <% if can? :create, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加商机</button>
     <% end %>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="mine"> 我的商机</button>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="all"> 全部商机</button>
   </div>
 </script>
 <script type="text/html" id="currentTableBar">
@@ -150,7 +152,7 @@
               // },
               {
                 field: 'clazz',
-                width: 60,
+                width: 120,
                 title: '类型'
               },
               {
@@ -195,7 +197,12 @@
               {
                 field: 'last_follow_person',
                 width: 120,
-                title: '跟进人'
+                title: '最新跟进人'
+              },
+              {
+                field: 'latest_time',
+                width: 200,
+                title: '最新跟进时间'
               },
               {
                 title: '操作',
@@ -361,7 +368,35 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
-            } else if (obj.event === 'delete') { // 监听删除操作
+            } else if (obj.event === 'all') {
+                search = {"all":"1"}
+                table.reload('businesses_table', {
+                    page: {
+                        curr: 1
+                    },
+                    where: {q: search, sort: sort}
+                }, 'data');
+                form.val('search_form', {
+                    name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                    place_id: '', date: '', area: ''
+                })
+                return false;
+            }
+            else if (obj.event === 'mine') {
+                search = {"mine":"1"}
+                table.reload('businesses_table', {
+                    page: {
+                        curr: 1
+                    },
+                    where: {q: search, sort: sort}
+                }, 'data');
+                form.val('search_form', {
+                    name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                    place_id: '', date: '', area: ''
+                })
+                return false;
+            }
+            else if (obj.event === 'delete') {
                 var checkStatus = table.checkStatus('currentTableId'),
                     data = checkStatus.data;
                 layer.alert(JSON.stringify(data));

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

@@ -20,6 +20,7 @@ json.data do
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
   end
 end
 json.code 0

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

@@ -17,9 +17,9 @@
     <br>
     <div class="layui-inline">
       <label class="layui-form-label required">项目类型</label>
-      <%if @last_follow_up&.clazz&.name == "O类" %>
+      <%if @last_follow_up&.clazz&.name == @o_name %>
       <div class="layui-input-inline">
-        <%= select_tag "clazz_id", options_for_select([['O类',EducodeSales::Common.find_by(name: "O类").id]]),:disabled => true, class: 'required' %>
+        <%= select_tag "clazz_id", options_for_select([[@o_name,EducodeSales::Common.find_by(name: @o_name).id]]),:disabled => true, class: 'required' %>
       </div>
         <%else %>
         <div class="layui-input-inline">
@@ -59,9 +59,9 @@
       </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" autocomplete="off"
+        <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
           value="<%= @last_follow_up&.actual_amount%>">
       </div>
     </div>
@@ -73,11 +73,10 @@
       </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_rate" class="layui-input" value="<%= @last_follow_up&.divide_rate%>">
+        <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
       </div>
-      <span style="margin-top: 10px; float:left;">%</span>
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
@@ -86,7 +85,7 @@
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label required">商机说明</label>
+      <label class="layui-form-label required">最新进展</label>
       <div class="layui-input-block">
         <textarea name="description" lay-verify="required" placeholder="此处可以填写：
 1、有无预算；

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

@@ -86,9 +86,14 @@
                 title: '时间',
                 sort: true
               },
+                {
+                    field: 'staff',
+                    width: 100,
+                    title: '跟进人',
+                },
               {
                 field: 'clazz',
-                width: 60,
+                width: 120,
                 title: '类型',
               },
               {
@@ -120,12 +125,12 @@
               {
                 field: 'actual_amount',
                 width: 100,
-                title: '实额',
+                title: '合同额',
               },
               {
-                field: 'divide_rate',
-                width: 80,
-                title: '分成',
+                field: 'divide_amount',
+                width: 100,
+                title: '渠道分成',
               },
               {
                 field: 'money',
@@ -138,11 +143,6 @@
                 title: '回款计划',
                 templet: '#edit_plan'
               },
-              {
-                field: 'staff',
-                width: 100,
-                title: '跟进人',
-              },
               {
                 field: 'place',
                 width: 200,

data/app/views/educode_sales/businesses/show_follow.json.jbuilder

@@ -9,11 +9,11 @@ json.data do
     json.reception_at d.reception_at&.to_s(:date)
     json.total_amount d.total_amount
     json.actual_amount d.actual_amount
-    json.divide_rate d.divide_rate ? "#{d.divide_rate}%" : ""
+    json.divide_amount d.divide_amount ? d.divide_amount : ""
     json.staff d.staff.user.real_name
     json.place d.place&.name
     json.money_plans_count d.money_plans_count
-    json.money d.money_plans.where(clazz: 1).sum(:amount)
+    json.money d.money_plans.where(clazz: 1).sum(:amount).round(2)
     json.is_latest d.id == @latest&.id
   end
 end

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

@@ -47,7 +47,7 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">实额：</label>
+      <label class="layui-form-label">合同额：</label>
       <div class="layui-input-inline">
         <%= @follow_up.actual_amount %>万
       </div>
@@ -60,9 +60,9 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">分成：</label>
+      <label class="layui-form-label">渠道分成：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.divide_rate %>%
+        <%= @follow_up.divide_amount %>
       </div>
     </div>
     <div class="ayui-form-item">
@@ -72,7 +72,7 @@
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">商机说明：</label>
+      <label class="layui-form-label">最新进展：</label>
       <div class="layui-input-block" style="padding-right: 20px;">
         <pre><%= @follow_up.description %></pre>
       </div>
@@ -83,5 +83,17 @@
         <pre><%= @follow_up.advise %></pre>
       </div>
     </div>
+    <div class="layui-form-item layui-form-text">
+      <label class="layui-form-label">时间：</label>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @follow_up.created_at.to_s %></pre>
+      </div>
+    </div>
+    <div class="layui-form-item layui-form-text">
+      <label class="layui-form-label">跟进人：</label>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @follow_up.staff.user.real_name %></pre>
+      </div>
+    </div>
   </div>
 </form>