educode_sales 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e11b0c160f2894e96d39dff5b6f90e895950940a
-  data.tar.gz: fcb96df55ddd39ed2dc9e67e4cd6313cdd6c8259
+  metadata.gz: 32ccbb45cc443858202f0e53c3f30a5545100930
+  data.tar.gz: 1fa4454eb41cf3c2a554859251d5484e487aa9ec
 SHA512:
-  metadata.gz: f5fba1e9ca510c1803807abb69e41a1482a0858b4e7e54757fdf894ae5460b110ae8bd1faf0559de01cc108f47594bdc2f8cd0e4f90c91e59054a47f7f99d5b8
-  data.tar.gz: 0c6e805fe44da4508bc033bbf63846bda0bd24248a3f8face88ae839fc06ceabb90e9dbb061f6f8cae7fd91b711806f0c841b0c9aa2fcc9541166e77cbce4e7a
+  metadata.gz: 0f4bdf23a11199467f92acb3dd4f2eac20c2500130bc5838eb69bf85984f42b2399f5d6854bf8afb20e7b85fedea6e1557e8b4cc8a0191fec627faa75a4cf8e8
+  data.tar.gz: bc4ae21970c1e12ab3ad7ec78b053fb1a90d431a8a6cbe0022e53f36befc6a25ea7e6fbcc5ace7b1c4f43761f8f3936e9519448b295cb0a4fe3b4d38eacc4e4d

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

@@ -64,7 +64,6 @@ module EducodeSales
             @businesses = @businesses.where("created_at > ? AND created_at < ?", date[0], date[1])
           end
 
-          @businesses = @businesses.page(params[:page]).per(params[:per_page])
 
           if params[:sort].present? && params[:sort][:field]
             @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
@@ -80,7 +79,7 @@ module EducodeSales
             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[:per_page])
+          ").page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -145,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
@@ -162,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
@@ -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/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/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

@@ -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/index.json.jbuilder

@@ -17,5 +17,5 @@ json.data do
   end
 end
 json.code 0
-json.count @business_count
+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') { // 监听添加操作

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

@@ -18,4 +18,4 @@ json.data do
 end
 
 json.code 0
-json.count @follow_ups.count
+json.count @follow_ups.total_count

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

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

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

@@ -10,4 +10,4 @@ json.data do
 end
 
 json.code 0
-json.count @commons.size
+json.count @commons.total_count

data/app/views/educode_sales/follow_ups/money_plans.json.jbuilder

@@ -8,4 +8,4 @@ json.data do
 end
 
 json.code 0
-json.count @money_plans.count
+json.count @money_plans.total_count

data/app/views/educode_sales/follow_ups/teachers.json.jbuilder

@@ -13,4 +13,4 @@ json.data do
 end
 
 json.code 0
-json.count @teachers.count
+json.count @teachers.total_count

data/app/views/educode_sales/operation_plans/edit_month.html.erb

@@ -31,9 +31,10 @@
         <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
       </div>
     </div>
-    <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交
-      </button>
+    <div class="layui-form-item m-t-20">
+      <div class="layui-input-block">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交</button>
+      </div>
     </div>
   </div>
 </form>

data/app/views/educode_sales/operation_plans/edit_week.html.erb

@@ -39,9 +39,10 @@
         <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
       </div>
     </div>
-    <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交
-      </button>
+    <div class="layui-form-item m-t-20">
+      <div class="layui-input-block">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交</button>
+      </div>
     </div>
   </div>
 </form>

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

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/operation_plans/my_month.json.jbuilder

@@ -15,4 +15,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/operation_plans/my_week.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/operation_plans/new_month.html.erb

@@ -39,9 +39,10 @@
         </select>
       </div>
     </div>
-    <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_month_plan">提交
-      </button>
+    <div class="layui-form-item m-t-20">
+      <div class="layui-input-block">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_month_plan">提交</button>
+      </div>
     </div>
   </div>
 </div>

data/app/views/educode_sales/operation_plans/new_monthly.html.erb

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @rate %></span>
+      <span><%= @rate %>%</span>
       <%= hidden_field_tag 'finish_rate', @rate, {id: 'monthly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">

data/app/views/educode_sales/operation_plans/new_week.html.erb

@@ -46,9 +46,10 @@
         </select>
       </div>
     </div>
-    <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_week_plan">提交
-      </button>
+    <div class="layui-form-item m-t-20">
+      <div class="layui-input-block">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_week_plan">提交</button>
+      </div>
     </div>
   </div>
 </div>

data/app/views/educode_sales/operation_plans/new_weekly.html.erb

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @rate %></span>
+      <span><%= @rate %>%</span>
       <%= hidden_field_tag 'finish_rate', @rate, {id: 'weekly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">

data/app/views/educode_sales/operation_reports/audit.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
       <%= hidden_field_tag :id, @sale_report.id, {id: 'sale_report_audito'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">

data/app/views/educode_sales/operation_reports/edit.html.erb

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">运营教师:</label>

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

@@ -15,4 +15,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_reports.count
+json.count @sale_reports.total_count

data/app/views/educode_sales/operation_reports/plans.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/operation_reports/show.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">运营教师:</label>

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

@@ -10,4 +10,4 @@ json.data do
 end
 
 json.code 0
-json.count @places.size
+json.count @places.total_count

data/app/views/educode_sales/plans/_monthPlan.html.erb

@@ -201,12 +201,7 @@
 
         table.on('tool(monthPlanTable)', function (obj) {
             var data = obj.data;
-            if (obj.event === 'delete') {
-                layer.confirm('真的删除行么', function (index) {
-                    obj.del();
-                    layer.close(index);
-                });
-            } else if (obj.event === 'show') {
+            if (obj.event === 'show') {
                 content = miniPage.getHrefContent('/educode_sales/plans/show_month?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
@@ -259,6 +254,14 @@
               $(window).on("resize", function () {
                   layer.full(index);
               });
+            } else if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.id, function (index) {
+                    console.log("aaaaa");
+                    request.delete('educode_sales/plans/' + data.id, {}, function (res) {
+                        layer.close(index);
+                        table.reload("monthPlanTable")
+                    })
+                });
             }
         });
 

data/app/views/educode_sales/plans/edit_week.html.erb

@@ -73,7 +73,7 @@
           } else {
             parent.table.reload('unfinish_table')
           }
-          
+          parent.table.reload('newWeeklyTable')
         }
       })
       return false;

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

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/plans/my_month.json.jbuilder

@@ -15,4 +15,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/plans/my_week.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/plans/new_monthly.html.erb

@@ -10,7 +10,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @rate %></span>
+      <span><%= @rate %>%</span>
       <%= hidden_field_tag 'finish_rate', @rate, {id: 'monthly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">

data/app/views/educode_sales/plans/new_week.html.erb

@@ -87,7 +87,9 @@
           else {
             parent.table.reload('businesses_table')
           }
-         
+            parent.table.reload('newWeeklyTable')
+
+
         }
       })
       return false;

data/app/views/educode_sales/plans/new_weekly.html.erb

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @rate %></span>
+      <span><%= @rate %>%</span>
       <%= hidden_field_tag 'finish_rate', @rate, {id: 'weekly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
@@ -97,6 +97,7 @@
           layer.close(parent.sindex);
           parent.layer.close(parent.layer.getFrameIndex(window.name))
           parent.table.reload('newWeeklyTable');
+          table.reload('weeklyTable');
           layer.alert('添加成功')
         }
       })

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

@@ -7,4 +7,4 @@ json.data do
 end
 
 json.code 0
-json.count @roles.size
+json.count @roles.total_count

data/app/views/educode_sales/sale_reports/audit.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
       <%= hidden_field_tag :id, @sale_report.id, {id: 'sale_report_audito'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">

data/app/views/educode_sales/sale_reports/edit.html.erb

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">覆盖客户:</label>

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

@@ -14,4 +14,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_reports.count
+json.count @sale_reports.total_count

data/app/views/educode_sales/sale_reports/plans.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">覆盖客户:</label>

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -65,7 +65,7 @@
                 </div>
               </div>
             </div>
-            <div class="layui-col-xs3">
+            <div class="layui-col-xs3" >
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">

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

@@ -14,4 +14,4 @@ json.data do
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

data/app/views/educode_sales/sales/operations.json.jbuilder

@@ -6,9 +6,9 @@ json.data do
     json.job_type EducodeSales::Common.job_type_name[d.job_type]
     json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
     json.departments EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(educode_sales_follow_ups.staff_id) AS count")[0]&.send('count') || 0
-    json.schools EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").group("departments.school_id").select("COUNT(departments.school_id) AS count")[0]&.send('count') || 0
+    json.schools EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count']
   end
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

data/app/views/educode_sales/staffs/follow_up_departments.json.jbuilder

@@ -10,4 +10,4 @@ json.data do
 end
 
 json.code 0
-json.count @schools.count
+json.count @schools.total_count

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

@@ -12,4 +12,4 @@ json.data do
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

data/app/views/educode_sales/teachers/course_list.json.jbuilder

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

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

@@ -146,12 +146,12 @@
                 },
                 {
                     field: 'school',
-                    width: 190,
+                    width: 250,
                     title: '单位',
                 },
                 {
                     field: 'department',
-                    width: 190,
+                    width: 250,
                     title: '部门'
                 },
                 {
@@ -260,7 +260,7 @@
             form.val('search_teachers', {
                 area: "",
                 date: "",
-                key_attitude: "",
+                attitude: "",
                 name: "",
                 professional_title: "",
                 regist_at: "",

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

@@ -12,14 +12,15 @@ json.data do
     json.teacher_follows_count d.teacher_follows_count
     json.activities_count d.activity_teachers_count
     json.source EducodeSales::Common.teacher_source_name[d.source_id]
-    json.attitude EducodeSales::Common.key_attitude_name[d.attitude_id]
+    # a_id = EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).present? ? EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).attitude_id : 73
+    json.attitude EducodeSales::TeacherFollow.find_by(teacher_id: d.id).present? ? EducodeSales::Common.find(EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).attitude_id).name : ''
     json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).count : 0
     json.actives d.actives
-    json.students d.students
+    json.students d.students_count
     json.regist_at d.regist_at ? d.regist_at.to_s(:date) : ''
     json.teacher_used d.teacher_used_of_department
   end
 end
 json.code 0
-json.count @teachers.count
+json.count @teachers.total_count
 json.msg 'succcess'

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

@@ -152,13 +152,11 @@
             if (res.success == false) {
               layer.alert(res.msg)
             } else {
-              layer.closeAll();
-              if (parent.activity_id) {
+                layer.closeAll();
                 table.reload('show_teachers_table');
-              } else {
+                table.reload('activities_table');
                 table.reload('teachers_table');
-              }
-              
+
             }
           })
           return false;

data/app/views/educode_sales/teachers/show_class.html.erb

@@ -1,4 +1,8 @@
 
+<script type="text/html" id="class_name">
+  <a href="https://test-data.educoder.net/classrooms/{{d.id}}" class="layui-table-link" target="_blank">{{ d.name }}</a>
+</script>
+
 <table class="layui-hide" id="class_T" lay-filter="classFilter"></table>
 <script>
     layui.use(['form', 'table'], function () {
@@ -20,6 +24,8 @@
                     field: 'name',
                     width: 150,
                     title: '课程名称',
+                    templet: "#class_name"
+
                 },
                 {
                     field: 'teachers',

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

@@ -17,4 +17,4 @@ json.data do
 end
 
 json.code 0
-json.count @follow_ups.count
+json.count @follow_ups.total_count

data/app/views/educode_sales/teachers/unfinish_plans.json.jbuilder

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

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails