educode_sales 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef5373cd46335d53f4f5062b2ac750c01fa8797ddf1626c4373c6997e5e1fa9f
-  data.tar.gz: f27164e66b64b22b5b0c889ffb3c5c2c6567559f490a00e4af8a32f4298841dd
+  metadata.gz: cb7ba8647915177726d6f9f525ea700b0e7ca469bf8ff7460d27a8d3e5204c28
+  data.tar.gz: d56bb7b39f7f44dc59b2d733ae60af4d3aee9135f8ee60e0721a5723bf20fc7a
 SHA512:
-  metadata.gz: a9d42047fdaeba4c49096c40dd92b9d33ed77f84ef7a65410f34bab1a0408be55c7db38caa5e30aab0456d1b93af4db2a0c79c953dfdfd9f39579f26e5a1cef2
-  data.tar.gz: 2850fa03b263d9a06f0d2af5c9649b9ccd30719a58e5a0f0dac41bb2b495c2745e2ed1b8711ecabdac249166c75dadec3d26b7219800398ee7ff219c6fa167c7
+  metadata.gz: 7b2d57743dbf47151f106931393b6e4e9671a8bba6b8393e3769954ddb8a82cb914c85ee926c16595ec546f2e7826a569590d6d9589d12d67d0858a77c2effc6
+  data.tar.gz: 96d8209f672ee5118f30da45bb672db2139f9890148c0bfff46873df59329d8aa5b1c9e1763e7c063048e994f03399706fd8e850a8502e8cd8d08bcae3e44dc0

data/app/controllers/educode_sales/businesses_controller.rb

@@ -149,10 +149,24 @@ module EducodeSales
 
           if params[:q].present? && params[:q][:area].present?
             p = EducodeSales::Common.find(params[:q][:area]).name
-            @businesses = @businesses.joins("
+            if @current_admin.is_admin?
+              @businesses = @businesses.joins("
+              JOIN departments ON educode_sales_businesses.department_id = departments.id
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+            else
+              level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+              if level == "区域"
+                @businesses = @businesses.joins("
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+              else
+                @businesses = @businesses.joins("
               JOIN departments ON educode_sales_businesses.department_id = departments.id
               JOIN schools ON departments.school_id = schools.id
             ").where("province = ?", p)
+              end
+            end
           end
 
           if params[:q].present? && params[:q][:date].present?
@@ -261,6 +275,7 @@ module EducodeSales
 
     def new_follow_record
       load_business
+      @years = (2015..Time.now.year).to_a.reverse
       @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       @stages = Common.where(clazz: 'business_step').order("position").pluck(:name, :id)
@@ -270,7 +285,7 @@ module EducodeSales
         gon.sales = @last_follow_up.assign_follow_ups.map do |d|
           {value: d.staff_id, name: d.staff.user.full_name}
         end
-        gon.place = [{ value: @last_follow_up.place&.id, name: @last_follow_up.place&.name }]
+        gon.place = @last_follow_up.place.present? ? [{ value: @last_follow_up.place&.id, name: @last_follow_up.place&.name }] : []
       end
       render layout: false
     end
@@ -296,6 +311,7 @@ module EducodeSales
     end
 
     def edit_follow_record
+      @years = (2015..Time.now.year).to_a.reverse
       @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @follow_up = FollowUp.find(params[:follow_up_id])
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
@@ -304,7 +320,7 @@ module EducodeSales
       gon.sales = @follow_up.assign_follow_ups.map do |d|
         {value: d.staff_id, name: d.staff.user.full_name}
       end
-      gon.place = [{ value: @follow_up.place&.id, name: @follow_up.place&.name }]
+      gon.place = @follow_up.place.present? ? [{ value: @follow_up.place&.id, name: @follow_up.place&.name }] : [value: '', name: '']
       render layout: false
     end
 

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -29,22 +29,22 @@ module EducodeSales
               @follow_ups = FollowUp.all
             end
           end
-          if params[:q].present? && params[:q][:follows_business].present?
-            @follow_ups = @follow_ups.joins(:business).where("educode_sales_businesses.name LIKE ?", "%#{params[:q][:follows_business]}%")
+          if params[:q].present? && params[:q][:name].present?
+            @follow_ups = @follow_ups.joins(:business).where("educode_sales_businesses.name LIKE ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:follows_date].present?
             date = params[:q][:follows_date].split(" - ")
             @follow_ups = @follow_ups.where("educode_sales_follow_ups.created_at > ? AND educode_sales_follow_ups.created_at < ?", date[0], date[1])
           end
-          if params[:q].present? && params[:q][:follows_staff_id].present?
-            @follow_ups = @follow_ups.where(staff_id: params[:q][:follows_staff_id])
+          if params[:q].present? && params[:q][:staff_id].present?
+            @follow_ups = @follow_ups.where(staff_id: params[:q][:staff_id])
           end
-          if params[:q].present? && params[:q][:follows_department].present?
-            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:follows_department]}%").pluck(:id)
+          if params[:q].present? && params[:q][:department].present?
+            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:department]}%").pluck(:id)
             @follow_ups = @follow_ups.joins(business: :department).where("departments.id in (?)", departments_ids)
           end
-          if params[:q].present? && params[:q][:follows_area].present?
-            p = EducodeSales::Common.find(params[:q][:follows_area]).name
+          if params[:q].present? && params[:q][:area].present?
+            p = EducodeSales::Common.find(params[:q][:area]).name
             @follow_ups = @follow_ups.joins(:business).joins("
               JOIN departments ON educode_sales_businesses.department_id = departments.id
               JOIN schools ON departments.school_id = schools.id
@@ -214,7 +214,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year)
     end
 
     def teacher_params

data/app/controllers/educode_sales/home_controller.rb

@@ -42,21 +42,26 @@ module EducodeSales
     end
 
     def sales_staff
-      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      @staffs = Staff
       if params[:teacher_assist].present?
         common = Common.find_by(clazz: 'staff_type', name: '运营')
+      else
+        common = Common.find_by(clazz: 'staff_type', name: '销售')
       end
-      @staffs = Staff
       if params[:q].present?
         @staffs = @staffs.joins(user: :user_extension).where("concat(lastname, firstname) like :q", q: "%#{params[:q]}%")
       end
-      @staffs = @staffs.where(is_admin: false).where.not(id: @current_admin.id).where(job_type: common.id).page(params[:page]).per(10)
+      if params[:teacher_assist].present?
+        @staffs = @staffs.where(is_admin: false).where(job_type: common.id).page(params[:page]).per(10)
+      else
+        @staffs = @staffs.where(is_admin: false).where.not(id: @current_admin.id).where(job_type: common.id).page(params[:page]).per(10)
+      end
     end
 
     def sales_place
       @places = EducodeSales::Place
       if params[:q].present?
-        @places = @places.where("name like :q", q: "%#{params[:q]}%")
+        @places = @places.where("name like :q", q: "%#{params[:q].strip}%")
       end
       @places = @places.page(params[:page]).per(10)
     end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -120,7 +120,7 @@ module EducodeSales
         labels: dates,
         datasets:names.map.with_index do |name,i|
           {
-            hidden: i < 3 ? false : true,
+            # hidden: i < 3 ? false : true,
             label: name[0],
             data: dates.map{ |d| @follow_up = FollowUp.where(staff_id: name[1], created_at: d.beginning_of_day..d.end_of_day).where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
@@ -134,21 +134,32 @@ module EducodeSales
     end
     def week_follow_count_chart(dates,names,x_business_ids,colors)
       {
-        labels: dates,
+        labels: dates.map{ |date|
+          d = date.split("-")
+          year = d[0].to_i
+          week = d[1].to_i
+          if week == 0
+            0
+          else
+            month = Date.commercial(year,week).strftime("%m月%d日")
+            day = Date.commercial(year,week,7).strftime("%m月%d日")
+            date.to_s + "(#{month}-#{day})"
+          end
+        } - [0],
         datasets:names.map.with_index do |name,i|
           {
-            hidden: i < 3 ? false : true,
+            # hidden: i < 3 ? false : true,
             label: name[0],
             data: dates.map{ |d|
               d = d.split("-")
               year = d[0].to_i
               week = d[1].to_i
                if week == 0
-                 @follow_up = 0
+                 @follow_up = 999999
                else
                  @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", Date.commercial(year,week).strftime("%Y-%m-%d"), Date.commercial(year,week,7).strftime("%Y-%m-%d")).where.not(business: x_business_ids).count
                end
-               },
+               } - [999999],
             backgroundColor: "#fff",
             pointBorderColor: colors[i%15+1],
             borderColor: colors[i%15+1],
@@ -163,7 +174,7 @@ module EducodeSales
         labels: dates,
         datasets:names.map.with_index do |name,i|
           {
-            hidden: i < 3 ? false : true,
+            # hidden: i < 3 ? false : true,
             label: name[0],
             data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01", "#{d}-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
@@ -180,7 +191,7 @@ module EducodeSales
         labels: dates,
         datasets:names.map.with_index do |name,i|
           {
-            hidden: i < 3 ? false : true,
+            # hidden: i < 3 ? false : true,
             label: name[0],
             data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01-01", "#{d}-12-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",

data/app/controllers/educode_sales/sales_controller.rb

@@ -9,8 +9,11 @@ module EducodeSales
       authorize! :sales, Staff
       respond_to do |format|
         format.html do
+          @year = params[:year] ? params[:year] : "全部"
+          @years = ["全部"]+(2015..Time.now.year).to_a.reverse
         end
         format.json do
+          @year = params[:year] ? params[:year] : "全部"
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @a_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name)
           @b_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name)

data/app/controllers/educode_sales/teachers_controller.rb

@@ -57,6 +57,11 @@ module EducodeSales
             end
           end
 
+          if @current_admin.job_type == Common.find_by(clazz: 'staff_type', name: '销售').id
+            public_teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id)
+            @teachers = @teachers.where.not(id: public_teacher_ids)
+          end
+
 
 
           if params[:q].present? && params[:q][:assist].present?

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

@@ -4,25 +4,25 @@
       <div class="layui-inline">
         <label class="layui-form-label">所属商机</label>
         <div class="layui-input-inline">
-          <input type="text" name="follows_business" autocomplete="off" class="layui-input">
+          <input type="text" name="name" autocomplete="off" class="layui-input">
         </div>
       </div>
       <div class="layui-inline">
         <label class="layui-form-label">单位</label>
         <div class="layui-input-inline">
-          <input type="text" name="follows_department" autocomplete="off" class="layui-input">
+          <input type="text" name="department" autocomplete="off" class="layui-input">
         </div>
       </div>
       <div class="layui-inline">
         <label class="layui-form-label">销售人员</label>
         <div class="layui-input-inline">
-          <%= select_tag "follows_staff_id", options_for_select(@staffs, params[:follows_staff_id]), { 'lay-filter': 'follows_staff_id', include_blank: true } %>
+          <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true } %>
         </div>
       </div>
       <div class="layui-inline">
         <label class="layui-form-label">区域</label>
         <div class="layui-input-inline">
-          <%= select_tag "follows_area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
+          <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
       <div class="layui-inline">
@@ -80,6 +80,10 @@
             // where: {q: form.val('search_form')},
             toolbar: '#toolbarDemo_follows',
             defaultToolbar: ['filter'],
+            initSort: {
+                field: 'created_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
             cols: [
                 [
                     {
@@ -90,27 +94,42 @@
                     {
                         field: 'description',
                         title: '最新进展',
+                        templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
                     },
                     {
                         field: 'advise',
                         width: 170,
                         title: '团队建议',
+                        templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
                     },
                     {
                         field: 'clazz',
                         width: 80,
-                        title: '类型'
+                        title: '类型',
+                        templet:'<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
                     },
                     {
                         field: 'stage',
                         title: '阶段',
                         width: 90,
+                        templet:'<div><span title="{{d.stage}}">{{d.stage}}</span></div>'
                     },
                     {
                         field: 'key_people',
                         width: 90,
                         title: '关键人',
-
+                        templet:'<div><span title="{{d.key_people}}">{{d.key_people}}</span></div>'
+                    },
+                    {
+                        field: 'business',
+                        width: 150,
+                        title: '所属商机',
+                        templet:'#business'
+                    },
+                    {
+                        field: 'school',
+                        width: 150,
+                        title: '单位',
                     },
                     {
                         field: 'staff',
@@ -123,12 +142,6 @@
                         title: '跟进时间',
                         sort: true,
                     },
-                    {
-                        field: 'business',
-                        width: 150,
-                        title: '所属商机',
-                        templet:'#business'
-                    },
                     {
                         title: '操作',
                         width: 80,
@@ -169,17 +182,26 @@
                 },
                 where: {q: search, sort: sort}
             }, 'data');
+            table.reload('businesses_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            form.val('search_form', {
+                name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
+            })
             return false;
         });
 
         form.on('submit(reset_follows_search)', function (data) {
             var field = data.field;
             form.val('search_follows', {
-                follows_area: "",
+                area: "",
                 follows_date: "",
-                follows_business: "",
-                follows_department: "",
-                follows_staff_id: ""
+                name: "",
+                department: "",
+                staff_id: ""
             })
             return false;
         });

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

@@ -89,6 +89,15 @@
         <input name="divide_amount" class="layui-input" value="<%= @follow_up.divide_amount%>">
       </div>
     </div>
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">所属年度</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" name="year" autocomplete="off" id="edit_year"
+                 value="<%= @follow_up&.year%>"
+                 placeholder="请选择年度">      </div>
+      </div>
+    </div>
     <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
       <div class="layui-input-inline">
@@ -141,6 +150,10 @@
     laydate.render({
       elem: '#invitation_at_edit'
     })
+    laydate.render({
+      elem: '#edit_year',
+        type: 'year'
+    })
 
     laydate.render({
       elem: '#reception_at_edit'

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

@@ -195,17 +195,20 @@
               {
                 field: 'name',
                 width: 170,
-                title: '名称'
+                  title: '名称',
+                  templet:'<div><span title="{{d.name}}">{{d.name}}</span></div>'
               },
               {
                 field: 'school',
                 width: 150,
                 title: '单位',
+                  templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
               },
               {
                 field: 'department',
                 width: 150,
-                title: '部门'
+                title: '部门',
+                  templet:'<div><span title="{{d.department}}">{{d.department}}</span></div>'
               },
               {
                 field: 'follow_ups_count',
@@ -223,7 +226,8 @@
               {
                 field: 'clazz',
                 width: 80,
-                title: '类型'
+                title: '类型',
+                  templet:'<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
               },
               {
                 field: 'stage',
@@ -278,7 +282,7 @@
               {
                 field: 'place',
                 width: 160,
-                title: '渠道'
+                title: '渠道',
               },
               {
                 field: 'source',
@@ -479,6 +483,15 @@
             },
             where: {q: search, sort: sort}
           }, 'data');
+            table.reload('teachers_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            form.val('search_follows', {
+                name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
+            })
 
           return false;
         });
@@ -694,4 +707,11 @@
     .layui-table-tool-temp{
         padding-right: 30px; !important;
     }
+    .layui-table-fixed .layui-table-body {
+        height: auto!important;
+    }
+    .layui-table-fixed.layui-hide {
+        display: block!important;
+    }
+
 </style>

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

@@ -10,7 +10,7 @@ json.data do
     json.follow_up_id d.last_follow_up_id
     # json.teachers_count d.follow_ups.sum(:key_people_count)
     # json.teachers_count EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).present? ? EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).key_people_count : 0
-    json.clazz d.last_follow_up&.clazz&.name
+    json.clazz d.last_follow_up&.clazz&.name || ""
     json.stage d.last_follow_up&.stage&.name
     json.invitation_at d.last_follow_up&.invitation_at.to_s
     json.reception_at d.last_follow_up&.reception_at.to_s

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

@@ -94,6 +94,15 @@
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
       </div>
+    </div>
+    <div class="layui-form-item">
+    <div class="layui-inline">
+      <label class="layui-form-label">所属年度</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="year" autocomplete="off" id="year"
+               value="<%= @last_follow_up&.year%>"
+               placeholder="请选择年度">      </div>
+    </div>
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
@@ -147,6 +156,10 @@
       xmSelect = layui.xmSelect,
       $ = layui.$;
 
