educode_sales 1.10.26 → 1.10.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5943ba3342b717b15aae35d1f7924a361af064491e015a553cc9f0e7b47586
-  data.tar.gz: 37f21daa33a22073f98454512b4488bf39757ed93e471b62c4ef16380ab09453
+  metadata.gz: b133a8fca27810c1c165bdab01c812af7c4ee76a0f80b02be3fcc064a353e4f9
+  data.tar.gz: 3631d821e73722d263dc9f724f09b19abd7dc0a9559a114f41f5bf204a334cb2
 SHA512:
-  metadata.gz: d2c8a7277e685e6a73ad129275bb4b75d041bdfe870760f2833be8a8f0a387dbc41aacaafb3acb52530b941baced2bf02823cc71b313620423c3cd510f94fa85
-  data.tar.gz: 99ecbbc2a8626d0ba99289a499008b7dcc8591154907cbdcab6abf427c3e49ce7b223dc9052df77ef30fcbcb2356b25edd91055267df6df739efecf3fc61ea62
+  metadata.gz: b3f72cb4af3f4f343fefc8438d08bc041d3f3526e639a0714196fbd63c91b9a322e03d2fc2548632b97aeed7cd6a7425a2bc5c9e798563b10be870124e504539
+  data.tar.gz: 40fbf3c2c51e50c8eaac57940279e8ec16708b1bfddc6d3673aed16033aa07aaadfaa8f69a28f9f527987afe515e77f565272298ac1f915deeb883535d27a048

data/app/controllers/educode_sales/businesses_controller.rb

@@ -115,7 +115,7 @@ module EducodeSales
           end
         end
         format.json do
-          if params[:q] && (params[:q][:clazz] == 'area' || params[:q][:clazz] == 'special' || params[:q][:clazz] == 'delete_list')
+          if params[:q] && (params[:q][:clazz] == 'area' || params[:q][:clazz] == 'special' || params[:q][:clazz] == 'delete_list' || params[:q][:clazz] == 'plan_year')
             if params[:q][:clazz] == 'special'
               school_ids = []
               # 专项商机
@@ -132,6 +132,8 @@ module EducodeSales
               @businesses = Business.joins("JOIN departments  AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
             elsif params[:q][:clazz] == 'delete_list'
               @businesses = Business.unscoped.where(state_id: [1, 3])
+            elsif params[:q][:clazz] == 'plan_year'
+              @businesses = Business.joins(:last_follow_up).where("educode_sales_follow_ups.plan_a_date > :year OR educode_sales_follow_ups.plan_return_date > :year OR educode_sales_follow_ups.invitation_at > :year", year: Time.now.beginning_of_year)
             end
           else
             if @current_admin.is_admin?
@@ -390,6 +392,11 @@ module EducodeSales
           @businesses = @businesses.select("
             distinct
             educode_sales_businesses.*,
+            last_follow.plan_a_date,
+            last_follow.plan_a_money,
+            last_follow.invitation_money,
+            last_follow.plan_return_date,
+            last_follow.plan_return_money,
             last_follow.invitation_at,
             last_follow.budget_amount,
             last_follow.o_business_deployment,

data/app/controllers/educode_sales/contracts_controller.rb

@@ -54,7 +54,12 @@ module EducodeSales
               business_ids = @businesses.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
               assign_business_ids = EducodeSales::Business.joins(:assign_staffs).where("educode_sales_assign_staffs.staff_id = ?", @current_admin.id).pluck(:id)
 
-              @businesses = @businesses.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids + assign_business_ids)
+              if @current_admin.staff_school_tags.present?
+                # 如果设置专项客户类型，则视为专项经理，根据专项客户查看对应商机
+                school_ids += School.joins(:school_tags).where("school_tags.id in (?)", @current_admin.staff_school_tags.pluck(:school_tag_id)).pluck(:id)
+              end
+              @businesses = @businesses.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids.uniq, business_ids + assign_business_ids)
+              
             end
           end
 
@@ -365,20 +370,36 @@ module EducodeSales
             current_2_actual = v
           end
 
-          if i == 1 && last_follow_up
-            # 验收时间
-            last_follow_up.reception_at = v
-          elsif i == 0 && last_follow_up
-            # 合同部署时间
-            last_follow_up.deploy_time = v
-            @business.p_deploy_time = v
-          end
+          # if i == 1 && last_follow_up
+          #   # 验收时间
+          #   last_follow_up.reception_at = v
+          # elsif i == 0 && last_follow_up
+          #   # 合同部署时间
+          #   last_follow_up.deploy_time = v
+          #   @business.p_deploy_time = v
+          # end
         end
        
       end
-      # data.each do |d|
-      #   d.select! { |d| d.delete_if{|f| f == ''}.present? }
-      # end
+      data.each do  |row|
+        # 全部为空的值去掉选项
+        row.select! do |d|
+          s = d.uniq
+          s.size == 1 && s[0].blank? ? false : true
+        end
+      end
+      if last_follow_up
+        if data[0].present?
+            # 合同部署时间
+          last_follow_up.deploy_time = data[0][-1][-1]
+          @business.p_deploy_time = data[0][-1][-1]
+        end
+        if data[1].present?
+           # 验收时间
+          last_follow_up.reception_at = data[1][-1][-1]
+        end
+      end
+
       current_week = Time.now.strftime('%W')
       staff_manage_ids = @business&.last_follow_up&.assign_follow_ups.present? ? @business.last_follow_up.assign_follow_ups.pluck(:staff_id) : [@business.staff_id]
       if current_1_plan && current_1_plan.to_date.strftime('%W') == current_week

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -409,7 +409,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment, :deploy_time, :rival)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment, :deploy_time, :rival, :plan_a_date, :plan_a_money, :invitation_money, :plan_return_date, :plan_return_money)
     end
 
     # 更新部门和部门下老师用户的状态

data/app/controllers/educode_sales/ideas_controller.rb

@@ -42,6 +42,8 @@ module EducodeSales
           @creator_arr = EducodeSales::Staff.joins(:user).where(id: creator_ids).pluck("concat(users.lastname,users.firstname)", :id)
           @staff_arr = EducodeSales::Staff.joins(:user).where(id: staff_ids).pluck("concat(users.lastname,users.firstname)", :id)
           @sale_staff_arr = EducodeSales::Staff.joins(:user).where(id: sale_staff_ids).pluck("concat(users.lastname,users.firstname)", :id)
+          filter = Filter.find_or_create_by(staff_id: @current_admin.id, clazz: "ideas")
+          gon.filter = filter.extras || {}
         end
         format.json do
           @ideas = params[:is_deleted].to_s == "true" ? Idea.deleted : Idea.not_deleted
@@ -142,9 +144,16 @@ module EducodeSales
         idea.department_id = idea.business&.department_id
       end
       idea.attachment_ids = attachment_ids
+
       # idea.assist_staff_ids = assist_staff_ids
       # idea.other_staff_ids = other_staff_ids
       idea.save
+      attachment_ids.each do |a|
+        attachment = Attachment.find_by_id(a)
+        attachment.container_id = idea.id
+        attachment.container_type = 'EducodeSales::Idea'
+        attachment.save
+      end
       render_success
     end
 
@@ -217,7 +226,9 @@ module EducodeSales
 
     def new_follow_up
       @idea = Idea.find(params[:id])
-      gon.staffs = Staff.where.not(role_id: 11).includes(:user).map { |d| { name: d.user.real_name, value: d.id } }
+      staffs = Staff.where.not(role_id: 11).includes(:user)
+      gon.sale_staffs = staffs.map { |d| { name: d.user.real_name, value: d.id, selected: d.id == @idea.sale_staff_id } }
+      gon.idea_staffs = staffs.map { |d| { name: d.user.real_name, value: d.id, selected: d.id == @idea.staff_id } }
       render layout: false
     end
 
@@ -264,6 +275,14 @@ module EducodeSales
       if follow_up.save
         idea.last_idea_follow_id = follow_up.id
         idea.save
+        attachment_ids = Array(params[:attachment_ids].to_s.split(","))
+        attachment_ids.each do |a|
+          attachment = Attachment.find_by_id(a)
+          attachment.container_id = idea.id
+          attachment.container_type = 'EducodeSales::Idea'
+          attachment.description = follow_up.id.to_s
+          attachment.save
+        end
         render_success
       else
         render_failure follow_up

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -25,8 +25,12 @@ module EducodeSales
               @money_plan_records = @money_plan_records.where(staff_id: @current_admin.id)
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
-              b_ids = Business.where(school_id: school_ids).pluck(:id)
-              @money_plan_records = @money_plan_records.joins(:business).where("educode_sales_businesses.id in (?) OR educode_sales_money_plans.staff_id = ?", b_ids, @current_admin.id)
+              if @current_admin.staff_school_tags.present?
+                # 如果设置专项客户类型，则视为专项经理，根据专项客户查看对应商机
+                school_ids += School.joins(:school_tags).where("school_tags.id in (?)", @current_admin.staff_school_tags.pluck(:school_tag_id)).pluck(:id)
+              end
+              b_ids = Business.where(school_id: school_ids.uniq).pluck(:id)
+              @money_plan_records = @money_plan_records.joins(:business).where("educode_sales_businesses.id in (?) OR educode_sales_money_plan_records.staff_id = ?", b_ids, @current_admin.id)
             end
           end
 

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -20,7 +20,11 @@ module EducodeSales
               @money_plans = @money_plans.where(staff_id: @current_admin.id)
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
-              b_ids = Business.where(school_id: school_ids).pluck(:id)
+              if @current_admin.staff_school_tags.present?
+                # 如果设置专项客户类型，则视为专项经理，根据专项客户查看对应商机
+                school_ids += School.joins(:school_tags).where("school_tags.id in (?)", @current_admin.staff_school_tags.pluck(:school_tag_id)).pluck(:id)
+              end
+              b_ids = Business.where(school_id: school_ids.uniq).pluck(:id)
               @money_plans = @money_plans.where("educode_sales_businesses.id in (?) OR educode_sales_money_plans.staff_id = ?", b_ids, @current_admin.id)
             end
           end

data/app/controllers/educode_sales/plans_controller.rb

@@ -22,7 +22,14 @@ module EducodeSales
               @sale_plans = SalePlan.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              business_ids = Business.where(school_id: StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)).pluck(:id)
+
+              school_ids = StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+              if @current_admin.staff_school_tags.present?
+                # 如果设置专项客户类型，则视为专项经理，根据专项客户查看对应商机
+                school_ids += School.joins(:school_tags).where("school_tags.id in (?)", @current_admin.staff_school_tags.pluck(:school_tag_id)).pluck(:id)
+              end
+
+              business_ids = Business.where(school_id: school_ids.uniq).pluck(:id)
               @sale_plans = SalePlan.where("staff_id in (?) OR educode_sales_sale_plans.staff_id = ? OR educode_sales_sale_plans.business_id in (?)", staff_ids, @current_admin.id,business_ids)
             else
               @sale_plans = SalePlan
@@ -468,6 +475,41 @@ module EducodeSales
       render layout: false
     end
 
+    def week_plan
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
+      @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
+      @months = (1..12).map { |d| d }
+    end
+
+    def weekly
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
+      @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
+      @months = (1..12).map { |d| d }
+    end
+
+    def monthly
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
+      @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
+      @months = (1..12).map { |d| d }
+    end
+
+    def month_plan
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
+      @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
+      @months = (1..12).map { |d| d }
+    end
+
+    def year_plan
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
+      @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
+      @months = (1..12).map { |d| d }
+    end
+
     private
 
     def plan_params

data/app/models/educode_sales/idea.rb

@@ -25,7 +25,7 @@ module EducodeSales
     enum model: %w[本地版 线上版 混合版]
     enum idea_type: %w[建设方案 申报论证 市场调研 课程建设 报价清单 交流汇报 招标参数 资质申报 产品手册 宣传海报 课题论文 投标支持 其他类]
 
-    serialize :assist_staff_ids,Array
+    serialize :assist_staff_ids, Array
     serialize :attachment_ids, Array
     serialize :other_staff_ids, Array
 
@@ -35,6 +35,18 @@ module EducodeSales
       self.update(deleted_at: nil, deleter_id: nil, is_deleted: false)
     end
 
+    def sync_data
+      # {"content"=>"123", "idea_id"=>15, "school_id"=>nil, "money"=>123.0,  "advise"=>"123", "sale_staff_id"=>8, "idea_staff_id"=>12, "staff_id"=>2, "comment"=>nil, "created_at"=>Mon, 01 May 2023 11:12:48 CST +08:00, "updated_at"=>Mon, 01 Ma023 11:14:06 CST +08:00}
+      # {"school_id"=>38739, "name"=>"java项目", "level"=>"高", "staff_id"=>24,"types"=>"低定制", "model"=>"本地版", "hardware"=>111.011, "project"=>333.011, "money"=>222.01, "creator_id"=>2, "end_time"=>Sat, 08 Apr 2023, "history_type"=>n"=>"4441111", "deleter_id"=>nil, "is_deleted"=>false, "deleted_at"=>nil, "department_id"=>35794, "manager_name"=>"王旭11111", "manager_phone"=>"131011111111111", "history_record"=>nil, "created_at"=>Thu, 23 Mar 2023 11:27:22 CST +08:00, "updated_at"=>Tue, 04 Jul 20217:57:32 CST +08:00, "school_name"=>"湖南科技大学1111", "department_name"=>"计算机科学与技术11111", "sale_staff_id"=>53, "idea_staff_id"=>nil, "assist_staff_ids"=>["10"], "attachment_id"=>nil, "attachment_ids"=>["4390068"], "idea_type"=>"建设方案", "other_staff_ids" "12", "13", "14", "16", "17", "18"], "idea_follows_count"=>2, "last_idea_follow_id"=>11, "advise"=>"123123", "business_id"=>nil}
+
+      last_follow = self.idea_follows.order(created_at: :desc).first
+      if last_follow
+        self.update(status: last_follow.status, last_idea_follow_id: last_follow.id, staff_id: last_follow.idea_staff_id, sale_staff_id: last_follow.sale_staff_id)
+      else
+        self.update(last_idea_follow_id: nil)
+      end
+    end
+
     def assist_staffs
       Staff.where(id: self.assist_staff_ids)
     end

data/app/models/educode_sales/idea_follow.rb

@@ -7,5 +7,12 @@ module EducodeSales
     belongs_to :school, optional: true
 
     enum status: %w[未完成 已完成]
+
+    after_save :update_idea_status
+    after_destroy :update_idea_status
+
+    def update_idea_status
+      idea.sync_data
+    end
   end
 end

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

@@ -170,6 +170,7 @@
   <% if can?(:audit_business, EducodeSales::Business) %>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right delete-btn" lay-event="delete_list">审核商机</button>
   <% end %>
+  <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right plan_year" lay-event="plan_year">本年计划</button>
   </div>
 </script>
 <script type="text/html" id="delete_bar">
@@ -522,6 +523,20 @@
                     sort: true,
                     hide: gon.filter.latest_time
                 },
+                {
+                  field: 'plan_a_date',
+                  width: 150,
+                  title:'计划A类时间',
+                  sort: true,
+                  hide: gon.filter.plan_a_date
+              },
+              {
+                  field: 'plan_a_money',
+                  width: 150,
+                  title: '计划A类金额',
+                  sort: true,
+                  hide: gon.filter.plan_a_money
+               },
                 {
                     field: 'invitation_at',
                     width: 150,
@@ -530,11 +545,25 @@
                     hide: gon.filter.invitation_at
                 },
                 {
-                  field: 'bidded_date',
-                  width: 105,
-                  title: '中标时间',
+                  field: 'invitation_money',
+                  width: 150,
+                  title: '计划投标金额',
                   sort: true,
-                  hide: gon.filter.bidded_date
+                  hide: gon.filter.invitation_money
+                },
+                {
+                  field: 'plan_return_date',
+                  width: 135,
+                  title: '计划回款时间',
+                  sort: true,
+                  hide: gon.filter.plan_return_date
+                },
+                {
+                  field: 'plan_return_money',
+                  width: 135,
+                  title: '计划回款金额',
+                  sort: true,
+                  hide: gon.filter.plan_return_money
                 },
                 {
                     field: 'budget_amount',
@@ -544,6 +573,13 @@
                     sort: true,
                     hide: gon.filter.budget_amount
                 },
+                {
+                  field: 'bidded_date',
+                  width: 105,
+                  title: '中标时间',
+                  sort: true,
+                  hide: gon.filter.bidded_date
+                },
                 {
                   field: 'total_amount',
                   width: 100,
@@ -1067,6 +1103,8 @@
               $(".area-btn").addClass("selected-btn");
             } else if (search['clazz'] == 'delete_list') {
               $(".delete-btn").addClass("selected-btn");
+            } else if (search['clazz'] == 'plan_year') {
+              $(".plan_year").addClass("selected-btn");
             } else {
               $(".all-btn").addClass("selected-btn");
             }
@@ -1249,6 +1287,26 @@
 
               return false;
             }
+            else if (obj.event === 'plan_year') {
+              search = {"clazz": "plan_year"}
+              business_type_list.setValue([])
+              table.reload('businesses_table', {
+                url: '/missions/businesses',
+                cols: cols_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: ''
+              })
+              $(".plan_year").addClass("selected-btn");
+
+              return false;
+            }
             else if (obj.event === 'delete') {
               var checkStatus = table.checkStatus('currentTableId'),
                   data = checkStatus.data;

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

@@ -76,6 +76,11 @@ json.data do
     json.self_flag (d.staff_id == @current_admin.id) || (d.last_follow_up_id.in? follow_up_ids)
     json.followed  d.users.pluck(:user_id).include?(@current_admin.user.id) ? 1 : 0 # d.users.where(user_id:@current_admin.user.id).first ? 1 : 0
     json.p_deploy_time d.p_deploy_time
+    json.plan_a_date d.last_follow_up&.plan_a_date&.to_s
+    json.plan_a_money d.last_follow_up&.plan_a_money&.round(6)
+    json.invitation_money d.last_follow_up&.invitation_money&.to_s
+    json.plan_return_date d.last_follow_up&.plan_return_date&.to_s
+    json.plan_return_money d.last_follow_up&.plan_return_money&.round(6)
   end
 end
 

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

@@ -43,6 +43,11 @@
             width: 200,
             title: '生日',
           },
+          {
+            field: 'tel',
+            width: 200,
+            title: '联系方式',
+          },
           {
             field: 'remark',
             width: 300,

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

@@ -37,6 +37,21 @@
         <%= select_tag "stage_id", options_for_select(@stages, @last_follow_up&.stage_id), { 'lay-filter': 'stage_id', class: 'required', } %>
       </div>
     </div>
+    </br>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划A类时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="plan_a_date" autocomplete="off" id="plan_a_date"
+              value="<%= @last_follow_up&.plan_a_date %>"
+              placeholder="请选择日期">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划A类金额(万)</label>
+      <div class="layui-input-inline">
+        <input name="plan_a_money" class="layui-input" value="<%= @last_follow_up&.plan_a_money.to_f.round(6) %>">
+      </div>
+    </div>
     <br>
     <div class="layui-inline">
       <label class="layui-form-label">计划投标时间</label>
@@ -46,14 +61,29 @@
                placeholder="请选择日期">
       </div>
     </div>
-     <div class="layui-inline">
-      <label class="layui-form-label">中标时间</label>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划投标金额(万)</label>
       <div class="layui-input-inline">
-        <input type="text" class="layui-input" name="bidded_date" autocomplete="off" id="invitation_at_add"
-               value="<%= @last_follow_up&.bidded_date %>"
-               placeholder="请选择日期">
+        <input name="invitation_money" class="layui-input" value="<%= @last_follow_up&.invitation_money.to_f.round(6) %>">
       </div>
     </div>
+    </br>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划回款时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="plan_return_date" autocomplete="off" id="plan_return_date"
+              value="<%= @last_follow_up&.plan_return_date %>"
+              placeholder="请选择日期">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划回款金额(万)</label>
+      <div class="layui-input-inline">
+        <input name="plan_return_money" class="layui-input" value="<%= @last_follow_up&.plan_return_money.to_f.round(6) %>">
+      </div>
+    </div>
+ 
+  
     <br>
     <!-- 
     <div class="layui-inline">
@@ -88,6 +118,14 @@
     </div> -->
 
     <br class="service_show layui-hide">
+    <div class="layui-inline">
+      <label class="layui-form-label">中标时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="bidded_date" autocomplete="off" id="invitation_at_add"
+              value="<%= @last_follow_up&.bidded_date %>"
+              placeholder="请选择日期">
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">中标额(万)</label>
       <div class="layui-input-inline">
@@ -247,6 +285,14 @@
         laydate.render({
             elem: '#reception_at_add'
         });
+
+        laydate.render({
+            elem: '#plan_a_date'
+        })
+
+        laydate.render({
+            elem: '#plan_return_date'
+        })
         var sales_list = xmSelect.render({
             el: '#assign_follow',
             remoteSearch: true,
@@ -358,6 +404,10 @@
 <style>
     .new_place_select xm-select > .xm-body {
         width: 300px;
-    !important;
+        !important;
+    }
+
+    .layui-form-label {
+      width: 120px;
     }
 </style>

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

@@ -35,6 +35,19 @@
       </div>
     </div>
     <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划A类时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.plan_a_date.to_s %>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划A类金额：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.plan_a_money&.round(6) %>
+      </div>
+    </div>
+    </br>
     <div class="layui-inline">
       <label class="layui-form-label">计划投标时间：</label>
       <div class="layui-input-inline">
@@ -42,9 +55,22 @@
       </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.bidded_date.to_s %>
+        <%= @follow_up.invitation_money&.round(6) %>
+      </div>
+    </div>
+    </br>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划回款时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.plan_return_date.to_s %>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划回款金额：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.plan_return_money&.round(6) %>
       </div>
     </div>
     <br>
@@ -86,6 +112,12 @@
         <%= @follow_up.total_amount.to_f.round(6) %>万
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">中标时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.bidded_date.to_s %>
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">合同额：</label>
       <div class="layui-input-inline">
@@ -222,3 +254,9 @@
         });
     }
 </script>
+<style>
+
+.layui-form-label {
+  width: 120px;
+}
+</style>