educode_sales 0.7.7 → 0.8.1

data/app/controllers/educode_sales/businesses_controller.rb

@@ -2,6 +2,7 @@ require_dependency "educode_sales/application_controller"
 
 module EducodeSales
   class BusinessesController < ApplicationController
+    skip_before_action :verify_authenticity_token,only: [:following]
 
 
     def index
@@ -18,14 +19,18 @@ module EducodeSales
           gon.business_type = Common.where(clazz: 'business_type').map do |d|
             {value: d.id, name: d.name}
           end
+
           gon.type = params[:clazz_id].present? ? [{ value: params[:clazz_id], name: Common.find(params[:clazz_id]).name }] : []
-          gon.business_step = Common.where(clazz: 'business_step').map do |d|
+          gon.business_step = Common.where(clazz: 'business_step').order("position").map do |d|
             {value: d.id, name: d.name}
           end
+
           if can?(:create, EducodeSales::SalePlan)
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
           end
+
+          gon.menus << { title: '关注', event: 'following' }
           gon.menus << { title: '跟进时间线', event: 'time_line' }
           if can?(:show_file, EducodeSales::Business)
             gon.menus << { title: '附件管理', event: 'file' }
@@ -41,6 +46,13 @@ module EducodeSales
             gon.export_menus << { title: '导出到Excel文件', event: 'export_excel' }
           end
           gon.export_menus << { title: '导出记录', event: 'export_records' }
+
+          filter_businesses_list = Filter.find_or_create_by(staff_id: @current_admin.id, filter_type: "businesses_list")
+          gon.business_filter = {}
+          filter_businesses_list.filter_data&.split(",")&.each do |d|
+            m = d[0..-2]
+            gon.business_filter["#{m}"] = d[-1].to_i
+          end
         end
         format.json do
           if @current_admin.is_admin?
@@ -221,11 +233,13 @@ module EducodeSales
             last_follow.created_at as latest_time,
             last_follow.actual_amount,
             (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
-            last_follow.total_amount").joins("
+            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
 
@@ -580,6 +594,54 @@ module EducodeSales
         end
       end
     end
+    #关注接口
+    def following
+      if brs=follow_business(@current_admin.user_id,params[:business_id])
+        if brs.delete
+          render json: {code:200,msg:"已取消关注"}
+        else
+          render json: {code:300,msg:"操作失败"}
+        end
+      else
+        brs=BusinessRelationShip.new(user_id:@current_admin.user_id, business_id:params[:business_id])
+        if brs.save
+          render json: {code:200,msg:"关注成功"}
+        else
+          render json: {code:300,msg:"操作失败"}
+        end
+      end
+    end
+
+    #我已关注的商机
+    def following_businesses
+      p=[]
+      BusinessRelationShip.select(:business_id).where(user_id:@current_admin.user_id).to_a.each { |d|  p << d.business_id}
+      @businesses=Business.where(id:p)
+      @businesses=@businesses.select("
+            educode_sales_businesses.*,
+            last_follow.invitation_at,
+            last_follow.reception_at,
+            last_follow.service_time_long,
+            last_follow.service_end_time,
+            last_follow.service_start_time,
+            last_follow.bidded_date,
+            last_follow.signed_date,
+            last_follow.created_at as latest_time,
+            last_follow.actual_amount,
+            (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
+            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
+
+    def followed
+      if brs=follow_business(@current_admin.user_id,params[:business_id])
+        render json: {msg:'确定取消关注？'}
+      else
+        render json: {msg:'确定关注？'}
+      end
+    end
+
 
     private
 
@@ -594,5 +656,9 @@ module EducodeSales
     def edu_setting name
       EduSetting.get(name)
     end
+
+    def follow_business(user_id,business_id)
+      BusinessRelationShip.where(user_id:user_id,business_id:business_id).first
+    end
   end
 end

data/app/controllers/educode_sales/customers_controller.rb

@@ -68,9 +68,6 @@ module EducodeSales
             @customers = @customers.where("schools.province = ?", "#{params[:q][:area]}")
           end
           if params[:q].present? && params[:q][:staff_id].present?
-            p "--------------------------------------------------------------------------------------"
-            p params[:q][:staff_id]
-            p "--------------------------------------------------------------------------------------"
             school_ids = EducodeSales::CustomerExtension.where(customer_staff_id: params[:q][:staff_id]).pluck(:school_id)
             @customers = @customers.where(id: school_ids)
           end

data/app/helpers/educode_sales/application_helper.rb

@@ -55,7 +55,7 @@ module EducodeSales
 
     # 完成率completion_rate
     def completion_rate(setting,progress)
-      if setting.to_i == 0
+      if setting.to_i == 0 || progress.to_i >= setting.to_i
         '100%'
       else
         (progress.to_f/setting.to_f*100).round(2).to_s + "%"
@@ -83,7 +83,7 @@ module EducodeSales
     #新增商机数 得分规则
     def add_businesses_score(staff_id,start_time,end_time)
       if @current_admin.is_admin?
-        @businesses = Business
+        @businesses = Business.all
       else
         level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
         case level
@@ -96,7 +96,7 @@ module EducodeSales
           business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
           @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids)
         else
-          @businesses = Business
+          @businesses = Business.all
         end
       end
 

data/app/models/educode_sales/business.rb

@@ -8,6 +8,10 @@ module EducodeSales
     has_many :sale_plans
     has_many :follow_ups
 
+    #关联关注
+    has_many :users,:class_name => 'EducodeSales::BusinessRelationShip',foreign_key: 'business_id',:dependent => :destroy
+
+
     #每次查询时 默认的查询条件
     default_scope  -> {where(deleted_at: nil)}
 
@@ -20,5 +24,9 @@ module EducodeSales
       EducodeSales::Recycle.create(source: self, deleter_id: user_id)
     end
 
+
+
+
+
   end
 end

data/app/models/educode_sales/business_relation_ship.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class BusinessRelationShip < ApplicationRecord
+    belongs_to :user
+    belongs_to :follow_business, :class_name => 'EducodeSales::Business',foreign_key: "business_id"
+  end
+end

data/app/models/educode_sales/customer_follow.rb

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

data/app/models/educode_sales/filter.rb

@@ -0,0 +1,18 @@
+
+
+module EducodeSales
+  class Filter< ApplicationRecord
+    # belongs_to :educode_sales_staff, :class_name => 'EducodeSales::Staff'
+    belongs_to :staff
+
+    # serialize :filter_data, Json
+
+
+
+
+
+
+
+  end
+end
+

data/app/models/educode_sales/follow_up.rb

@@ -10,6 +10,8 @@ module EducodeSales
     belongs_to :staff
     belongs_to :stage, class_name: 'Common'
     belongs_to :clazz, class_name: 'Common'
+
+
     default_scope  -> {where(deleted_at: nil)}
 
 

data/app/models/educode_sales/role_area.rb

@@ -2,7 +2,7 @@ module EducodeSales
   class RoleArea < ApplicationRecord
     belongs_to :role
 
-    enum level: ['自己', '区域', '全部']
+    enum level: ['自己', '区域', '全部'] # 0 1 2
     enum clazz: {
       '商机管理': 'Business',
       '销售计划': 'SalePlan',

data/app/views/educode_sales/assessments/_progress.html.erb

@@ -81,6 +81,7 @@
             ,url: '/missions/assessments/progress'
             ,toolbar: '#progress_Toolbar'
             ,totalRow:true
+            ,title: "绩效考核指标完成情况" // 目前发现的作用(导出文件的文件名)
             ,defaultToolbar: ['filter']
             // ,limit: 10
             ,limits: [10,15,20,30,40,50,60,70,80,90]
@@ -89,7 +90,7 @@
             ,cols:[
                     [ //标题栏
                         { title: '序号', width: 80, rowspan: 2,type:'numbers',fixed:'left',sort: true,} //rowspan即纵向跨越的单元格数
-                        ,{field: 'name', title: '考核人员', width: 80, rowspan: 2,fixed:'left'}
+                        ,{field: 'name', title: '考核人员', width: 120, rowspan: 2,fixed:'left'}
                         ,{align: 'center', title: '全年', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
                         ,{align: 'center', title: '第1季度', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
                         ,{align: 'center', title: '1月', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
@@ -252,6 +253,8 @@
                 // select: data.select, //有点东西
             }, function (res) {
                 data = res.data
+                // table.exportFile(['标题','案件类型','立案日期'], data , "xls");
+                // 表格中每行的title , 数据 ,格式
                 table.exportFile(progress_table.config.id,data, 'csv');
                 layer.closeAll('loading');
             })
@@ -259,12 +262,12 @@
         }
         function export_excel() {
             var data = form.val("assessment_progress_form");
-            request.authPost("/missions/businesses/get_export_data", {
+            request.authPost("/missions/assessments/get_export_data", {
                 assessment_year: data.assessment_year,
                 assessment_id: data.assessment_id,
                 staff_id: data.staff_id,
             }, function (res) {
-                data = res.data
+                data = res.data;
                 table.exportFile(progress_table.config.id,data, 'xls');
                 layer.closeAll('loading');
             })
@@ -310,7 +313,7 @@
             form.val('assessment_progress_form', {
                 staff_id: '',
                 assessment_year: '2022',
-                assessment_id: '签单金额',
+                assessment_id: '1', // 重置后显示value=1的name
             })
             return false;
         });

data/app/views/educode_sales/assessments/_setup.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-btn-container">
     <span class="table-label">指标完成情况</span>
     <% if can?(:create, EducodeSales::AssessmentsSetting) %>
-      <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="add">添加人员任务指标</button>
+      <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="add" >添加人员任务指标</button>
     <% end %>
   </div>
 </script>
@@ -61,9 +61,6 @@
   <% end %>
 </script>
 
-<!--<script type="text/html" id="showchance">-->
-<!--  <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}asd</a>-->
-<!--</script>-->
 
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'laypage'], function () {
@@ -96,96 +93,115 @@
                         title: '序号',
                         width: 100,
                         sort: true,
-                        fixed: 'left'
+                        fixed: 'left',
+                        // filter: false
                     },
                     {
                         field: 'username',
                         title: '考核人员',
                         width: 100,
-                        fixed: 'left'
+                        fixed: 'left',
+                        hide: gon.filter["username"]
                     },
                     {
                         field: 'annual',
                         title: '全年',
                         width: 100,
+                        hide: gon.filter["annual"],
                     },
                     {
                         field: 'first_quarter',
                         title: '第1季度',
                         width: 100,
+                        hide: gon.filter["first_quarter"],
                     },
                     {
                         field: 'january',
                         title: '1月',
+                        hide: gon.filter.january,
                     },
                     {
                         field: 'february',
                         title: '2月',
                         width: 70,
+                        hide: gon.filter.february,
                     },
                     {
                         field: 'march',
                         title: '3月',
                         width: 70,
+                        hide: gon.filter.march,
                     },
                       {
                           field: 'second_quarter',
                           title: '第2季度',
                           width: 100,
+                          hide: gon.filter.second_quarter,
                       },
                       {
                           field: 'april',
                           title: '4月',
+                          hide: gon.filter.april,
                       },
                       {
                           field: 'may',
                           title: '5月',
                           width: 70,
+                          hide: gon.filter.may,
                       },
                       {
                           field: 'june',
                           title: '6月',
                           width: 70,
+                          hide: gon.filter.june,
                       },
                       {
                           field: 'third_quarter',
                           title: '第3季度',
                           width: 100,
+                          hide: gon.filter.third_quarter,
                       },
                       {
                           field: 'july',
                           title: '7月',
                           width: 70,
+                          hide: gon.filter.july,
                       },
                       {
                           field: 'august',
                           title: '8月',
                           width: 70,
+                          hide: gon.filter.august,
                       },
                       {
                           field: 'september',
                           title: '9月',
                           width: 70,
+                          hide: gon.filter.september,
                       },
                     {
                         field: 'fourth_quarter',
                         title: '第4季度',
                         width: 100,
+                        hide: gon.filter.fourth_quarter,
                     },
                     {
                         field: 'october',
                         title: '10月',
                         width: 70,
+                        hide: gon.filter.october,
                     },
                     {
                         field: 'november',
                         title: '11月',
                         width: 70,
+                        hide: gon.filter.november,
                     },
                     {
                         field: 'december',
                         title: '12月',
                         width: 70,
+                        hide: gon.filter.december,
                     },
                     {
                         field: 'option',
@@ -197,7 +213,11 @@
                     },
                 ]
             ],
-            limit: 10,
+            done : function () {
+            $('.layui-table-fixed-r').removeClass('layui-hide');  // 与底部的css文件解决fixed第一次加载无法实现问题
+        },
+
+        limit: 10,
             limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
             page: true,
             parseData: function(res){ //将原始数据解析成 table 组件所规定的数据，res为从url中get到的数据
@@ -236,7 +256,22 @@
         })
 
 
+
         table.on('tool(assessments)', function (obj) {
+
+            switch (obj.event) {
+                case 'username' :
+                    console.log(obj);
+                    console.log(obj.data);
+                    console.log("username")
+                    console.log("=================")
+                    break;
+                case 'annual' :
+                    console.log("annual")
+                    break;
+
+            }
+
             var data = obj.data;
             console.log(obj)
             console.log(data)
@@ -264,7 +299,7 @@
                   });
                   return false;
               } else if (obj.event === 'delete') {
-                  layer.confirm('确定删除' +  "demo" +  data.id, function (index) {
+                  layer.confirm('确定删除该人员任务指标吗？', function (index) {
                       request.delete('missions/assessments/' + data.id, {}, function (res) {
                           layer.close(index);
                           table.reload("assessments")
@@ -274,7 +309,31 @@
               });
 
           // * toolbar事件监听
-          table.on('toolbar(assessments)', function (obj) {
+        table.on('toolbar(assessments)', function (obj) {
+              switch (obj.event) {
+                  case 'LAYTABLE_COLS':
+                      console.log("start")
+                      var checkStatus = table.checkStatus(obj.config.id);
+                      console.log(checkStatus)
+                      layui.form.on('checkbox(LAY_TABLE_TOOL_COLS)', function(obj) {
+                          console.log(obj); //当前行的一些常用操作集合
+                          var value = obj.elem.checked
+                          console.log(value); //当前是否选中状态
+                          console.log('====checked'); //选中行的相关数据
+                          var name = obj.elem.attributes[1].value
+                          console.log(name);
+                          console.log("request start")
+                          request.get('missions/filter?type=assessments_setup&name='+name+'&hidden='+value, {}, function (res) {
+                              console.log("end")
+                              // layui.msg("重新加载生效")
+                              // layer.close(index);
+                              // table.reload("assessments")
+                          })
+                      });
+                      break;
+
+              }
+
               if (obj.event === 'add') { // 监听添加操作
                   var content = miniPage.getHrefContent('/missions/assessments/new');
                   var openWH = miniPage.getOpenWidthHeight();
@@ -288,10 +347,24 @@
                       offset: [openWH[2] + 'px', openWH[3] + 'px'],
                       content: content,
                       success: function (layero, index) {
-                          // 重新渲染弹层中的下拉选择框select
-                          form.render('select');
+                          // 重新加载select下拉框(绩效考核标准)
+                          form.render('select')
+                          // clear上次弹层中的多选人员数据  //   staffs不清楚为什么要写在单独的script下才有效
+                          staffs.setValue([  ])
+
                       }
                   });
+                  //  这样写无法实现  要写在success中记住(open弹出层) 294
+                  // document.getElementById('clear_staffs').onclick = function() {
+                  //     console.log("delete")
+                  //     staffs.setValue([ {name:'', value:''} ])
+                  //     // console.log(staffs)
+                  //     // alert(staffs.setValue([ {name:'', value:''} ]))
+                  //     // staffs.setValue([ ])
+                  //     // alert(staffs.setValue([ ]))
+                  //     clear(staffs)
+                  //     console.log("ok")
+                  // };
                   $(window).on("resize", function () {
                       layer.full(index);
                   });
@@ -321,11 +394,40 @@
               console.log("setup");
               form.val('search_assessments_form', {
                   assessment_year: '2022',
-                  assessment_id: "签单金额",
+                  assessment_id: 1, //重置后显示value=1的name
                   staff_id: ''
               });
               return false;
           });
     });
 
-</script>
+</script>
+<style>
+    /*与table下的done解决fixed第一次加载无法实现问题*/
+    .layui-hide {
+        display: none!important;
+    }
+
+    .layui-table-fixed .layui-table-body {
+        height: auto!important;
+    }
+    .layui-table-fixed.layui-hide {
+        display: block!important;
+    }
+
+
+</style>
+
+<!--table下的tootbar布局-->
+<style>
+    .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>