educode_sales 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb565ace898040e094fd5bb5659ba71b471f4d3c6d718f5b0d52c8d0b3b78329
-  data.tar.gz: 5c235c5d885f53def688cf0cf1f6bbfb8a33de88de4811249f54fb69cab34665
+  metadata.gz: 6c7d5af9d8ef299b488469e4641429c5f7ef51411ee9749817d215920ab2eefe
+  data.tar.gz: 8ecea150b2f7ebf1c83b46873d79aad3561a803d45c3d96b28be8d96d6ac6d7e
 SHA512:
-  metadata.gz: 2471c1f71f7e9bd3a724a932462fec5eeac8a292d1e7c25938120fbbe25d1c2063d381aa4cca78d8eaa1519b2690b57b02b4e8f1392c28c387f7c4cfc13d9b2a
-  data.tar.gz: 7fe56251df0ff25212c1a3bbc5b9ce9f4c0f418d5e445e4b90eca2ff324ce12f9cd3f4fbfe3d712610dfb513531977713a7e23af5485944277c4b838539160d1
+  metadata.gz: 670ed7ce415e605c9d93dd0eaf7f369beed38af7f5f576726181fb2232281e6eafcbbf9678fb97fb7b4263abfe9c857f19d80e81b55e23186d2e5fc0a08fe11a
+  data.tar.gz: cad4aa2546734ae5cc3807c0947c0d194449867d0086efffeb36248040dba564bd145f06cc96bbe87a2c094b9b62abb364a99d98a6149d0eb54ccf31019ec367

data/app/controllers/educode_sales/application_controller.rb

@@ -28,25 +28,15 @@ module EducodeSales
     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 + ','
+      params[:check] = params[:check] == "true" ? 0:1
+      begin
+        filter = Filter.find_or_create_by!(staff_id: @current_admin.id, clazz: params[:type])
+        filter.extras["#{params[:name]}"] = params[:check]
+        filter.save!
+        render json: {success: true ,hidden: params[:check]}
+      rescue => e
+        render_failure("操作失败")
       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
 
 

data/app/controllers/educode_sales/assessments_controller.rb

@@ -18,17 +18,12 @@ module EducodeSales
             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类型 获取不到
+            filter = Filter.find_or_create_by(staff_id: @current_admin.id, clazz: "assessments_setup")
+            if filter.extras.present?
+              gon.filter = filter.extras
+            else
+              gon.filter = {}
             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'
@@ -45,18 +40,18 @@ module EducodeSales
     # 新增
     def create
       begin
-      demo = AssessmentsSetting.new(params_create)
-      demo.user_id = current_user.user_id
-      demo.assessment_year = "#{params[:assessment_year]}-01-01"
-      AssessmentsSetting.transaction do
+        assessment = AssessmentsSetting.new(params_create)
+        assessment.user_id = current_user.user_id
+        assessment.assessment_year = "#{params[:assessment_year]}-01-01"
+        AssessmentsSetting.transaction do
         params[:staffs_ids].split(",").each do |d|
-            staff = demo.dup
+            staff = assessment.dup
             staff.staff_id = d.to_i
             staff.save
         end
       end
         render_success
-      rescue  OneError => e
+      rescue  => e
         render_failure '增加数据错误'
       end
     end
@@ -96,7 +91,7 @@ module EducodeSales
         assessment = AssessmentsSetting.find(params[:id])
         assessment.destroy
         render_success
-      rescue OneError => e
+      rescue  => e
         render_failure '暂不能删除'
       end
     end
@@ -170,14 +165,13 @@ module EducodeSales
       @staff_ids.each do |d|
         # 注意
         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|
