educode_sales 0.7.8 → 0.8.2

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
@@ -20,13 +21,16 @@ 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' }
           end
+
+          gon.menus << { title: '关注', event: 'following' }
           gon.menus << { title: '跟进时间线', event: 'time_line' }
           if can?(:show_file, EducodeSales::Business)
             gon.menus << { title: '附件管理', event: 'file' }
@@ -42,6 +46,12 @@ module EducodeSales
             gon.export_menus << { title: '导出到Excel文件', event: 'export_excel' }
           end
           gon.export_menus << { title: '导出记录', event: 'export_records' }
+          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
           if @current_admin.is_admin?
@@ -222,11 +232,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
 
@@ -581,6 +593,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
 
@@ -595,5 +655,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

@@ -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,15 @@
+
+
+module EducodeSales
+  class Filter< ApplicationRecord
+    # belongs_to :educode_sales_staff, :class_name => 'EducodeSales::Staff'
+    belongs_to :staff
+
+    serialize :extras, Hash
+
+
+
+
+  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/_setup.html.erb

@@ -93,96 +93,115 @@
                         title: '序号',
                         width: 100,
                         sort: true,
-                        fixed: 'left'
+                        fixed: 'left',
                     },
                     {
                         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月',
+                        width: 70,
+                        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,9 @@
         })
 
 
+
         table.on('tool(assessments)', function (obj) {
+
             var data = obj.data;
             console.log(obj)
             console.log(data)
@@ -275,8 +296,55 @@
               });
 
           // * toolbar事件监听
-          table.on('toolbar(assessments)', function (obj) {
-              if (obj.event === 'add') { // 监听添加操作
+        table.on('toolbar(assessments)', 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
+              //             $.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({
@@ -289,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/assessments/edit.html.erb

@@ -127,7 +127,7 @@
           <div class="layui-input-inline">
             <label class="layui-form-label ">12月(万)</label>
             <div class="layui-input-block" style="width: 200px;">
-              <input type="text" name="december"  value="<%= @assessment.december %>" autocomplete="off" class="layui-input"  lay-verify="number|data" id="month12" onkeyup="sum()">
+              <input type="text" name="december"  value="<%= @assessment.december %>" autocomplete="off" class="layui-input"  lay-verify="data|number" id="month12" onkeyup="sum()">
             </div>
           </div>
         </div>
@@ -179,7 +179,8 @@
                     layer.alert(res.msg)
                 } else {
                     layer.closeAll();
-                    table.reload("assessments")
+                    table.reload("assessments");
+                    table.reload("progressTable");
                 }
             })
             return false;

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

@@ -41,9 +41,8 @@
                       $("#setup_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
                       break;
               }
-
-
         });
+
           // 重置按钮写在index下无效！！！
           // 监控重置
           form.on('submit(reset_assessments_search)', function (data) {

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

@@ -23,4 +23,4 @@ json.data do
 end
 
 json.code 0
-json.count 0
+json.count @assessments.count

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,
@@ -244,6 +244,7 @@
                         layer.closeAll();
                         layer.alert("添加成功");
                         table.reload("assessments");
+                        table.reload("progressTable");
                     }
                 });
                 return false;