educode_sales 0.5.8 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb7ba8647915177726d6f9f525ea700b0e7ca469bf8ff7460d27a8d3e5204c28
-  data.tar.gz: d56bb7b39f7f44dc59b2d733ae60af4d3aee9135f8ee60e0721a5723bf20fc7a
+  metadata.gz: 97a73ea8470e60cc322017425b3af50411105d237ae981f490aef1df1cd2816f
+  data.tar.gz: 3711b02d39d60076344835b00d1ff44fc152d30a0671eee314096cb817f720f0
 SHA512:
-  metadata.gz: 7b2d57743dbf47151f106931393b6e4e9671a8bba6b8393e3769954ddb8a82cb914c85ee926c16595ec546f2e7826a569590d6d9589d12d67d0858a77c2effc6
-  data.tar.gz: 96d8209f672ee5118f30da45bb672db2139f9890148c0bfff46873df59329d8aa5b1c9e1763e7c063048e994f03399706fd8e850a8502e8cd8d08bcae3e44dc0
+  metadata.gz: 30dda9e9c18079954c459b90f623735b7c286d8a8c0fb6c42ab32464289bdd8133f87d39d938d8d20979b5eb944b65362910d1edf675f32e82c62cefc3ebfdf5
+  data.tar.gz: 73f820c375a6035995ddcbae380fd39fd07d7db4b2d53e27637c3e6c955371b1a7fe4d4e4ed7649544090501ad2c2aefba4ce02dd6adb9a0778d7313429ba354

data/app/controllers/educode_sales/businesses_controller.rb

@@ -35,6 +35,7 @@ module EducodeSales
           @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
           @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business)
           gon.menus = []
+          gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
           if can?(:create, EducodeSales::SalePlan)
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
@@ -190,6 +191,7 @@ module EducodeSales
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
+            last_follow.created_at as latest_time,
             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
@@ -200,7 +202,7 @@ module EducodeSales
 
     def create
       department = Department.find(params[:department_id])
-      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source])
+      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
       if business.save
         render_success
       else
@@ -222,7 +224,7 @@ module EducodeSales
     def update
       business = Business.find(params[:id])
       department = Department.find(params[:department_id])
-      if business.update(name: params[:name], department_id: department.id, source: params[:source])
+      if business.update(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
         render_success
       else
         render_failure business

data/app/controllers/educode_sales/customer_extensions_controller.rb

@@ -0,0 +1,17 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class CustomerExtensionsController < ApplicationController
+
+    def create
+      params[:school_ids].each do |d|
+        if EducodeSales::CustomerExtension.find_by(school_id: d).present?
+          EducodeSales::CustomerExtension.find_by(school_id: d).update(customer_staff_id: params[:staff_id])
+        else
+          EducodeSales::CustomerExtension.create(customer_staff_id: params[:staff_id], school_id: d)
+        end
+      end
+        render_success
+      end
+    end
+  end

data/app/controllers/educode_sales/customer_follows_controller.rb

@@ -0,0 +1,41 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class CustomerFollowsController < ApplicationController
+    def create
+      follow_up = EducodeSales::CustomerFollow.new(follow_up_params)
+      follow_up.staff = @current_admin
+      if follow_up.save
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def destroy
+      follow_up = CustomerFollow.find(params[:id])
+      if follow_up.destroy
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def update
+      follow_up = CustomerFollow.find(params[:id])
+      follow_up.assign_attributes(follow_up_params)
+      if follow_up.save
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    private
+
+    def follow_up_params
+      params.permit(:school_id, :department_id, :content)
+    end
+
+  end
+end

data/app/controllers/educode_sales/customers_controller.rb

@@ -0,0 +1,204 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class CustomersController < ApplicationController
+
+    def new_department
+      render layout: false
+    end
+    def create_department
+        department_name = params[:department_name].to_s.strip
+        school = School.find(params[:school_id])
+
+        return render_failure('部门名称重复') if school.departments.exists?(name: department_name)
+
+        ActiveRecord::Base.transaction do
+          department = school.departments.create!(name: department_name, is_auth: 1)
+          ApplyAddDepartment.create!(school_id: school.id, status: 1, name: department.name,
+                                     department_id: department.id, user_id: current_user.id)
+        end
+
+        render_success
+    end
+
+    def edit_department
+      @department = Department.find(params[:id])
+      render layout: false
+    end
+    def update_department
+      department = Department.find(params[:id])
+      department.update(name: params[:department_name])
+      render_success
+    end
+
+
+    def index
+      authorize! :read, Customer
+      respond_to do |format|
+        format.html do
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+        end
+        format.json do
+          if @current_admin.is_admin?
+            @customers = School.all
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '客户管理').level
+            case level
+            when '自己'
+              school_ids = CustomerExtension.where(customer_staff_id:  @current_admin.id).pluck(:school_id)
+              @customers = School.where(id: school_ids)
+            when '区域'
+              a_school_ids = School.where(province: @current_admin.areas.pluck(:name)).ids
+              b_school_ids = CustomerExtension.where(customer_staff_id:  @current_admin.id).pluck(:school_id)
+              school_ids = a_school_ids + b_school_ids
+              @customers = School.where(id: school_ids)
+            else
+              @customers = School.all
+            end
+          end
+
+          if params[:q].present? && params[:q][:name].present?
+            @customers = @customers.where("schools.name like ?", "%#{params[:q][:name]}%")
+          end
+          if params[:q].present? && params[:q][:area].present?
+            @customers = @customers.where("schools.province = ?", "#{params[:q][:area]}")
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            school_ids = EducodeSales::CustomerExtension.where(customer_staff_id: params[:q][:staff_id]).pluck(:school_id)
+            @customers = @customers.where(id: school_ids)
+          end
+
+          if params[:q].present? && params[:q][:date].present?
+            ids = EducodeSales::CustomerFollow.all.pluck(:school_id)
+            @customers = @customers.where(id: ids)
+            school_ids =[]
+            date = params[:q][:date].split(" - ")
+            @customers.each do |d|
+              business_ids = EducodeSales::Business.where(school_id: d.id).ids
+              follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
+              customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
+              next if follow_ups.blank? && customer_follows.blank?
+              a_last_follow_time = follow_ups.last&.created_at&.to_s
+              b_last_follow_time = customer_follows.last&.created_at&.to_s
+              if a_last_follow_time.present? && b_last_follow_time.present?
+                last_follow_time = ((a_last_follow_time < b_last_follow_time) ? b_last_follow_time : a_last_follow_time)
+              else
+                last_follow_time = (a_last_follow_time || b_last_follow_time)
+              end
+              if last_follow_time.present? && last_follow_time > date[0] && last_follow_time < date[1]
+                school_ids << d.id
+              end
+            end
+            @customers = @customers.where(id: school_ids)
+          end
+
+          @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def give
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+      render layout: false
+    end
+
+    def show_follow
+      respond_to do |format|
+        format.html do
+          @school_name = School.find(params[:id]).name
+          @area = School.find(params[:id]).province
+          @staff = EducodeSales::CustomerExtension.find_by(school_id: params[:id])&.customer_staff&.user&.real_name
+          render layout: false
+        end
+        format.json do
+          @follow_ups = EducodeSales::CustomerFollow.where(school_id: params[:id])
+          @latest = @follow_ups.order(created_at: :desc).first
+          @follow_ups = @follow_ups.order("created_at desc")
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def show_department
+      @departments = School.find(params[:id]).departments
+      @departments = @departments.order("created_at desc")
+      @departments = @departments.page(params[:page]).per(params[:limit])
+    end
+
+
+    def new_follow_record
+      @school = School.find(params[:id])
+      render layout: false
+    end
+
+    def show_follow_record
+      @follow_up = EducodeSales::CustomerFollow.find(params[:id])
+      @school = School.find(@follow_up.school_id)
+      render layout: false
+    end
+
+    def edit_follow_record
+      @follow_up = EducodeSales::CustomerFollow.find(params[:id])
+      @school = School.find(@follow_up.school_id)
+      render layout: false
+    end
+
+    def new
+      render layout: false
+    end
+
+    def create
+      ActiveRecord::Base.transaction do
+        property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
+                                                     project_211: params[:project_211].present? ? 1 : 0,
+                                                     regular_college: params[:regular_college].present? ? 1 : 0,
+                                                     junior_college: params[:junior_college].present? ? 1 : 0,
+                                                     secondary_school: params[:secondary_school].present? ? 1 : 0,
+                                                     military_school: params[:military_school].present? ? 1 : 0,
+                                                     enterprise: params[:enterprise].present? ? 1 : 0)
+        @school = School.new
+        @school.attributes = school_params
+        @school.school_property = property
+        @school.save!
+      end
+      render_success
+    end
+
+    def edit
+      @school = School.find(params[:id])
+      @school_property = @school.school_property
+      render layout: false
+    end
+
+    def update
+      @school = School.find(params[:id])
+      ActiveRecord::Base.transaction do
+        property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
+                                                     project_211: params[:project_211].present? ? 1 : 0,
+                                                     regular_college: params[:regular_college].present? ? 1 : 0,
+                                                     junior_college: params[:junior_college].present? ? 1 : 0,
+                                                     secondary_school: params[:secondary_school].present? ? 1 : 0,
+                                                     military_school: params[:military_school].present? ? 1 : 0,
+                                                     enterprise: params[:enterprise].present? ? 1 : 0)
+        @school.attributes = school_params
+        @school.school_property = property
+        @school.save!
+      end
+      render_success
+    end
+
+    private
+
+
+    def school_property_params
+      params.permit(:project_985, :project_211, :regular_college, :junior_college, :secondary_school, :military_school, :enterprise)
+    end
+
+    def school_params
+      params.permit(:name, :province, :city, :address)
+    end
+
+  end
+end

data/app/controllers/educode_sales/places_controller.rb

@@ -8,7 +8,11 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @places = Place.page(params[:page]).per(params[:limit])
+          @places = EducodeSales::Place.all
+          if params[:q].present? && params[:q][:name].present?
+            @places = @places.where("name like ?", "%#{params[:q][:name]}%")
+          end
+          @places = @places.page(params[:page]).per(params[:limit])
           @x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
           @stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
         end

data/app/controllers/educode_sales/roles_controller.rb

@@ -16,7 +16,7 @@ module EducodeSales
 
     def create
       role = Role.new(name: params[:name])
-      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }])
+      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, {clazz:'Customer'}])
       if role.save
         render_success
       else
@@ -78,6 +78,9 @@ module EducodeSales
       role.role_areas.find_by(clazz: 'Operation').update(level: params[:operation])
       role.role_areas.find_by(clazz: 'SalePlan').update(level: params[:sale_plan])
       role.role_areas.find_by(clazz: 'Teacher').update(level: params[:teacher])
+      r = role.role_areas.find_or_initialize_by(clazz: 'Customer')
+      r.level = params[:customer]
+      r.save
       render_success
     end
 

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -13,7 +13,7 @@ module EducodeSales
       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).sum(:total_amount).round(2)
+      @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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)
@@ -72,6 +72,21 @@ module EducodeSales
         end
       end
 
+      #商机区域分布图表
+      provinces = EducodeSales::Common.where(clazz: 'area').pluck(:name)
+      @business_data =  {
+        labels: provinces,
+        datasets:[
+          {
+            label: "商机总额",
+            data: provinces.map{|province| Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)},
+            backgroundColor: colors[0],
+            borderColor: colors[0],
+            borderWidth: 1
+          }
+        ]
+      }
+
 
       # 已中标图表
       goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a

data/app/controllers/educode_sales/teachers_controller.rb

@@ -113,10 +113,21 @@ module EducodeSales
             @teachers = @teachers.where("educode_sales_teachers.created_at > ? AND educode_sales_teachers.created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.order("educode_sales_teachers.created_at desc").page(params[:page]).per(params[:limit])
+          @teachers = @teachers.select("
+            educode_sales_teachers.*,
+            users.created_on,
+            users.last_login_on").joins("
+            LEFT JOIN users ON educode_sales_teachers.user_id = users.id
+          ")
+          if params[:sort].present? && params[:sort][:field]
+            @teachers = @teachers.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @teachers = @teachers.order("educode_sales_teachers.created_at desc")
+          end
+          @teachers = @teachers.page(params[:page]).per(params[:limit])
+        end
 
         end
-      end
     end
 
     def import

data/app/models/educode_sales/customer.rb

@@ -0,0 +1,4 @@
+module EducodeSales
+  class Customer < ApplicationRecord
+  end
+end

data/app/models/educode_sales/customer_extension.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class CustomerExtension < ApplicationRecord
+    belongs_to :customer_staff, class_name: 'Staff', optional: true
+    belongs_to :school
+
+  end
+end

data/app/models/educode_sales/customer_follow.rb

@@ -0,0 +1,5 @@
+module EducodeSales
+  class CustomerFollow < ApplicationRecord
+    belongs_to :staff
+  end
+end

data/app/models/educode_sales/permission.rb

@@ -1,7 +1,7 @@
 module EducodeSales
   class Permission < ApplicationRecord
     enum clazz: {
-      '市场态势': 'market',
+      '销售态势': 'market',
       '销售分工': 'sale_job',
       '商机管理': 'business',
       '渠道管理': 'place',
@@ -10,7 +10,8 @@ module EducodeSales
       '运营分工': 'operation_job',
       '教师运营': 'teacher',
       '活动运营': 'activity',
-      '运营计划': 'operation_plan'
+      '运营计划': 'operation_plan',
+      '客户管理': 'customer'
     }
   end
 end

data/app/models/educode_sales/role_area.rb

@@ -8,6 +8,7 @@ module EducodeSales
       '销售计划': 'SalePlan',
       '教师运营': 'Teacher',
       '运营计划': 'Operation',
+      '客户管理': 'Customer',
     }
   end
 end

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

@@ -55,6 +55,9 @@
 <script type="text/html" id="business">
   <a href="javascript:void(0);" lay-event="business" class="layui-table-link">{{ d.business }}</a>
 </script>
+<script type="text/html" id="school">
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
+</script>
 
 
 <script>
@@ -98,7 +101,7 @@
                     },
                     {
                         field: 'advise',
-                        width: 170,
+                        width: 120,
                         title: '团队建议',
                         templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
                     },
@@ -122,14 +125,15 @@
                     },
                     {
                         field: 'business',
-                        width: 150,
+                        width: 120,
                         title: '所属商机',
                         templet:'#business'
                     },
                     {
                         field: 'school',
-                        width: 150,
+                        width: 120,
                         title: '单位',
+                        templet:'#school'
                     },
                     {
                         field: 'staff',
@@ -138,9 +142,11 @@
                     },
                     {
                         field: 'created_at',
-                        width: 170,
+                        width: 120,
                         title: '跟进时间',
                         sort: true,
+                        templet:'<div><span title="{{d.created_at}}">{{d.created_at}}</span></div>'
+
                     },
                     {
                         title: '操作',

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

@@ -91,9 +91,9 @@
     </div>
     <div class="layui-form-item">
       <div class="layui-inline">
-        <label class="layui-form-label">所属年度</label>
+        <label class="layui-form-label required">所属年度</label>
         <div class="layui-input-inline">
-          <input type="text" class="layui-input" name="year" autocomplete="off" id="edit_year"
+          <input type="text" class="layui-input" name="year"  lay-verify="required" autocomplete="off" id="edit_year"
                  value="<%= @follow_up&.year%>"
                  placeholder="请选择年度">      </div>
       </div>

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

@@ -18,12 +18,13 @@
                 <label class="layui-form-label">商机名称</label>
                 <div class="layui-input-inline">
                   <input type="text" name="name" autocomplete="off" class="layui-input" value="<%=params[:name] %>">
+                  <input type="text" style="display: none" name="place_id" autocomplete="off" class="layui-input" value="<%=params[:place_id] %>">
                 </div>
               </div>
               <div class="layui-inline">
                 <label class="layui-form-label">单位</label>
                 <div class="layui-input-inline">
-                  <input type="text" name="department" autocomplete="off" class="layui-input">
+                  <input type="text" name="department" autocomplete="off" value="<%=params[:school] %>" class="layui-input">
                 </div>
               </div>
               <div class="layui-inline">
@@ -107,6 +108,9 @@
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
+<script type="text/html" id="school_name">
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
+</script>
 
 
 <script>
@@ -123,7 +127,7 @@
         range: true
       });
 
-         var is_show = <%=params[:name].present? || params[:clazz_id].present? %>
+         var is_show = <%=params[:name].present? || params[:clazz_id].present? || params[:place_id].present? || params[:school].present? %>
       if(is_show){
           $('.follows_li').removeClass('layui-this');
           $('.follows_div').removeClass('layui-show');
@@ -174,6 +178,7 @@
                 })
             }
         })
+            index_place_list.setValue(gon.place)
 
 
       table = layui.table;
@@ -202,7 +207,7 @@
                 field: 'school',
                 width: 150,
                 title: '单位',
-                  templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
+                  templet:'#school_name'
               },
               {
                 field: 'department',
@@ -234,6 +239,22 @@
                 width: 90,
                 title: '阶段'
               },
+                {
+                    field: 'source',
+                    width: 90,
+                    title: '商机来源'
+                },
+                {
+                    field: 'last_follow_person',
+                    width: 100,
+                    title: '最新跟进人'
+                },
+                {
+                    field: 'latest_time',
+                    width: 200,
+                    title: '最新跟进时间',
+                    sort: true
+                },
               {
                 field: 'invitation_at',
                 width: 105,
@@ -284,21 +305,6 @@
                 width: 160,
                 title: '渠道',
               },
-              {
-                field: 'source',
-                width: 90,
-                title: '商机来源'
-              },
-              {
-                field: 'last_follow_person',
-                width: 100,
-                title: '最新跟进人'
-              },
-              {
-                field: 'latest_time',
-                width: 200,
-                title: '最新跟进时间'
-              },
               {
                 title: '操作',
                 minWidth: 170,
@@ -389,6 +395,7 @@
         });
       }
       function time_line(id,name) {
+          business_id = id
         var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({

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

@@ -5,6 +5,7 @@ json.data do
     json.name d.name
     json.department d.department.name
     json.school d.department.school.name
+    json.school_id d.department.school.id
     json.follow_ups_count d.follow_ups_count
     follow_ups_count += d.follow_ups_count
     json.follow_up_id d.last_follow_up_id

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

@@ -10,6 +10,9 @@
       <label class="layui-form-label required">单位部门</label>
       <div class="layui-input-block" id="add_department" style="width: 300px;"></div>
     </div>
+     <div class="layui-inline" >
+       <a href="/missions/customers" style=" color: #0000FF">添加单位/部门</a>
+     </div>
      <br>
       <div class="layui-inline" style="padding-top: 20px">
         <label class="layui-form-label ">商机来源</label>

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

@@ -97,9 +97,9 @@
     </div>
     <div class="layui-form-item">
     <div class="layui-inline">
-      <label class="layui-form-label">所属年度</label>
+      <label class="layui-form-label required">所属年度</label>
       <div class="layui-input-inline">
-        <input type="text" class="layui-input" name="year" autocomplete="off" id="year"
+        <input type="text" class="layui-input" name="year" autocomplete="off"  lay-verify="required" id="year"
                value="<%= @last_follow_up&.year%>"
                placeholder="请选择年度">      </div>
     </div>