educode_sales 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b4a41e482e6776c9768761b3d37e0ad17e0244e
-  data.tar.gz: 56041da1c4e2f2a2d7a87b8d438af0691e398c95
+  metadata.gz: 82d677b53ce6178046e2f6e663dabe5a5789762f
+  data.tar.gz: 174acd6fb6a9bf597dddd2783dd0a9f23139abea
 SHA512:
-  metadata.gz: 6d741309b6fce698679dac6cb314da6ba096ab89fdf83067b4cd45c363995954fcc0b183b7bdc1821aa0c1af0a9a3aa62872723cac2f1b50c5c2aa4935870601
-  data.tar.gz: 83d7f4c01c7737dc391c46cf65641c35e714f390b3792cc001968e11b4abb8e3d7f7316f7727ebccceff5299abce8b9459eeb2600f1c11216e2d2f0a5c520f47
+  metadata.gz: e6c888d00d3cb588d67982a88c3b316085ba23ac19c926a4e7f37810262c3dda76ce0a736f94e883ca0e89d69c5ab54d7c5d3e18bd457071a3e6ad76455c7a6e
+  data.tar.gz: 62eee795ac83adfe2f6d2cf102ae34557f8f291c9b836f4505042d447850c0cdeb86d0bf65de3358f18883ccd653ab893c3188168e6581d69edce52aca867dae

data/app/assets/stylesheets/educode_sales/app.css

@@ -109,6 +109,7 @@
 
 .welcome .layui-bg-number {
   background-color: #F8F8F8;
+  height: 90px;
 }
 
 .welcome .layuimini-notice:hover {

data/app/controllers/educode_sales/activities_controller.rb

@@ -13,7 +13,7 @@ module EducodeSales
           else
             @activities = @activities.order("created_at desc")
           end
-          @activities = @activities.page(params[:page]).per(params[:per_page])
+          @activities = @activities.page(params[:page]).per(params[:limit])
         end
       end
     end

data/app/controllers/educode_sales/businesses_controller.rb

@@ -25,13 +25,7 @@ module EducodeSales
             end
           end
           
-          @businesses = @businesses.select("
-            educode_sales_businesses.*,
-            last_follow.invitation_at,
-            last_follow.reception_at,
-            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
-          ")
+          @businesses = @businesses
           if params[:q].present? && params[:q][:name].present?
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
@@ -70,11 +64,22 @@ module EducodeSales
             @businesses = @businesses.where("created_at > ? AND created_at < ?", date[0], date[1])
           end
 
+
           if params[:sort].present? && params[:sort][:field]
             @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
             @businesses = @businesses.order("created_at desc")
           end
+
+          @business_count = @businesses.count
+          
+          @businesses = @businesses.select("
+            educode_sales_businesses.*,
+            last_follow.invitation_at,
+            last_follow.reception_at,
+            last_follow.total_amount").joins(" 
+            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
+          ").page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -139,7 +144,7 @@ module EducodeSales
           else
             @follow_ups = @follow_ups.order("created_at desc")
           end
-          @follow_ups = @follow_ups.page(params[:page]).per(params[:per_page])
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -156,7 +161,7 @@ module EducodeSales
 
     def unfinish_plans
       load_business
-      @plans = @business.sale_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:per_page])
+      @plans = @business.sale_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:limit])
     end
 
     def show_follow_record

data/app/controllers/educode_sales/commons_controller.rb

@@ -8,7 +8,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @commons = Common.group("clazz")
+          @commons = Common.group("clazz").page(params[:page]).per(params[:limit])
         end
       end
     end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -21,7 +21,7 @@ module EducodeSales
       business = follow_up.business
       if follow_up.destroy
         if follow_up.id == business.last_follow_up_id
-          business.update(last_follow_up: follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: follow_ups.last&.id).sum(:amount))
+          business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: business.follow_ups.last&.id).sum(:amount))
         end
         render_success
       else
@@ -43,7 +43,7 @@ module EducodeSales
     def teachers
       follow_up = FollowUp.find_by(id: params[:id])
       if follow_up.present?
-        @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:per_page])
+        @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:limit])
       else
         @teachers = FollowUp.none
       end
@@ -51,7 +51,7 @@ module EducodeSales
 
     def money_plans
       follow_up = FollowUp.find_by(id: params[:id])
-      @money_plans = follow_up.money_plans.page(params[:page]).per(params[:per_page])
+      @money_plans = follow_up.money_plans.page(params[:page]).per(params[:limit])
     end
 
     def add_money

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -46,7 +46,7 @@ module EducodeSales
           else
             @sale_plans = @sale_plans.order("updated_at desc")
           end
-          @sale_plans = @sale_plans.page(params[:page]).per(params[:per_page])
+          @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -60,7 +60,7 @@ module EducodeSales
       else
         @weeks = [week]
       end
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       render layout: false
     end
 
@@ -87,7 +87,7 @@ module EducodeSales
 
     def new_month
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       render layout: false
     end
 
@@ -117,7 +117,7 @@ module EducodeSales
 
     def edit_week
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       @sale_plan = OperationPlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
@@ -145,7 +145,7 @@ module EducodeSales
 
     def edit_month
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       @sale_plan = OperationPlan.find(params[:id])
       @months = [Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]
       @months << @sale_plan.month.strftime("%Y-%m")
@@ -166,7 +166,7 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     def my_month
@@ -176,7 +176,7 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     def update

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -42,7 +42,7 @@ module EducodeSales
           else
             @sale_reports = @sale_reports.order("updated_at desc")
           end
-          @sale_reports = @sale_reports.page(params[:page]).per(params[:per_page])
+          @sale_reports = @sale_reports.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -118,7 +118,7 @@ module EducodeSales
 
     def plans
       sale_report = OperationReport.find(params[:id])
-      @sale_plans = OperationPlan.where(staff_id: sale_report.staff_id, month: sale_report.month, weekly: sale_report.weekly).order("updated_at desc").page(params[:page]).per(params[:per_page])
+      @sale_plans = OperationPlan.where(staff_id: sale_report.staff_id, month: sale_report.month, weekly: sale_report.weekly).order("updated_at desc").page(params[:page]).per(params[:limit])
     end
 
     private

data/app/controllers/educode_sales/places_controller.rb

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

data/app/controllers/educode_sales/plans_controller.rb

@@ -47,7 +47,7 @@ module EducodeSales
             @sale_plans = @sale_plans.order("updated_at desc")
           end
 
-          @sale_plans = @sale_plans.page(params[:page]).per(params[:per_page])
+          @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -86,7 +86,7 @@ module EducodeSales
       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
       @departments_count = sale_plans.joins(:business).count("distinct(department_id)")
-      @total_amount = sale_plans.joins(business: :last_follow_up).sum("total_amount")
+      @total_amount = sale_plans.joins(business: :last_follow_up).distinct.sum("total_amount")
       render layout: false
     end
 
@@ -100,7 +100,7 @@ module EducodeSales
       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
       @departments_count = sale_plans.joins(:business).count("distinct(department_id)")
-      @total_amount = sale_plans.joins(business: :last_follow_up).sum("total_amount")
+      @total_amount = sale_plans.joins(business: :last_follow_up).distinct.sum("total_amount")
       render layout: false
     end
 
@@ -187,7 +187,7 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     def my_month
@@ -197,13 +197,13 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     private
 
     def plan_params
-      params.permit(:month, :weekly, :content, :finish_rate)
+      params.permit(:month, :weekly, :content, :finish_rate, :business_id)
     end
 
   end

data/app/controllers/educode_sales/roles_controller.rb

@@ -9,7 +9,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @roles = Role.all
+          @roles = Role.page(params[:page]).per(params[:limit])
         end
       end
     end

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -75,7 +75,7 @@ module EducodeSales
           else
             @sale_reports = @sale_reports.order("updated_at desc")
           end
-          @sale_reports = @sale_reports.page(params[:page]).per(params[:per_page])
+          @sale_reports = @sale_reports.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -123,7 +123,7 @@ module EducodeSales
 
     def plans
       sale_report = SaleReport.find(params[:id])
-      @sale_plans = SalePlan.where(staff_id: sale_report.staff_id, month: sale_report.month, weekly: sale_report.weekly).order("updated_at desc").page(params[:page]).per(params[:per_page])
+      @sale_plans = SalePlan.where(staff_id: sale_report.staff_id, month: sale_report.month, weekly: sale_report.weekly).order("updated_at desc").page(params[:page]).per(params[:limit])
     end
 
     private

data/app/controllers/educode_sales/sales_controller.rb

@@ -16,7 +16,7 @@ module EducodeSales
           @b_clazz = Common.find_by(clazz: 'business_type', name: 'B类')
           @step_ids = Common.where(name: %w(已中标 已签单 已验收 回款中 服务中 已结束), clazz: 'business_step').pluck(:id)
           
-          @staffs = Staff.where(job_type: common.id).page(params[:page]).per(params[:per_page])
+          @staffs = Staff.where(job_type: common.id).page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -44,7 +44,7 @@ module EducodeSales
         end
         format.json do
           common_id = Common.where(clazz: 'staff_type', name: ['销售', '运营']).pluck(:id)
-          @staffs = Staff.where(job_type: common_id).page(params[:page]).per(params[:per_page])
+          @staffs = Staff.where(job_type: common_id).page(params[:page]).per(params[:limit])
         end
       end
     end

data/app/controllers/educode_sales/sessions_controller.rb

@@ -15,6 +15,7 @@ module EducodeSales
       elsif user
         staff = Staff.find_by(user_id: user.id)
         if staff
+          return render_failure('该账号已禁止使用') if staff.expired_at < Time.now
           check_pwd(user, staff)
         else
           render_failure('账号不存在')

data/app/controllers/educode_sales/staffs_controller.rb

@@ -8,7 +8,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @staffs = Staff.where(is_admin: false).page(params[:page]).per(params[:per_page])
+          @staffs = Staff.where(is_admin: false).page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -67,13 +67,13 @@ module EducodeSales
 
     def follow_up_schools
       staff = Staff.find(params[:id])
-      @schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at").page(params[:page]).per(params[:per_page])
+      @schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at").page(params[:page]).per(params[:limit])
       @count =  EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").count
     end
 
     def follow_up_departments
       staff = Staff.find(params[:id])
-      @schools = EducodeSales::Business.joins(:last_follow_up, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.name, schools.name AS school, educode_sales_follow_ups.updated_at").page(params[:page]).per(params[:per_page])
+      @schools = EducodeSales::Business.joins(:last_follow_up, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.name, schools.name AS school, educode_sales_follow_ups.updated_at").page(params[:page]).per(params[:limit])
     end
 
 

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -44,7 +44,7 @@ module EducodeSales
     # def teachers
     #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
     #   if follow_up.present?
-    #     @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:per_page])
+    #     @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:limit])
     #   else
     #     @teachers = FollowUp.none
     #   end
@@ -52,7 +52,7 @@ module EducodeSales
     #
     # def money_plans
     #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
-    #   @money_plans = follow_up.money_plans.page(params[:page]).per(params[:per_page])
+    #   @money_plans = follow_up.money_plans.page(params[:page]).per(params[:limit])
     # end
     #
     # def add_money

data/app/controllers/educode_sales/teachers_controller.rb

@@ -73,7 +73,7 @@ module EducodeSales
             @teachers = @teachers.where("created_at > ? AND created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.order("created_at desc").page(params[:page]).per(params[:per_page])
+          @teachers = @teachers.order("created_at desc").page(params[:page]).per(params[:limit])
 
         end
       end
@@ -144,7 +144,7 @@ module EducodeSales
 
     def unfinish_plans
       load_teacher
-      @plans = @teacher.operation_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:per_page])
+      @plans = @teacher.operation_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:limit])
     end
 
     def course_subject
@@ -206,7 +206,7 @@ module EducodeSales
           else
             @follow_ups = @follow_ups.order("created_at desc")
           end
-          @follow_ups = @follow_ups.page(params[:page]).per(params[:per_page])
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -244,7 +244,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}).page(params[:page]).per(params[:per_page])
+      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).page(params[:page]).per(params[:limit])
       else
         @courses = Course.none
       end
@@ -253,7 +253,7 @@ module EducodeSales
 
     def activities
       teacher = Teacher.find(params[:id])
-      @activities = teacher.activities.page(params[:page]).per(params[:per_page]) 
+      @activities = teacher.activities.page(params[:page]).per(params[:limit])
     end
 
     private

data/app/models/educode_sales/common.rb

@@ -29,5 +29,9 @@ module EducodeSales
     def self.key_attitude_name
       self.where(clazz: 'key_attitude').pluck(:id, :name).to_h
     end
+
+    def self.teacher_attitude_name
+      self.where(clazz: 'teacher_attitude').pluck(:id, :name).to_h
+    end
   end
 end

data/app/models/educode_sales/follow_up.rb

@@ -2,7 +2,7 @@ module EducodeSales
   class FollowUp < ApplicationRecord
     belongs_to :business, counter_cache: true
     belongs_to :place, optional: true
-    has_many :money_plans
+    has_many :money_plans, dependent: :destroy
     has_many :key_person
     has_many :teachers, through: :key_person
     belongs_to :staff

data/app/models/educode_sales/operation_plan.rb

@@ -4,6 +4,5 @@ module EducodeSales
     belongs_to :teacher
 
     validates :month, presence: true
-    validates :weekly, presence: true
   end
 end

data/app/models/educode_sales/sale_plan.rb

@@ -4,6 +4,5 @@ module EducodeSales
     belongs_to :staff
 
     validates :month, presence: true
-    validates :weekly, presence: true
   end
 end

data/app/models/educode_sales/teacher.rb

@@ -18,11 +18,20 @@ module EducodeSales
         user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
         course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
         if course_ids.present?
+          course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 30").select("COUNT(*) AS count")
+          course_members.present? ? course_members[0]['count'] : 0
         else
           0
         end
-        course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 30").select("COUNT(*) AS count")
-        course_members.present? ? course_members[0]['count'] : 0
+      else
+        0
+      end
+    end
+
+    def students_count
+      if user_id.present?
+        course_ids = CourseMember.where.not(role: "STUDENT").where(user_id: user_id).pluck(:course_id)
+        CourseMember.where(course_id: course_ids, role: "STUDENT").count
       else
         0
       end

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

@@ -22,7 +22,7 @@
   <a href="javascript:void(0);" lay-event="teachers" class="layui-table-link">{{ d.name}}</a>
 </script>
 <script type="text/html" id="teachers_count">
-  <a href="javascript:void(0);" lay-event="teachers" class="layui-table-link">{{ d.teachers_count}}</a>
+  <a href="javascript:void(0);" lay-event="teachers_count" class="layui-table-link">{{ d.teachers_count}}</a>
 </script>
 
 <script>
@@ -60,7 +60,7 @@
                 {
                   field: 'days',
                   title: '天数',
-                  width: 80
+                  width: 100
                 },
                 {
                   field: 'teachers_count',
@@ -68,14 +68,6 @@
                   width: 100,
                   templet: '#teachers_count'
                 },
-                // {
-                //     field: 'return_rate',
-                //     title: '回访率',
-                // },
-                // {
-                //     field: 'course_rate',
-                //     title: '建课率',
-                // },
                 {
                   field: 'students_count',
                   title: '学生数',
@@ -181,6 +173,28 @@
               });
               return false;
             }
+             else if (obj.event === 'teachers_count') {
+                activity_id = obj.data.id;
+                content = miniPage.getHrefContent('/educode_sales/activities/show_teachers');
+              openWH = miniPage.getOpenWidthHeight();
+              index = layer.open({
+                title: '活动列表/' + data.name,
+                type: 1,
+                shade: 0.2,
+                maxmin: true,
+                shadeClose: true,
+                area: [openWH[0] + 'px', openWH[1] + 'px'],
+                offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                content: content,
+                success: function (layero, index) {
+                  form.render('select');
+                },
+              });
+              $(window).on("resize", function () {
+                layer.full(index);
+              });
+              return false;
+            }
         });
 
     });

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

@@ -11,4 +11,4 @@ json.data do
   end
 end
 json.code 0
-json.count @activities.size
+json.count @activities.total_count

data/app/views/educode_sales/activities/show_teachers.html.erb

@@ -247,10 +247,11 @@
                 });
                 return false;
             } else if (obj.event === 'delete') {
+                console.log(data);
                 layer.confirm('确定删除' + data.name, function (index) {
-                    request.delete('educode_sales/businesses/' + data.id, {}, function (res) {
+                    request.delete('educode_sales/teachers/' + data.id, {}, function (res) {
                         layer.close(index);
-                        table.reload("teachers_table")
+                        table.reload("show_teachers_table")
                     })
                 });
             } else if (obj.event === 'addWeek') {
@@ -288,7 +289,8 @@
                 });
 
             } else if (obj.event === 'courses') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/add_courses');
+                teacher_id = data.id
+                content = miniPage.getHrefContent('/educode_sales/teachers/add_courses?id='+data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '课程方向',
@@ -298,12 +300,16 @@
                     shadeClose: true,
                     area: [openWH[0] + 'px', openWH[1] + 'px'],
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
-                    content: content
+                    content: content,
+                    success: function (layero, index) {
+                        // 重新渲染弹层中的下拉选择框select
+                        // form.render('select');
+                    }
                 });
                 $(window).on("resize", function () {
-                  layer.full(index);
+                    layer.full(index);
                 });
-            } else if (obj.event === 'event') {
+            }else if (obj.event === 'event') {
                 content = miniPage.getHrefContent('/educode_sales/teachers/add_event');
                 openWH = miniPage.getOpenWidthHeight();
                 teacher_id = obj.data.id
@@ -342,7 +348,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'follow') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow');
+                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '跟进记录',

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

@@ -17,7 +17,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">项目类型</label>
       <div class="layui-input-inline">
-         <%= select_tag "clazz_id", options_for_select(@clazz, @follow_up.clazz), class: 'required' %>
+         <%= select_tag "clazz_id", options_for_select(@clazz, @follow_up.clazz_id), class: 'required' %>
       </div>
     </div>
     <div class="layui-inline">
@@ -51,7 +51,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">实额</label>
       <div class="layui-input-inline">
-         <input name="actual_amount" type="number" class="layui-input" value="<%= @follow_up.total_amount %>">
+         <input name="actual_amount" type="number" class="layui-input" value="<%= @follow_up.actual_amount %>">
       </div>
     </div>
     <br>
@@ -66,6 +66,7 @@
       <div class="layui-input-inline">
         <input name="divide_rate" class="layui-input" value="<%= @follow_up.divide_rate%>">
       </div>
+      <span style="margin-top: 10px; float:left;">%</span>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">自我小结</label>

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

@@ -81,9 +81,10 @@
         if (res.success == false) {
           layer.alert(res.msg)
         } else {
-          layer.close(parent.plan_index);
+          // layer.close(parent.plan_index);
           parent.table.reload('sale_plan_follow_table');
           parent.table.reload('businesses_table');
+          table.reload('return_money_list');
         }
       })
       return false;

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

@@ -17,4 +17,5 @@ json.data do
   end
 end
 json.code 0
+json.count @businesses.total_count
 json.msg 'succcess'

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

@@ -194,6 +194,7 @@
                 request.authDelete("educode_sales/follow_ups/" + data.id, {}, function() {
                   obj.del();
                   layer.close(index);
+                    table.reload("businesses_table");
                 })
               });
           } else if (obj.event === 'show') { // 监听添加操作