-          b << {value: m.actual_amount.to_i, date:m.signed_date.to_s[5..6].to_i}
+        data_count=[]
+        data_list = 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)).map do |m|
+          {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
+        count_data(data_list,data_count)  #  统计数据
+        update_assessments_progress(data_count,d) #  批量更新assessment数据  事物  一个commit
       end
     end
 
@@ -198,20 +192,19 @@ module EducodeSales
           b_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
           ids = a_ids + b_ids
           @money_plans = MoneyPlan.joins(:follow_up).where(follow_up_id: ids)
-        else
+          else
           @money_plans = MoneyPlan.joins(:follow_up).where(follow_up_id: follow_up_ids)
         end
       end
       #  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 = []
-        a = []
-        @money_plans.where(staff_id: d).each do |m|
-          b << {date:m.date_at.to_s[5..6].to_i, value:m.amount.to_i}
+        data_count = []
+        data_list = @money_plans.where(staff_id: d).map do |m|
+          {date:m.date_at.to_s[5..6].to_i, value:m.amount.to_i}
         end
-        count_data(b,a)
-        update_assessments_progress(a, d)
+        count_data(data_list,data_count)
+        update_assessments_progress(data_count, d)
       end
     end
 
@@ -247,20 +240,20 @@ module EducodeSales
     def customer_and_busniness_visits
       @staff_ids.each do |m|
         customers = @customers.where(id: EducodeSales::CustomerExtension.where(customer_staff_id: m).pluck(:school_id))
-        b = []
-        a = []
+        data_list = []
+        data_count = []
         CustomerFollow.joins(:school).where(school_id: customers.pluck(:id))
                               .where("Educode_Sales_customer_follows.created_at >= ? and Educode_Sales_customer_follows.created_at <= ?","#{@assessment_year}-01-01 ","#{@assessment_year}-12-31 23:59:59" )
                               .each do |d|
-          b << {value: 1, date: d.created_at.to_s[5..6].to_i}
+          data_list << {value: 1, date: d.created_at.to_s[5..6].to_i}
         end
         FollowUp.joins(:business).where("Educode_Sales_businesses.id in (?)",EducodeSales::Business.where(school_id: customers.pluck(:id)).pluck(:id))
                 .where("Educode_Sales_follow_ups.created_at >= ? and Educode_Sales_follow_ups.created_at <= ?","#{@assessment_year}-01-01 00:00:00", "#{@assessment_year}-12-31 23:59:59").each do |d|
-          b << {date: d.created_at.to_s[5..6].to_i, value: 1}
+          data_list << {date: d.created_at.to_s[5..6].to_i, value: 1}
         end
-        count_data(b,a)
+        count_data(data_list,data_count)
         assessment = @assessments.where(staff_id: m)
-        update_assessments_progress(a, assessment)
+        update_assessments_progress(data_count, assessment)
       end
     end
 
@@ -274,13 +267,12 @@ module EducodeSales
       @businesses = @businesses.joins("JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id").where("educode_sales_follow_ups.clazz_id in (?) ",ids)
       @staff_ids.each do |d|
         businesses = @businesses.where(staff_id: d)
-        b = []
-        a = []
-        businesses.each do |m|
-          b << {date: m.created_at.to_s[5..6].to_i, value: 1}
+        data_count = []
+        data_list = businesses.map do |m|
+          {date: m.created_at.to_s[5..6].to_i, value: 1}
         end
-        count_data(b,a)  #  统计数据
-        update_assessments_progress(a, d)  #  批量更新assessment数据  事物  一个commit
+        count_data(data_list,data_count)  #  统计数据
+        update_assessments_progress(data_count, d)  #  批量更新assessment数据  事物  一个commit
       end
     end
 
@@ -309,27 +301,27 @@ module EducodeSales
 
 
     # 更新assessments_settings表中数据
-    def update_assessments_progress(a,staff_id)
-        a[12] = a[0].to_i + a[1].to_i + a[2].to_i
-        a[13] = a[3].to_i + a[4].to_i + a[5].to_i
-        a[14] = a[6].to_i + a[7].to_i + a[8].to_i
-        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
+    def update_assessments_progress(data_count,staff_id)
+      data_count[12] = data_count[0].to_i + data_count[1].to_i + data_count[2].to_i
+      data_count[13] = data_count[3].to_i + data_count[4].to_i + data_count[5].to_i
+      data_count[14] = data_count[6].to_i + data_count[7].to_i + data_count[8].to_i
+      data_count[15] = data_count[9].to_i + data_count[10].to_i + data_count[11].to_i
+      data_count[16] = data_count[12].to_i + data_count[13].to_i + data_count[14].to_i + data_count[15].to_i
         # 开启事物  处理 批量修改数据
         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])
+        assessments.update(annual_progress: data_count[16], first_quarter_progress: data_count[12], second_quarter_progress: data_count[13], third_quarter_progress: data_count[14], fourth_quarter_progress: data_count[15],
+                              january_progress: data_count[0], february_progress: data_count[1], march_progress: data_count[2], april_progress: data_count[3], may_progress: data_count[4], june_progress: data_count[5],
+                              july_progress: data_count[6], august_progress: data_count[7], september_progress: data_count[8], october_progress: data_count[9], november_progress: data_count[10], december_progress: data_count[11])
 
     end
 
     # 将统计到的数据转入a中
-    def count_data(arry,a)
-      arry.each do |d|
-        if a[d[:date]-1].present?
-          a[d[:date]-1] = a[d[:date]-1] + d[:value]
+    def count_data(data_list,data_count)
+      data_list.each do |d|
+        if data_count[d[:date]-1].present?
+          data_count[d[:date]-1] = data_count[d[:date]-1] + d[:value]
         else
-          a[d[:date]-1] = d[:value]
+          data_count[d[:date]-1] = d[:value]
         end
       end
     end

data/app/controllers/educode_sales/businesses_controller.rb

@@ -46,12 +46,11 @@ 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
+          filter = Filter.find_or_create_by(staff_id: @current_admin.id, clazz: "businesses_list")
+          if filter.extras.present?
+            gon.filter = filter.extras
+          else
+            gon.filter = {}
           end
         end
         format.json do

data/app/models/educode_sales/filter.rb

@@ -5,10 +5,7 @@ module EducodeSales
     # belongs_to :educode_sales_staff, :class_name => 'EducodeSales::Staff'
     belongs_to :staff
 
-    # serialize :filter_data, Json
-
-
-
+    serialize :extras, Hash
 
 
 

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

@@ -94,14 +94,13 @@
                         width: 100,
                         sort: true,
                         fixed: 'left',
-                        // filter: false
                     },
                     {
                         field: 'username',
                         title: '考核人员',
                         width: 100,
                         fixed: 'left',
-                        hide: gon.filter["username"]
+                        hide: gon.filter["username"],
                     },
                     {
                         field: 'annual',
@@ -118,6 +117,7 @@
                     {
                         field: 'january',
                         title: '1月',
+                        width: 70,
                         hide: gon.filter.january,
                     },
                     {
@@ -259,19 +259,6 @@
 
         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)
@@ -310,31 +297,54 @@
 
           // * toolbar事件监听
         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') { // 监听添加操作
+              // 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
+              //             $.ajax({
+              //                 url: "filter",
+              //                 type: "GET",
+              //                 data: "type=assessments_setup&name=" + name + "&hidden=" + value,
+              //                 success: function (data){
+              //                     let hide_type = "[data-field='"+name+"']"
+              //                     if (data.hidden === '1'){
+              //                         $(hide_type).addClass('layui-hide');
+              //                     }else{
+              //                         $(hide_type).removeClass('layui-hide');
+              //                     }
+              //                 },
+              //                 dataType: 'Json'
+              //             })
+              //         });
+              //         break;
+              //
+              // }
+
+              if (obj.event === 'LAYTABLE_COLS'){
+                  layui.form.on('checkbox(LAY_TABLE_TOOL_COLS)', function(obj) {
+                      var value = obj.elem.checked
+                      var name = obj.elem.attributes[1].value
+                      $.ajax({
+                          url: "filter",
+                          type: "GET",
+                          data: "type=assessments_setup&name=" + name + "&check=" + value,
+                          success: function (data){
+                              let hide_type = "[data-field='"+name+"']"
+                              if (data.hidden === 1){
+                                  $(hide_type).addClass('layui-hide');
+                              }else if (data.hidden === 0){
+                                  $(hide_type).removeClass('layui-hide');
+                              }
+                          },
+                          error: function (data){
+                              layer.msg("操作失败")
+                          },
+                          dataType: 'Json'
+                      })
+                  });
+              }else if( obj.event === 'add'){
+                   // 监听添加操作
                   var content = miniPage.getHrefContent('/missions/assessments/new');
                   var openWH = miniPage.getOpenWidthHeight();
                   var index = layer.open({
@@ -347,28 +357,30 @@
                       offset: [openWH[2] + 'px', openWH[3] + 'px'],
                       content: content,
                       success: function (layero, index) {
-                          // 重新加载select下拉框(绩效考核标准)
+                              // 重新加载select下拉框(绩效考核标准)
                           form.render('select')
-                          // clear上次弹层中的多选人员数据  //   staffs不清楚为什么要写在单独的script下才有效
-                          staffs.setValue([  ])
+                              // 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);
-                  });
-              }
+                      //  这样写无法实现  要写在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);
+                  // });
+            }
           });
 
 

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

@@ -280,21 +280,21 @@
                         title: '商机名称',
                         templet: '<div><span title="{{d.name}}">{{d.name}}</span></div>',
                         fixed: 'left',
-                        hide: gon.business_filter.name
+                        hide: gon.filter.name
                     },
                     {
                         field: 'school',
                         width: 150,
                         title: '单位',
                         templet: '#school_name',
-                        hide: gon.business_filter.school
+                        hide: gon.filter.school
                     },
                     {
                         field: 'department',
                         width: 150,
                         title: '部门',
                         templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>',
-                        hide: gon.business_filter.department
+                        hide: gon.filter.department
                     },
                     {
                         field: 'follow_ups_count',
@@ -302,7 +302,7 @@
                         width: 60,
                         templet: '#show_follow',
                         totalRow: true,
-                        hide: gon.business_filter.name
+                        hide: gon.filter.follow_ups_count
                     },
                     // {
                     //   field: 'teachers_count',
@@ -315,67 +315,67 @@
                         width: 80,
                         title: '类型',
                         templet: '<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>',
-                        hide: gon.business_filter.name
+                        hide: gon.filter.clazz
               },
               {
                 field: 'stage',
                 width: 90,
                 title: '阶段',
-                  hide: gon.business_filter.name
+                  hide: gon.filter.stage
               },
                 {
                     field: 'source',
                     width: 90,
                     title: '商机来源',
-                    hide: gon.business_filter.source
+                    hide: gon.filter.source
                 },
                 {
                     field: 'last_follow_person',
                     width: 100,
                     title: '最新跟进人',
-                    hide: gon.business_filter.last_follow_person
+                    hide: gon.filter.last_follow_person
                 },
                 {
                     field: 'latest_time',
                     width: 200,
                     title: '最新跟进时间',
                     sort: true,
-                    hide: gon.business_filter.latest_time
+                    hide: gon.filter.latest_time
                 },
               {
                 field: 'invitation_at',
                 width: 105,
                 title: '招标时间',
                 sort: true,
-                  hide: gon.business_filter.invitation_at
+                  hide: gon.filter.invitation_at
               },
               {
                 field: 'bidded_date',
                 width: 105,
                 title: '中标时间',
                   sort: true,
-                  hide: gon.business_filter.bidded_date
+                  hide: gon.filter.bidded_date
               },
               {
                 field: 'signed_date',
                   width: 105,
                   title: '签单时间',
                   sort: true,
-                  hide: gon.business_filter.signed_date
+                  hide: gon.filter.signed_date
               },
                     {
                         field: 'reception_at',
                         width: 105,
                         title: '验收时间',
                         sort: true,
-                        hide: gon.business_filter.reception_at
+                        hide: gon.filter.reception_at
                     },
                     {
                         field: 'service_end_time',
                         width: 200,
                         title: '服务期',
                         sort: true,
-                        hide: gon.business_filter.service_end_time
+                        hide: gon.filter.service_end_time
                     },
                     {
                         field: 'total_amount',
@@ -383,23 +383,23 @@
                         title: '总额',
                         totalRow: true,
                         sort: true,
-                        hide: gon.business_filter.total_amount
+                        hide: gon.filter.total_amount
                     },
                     {
                         field: 'actual_amount',
                         width: 100,
-                title: '合同额',
-                  totalRow: true,
-                sort: true,
-                        hide: gon.business_filter.actual_amount
+                        title: '合同额',
+                        totalRow: true,
+                        sort: true,
+                        hide: gon.filter.actual_amount
               },
               {
-                field: 'return_money',
-                width: 100,
-                title: '回款',
-                sort: true,
+                  field: 'return_money',
+                  width: 100,
+                  title: '回款',
+                  sort: true,
                   totalRow: true,
-                  hide: gon.business_filter.return_money
+                  hide: gon.filter.return_money
               },
               {
                 field: 'wait_return_money',
@@ -407,26 +407,26 @@
                 title: '待回款',
                 sort: true,
                   totalRow: true,
-                  hide: gon.business_filter.wait_return_money
+                  hide: gon.filter.wait_return_money
               },
               {
                 field: 'return_money_days',
                 width: 150,
                 title: '首次回款周期(天)',
-                  hide: gon.business_filter.return_money_days
+                  hide: gon.filter.return_money_days
               },
               {
                 field: 'place',
                 width: 160,
                 title: '渠道',
-                  hide: gon.business_filter.place
+                  hide: gon.filter.place
               },
               {
                 field: 'year',
                 width: 105,
                 title: '所属年度',
                   sort: true,
-                  hide: gon.business_filter.year
+                  hide: gon.filter.year
               },
               {
                   field: 'followed',
@@ -441,7 +441,7 @@
                  width: 105,
                  title: '关注',
                   align: "center",
-                  hide: gon.business_filter.followed
+                  hide: gon.filter.followed
 
                },
               {
@@ -861,8 +861,16 @@
                     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){})
+                        request.get('missions/filter?type=businesses_list&name='+name+'&check='+value,{},function (res){
+                            let hide_type = "[data-field='"+name+"']"
+                            if (res.hidden === 1){
+                                $(hide_type).addClass("layui-hide")
+                            }else if(res.hidden === 0 ){
+                                $(hide_type).removeClass("layui-hide")
+                            }else if(res.status === 403){
+                                layer.msg("操作失败")
+                            }
+                        })
                     });
             }
 

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

@@ -219,7 +219,7 @@
               }
             ]
           ],
-          limit: 20,
+          limit: 90,
           limits: [10,15,20,30,40,50,60,70,80,90],
           page: true,
           skin: 'line',
@@ -435,8 +435,6 @@
                 }
               ]
             ],
-             
-
             page: true,
             skin: 'line'
         });

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

@@ -2,7 +2,7 @@ total_amount = 0
 json.data do
   json.array! @money_plans do |d|
     json.id d.id
-    json.date_at d.date_at.to_s(:date)
+    json.date_at (d&.date_at&.to_s(:date) || "")
     json.amount d.amount
     total_amount += d.amount
     json.clazz d.clazz

data/db/migrate/20220509073936_update_educode_sales_filters_filter_data.rb

@@ -0,0 +1,9 @@
+class UpdateEducodeSalesFiltersFilterData < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :educode_sales_filters, :filter_data , :extras
+    rename_column :educode_sales_filters, :filter_type, :clazz
+    EducodeSales::Filter.find_each do |filter|
+      filter.update_attributes!(:extras => nil )
+    end
+  end
+end

data/lib/educode_sales/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -456,6 +456,7 @@ files:
 - 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
+- db/migrate/20220509073936_update_educode_sales_filters_filter_data.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb