educode_sales 0.7.9 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9403e25df2848c96f744c79481e62ea3ebe44c6da7d265bd1e107885c13b108
-  data.tar.gz: 994b9567c3b88d6a804b43484447932725dcfe5d3c0f1e6113233c309a1f1f62
+  metadata.gz: cb565ace898040e094fd5bb5659ba71b471f4d3c6d718f5b0d52c8d0b3b78329
+  data.tar.gz: 5c235c5d885f53def688cf0cf1f6bbfb8a33de88de4811249f54fb69cab34665
 SHA512:
-  metadata.gz: 202b2c2d096f7b8d949658605ed1eb1d9b288a2764ee8144e83efb60b7c718720471f3acec0f5a818302798550eef40c53b1642421465bb3370dec1160272fee
-  data.tar.gz: d5cd014d540019070da9da22c4b7439c4a71b242d6841d34494fdff9af0b049e9d14e22200af16b8c5a32f06bdd6ba9c18bb7b1c21a8c8a78c94f7ec446f7d7f
+  metadata.gz: 2471c1f71f7e9bd3a724a932462fec5eeac8a292d1e7c25938120fbbe25d1c2063d381aa4cca78d8eaa1519b2690b57b02b4e8f1392c28c387f7c4cfc13d9b2a
+  data.tar.gz: 7fe56251df0ff25212c1a3bbc5b9ce9f4c0f418d5e445e4b90eca2ff324ce12f9cd3f4fbfe3d712610dfb513531977713a7e23af5485944277c4b838539160d1

data/app/controllers/educode_sales/application_controller.rb

@@ -27,6 +27,30 @@ module EducodeSales
       end
     end
 
+    def filter
+      filter = Filter.find_or_create_by(staff_id: @current_admin.id, filter_type: params[:type])
+      params[:hidden] = params[:hidden] == "true" ? "0":"1"
+      a = ''
+      b = []
+      filter.filter_data&.split(",")&.each do |d|
+        b << d[0..-2]
+        if d[0..-2] == params[:name]
+          d[-1] = params[:hidden]
+        end
+        a = a + d + ','
+      end
+      if b.include?(params[:name]) == false
+        p "include"
+        a = a + params[:name] + params[:hidden]
+        p a
+      end
+      filter.filter_data = a
+      filter.save
+      render_success
+    end
+
+
+
     rescue_from CanCan::AccessDenied do |exception|
       redirect_to no_permission_path
     end

data/app/controllers/educode_sales/assessments_controller.rb

@@ -15,9 +15,20 @@ module EducodeSales
             gon.export_menus << { title: '导出到Csv文件', event: 'export_csv' }
             gon.export_menus << { title: '导出到Excel文件', event: 'export_excel' }
             # index页面new弹出层下使用
-            gon.demo = Staff.joins(:user).where(job_type: common.id).map do |d|
+            gon.staff_ids = Staff.joins(:user).where(job_type: common.id).map do |d|
               {value: d.id, name: d.user.real_name }
             end
+            filter = Filter.find_or_create_by(staff_id: @current_admin.id, filter_type: "assessments_setup")
+            gon.filter = {}
+            filter.filter_data&.split(",")&.each do |d|
+              m = d[0..-2]
+              # gon.filter[:"#{m}"] = d[-1].to_i # 前端的hide注意时int类型 string类型 获取不到
+              gon.filter["#{m}"] = d[-1].to_i # 前端的hide注意时int类型 string类型 获取不到
+            end
+            # p gon.filter
+            # gon.filter2 = {:username => false }
+            # gon.filter3 = '1'
+            # p gon.filter
           end
           format.json do
             @year = params[:q].present? && params[:q][:assessment_year].present? ? params[:q][:assessment_year]:'2022'
@@ -37,13 +48,15 @@ module EducodeSales
       demo = AssessmentsSetting.new(params_create)
       demo.user_id = current_user.user_id
       demo.assessment_year = "#{params[:assessment_year]}-01-01"
+      AssessmentsSetting.transaction do
         params[:staffs_ids].split(",").each do |d|
             staff = demo.dup
             staff.staff_id = d.to_i
             staff.save
         end
+      end
         render_success
-      rescue  => e
+      rescue  OneError => e
         render_failure '增加数据错误'
       end
     end
@@ -83,8 +96,8 @@ module EducodeSales
         assessment = AssessmentsSetting.find(params[:id])
         assessment.destroy
         render_success
-      rescue ActiveRecord::DeleteRestrictionError => e
-        render_failure '渠道下已有关联数据产生，暂不能删除'
+      rescue OneError => e
+        render_failure '暂不能删除'
       end
     end
 
@@ -109,14 +122,13 @@ module EducodeSales
       # common = Common.find_by(clazz: 'staff_type', name: '销售')
       # @staff_ids = Staff.joins(:user).where(job_type: common.id).pluck(:id)
       @assessment_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]:'1'
-      @assessment_year = params[:q].present? && params[:q][:assessment_year].present? ?  params[:q][:assessment_year] : '2022'
+      @assessment_year = params[:q].present? && params[:q][:assessment_year].present? ?  params[:q][:assessment_year] : Time.now.year
       @assessments =AssessmentsSetting.where(assessment: @assessment_id)
                                       .where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
                                       .order("created_at desc")
       if @assessments.present?
         # 小优化
-        @staff_ids = params[:q].present? && params[:q][:staff_id].present? ? [params[:q][:staff_id].to_i]:@assessments.pluck(:staff_id).uniq
-        p @staff_ids
+        @staff_ids = params[:q].present? && params[:q][:staff_id].present? ? [params[:q][:staff_id].to_i]:@assessments.distinct.pluck(:staff_id)
         progress_main
         #  注意一下
         @assessments = @assessments.where(staff_id: @staff_ids)
@@ -160,12 +172,12 @@ module EducodeSales
         businesses = @businesses.where(staff_id: d)
         b = []
         a=[]
-        FollowUp.joins("JOIN educode_sales_businesses ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id").where("educode_sales_businesses.id in (?)",businesses.pluck(:id)).each do |m|
+        FollowUp.joins("JOIN educode_sales_businesses ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id")
+                .where("educode_sales_businesses.id in (?)",businesses.pluck(:id)).each do |m|
           b << {value: m.actual_amount.to_i, date:m.signed_date.to_s[5..6].to_i}
         end
-
         count_data(b,a)  #  统计数据
-        update_assessments_progress(a,d) #  批量更新assessment数据  事物  出现一个commit
+        update_assessments_progress(a,d) #  批量更新assessment数据  事物  一个commit
       end
     end
 
@@ -190,7 +202,7 @@ module EducodeSales
           @money_plans = MoneyPlan.joins(:follow_up).where(follow_up_id: follow_up_ids)
         end
       end
-      #  todo 1 :实际回款 0:计划回款 where(clazz: 1 OR 实际回款 )  先把staff写死
+      #  todo 1 :实际回款 0:计划回款 where(clazz: 1 OR 实际回款 )
       @money_plans = @money_plans.where(clazz: 1).where.not(date_at: nil)
       @staff_ids.each do |d|
         b = []
@@ -267,8 +279,8 @@ module EducodeSales
         businesses.each do |m|
           b << {date: m.created_at.to_s[5..6].to_i, value: 1}
         end
-        count_data(b,a)
-        update_assessments_progress(a, d)
+        count_data(b,a)  #  统计数据
+        update_assessments_progress(a, d)  #  批量更新assessment数据  事物  一个commit
       end
     end
 
@@ -304,14 +316,11 @@ module EducodeSales
         a[15] = a[9].to_i + a[10].to_i + a[11].to_i
         a[16] = a[12].to_i + a[13].to_i + a[14].to_i + a[15].to_i
         # 开启事物  处理 批量修改数据
-        ActiveRecord::Base.transaction do
-          assessments = @assessments.where(staff_id: staff_id)
-          assessments.update(annual_progress: a[16], first_quarter_progress: a[12], second_quarter_progress: a[13], third_quarter_progress: a[14], fourth_quarter_progress: a[15],
+        assessments = @assessments.where(staff_id: staff_id)
+        assessments.update(annual_progress: a[16], first_quarter_progress: a[12], second_quarter_progress: a[13], third_quarter_progress: a[14], fourth_quarter_progress: a[15],
                               january_progress: a[0], february_progress: a[1], march_progress: a[2], april_progress: a[3], may_progress: a[4], june_progress: a[5],
                               july_progress: a[6], august_progress: a[7], september_progress: a[8], october_progress: a[9], november_progress: a[10], december_progress: a[11])
 
-        end
-
     end
 
     # 将统计到的数据转入a中

data/app/controllers/educode_sales/businesses_controller.rb

@@ -21,9 +21,10 @@ module EducodeSales
           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' }
@@ -45,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?

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/views/educode_sales/assessments/_setup.html.erb

@@ -93,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',
@@ -237,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)
@@ -275,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();

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

@@ -183,7 +183,7 @@
     //  单独写在这里配合upen(才实现打开open时清空select中数据)
     // staffs(select多选)
     // 因为new是弹出层 所以可以获取index页面的gon.demo数据
-    var test = gon.demo;
+    var test = gon.staff_ids;
     var staffs = xmSelect.render({
         el: '#staffs',
         data: test,

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

@@ -261,8 +261,8 @@
             elem: '#businesses_table',
             url: '/missions/businesses',
             where: {q: data},
-            defaultToolbar: ['filter'],
             toolbar: '#bussinessBar',
+            defaultToolbar: ['filter'],
             title: '商机数据表',
             totalRow: true,//开启合并行
             cols: [
@@ -279,19 +279,22 @@
                         width: 170,
                         title: '商机名称',
                         templet: '<div><span title="{{d.name}}">{{d.name}}</span></div>',
-                        fixed: 'left'
+                        fixed: 'left',
+                        hide: gon.business_filter.name
                     },
                     {
                         field: 'school',
                         width: 150,
                         title: '单位',
-                        templet: '#school_name'
+                        templet: '#school_name',
+                        hide: gon.business_filter.school
                     },
                     {
                         field: 'department',
                         width: 150,
                         title: '部门',
-                        templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>'
+                        templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>',
+                        hide: gon.business_filter.department
                     },
                     {
                         field: 'follow_ups_count',
@@ -299,6 +302,7 @@
                         width: 60,
                         templet: '#show_follow',
                         totalRow: true,
+                        hide: gon.business_filter.name
                     },
                     // {
                     //   field: 'teachers_count',
@@ -310,102 +314,119 @@
                         field: 'clazz',
                         width: 80,
                         title: '类型',
-                        templet: '<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
+                        templet: '<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>',
+                        hide: gon.business_filter.name
               },
               {
                 field: 'stage',
                 width: 90,
-                title: '阶段'
+                title: '阶段',
+                  hide: gon.business_filter.name
               },
                 {
                     field: 'source',
                     width: 90,
-                    title: '商机来源'
+                    title: '商机来源',
+                    hide: gon.business_filter.source
                 },
                 {
                     field: 'last_follow_person',
                     width: 100,
-                    title: '最新跟进人'
+                    title: '最新跟进人',
+                    hide: gon.business_filter.last_follow_person
                 },
                 {
                     field: 'latest_time',
                     width: 200,
                     title: '最新跟进时间',
-                    sort: true
+                    sort: true,
+                    hide: gon.business_filter.latest_time
                 },
               {
                 field: 'invitation_at',
                 width: 105,
                 title: '招标时间',
-                sort: true
+                sort: true,
+                  hide: gon.business_filter.invitation_at
               },
               {
                 field: 'bidded_date',
                 width: 105,
                 title: '中标时间',
-                  sort: true
+                  sort: true,
+                  hide: gon.business_filter.bidded_date
               },
               {
                 field: 'signed_date',
                   width: 105,
                   title: '签单时间',
-                  sort: true
+                  sort: true,
+                  hide: gon.business_filter.signed_date
               },
                     {
                         field: 'reception_at',
                         width: 105,
                         title: '验收时间',
-                        sort: true
+                        sort: true,
+                        hide: gon.business_filter.reception_at
                     },
                     {
                         field: 'service_end_time',
                         width: 200,
                         title: '服务期',
-                        sort: true
+                        sort: true,
+                        hide: gon.business_filter.service_end_time
                     },
                     {
                         field: 'total_amount',
                         width: 100,
                         title: '总额',
                         totalRow: true,
-                        sort: true
+                        sort: true,
+                        hide: gon.business_filter.total_amount
                     },
                     {
                         field: 'actual_amount',
                         width: 100,
                 title: '合同额',
                   totalRow: true,
-                sort: true
+                sort: true,
+                        hide: gon.business_filter.actual_amount
               },
               {
                 field: 'return_money',
                 width: 100,
                 title: '回款',
                 sort: true,
-                  totalRow: true
+                  totalRow: true,
+                  hide: gon.business_filter.return_money
               },
               {
                 field: 'wait_return_money',
                 width: 100,
                 title: '待回款',
                 sort: true,
-                  totalRow: true
+                  totalRow: true,
+                  hide: gon.business_filter.wait_return_money
               },
               {
                 field: 'return_money_days',
                 width: 150,
                 title: '首次回款周期(天)',
+                  hide: gon.business_filter.return_money_days
               },
               {
                 field: 'place',
                 width: 160,
                 title: '渠道',
+                  hide: gon.business_filter.place
               },
               {
                 field: 'year',
                 width: 105,
                 title: '所属年度',
-                  sort: true
+                  sort: true,
+                  hide: gon.business_filter.year
               },
               {
                   field: 'followed',
@@ -419,7 +440,8 @@
                   },
                  width: 105,
                  title: '关注',
-                  align: "center"
+                  align: "center",
+                  hide: gon.business_filter.followed
 
                },
               {
@@ -427,7 +449,7 @@
                 minWidth: 220,
                 toolbar: '#currentTableBar',
                 align: "center",
-                fixed: 'right'
+                fixed: 'right',
               }
             ]
           ],
@@ -834,6 +856,17 @@
         });
 
         table.on('toolbar(businesses_table)', function (obj) {
+            switch (obj.event) {
+                case 'LAYTABLE_COLS':
+                    layui.form.on('checkbox(LAY_TABLE_TOOL_COLS)', function(obj) {
+                        var value = obj.elem.checked
+                        var name = obj.elem.attributes[1].value
+                        console.log(obj.elem.attributes.name);
+                        request.get('missions/filter?type=businesses_list&name='+name+'&hidden='+value,{},function (res){})
+                    });
+            }
+
+
             if (obj.event === 'add') { // 监听添加操作
                 var content = miniPage.getHrefContent('/missions/businesses/new');
                 var openWH = miniPage.getOpenWidthHeight();
@@ -1045,7 +1078,6 @@
                 });
             }
         });
-
     });
 </script>
 <style>

data/config/routes.rb

@@ -13,6 +13,7 @@ EducodeSales::Engine.routes.draw do
   get :sales_staff, to: "home#sales_staff"
   get :sales_place, to: "home#sales_place"
   get :staff_schools, to: "home#staff_schools"
+  get :filter, to: "application#filter"
 
 
   resources :sessions do

data/db/migrate/20220507020149_create_filter.rb

@@ -0,0 +1,10 @@
+class CreateFilter < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_filters do |t|
+      t.string :filter_type
+      t.references :staff
+      t.string :filter_data
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220507091959_change_educode_sales_filter_column_length.rb

@@ -0,0 +1,5 @@
+class ChangeEducodeSalesFilterColumnLength < ActiveRecord::Migration[5.2]
+  def change
+    change_column :educode_sales_filters, :filter_data, :text
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.7.9'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.1
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,6 +193,7 @@ files:
 - app/models/educode_sales/customer_add.rb
 - app/models/educode_sales/customer_extension.rb
 - app/models/educode_sales/customer_follow.rb
+- app/models/educode_sales/filter.rb
 - app/models/educode_sales/follow_up.rb
 - app/models/educode_sales/key_person.rb
 - app/models/educode_sales/market_area.rb
@@ -453,6 +454,8 @@ files:
 - db/migrate/20220418033025_add_staff_id_to_sets.rb
 - db/migrate/20220419103842_add_column_timestamps_to_assessments_settings.rb
 - db/migrate/20220420071909_create_educode_sales_business_relation_ships.rb
+- db/migrate/20220507020149_create_filter.rb
+- db/migrate/20220507091959_change_educode_sales_filter_column_length.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb