educode_sales 1.10.7 → 1.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac101917e54365aede7a60619e9caf0be8de80ed94145e3abd9449a710444235
-  data.tar.gz: f78e765716fe9842703fbc8a66c9f7bd589843c940304da3b3ae65ac4f67db28
+  metadata.gz: 73d98a4d83213078f656abfeb070db43d2a6a594e8a273a8ace4bad8165dc541
+  data.tar.gz: 52b10fb147e17a25bd4f3d5b155676cbbb76d61cf6f799b2249edc6428b1ca1e
 SHA512:
-  metadata.gz: a96c916670d4f3e696c00378e5f94934ef9ea294968deac363f2ea0a043235d6215fd466729a9084ad6cd2899a583f111433f3cdef3cbc055c10e18640d8d61b
-  data.tar.gz: 4d3db639eb7d38180600e00a565502f71dfd19803abe213cb657edcc9b4bf2e7869399049edd5592e07856d15fda1b1a7d9b214147555a5cd4fb19dbf9040039
+  metadata.gz: 9808f3c65fd410beaf59ef94d4be34b7ba5f25c6377975eead142d6943f5c20007c70b6cd297150473c3e569a29142e17edf89671788e77173389711b2124684
+  data.tar.gz: 5b2c468c9b57723d26804fd589637a5f4f877da54be8a88d180b5aec8adca7b69d08bbd28a901b9c6c0cde03e78755e3cc4750a4c700f62f9c02041456d58b73

data/app/controllers/educode_sales/assessments_controller.rb

@@ -434,6 +434,22 @@ module EducodeSales
       render layout: false
     end
 
+    #批量删除签到记录
+    def batch_delete
+      begin
+        ActiveRecord::Base.transaction do
+          if params[:ids].present?
+            ids = params[:ids]
+            attendances = EducodeSales::Attendance.where(id: ids)
+            attendances.destroy_all
+          end
+        end
+        render_success
+      rescue Exception => e
+        render_failure(e.message)
+      end
+    end
+
     #导入签到记录接口
     def import_attendances
       render_failure("文件不存在或格式错误") if params[:file].blank? || !params[:file].is_a?(ActionDispatch::Http::UploadedFile)
@@ -453,7 +469,21 @@ module EducodeSales
           address = d[6]
           mobile_id = d[7]
           ip_address = d[8]
-          customer = d[9]
+          if d[9].blank?
+            school_college_name = d[5].split("学院")[0]
+            school_university_name = d[5].split("大学")[0] + "大学"
+            school = School.where("name like ?", "%#{school_college_name}%").first
+            school01 = School.where("name like ?", "%#{school_university_name}%").first
+            if school.present?
+              customer = school.name
+            elsif school01.present?
+              customer = school01.name
+            else
+              customer = ""
+            end
+          else
+            customer = d[9]
+          end
           target = d[10]
           attendance_vales << {name: name, attendance_date: attendance_date, longitude: longitude, latitude: latitude, location: location,
                                address: address, mobile_id: mobile_id, ip_address: ip_address, customer: customer, target: target}

data/app/controllers/educode_sales/businesses_controller.rb

@@ -295,6 +295,32 @@ module EducodeSales
             end
           end
 
+          #商机来源
+          if params[:q].present? && params[:q][:source_way].present?
+            if params[:q].present? && params[:q][:source_name].present?
+              if ["会议活动", "渠道代理", "客户"].include?(params[:q][:source_way])
+                if params[:q][:source_way] == '会议活动'
+                  sourcable_id = EducodeSales::Activity.where("name like ?", "%#{params[:q][:source_name]}%").limit(20).pluck(:id)
+                elsif params[:q][:source_way]  == '渠道代理'
+                  sourcable_id = EducodeSales::Place.where("name like ?", "%#{params[:q][:source_name]}%").limit(20).pluck(:id)
+                elsif params[:q][:source_way]  == '客户'
+                  sourcable_id = EducodeSales::Department.where("name like ?", "%#{params[:q][:source_name]}%").limit(20).pluck(:id)
+                end
+
+                if sourcable_id.present?
+                  @businesses = @businesses.where(source_way: params[:q][:source_way], sourcable_id: sourcable_id)
+                else
+                  @businesses = @businesses.none
+                end
+              else
+                @businesses = @businesses.where(source_way: params[:q][:source_way]).where("sourcable_type like ?", "%#{params[:q][:source_name]}%")
+              end
+            else
+              @businesses = @businesses.where(source_way: params[:q][:source_way])
+            end
+          end
+          
+
           # 商机变化
           if params[:q][:clazz_changes].present?
             clazz_changes = EducodeSales::BusinessClazzChange.clazz_changes_value[params[:q][:clazz_changes].to_s]
@@ -406,7 +432,26 @@ module EducodeSales
 
     def create
       department = Department.find(params[:department_id])
-      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id, clazz_id: params[:clazz_id])
+      if params[:sourcable_type].present?
+        if params[:source_way]  == '会议活动'
+          params[:sourcable_type] = 'EducodeSales::Activity'
+        elsif params[:source_way]  == '渠道代理'
+          params[:sourcable_type] = 'EducodeSales::Place'
+        elsif params[:source_way]  == '客户'
+          params[:sourcable_type] = 'EducodeSales::Department'
+        else
+          params[:sourcable_id] = ""
+        end
+      end
+      if ['会议活动', '渠道代理', '客户'].include?(params[:source_way] ) && params[:sourcable_id].blank?
+        params[:sourcable_type] = ""
+      end
+      if params[:sourcable_type].blank?
+        params[:sourcable_id] = ""
+      end
+      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id, clazz_id: params[:clazz_id],
+        sourcable_type: params[:sourcable_type], sourcable_id: params[:sourcable_id], source_way: params[:source_way])
+
       if business.save
         render_success
       else

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -33,13 +33,17 @@ 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.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
               business_ids = @businesses.pluck(:id)
-              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids)
+
+              # 指定查看人
+              follow_up_ids = EducodeSales::WatchFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids).or(FollowUp.where(id: follow_up_ids))
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
               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)
               business_ids = @businesses.pluck(:id)
-              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids)
+              follow_up_ids = EducodeSales::WatchFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids).or(FollowUp.where(id: follow_up_ids))
             else
               @follow_ups = FollowUp.all
             end
@@ -296,12 +300,62 @@ module EducodeSales
       render layout: false
     end
 
+    def add_tag
+      followup = FollowUp.find(params[:id])
+      gon.tags = []
+      tags = Tag.all.pluck(:name)
+      selecte_tags = followup.follow_up_tags.includes(:tag).map { |d| d.tag.name }
+      tags.each do |d|
+        gon.tags << {name: d, value: d, selected: selecte_tags.include?(d)}
+      end
+      render layout: false
+    end
+
+    def update_tags
+      follow_up = FollowUp.find(params[:id])
+      tags = []
+      tags_name = []
+      params[:tags].split(",").uniq.each do |d|
+        tag = Tag.find_or_initialize_by(name: d) do |d|
+          d.staff = @current_admin
+        end
+        tags_name << tag.name
+        tag.save unless tag.persisted?
+        t = FollowUpTag.find_or_initialize_by(tag_id: tag.id, follow_up_id: follow_up.id)
+        t.staff = @current_admin
+        tags << t
+      end
+      follow_up.follow_up_tags = tags
+      follow_up.save
+      render json: {success: true, tags: tags_name}
+    end
+
+    def add_assign
+      follow_up = FollowUp.find(params[:id])
+      staff_ids = follow_up.watch_follow_ups.pluck(:staff_id)
+
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      gon.assign_watch= Staff.joins(:user).where.not(job_type: common.id).where.not(role_id: 11).map { |d| {name: d.user.real_name, value: d.id, selected: staff_ids.include?(d.id)} }
+      render layout: false
+    end
+
+    def update_assign
+      follow_up = FollowUp.find(params[:id])
+      staffs = []
+      params[:staff_ids].split(",").each do |staff_id|
+        staffs << WatchFollowUp.find_or_initialize_by(staff_id: staff_id, follow_up_id: follow_up.id)
+      end
+      follow_up.watch_follow_ups = staffs
+      follow_up.save
+      render json: {success: true, tags: staffs.map { |d| d.staff.user.real_name }}
+    end
+
     private
 
     def edu_setting name
       EduSetting.get(name)
     end
-    
+
     def load_business
       @business = Business.find(params[:business_id])
     end

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -6,8 +6,12 @@ module EducodeSales
     def index
       respond_to do |format|
         format.html do
+       
         end
         format.js do
+          gon.edit_record = can?(:update_record, EducodeSales::MoneyPlan)
+          gon.edit_record_self = can?(:update_record_self, EducodeSales::MoneyPlan)
+          gon.staff_id = @current_admin.id
         end
         format.json do
           @money_plan_records = MoneyPlanRecord.left_joins(:money_plan_claims).group("educode_sales_money_plan_records.id").select("educode_sales_money_plan_records.*, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
@@ -100,6 +104,26 @@ module EducodeSales
       render json: { succcess: true}
     end
 
+    def edit
+      @money_plan_record = MoneyPlanRecord.find(params[:id])
+      render layout: false
+    end
+
+    def update
+      money_plan_record = MoneyPlanRecord.find(params[:id])
+      if money_plan_record.update(money_plan_record_params)
+        render json: { succcess: true}
+      else
+        render_failure money_plan_record
+      end
+    end
+
+    def destroy
+      money_plan_record = MoneyPlanRecord.find(params[:id])
+      money_plan_record.destroy
+      render json: { succcess: true}
+    end
+
     def confirm
       money_plan_record = MoneyPlanRecord.find(params[:id])
       money_plan_record.money_plan_claims.where.not(money_plan_id: params[:money_plan_ids]).delete_all
@@ -114,8 +138,13 @@ module EducodeSales
           business.update(return_money: claim.money_plan.money_plan_claims.sum(:amount))
         end
       end
-      
       render_success
     end
+
+    private
+
+    def money_plan_record_params
+      params.permit(:amount, :payer_name, :date_at)
+    end
   end
 end

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -7,6 +7,7 @@ module EducodeSales
       authorize! :read, MoneyPlan
       respond_to do |format|
         format.html do
+         
         end
         format.json do
           last_follow_up_ids = Business.all.pluck(:last_follow_up_id)
@@ -48,6 +49,9 @@ module EducodeSales
         format.html do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+          gon.edit_money_plan = can?(:update, EducodeSales::MoneyPlan)
+          gon.edit_money_plan_self = can?(:update_self, EducodeSales::MoneyPlan)
+          gon.staff_id = @current_admin.id
         end
   
       end
@@ -67,6 +71,10 @@ module EducodeSales
       @money_plan = MoneyPlan.find(params[:id])
       gon.business_id = @money_plan.business_id
       gon.business = [{value: @money_plan.business_id.to_s, name: @money_plan.business&.name}]
+
+      gon.edit_money_plan = can?(:update, EducodeSales::MoneyPlan)
+      gon.edit_money_plan_self = can?(:update_self, EducodeSales::MoneyPlan)
+      gon.staff_id = @current_admin.id
       render layout: false
     end
 

data/app/models/educode_sales/follow_up.rb

@@ -22,6 +22,9 @@ module EducodeSales
     has_many :key_person
     has_many :teachers, through: :key_person
     has_many :assign_follow_ups
+    has_many :follow_up_tags, dependent: :destroy
+
+    has_many :watch_follow_ups, dependent: :destroy
     belongs_to :staff
     belongs_to :stage, class_name: 'Common'
     belongs_to :clazz, class_name: 'Common'

data/app/models/educode_sales/follow_up_tag.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class FollowUpTag < ApplicationRecord
+    belongs_to :follow_up
+    belongs_to :staff
+    belongs_to :tag
+  end
+end

data/app/models/educode_sales/money_plan.rb

@@ -42,11 +42,11 @@ module EducodeSales
     private
 
     def update_return_money
-      if follow_up.business.last_follow_up_id == self.follow_up_id
-        follow_up.business.update(return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: self.follow_up_id).sum(:amount))
-      else
-        follow_up.update(return_money: follow_up.money_plans.where(clazz: '实际回款').sum(:amount))
-      end
+      # if follow_up.business.last_follow_up_id == self.follow_up_id
+      #   follow_up.business.update(return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: self.follow_up_id).sum(:amount))
+      # else
+      #   follow_up.update(return_money: follow_up.money_plans.where(clazz: '实际回款').sum(:amount))
+      # end
     end
   end
 end

data/app/models/educode_sales/money_plan_claim.rb

@@ -3,5 +3,14 @@ module EducodeSales
     belongs_to :money_plan
     belongs_to :money_plan_record
     belongs_to :staff
+
+    after_destroy :update_return_money
+
+
+    private
+
+    def update_return_money
+      self.money_plan.business.update(return_money: self.money_plan.money_plan_claims.sum(:amount))
+    end
   end
 end

data/app/models/educode_sales/money_plan_record.rb

@@ -2,6 +2,6 @@ module EducodeSales
   class MoneyPlanRecord < ApplicationRecord
     belongs_to :staff
     belongs_to :business, optional: true
-    has_many :money_plan_claims
+    has_many :money_plan_claims, dependent: :destroy
   end
 end

data/app/models/educode_sales/tag.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class Tag < ApplicationRecord
+    belongs_to :staff
+
+    enum clazz: ["follow_up"]
+  end
+end

data/app/models/educode_sales/watch_follow_up.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class WatchFollowUp < ApplicationRecord
+    belongs_to :follow_up
+    belongs_to :staff
+  end
+end

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

@@ -34,7 +34,12 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">签到列表</span>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import_attendances">批量导入签到数据</button>
+    <% if can?(:import_attendances,  EducodeSales::AssessmentsSetting) %>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import_attendances"><i class="layui-icon layui-icon-add-circle-fine"></i> 批量导入签到数据</button>
+    <% end %>
+    <% if can?(:batch_delete,  EducodeSales::AssessmentsSetting) %>
+      <button class="layui-btn layui-btn-normal layui-btn-sm layui-btn-danger data-delete-btn pull-right" lay-event="batch_delete"><i class="layui-icon layui-icon-delete"></i> 批量删除签到数据</button>
+    <% end %>
   </div>
 </script>
 
@@ -43,8 +48,12 @@
 </div>
 
 <script type="text/html" id="currentTableBar">
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
-  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% if can?(:edit_attendance,  EducodeSales::AssessmentsSetting) %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can?(:delete_attendance,  EducodeSales::AssessmentsSetting) %>
+    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
 </script>
 
 <script>
@@ -71,6 +80,10 @@
           defaultToolbar: ['filter'],
           cols: [
               [
+                  {
+                      type: 'checkbox',
+                      fixed: 'left'
+                  },
                   {
                       field: 'id',
                       width: 100,
@@ -184,8 +197,13 @@
           return false;
       });
 
+      //监听表格复选框选择
+      table.on('checkbox(attendance_table)',function (obj) {});
+
       //toorbar事件监听
       table.on('toolbar(attendance_table)', function (obj) {
+          var data = obj.data;
+          var checkStatus = table.checkStatus(obj.config.id);
           if (obj.event === 'import_attendances') {  //批量导入签到记录
               var content = miniPage.getHrefContent('/missions/assessments/import');
               var openWH = miniPage.getOpenWidthHeight();
@@ -202,6 +220,30 @@
               $(window).on("resize", function () {
                   layer.full(index);
               });
+          }if (obj.event === 'batch_delete') { //批量删除签到记录
+              //定义数组存放批量删除的数据id
+              var ids = [];
+              //获取所有选中行的数据
+              var dataList = checkStatus.data;
+              //遍历选中的数据,将每一行的id存储到数据中
+              $.each(dataList,function (index, data) {
+                  ids.push(data.id)
+              });
+              if (ids.length <= 0){
+                  layer.msg('请选择要删除的签到记录', {icon: 5})
+              }else{
+                  layer.confirm('确定要删除这些签到记录吗？', function (index) {
+                      request.authPost("missions/assessments/batch_delete", {'ids': ids}, function (res) {
+                          if (res.success === false){
+                              layer.alert(res.msg)
+                          }else{
+                              layer.msg('删除成功');
+                              layer.close(index);
+                              table.reload("attendance_table")
+                          }
+                      })
+                  })
+              }
           }
       });
 

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

@@ -6,7 +6,9 @@
     <% if can?(:show, EducodeSales::AssessmentsSetting) %>
       <li data="assessments" > 考核指标设置</li>
     <%end %>
-    <li class="">签到记录</li>
+    <% if can?(:show_attendances,  EducodeSales::AssessmentsSetting) %>
+      <li class="">签到记录</li>
+    <% end %>
   </ul>
   <!--<div class="layuimini-main min-height-table"></div>-->
   <div class="layui-tab-content">

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

@@ -68,34 +68,38 @@
       $ = layui.$;
     selectInput = layui.selectInput;
 
-    var levels_select = xmSelect.render({
-      el: '#levels',
-      name: 'level_ids',
-      data: gon.levels,
-      on: function(data) {
-        var is_secret = false;
-        data.arr.forEach(function(i) {
-          if (i.name == '战略型' || i.name == '保密型') {
-            is_secret = true;
+    if ($("#levels").length > 0) {
+      var levels_select = xmSelect.render({
+        el: '#levels',
+        name: 'level_ids',
+        data: gon.levels,
+        on: function(data) {
+          var is_secret = false;
+          data.arr.forEach(function(i) {
+            if (i.name == '战略型' || i.name == '保密型') {
+              is_secret = true;
+            }
+          })
+          if (is_secret) {
+            $("#watch_ids_wraper").removeClass('layui-hide')
+          } else {
+            $("#watch_ids_wraper").addClass('layui-hide')
           }
-        })
-        if (is_secret) {
-          $("#watch_ids_wraper").removeClass('layui-hide')
-        } else {
-          $("#watch_ids_wraper").addClass('layui-hide')
         }
+      })
+    }
+    if ($("#watch_ids").length > 0) {
+      var watch_id_select = xmSelect.render({
+        el: '#watch_ids',
+        name: 'watch_ids',
+        data: gon.watche_ids,
+        filterable: true,
+      })
+      if (gon.is_secret) {
+        $("#watch_ids_wraper").removeClass("layui-hide")
       }
-    })
-
-    var watch_id_select = xmSelect.render({
-      el: '#watch_ids',
-      name: 'watch_ids',
-      data: gon.watche_ids,
-      filterable: true,
-    })
-    if (gon.is_secret) {
-      $("#watch_ids_wraper").removeClass("layui-hide")
     }
+  
     var source_way = gon.source_way;
     form.on('select(source_id)', function(data){
       source_way = data.value;
@@ -162,20 +166,22 @@
         
       }
     });
-
-    var merge_business_select = xmSelect.render({
-      el: '#merge_business', 
-      filterable: true,
-      name: 'merge_business_ids',
-      remoteSearch: true,
-      remoteMethod: function(val, cb, show){
-        request.get('missions/businesses/search?id=' + parent.id + "&q=" + val, {},
-         function(res) {
-          cb(res.data)
-        })
-      },
-      data: []
-    })
+    if ($("#merge_business").length > 0) {
+      var merge_business_select = xmSelect.render({
+        el: '#merge_business', 
+        filterable: true,
+        name: 'merge_business_ids',
+        remoteSearch: true,
+        remoteMethod: function(val, cb, show){
+          request.get('missions/businesses/search?id=' + parent.id + "&q=" + val, {},
+          function(res) {
+            cb(res.data)
+          })
+        },
+        data: []
+      })
+    }
+   
 
 
       var sourcable_id = gon.sourcable_id;

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

@@ -32,6 +32,15 @@ json.data do
     json.divide_money d.divide_amount
     json.budget_amount d.budget_amount
     json.area d.department&.school&.province
+
+    json.keys_person_count d.last_follow_up.present? ? EducodeSales::KeyPerson.where("follow_up_id = #{d.last_follow_up.id}").count : 0
+    json.rival d.last_follow_up&.rival || ''
+
+    if ["会议活动", "渠道代理", "客户"].include?(d.source_way)
+      json.source "#{d.source_way} #{d.sourcable&.name}"
+    else
+      json.source "#{d.source_way} #{d.sourcable_type}"
+    end
     # school_property = d.department&.school&.school_property
     # property = []