educode_sales 0.9.66 → 0.9.68

data/app/controllers/educode_sales/teachers_controller.rb

@@ -51,22 +51,22 @@ module EducodeSales
           end if role
           
           if @current_admin.is_admin?
-            @teachers = Teacher.where(is_key: false)
+            @teachers = Teacher
           else
             level = @current_admin.role.role_areas.find_by(clazz: '教师运营').level
             case level
             when '自己'
-              @teachers = Teacher.where(is_key: false)
+              @teachers = Teacher
               @teachers = @teachers.where(staff_id: @current_admin.id)
               teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.all.pluck(:Teacher_id) + EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id) + @teachers.ids
               @teachers = Teacher.where(id: teacher_ids)
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
-              @teachers = Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where(is_key: false).where("departments.school_id in (?) OR educode_sales_teachers.staff_id = #{@current_admin.id}", school_ids)
+              @teachers = Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_teachers.staff_id = #{@current_admin.id}", school_ids)
               teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.all.pluck(:Teacher_id) + EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id) + @teachers.ids
               @teachers = Teacher.where(id: teacher_ids)
             else
-              @teachers = Teacher.where(is_key: false)
+              @teachers = Teacher
             end
           end
 

data/app/controllers/educode_sales/upload_files_controller.rb

@@ -33,13 +33,20 @@ module EducodeSales
       if @attachment.blank?
         @attachment = Attachment.new
         @attachment.filename = upload_file.original_filename
-        @attachment.description = "business"
+        if params[:activity_id].present?
+          @attachment.container_id = params[:activity_id]
+          @attachment.container_type = 'EducodeSales::Activity'
+        else
+          @attachment.description = "business"
+          @attachment.container_id = params[:business_id]
+        end
+        
         @attachment.disk_filename = local_path[save_path.size + 1, local_path.size]
         @attachment.filesize = upload_file.tempfile.size
         @attachment.content_type = content_type
         @attachment.digest = digest
         @attachment.author_id = @current_admin.user_id
-        @attachment.container_id = params[:business_id]
+      
         @attachment.save!
       else
         logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"

data/app/models/educode_sales/activity.rb

@@ -3,13 +3,30 @@ module EducodeSales
     belongs_to :staff
     has_many :activity_teachers, dependent: :destroy
     has_many :teachers, through: :activity_teachers, dependent: :restrict_with_exception
-    has_many :manages, -> {where("educode_sales_activity_staffs.clazz_id = 0")}, dependent: :destroy, class_name: 'ActivityStaff' 
-    has_many :assists, -> {where("educode_sales_activity_staffs.clazz_id = 1")}, dependent: :destroy, class_name: 'ActivityStaff' 
-    has_many :experts , -> {where("educode_sales_activity_staffs.clazz_id = 2")}, dependent: :destroy, class_name: 'ActivityStaff' 
-    has_many :activity_staffs
+    has_many :manages, -> {where("educode_sales_activity_staffs.clazz_id = 0")}, dependent: :destroy, class_name: 'ActivityStaff'
+    has_many :assists, -> {where("educode_sales_activity_staffs.clazz_id = 1")}, dependent: :destroy, class_name: 'ActivityStaff'
+    has_many :experts , -> {where("educode_sales_activity_staffs.clazz_id = 2")}, dependent: :destroy, class_name: 'ActivityStaff'
+    has_many :invitations , -> {where("educode_sales_activity_staffs.clazz_id = 3")}, dependent: :destroy, class_name: 'ActivityStaff'
+    
+    has_many :activity_staffs, dependent: :destroy
+    has_many :activity_follow_ups, dependent: :destroy
+
+    has_many :attachments, as: :container, dependent: :destroy
+
+    belongs_to :last_follow_up, class_name: 'ActivityFollowUp', optional: true 
+
+    belongs_to :sales, class_name: 'Staff', optional: true
 
     has_one :attachment, as: :container, dependent: :destroy
 
     enum clazz_id: ['全国会议', '区域会议', '单校会议', '国赛', '省赛', '夏令营']
+    enum state_id: {
+      '策划中': 1,
+      '筹备中': 2,
+      '实施中': 3,
+      '已结束': 4,
+      '已撤销': 5,
+      '已推迟': 6
+    }
   end
 end

data/app/models/educode_sales/activity_follow_up.rb

@@ -0,0 +1,13 @@
+module EducodeSales
+  class ActivityFollowUp < ApplicationRecord
+    belongs_to :staff
+    belongs_to :activity
+
+    enum info_id: {
+      '': nil,
+      '跟进信息': 1,
+      '团队建议': 2,
+      '评价': 3,
+    }
+  end
+end

data/app/models/educode_sales/activity_staff.rb

@@ -4,6 +4,6 @@ module EducodeSales
     belongs_to :staff, optional: true
     belongs_to :user, optional: true
 
-    enum clazz_id: ['manage', 'assist', 'expert']
+    enum clazz_id: ['manage', 'assist', 'expert', 'invitation']
   end
 end

data/app/models/educode_sales/assessments_setting.rb

@@ -8,7 +8,7 @@ module EducodeSales
 
 
     CLAZZ = {
-             7 => '销售指标', 1 => '签单指标', 2 => '回款指标', 3 => '商机跟进', 4 => '商机挖掘-A类商机', 5 => '商机挖掘-B类商机', 6 => '客户拜访-线下拜访', 8 => '客户拜访-线上拜访',
+             7 => '商机目标',  18 => '中标目标', 1 => '签单目标', 2 => '回款目标', 3 => '商机跟进', 4 => '商机挖掘-A类商机', 5 => '商机挖掘-B类商机', 6 => '客户拜访-线下拜访', 8 => '客户拜访-线上拜访',
              9 => '注册数据-学生', 10 => '注册数据-老师', 11 => '会议组织-区域性会议', 12 => '会议组织-单校会议', 13 => '生态合作-虚拟教研室', 14 => '生态合作-特软', 15 => '生态合作-大V合作',
              16 => '重要事项', 17 => '临时任务'
             }
@@ -17,7 +17,7 @@ module EducodeSales
 
     def unit_name
       case self.assessment
-      when 1, 2, 7
+      when 1, 2, 7, 18
         '万元'
       when 3
         '条'

data/app/models/educode_sales/business.rb

@@ -11,6 +11,8 @@ module EducodeSales
     has_many :sale_plans
     has_many :follow_ups
     has_many :business_clazz_changes
+    has_many :business_levels, dependent: :destroy
+    has_many :business_watches, dependent: :destroy
 
     #关联关注
     has_many :users,:class_name => 'EducodeSales::BusinessRelationShip',foreign_key: 'business_id',:dependent => :destroy
@@ -18,6 +20,7 @@ module EducodeSales
     #每次查询时 默认的查询条件
     default_scope  -> {where(deleted_at: nil)}
 
+
     def soft_destroy(user_id)
       self.update(deleted_at: Time.now, state_id: 2)
       self.sale_plans.each do |d|

data/app/models/educode_sales/business_info.rb

@@ -0,0 +1,9 @@
+module EducodeSales
+  class BusinessInfo < ApplicationRecord
+    belongs_to :staff
+    belongs_to :business
+    belongs_to :sale_plan, optional: true
+  end
+
+end
+  

data/app/models/educode_sales/business_level.rb

@@ -0,0 +1,11 @@
+module EducodeSales
+    class BusinessLevel < ApplicationRecord
+      belongs_to :business
+
+      enum level_id: {
+        '保密型': 1,
+        '战略型': 2
+      }
+    end
+  end
+  

data/app/models/educode_sales/business_watch.rb

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

data/app/models/educode_sales/sale_plan.rb

@@ -5,7 +5,9 @@ module EducodeSales
     belongs_to :staff
     validates :business_id, presence: true
 
-    validates :month, presence: true
+    # validates :month, presence: true
+
+    CLAZZ_NAME = {'商机目标' => 7, '中标目标' => 18, '签单目标' => 1, '回款目标' => 2}
 
     default_scope  -> {where(deleted_at: nil)}
   end

data/app/models/educode_sales/staff.rb

@@ -25,6 +25,8 @@ module EducodeSales
 
     has_many :staff_school_tags, dependent: :destroy
 
+    has_many :business_infos, dependent: :destroy
+
     has_many :market_areas, dependent: :destroy
     has_many :areas, through: :market_areas
     validates :user_id, uniqueness: { message: '已存在' }

data/app/views/educode_sales/activities/_follows.html.erb

@@ -0,0 +1,222 @@
+<div style="margin: 10px 10px 10px 10px">
+  <form class="layui-form layui-form-pane">
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">活动名称</label>
+        <div class="layui-input-inline">
+          <input type="text" name="name" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">最新进展</label>
+        <div class="layui-input-inline">
+          <input type="text" name="description" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">销售经理</label>
+        <div class="layui-input-inline">
+          <%= select_tag "sales_id", options_for_select(@staffs), { include_blank: true } %>
+        </div>
+      </div>
+
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_follows_search">重置
+        </button>
+        <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_follows">搜 索
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+<div class="">
+  <table class="layui-hide" id="activity_followp_table" style="min-height: 300px;" lay-filter="activity_followp_table"></table>
+</div>
+<script type="text/html" id="currentTableBar_follows">
+<% if can? :advise, EducodeSales::ActivityFollowUp %>
+  <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="advise">团队建议</a>
+<% end %>
+</script>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
+      var $ = layui.jquery,
+        form = layui.form,
+        request = layui.request,
+        dropdown = layui.dropdown,
+        miniPage = layui.miniPage,
+        laydate = layui.laydate;
+
+        var table = layui.table;
+        table.render({
+            elem: '#activity_followp_table',
+            url: '/missions/activities/follow_ups',
+            defaultToolbar: ['filter'],
+            initSort: {
+              field: 'created_at' ,type: 'desc'
+            },
+            cols: [
+                [
+                  {
+                      field: 'id',
+                      width: 60,
+                      title:'序号',type: 'numbers',
+                  },
+                  {
+                      field: 'description',
+                      title: '最新进展',
+                      width: 300,
+                      templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
+                  },
+                  {
+                      width: 120,
+                      title: '活动名称',
+                      field: 'name'
+                  },
+                  {
+                    field: 'state_id',
+                    width: 150,
+                    title: '活动状态',
+                  },
+                  {
+                    field: 'staff',
+                    width: 150,
+                    title: '销售经理',
+                  },
+                  {
+                    field: 'staff_manage',
+                    title: '生态经理',
+                    width: 150,
+                  },
+                  {
+                    field: 'info_id',
+                    width: 160,
+                    title: '信息类型',
+                  },
+                  {
+                    field: 'follow_up',
+                    width: 120,
+                    title: '最新跟进人',
+                  },
+                  {
+                    field: 'created_at',
+                    width: 180,
+                    title: '最新跟进时间',
+                    sort: true,
+                  },
+                  {
+                    field: 'advise',
+                    width: 300,
+                    title: '团队建议',
+                    templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
+                  },
+                  {
+                    title: '操作',
+                    width: 200,
+                    toolbar: '#currentTableBar_follows',
+                    align: "center",
+                    fixed: 'right'
+                 }
+                ]
+            ],
+            limit: 20,
+            page: true,
+            limits: [10,15,20,30,40,50,60,70,80,90]
+        });
+
+        var sort = {}, search = {};
+        table.on('sort(activity_followp_table)', function (obj) {
+          sort.field = obj.field;
+          sort.order = obj.type;
+          table.reload('activity_followp_table', {
+            initSort: obj,
+            where: {
+              sort: sort,
+              q: search
+            }
+          });
+        })
+
+        // 监听搜索操作
+        form.on('submit(search_follows)', function (data) {
+          search = data.field
+          table.reload('activity_followp_table', {
+            page: {
+                curr: 1
+            },
+            where: {q: search, sort: sort}
+          }, 'data');
+
+          return false;
+        });
+
+        form.on('submit(reset_follows_search)', function (data) {
+          var field = data.field;
+          form.val('search_follows', {
+            name: "",
+            description: "",
+            staff_id: ""
+          })
+          return false;
+        });
+
+
+        table.on('tool(activity_followp_table)', function (obj) {
+          var data = obj.data;
+          id = data.teacher_id;
+          if (obj.event === 'detail') { // 监听添加操作
+            content = miniPage.getHrefContent('/missions/teachers/show_follow?id=' + data.teacher_id);
+            openWH = miniPage.getOpenWidthHeight();
+            index = layer.open({
+              title: '跟进记录',
+              type: 1,
+              shade: 0.2,
+              maxmin: true,
+              shadeClose: true,
+              area: [openWH[0] + 'px', openWH[1] + 'px'],
+              offset: [openWH[2] + 'px', openWH[3] + 'px'],
+              content: content
+            });
+            $(window).on("resize", function () {
+              layer.full(index);
+            });
+          } else if (obj.event == 'advise') {
+            layer.open({
+                title: '添加团队建议',
+                closeBtn: 0,
+                type: 1,
+                area: '400px;',
+                id: 'LAY_layuipro',
+                content: '<div class="layui-form" lay-filter="edit_project" style="padding: 20px;"><textarea autocomplete="off" type="text" name="name" lay-verify="required" class="layui-textarea">' + data.advise + '</textarea></div>' ,
+                btn: ['保存', '取消'],
+                  btn1: function(index, l) {
+                    if (l.find("textarea").val().trim() == '') {
+                      layer.msg('内容不能为空')
+                      return false;
+                    } else {
+                      request.authPost("/missions/activities/add_advise", {content: l.find("textarea").val().trim(), id: data.id}, function(res) {
+                        if (res.success == false) {
+                          layer.alert(res.msg);
+                        } else {
+                          layer.close(index);
+                          table.reload('activity_followp_table');
+                        }
+                      })
+                    }
+                    
+                    return false
+                  },
+                  btn2: function(index, l) {
+                    layer.close(index)
+                  }
+              });
+          }
+        });
+
+    });
+</script>
+<style>
+    .layui-table-tool-temp{
+       padding-right: 30px; !important;
+    }
+</style>