+      laydate.render({
+        elem: '#year',
+          type: 'year'
+      })
       laydate.render({
         elem: '#invitation_at_add'
       })

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

@@ -78,6 +78,14 @@
         <%= @follow_up.divide_amount %>万
       </div>
     </div>
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">所属年度</label>
+        <div class="layui-input-inline">
+          <%= @follow_up&.year %>年
+        </div>
+      </div>
+    </div>
     <div class="ayui-form-item">
       <label class="layui-form-label" style="width: 85px;">指定跟进人：</label>
       <div class="layui-input-inline">

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

@@ -6,6 +6,7 @@ json.data do
     json.staff d.staff.user.real_name
     json.description d.description
     json.advise d.advise
+    json.school d.business.department.school.name
     json.created_at d.created_at.to_s
     json.business d.business.name
     json.business_id d.business.id

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

@@ -79,6 +79,10 @@
             toolbar: '#monthPlanToolbar',
             totalRow:true,
             defaultToolbar: ['filter'],
+            initSort: {
+                field: 'updated_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
             cols: [
                 [
                     {
@@ -111,6 +115,8 @@
                         field: 'content',
                         width: 400,
                         title: '计划内容',
+                        templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
+
                     },
                     {
                         field: 'count',

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

@@ -114,6 +114,8 @@
                         field: 'content',
                         width: 300,
                         title: '个人总结',
+                        templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
+
                     },
                     {
                         field: 'level1_score',

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

@@ -80,6 +80,10 @@
             toolbar: '#weekPlanToolbar',
             totalRow:true,
             defaultToolbar: ['filter'],
+            initSort: {
+                field: 'updated_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
             cols: [
                 [
                     {
@@ -122,6 +126,8 @@
                         field: 'content',
                         width: 300,
                         title: '计划内容',
+                        templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
+
                     },
                     {
                         field: 'count',

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

@@ -115,6 +115,8 @@
                         field: 'content',
                         width: 300,
                         title: '个人总结',
+                        templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
+
                     },
                     {
                         field: 'level1_score',

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

@@ -77,6 +77,10 @@
             url: '/missions/plans?clazz=month',
             toolbar: '#monthPlanToolbar',
             defaultToolbar: ['filter'],
+            initSort: {
+                field: 'updated_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
             totalRow:true,
             cols: [
                 [
@@ -115,6 +119,7 @@
                 field: 'content',
                 width: 300,
                 title: '计划内容',
+                  templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
               },
               {
                 field: 'follow_ups_count',

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

@@ -119,6 +119,7 @@
             field: 'content',
             width: 300,
             title: '个人总结',
+              templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
           },
           {
             field: 'level1_score',

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

@@ -78,6 +78,10 @@
           toolbar: '#weekPlanToolbar',
             totalRow:true,
             defaultToolbar: ['filter'],
+            initSort: {
+                field: 'updated_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
           cols: [
             [
               {
@@ -120,6 +124,7 @@
                 field: 'content',
                 width: 300,
                 title: '计划内容',
+                  templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
               },
               {
                 field: 'follow_ups_count',

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

@@ -121,6 +121,7 @@
               field: 'content',
               width: 300,
               title: '个人总结',
+                templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
             },
             {
               field: 'level1_score',

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

@@ -1,5 +1,12 @@
 <div class="section">
-  <h4><span>销售人员列表</span></h4>
+  <form class="layui-form" action="">
+    <span>销售人员列表</span>
+    <div style="float:right;">年度
+    <div class="layui-input-inline">
+      <%= select_tag "years", options_for_select(@years,@year), {'lay-filter': 'year' } %>
+    </div>
+    </div>
+  </form>
   <hr>
   <table class="layui-hide" id="table" lay-filter="table" ></table>
 </div>
@@ -40,11 +47,18 @@
 </script>
 <script>
   layui.use('table', function () {
-    var table = layui.table;
+      var form = layui.form,
+       table = layui.table;
+
+      form.on('select(year)', function(data){
+          console.log(data, )
+          year = data.value
+          window.location.href = "/missions/sales?year=" + data.value
+      })
 
     table.render({
       elem: '#table',
-      url: '/missions/sales',
+      url: '/missions/sales?year=<%= @year %>',
       cellMinWidth: 80,
         totalRow:true,
       cols: [
@@ -60,6 +74,7 @@
           }, {
             field: 'area',
             title: '负责区域',
+            templet:'<div><span title="{{d.area}}">{{d.area}}</span></div>'
           }, {
             field: 'business_a',
             title: 'A类商机',

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

@@ -26,32 +26,45 @@ json.data do
     else
       json.area  ''
     end
-    business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).count
-    businesses_a_count += business_a
+    if @year == "全部"
+      business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).count
+      business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).count
+      business_c = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @c_clazz&.id).count
+      business_d = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @d_clazz&.id).count
+      business_e = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @e_clazz&.id).count
+      business_o = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @o_clazz&.id).count
+      json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
+      json.return_money  @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ?", @x).sum("educode_sales_businesses.return_money").round(2)
+    else
+      business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      business_c = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @c_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      business_d = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @d_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      business_e = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @e_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      business_o = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @o_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).where("educode_sales_follow_ups.year = ?", @year).sum(:total_amount).round(2)
+      json.return_money  @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.year = ?", @year).sum("educode_sales_businesses.return_money").round(2)
+    end
+
     json.business_a business_a
-    business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).count
-    businesses_b_count += business_b
     json.business_b business_b
-    business_c = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @c_clazz&.id).count
-    businesses_c_count += business_c
     json.business_c business_c
-    business_d = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @d_clazz&.id).count
-    businesses_d_count += business_d
     json.business_d business_b
-    business_e = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @e_clazz&.id).count
-    businesses_e_count += business_e
     json.business_e business_b
-    business_o = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @o_clazz&.id).count
-    businesses_o_count += business_o
     json.business_o business_o
-    json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
-    json.return_money  @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ?", @x).sum("educode_sales_businesses.return_money").round(2)
+
     json.a_clazz_id @a_clazz&.id
     json.b_clazz_id @b_clazz&.id
     json.c_clazz_id @c_clazz&.id
     json.d_clazz_id @d_clazz&.id
     json.e_clazz_id @e_clazz&.id
     json.o_clazz_id @o_clazz&.id
+    businesses_a_count += business_a
+    businesses_b_count += business_b
+    businesses_c_count += business_c
+    businesses_d_count += business_d
+    businesses_e_count += business_e
+    businesses_o_count += business_o
   end
 end
 

data/app/views/educode_sales/sales/operations.html.erb

@@ -46,6 +46,7 @@
                 }, {
                     field: 'area',
                     title: '负责区域',
+                    templet:'<div><span title="{{d.area}}">{{d.area}}</span></div>'
                 }, {
                     field: 'schools',
                     title: '跟进学校',

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

@@ -160,6 +160,7 @@
                     width: 60,
                     title:'序号',type: 'numbers',
                     totalRowText:'合计',
+
                 },
                 {
                     field: 'name',
@@ -171,11 +172,15 @@
                     field: 'school',
                     width: 160,
                     title: '单位',
+                    templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
+
                 },
                 {
                     field: 'department',
                     width: 130,
-                    title: '部门'
+                    title: '部门',
+                    templet:'<div><span title="{{d.department}}">{{d.department}}</span></div>'
+
                 },
                 {
                     field: 'professional_title',

data/db/migrate/20211206054756_add_year_to_follow_ups.rb

@@ -0,0 +1,5 @@
+class AddYearToFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :year, :integer
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -382,6 +382,7 @@ files:
 - db/migrate/20211102085743_add_bidded_date_educode_sales_follow_ups.rb
 - db/migrate/20211109015617_create_educode_sales_recycles.rb
 - db/migrate/20211201023750_create_educode_sales_teacher_assign_follows.rb
+- db/migrate/20211206054756_add_year_to_follow_ups.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb