educode_sales 0.9.67 → 0.9.69

data/app/controllers/educode_sales/roles_controller.rb

@@ -16,7 +16,7 @@ module EducodeSales
 
     def create
       role = Role.new(name: params[:name])
-      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, { clazz: 'Customer' }, { clazz: 'MoneyPlan' }, { clazz: 'AssessmentsSetting' }, { clazz: 'Idea' }])
+      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, { clazz: 'Customer' }, { clazz: 'MoneyPlan' }, { clazz: 'AssessmentsSetting' }, { clazz: 'Idea' }, { clazz: 'Project' }])
       if role.save
         render_success
       else
@@ -90,6 +90,9 @@ module EducodeSales
       r = role.role_areas.find_or_initialize_by(clazz: 'Idea')
       r.level = params[:idea]
       r.save
+      r = role.role_areas.find_or_initialize_by(clazz: 'Project')
+      r.level = params[:project]
+      r.save
       render_success
     end
 

data/app/controllers/educode_sales/teachers_controller.rb

@@ -24,12 +24,12 @@ module EducodeSales
           common = Common.find_by(clazz: 'staff_type', name: '运营')
           role = EducodeSales::Role.find_by(name: '生态经理')
           if role
-            @staff_manage = Staff.joins(:user).where(role_id: role.id).map { |d| [d.user.real_name, d.id]}
+            @staff_manage = Staff.includes(:user).where(role_id: role.id).map { |d| [d.user.real_name, d.id]}
           else
             @staff_manage = Staff.none
           end
-          
-          @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+          @follow_upers = Staff.includes(:user).map { |d| [d.user.real_name, d.id]}
+          @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
           @more = can?(:create, EducodeSales::OperationPlan) || can?(:update, EducodeSales::Teacher) || can?(:destroy, EducodeSales::Teacher)
           gon.menus = []
           if can?(:create, EducodeSales::OperationPlan)
@@ -51,25 +51,27 @@ 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
 
+          @teachers = @teachers.includes(department: [:department_majors, :school])
+
           if @current_admin.job_type == Common.find_by(clazz: 'staff_type', name: '销售').id
             public_teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id)
             @teachers = @teachers.where.not(id: public_teacher_ids)
@@ -131,16 +133,39 @@ module EducodeSales
             @teachers = @teachers.where("educode_sales_teachers.created_at > ? AND educode_sales_teachers.created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.select("
-            educode_sales_teachers.*,
-            users.created_on,
-            last_follow.created_at as latest_time,
-            users.grade,
-            users.experience,
-            users.last_login_on").joins("
-            LEFT JOIN users ON educode_sales_teachers.user_id = users.id
-            LEFT JOIN educode_sales_teacher_follows AS last_follow ON last_follow.teacher_id = educode_sales_teachers.id AND last_follow.deleted_at IS NULL
-          ")
+          if params[:q].present? && params[:q][:staff_manage].present?
+            staff = Staff.find(params[:q][:staff_manage])
+            school_ids = School.where(province: staff.areas.pluck(:name)).pluck(:id)
+            teacher_ids = EducodeSales::Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id)
+            @teachers = @teachers.where(id: teacher_ids)
+          end
+
+         
+
+          if params[:q].present? && params[:q][:staff_id].present?
+            @teachers = @teachers.select("
+              educode_sales_teachers.*,
+              users.created_on,
+              last_follow.created_at as latest_time,
+              users.grade,
+              users.experience,
+              users.last_login_on").joins("
+              JOIN educode_sales_teacher_follows AS last_follow ON last_follow.id = educode_sales_teachers.follow_up_id AND last_follow.deleted_at IS NULL
+              LEFT JOIN users ON educode_sales_teachers.user_id = users.id
+            ")
+            @teachers = @teachers.where("last_follow.staff_id = ?", params[:q][:staff_id].to_i)
+          else
+            @teachers = @teachers.select("
+              educode_sales_teachers.*,
+              users.created_on,
+              last_follow.created_at as latest_time,
+              users.grade,
+              users.experience,
+              users.last_login_on").joins("
+              LEFT JOIN users ON educode_sales_teachers.user_id = users.id
+              LEFT JOIN educode_sales_teacher_follows AS last_follow ON last_follow.id = educode_sales_teachers.follow_up_id AND last_follow.deleted_at IS NULL
+            ")
+          end
           if params[:sort].present? && params[:sort][:field]
             @teachers = @teachers.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else

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/helpers/educode_sales/application_helper.rb

@@ -19,6 +19,7 @@ module EducodeSales
           File.join("images/avatars", ["#{source&.class}", "#{source&.id}"]) + "?t=#{ctime}"
         end
       elsif source.class.to_s == 'User'
+
         str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g"
         File.join(relative_path, "#{source.class}", str)
       elsif source.class.to_s == 'Subject'

data/app/models/educode_sales/activity.rb

@@ -11,6 +11,10 @@ module EducodeSales
     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

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

@@ -1,25 +1,34 @@
 module EducodeSales
   class Business < ApplicationRecord
 
-    validates_uniqueness_of :number ,allow_nil: true
+    validates_uniqueness_of :number, allow_nil: true
 
     belongs_to :clazz, class_name: 'Common'
     belongs_to :staff
     belongs_to :department
     belongs_to :last_follow_up, class_name: 'FollowUp', optional: true # 允许last_follow_up_id字段中的数为nil
 
+    belongs_to :p_staff, class_name: 'Staff', optional: true
+    belongs_to :p_sale_staff, class_name: 'Staff', optional: true
+    belongs_to :p_deleter, class_name: 'Staff', optional: true
+
     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 :business_histories, dependent: :destroy
 
-    #关联关注
-    has_many :users,:class_name => 'EducodeSales::BusinessRelationShip',foreign_key: 'business_id',:dependent => :destroy
+    # 关联关注
+    has_many :users, :class_name => 'EducodeSales::BusinessRelationShip', foreign_key: 'business_id', :dependent => :destroy
 
-    #每次查询时 默认的查询条件
-    default_scope  -> {where(deleted_at: nil)}
+    # 每次查询时 默认的查询条件
+    default_scope -> { where(deleted_at: nil) }
 
+    enum p_stage: %w[合同阶段 验收阶段 回款阶段]
+    enum p_difficulty: %w[困难 适中 容易]
+    enum p_special: %w[是 否]
+    enum p_status: %w[未完成 已完成]
 
     def soft_destroy(user_id)
       self.update(deleted_at: Time.now, state_id: 2)
@@ -30,6 +39,13 @@ module EducodeSales
       EducodeSales::Recycle.create(source: self, deleter_id: user_id)
     end
 
+    def p_soft_destroy(staff_id)
+      self.update(p_deleted_at: Time.now, p_deleter_id: staff_id)
+    end
+
+    def p_recycle
+      self.update(p_deleted_at: nil, p_deleter_id: nil)
+    end
 
     def self.include_types(type)
       {

data/app/models/educode_sales/business_history.rb

@@ -0,0 +1,8 @@
+module EducodeSales
+  class BusinessHistory < ApplicationRecord
+    belongs_to :business
+    belongs_to :staff
+
+    serialize :content, Array
+  end
+end

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/permission.rb

@@ -14,7 +14,8 @@ module EducodeSales
       '客户管理': 'customer',
       '回款管理': 'money_plan',
       '绩效考核': 'assessments_setting',
-      '方案管理': 'idea'
+      '方案管理': 'idea',
+      '项目管理': 'project'
     }
   end
 end

data/app/models/educode_sales/project.rb

@@ -0,0 +1,53 @@
+module EducodeSales
+  class Project < ApplicationRecord
+    self.table_name = "educode_sales_businesses"
+
+    enum p_stage: %w[合同阶段 验收阶段 回款阶段]
+    enum p_difficulty: %w[困难 适中 容易]
+    enum p_special: %w[是 否]
+    enum p_status: %w[未完成 已完成]
+
+    def self.save_history(attr, old_value, new_value)
+      # old_value = St.find_by(id: old_value)&.name
+      # new_value = Department.find_by(id: new_value)&.name
+      case attr
+      when "p_stage"
+        "项目阶段由“#{old_value}”变更为“#{new_value}”"
+      when "p_difficulty"
+        "项目难度由“#{old_value}”变更为“#{new_value}”"
+      when "p_special"
+        "定制由“#{old_value}”变更为“#{new_value}”"
+      when "p_status"
+        "交付由“#{old_value}”变更为“#{new_value}”"
+      when "p_staff_id"
+        old_value = Staff.find_by(id: old_value)&.user&.real_name
+        new_value = Staff.find_by(id: new_value)&.user&.real_name
+        "指派人由“#{old_value}”变更为“#{new_value}”"
+      when "p_sale_staff_id"
+        old_value = Staff.find_by(id: old_value)&.user&.real_name
+        new_value = Staff.find_by(id: new_value)&.user&.real_name
+        "销售经理由“#{old_value}”变更为“#{new_value}”"
+      when "p_course_time"
+        "课程交付时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_platform_time"
+        "平台交付时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_deploy_time"
+        "现场部署时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_accept_time"
+        "实际验收时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_pre_money_time"
+        "拟定回款时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_actual_money_time"
+        "实际回款时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_money"
+        "回款由“#{old_value}”变更为“#{new_value}”"
+      when "p_content"
+        "问题备注由“#{old_value}”变更为“#{new_value}”"
+      when "p_pre_accept_time"
+        "预计验收时间由“#{old_value}”变更为“#{new_value}”"
+      else
+        nil
+      end
+    end
+  end
+end

data/app/models/educode_sales/role_area.rb

@@ -11,7 +11,8 @@ module EducodeSales
       '客户管理': 'Customer',
       '回款管理': 'MoneyPlan',
       '绩效考核': 'AssessmentsSetting',
-      '方案管理': 'Idea'
+      '方案管理': 'Idea',
+      '项目管理': 'Project'
     }
   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

@@ -1,5 +1,5 @@
 <div style="margin: 10px 10px 10px 10px">
-  <form class="layui-form layui-form-pane" lay-filter="search_follows">
+  <form class="layui-form layui-form-pane">
     <div class="layui-form-item">
       <div class="layui-inline">
         <label class="layui-form-label">活动名称</label>
@@ -16,7 +16,7 @@
       <div class="layui-inline">
         <label class="layui-form-label">销售经理</label>
         <div class="layui-input-inline">
-          <%= select_tag "sales_id", options_for_select(EducodeSales::Staff.all.map{|d| [d.user&.real_name, d.id]}), { include_blank: true } %>
+          <%= select_tag "sales_id", options_for_select(@staffs), { include_blank: true } %>
         </div>
       </div>
 
@@ -33,19 +33,10 @@
   <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">
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
+<% 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 type="text/html" id="teacher_name">
-  {{# if (d.login) { }}
-    <a href="<%= base_url%>/users/{{d.login}}" class="layui-table-link" target="_blank">{{ d.teacher }}</a>
-  {{# } else {}}
-    <a href="javascript:;" class="">{{ d.teacher }}</a>
-  {{# }}}
-</script>
-<script type="text/html" id="school">
-  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
-</script>
-
 
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
@@ -56,20 +47,13 @@
         miniPage = layui.miniPage,
         laydate = layui.laydate;
 
-      var laydate = layui.laydate;
-
-        laydate.render({
-          elem: '#follows_date',
-          range: true
-        });
-
-        table = layui.table;
+        var table = layui.table;
         table.render({
             elem: '#activity_followp_table',
             url: '/missions/activities/follow_ups',
             defaultToolbar: ['filter'],
             initSort: {
-              field: 'created_at' ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+              field: 'created_at' ,type: 'desc'
             },
             cols: [
                 [
@@ -117,22 +101,22 @@
                   {
                     field: 'created_at',
                     width: 180,
-                    title: '跟进时间',
+                    title: '最新跟进时间',
                     sort: true,
                   },
                   {
-                      field: 'advise',
-                      width: 120,
-                      title: '团队建议',
-                      templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
+                    field: 'advise',
+                    width: 300,
+                    title: '团队建议',
+                    templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
                   },
-                //  {
-                 //     title: '操作',
-                  //    width: 80,
-                //      toolbar: '#currentTableBar_follows',
-                 //     align: "center",
-                 //     fixed: 'right'
-                //  }
+                  {
+                    title: '操作',
+                    width: 200,
+                    toolbar: '#currentTableBar_follows',
+                    align: "center",
+                    fixed: 'right'
+                 }
                 ]
             ],
             limit: 20,
@@ -196,6 +180,36 @@
             $(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)
+                  }
+              });
           }
         });
 
@@ -203,6 +217,6 @@
 </script>
 <style>
     .layui-table-tool-temp{
-        padding-right: 30px; !important;
+       padding-right: 30px; !important;
     }
 </style>

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

@@ -8,7 +8,7 @@
   </div>
 </script>
 <div style="margin: 10px 10px 10px 10px">
-  <form class="layui-form layui-form-pane" lay-filter="search_ideas">
+  <form class="layui-form layui-form-pane">
     <div class="layui-form-item">
       <div class="layui-inline ">
         <label class="layui-form-label">活动名称</label>
@@ -37,7 +37,7 @@
       <div class="layui-inline">
         <label class="layui-form-label">生态经理</label>
         <div class="layui-input-inline">
-          <%= select_tag "manage", options_for_select(@staffs, ""), { include_blank: true } %>
+          <%= select_tag "manage", options_for_select(@staff_manage, ""), { include_blank: true } %>
         </div>
       </div>
       <div class="layui-inline">
@@ -67,11 +67,19 @@
 
 <script type="text/html" id="currentTableBar">
   <% if can? :create, EducodeSales::ActivityFollowUp %>
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进</a>
   <% end %>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_plan">添加计划</a>
+  <% if can? :advise, EducodeSales::ActivityFollowUp %>
+    <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="advise">建议</a>
+  <% end %>
+  
   <% if can? :update, EducodeSales::Activity %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <% end %>
+  <% if can? :show_file, EducodeSales::Activity %>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="file">附件</a>
+  <% end %>
  <% if can? :destroy, EducodeSales::Activity %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
   <% end %>
@@ -174,11 +182,6 @@
                   width: 180,
                   title: '邀请专家'
                 },
-                {
-                  field: 'expert',
-                  width: 180,
-                  title: '报告专家'
-                },
                 {
                   field: 'start_at',
                   width: 200,
@@ -212,7 +215,7 @@
                 },
                 {
                   title: '操作',
-                  width: 260,
+                  width: 380,
                   toolbar: '#currentTableBar',
                   align: "center",
                   fixed: 'right'
@@ -311,6 +314,26 @@
                     layer.full(index);
                 });
                 return false;
+            } else if (obj.event === 'add_plan') {
+              var content = miniPage.getHrefContent('/missions/operation_plans/new_week');
+              var openWH = miniPage.getOpenWidthHeight();
+              new_weelPlan_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,
+                success: function (layero, index) {
+                    // 重新渲染弹层中的下拉选择框select
+                  form.render('select');
+                }
+              });
+              $(window).on("resize", function () {
+                layer.full(index);
+              });
             } else if (obj.event === 'delete') {
                 layer.confirm('确定删除' + data.name, function (index) {
                     request.delete('missions/activities/' + data.id, {}, function (res) {
@@ -405,6 +428,56 @@
                 $(window).on("resize", function () {
                  layer.full(followup_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.authPut("/missions/activities/" + data.id + "/update_advise", {content: l.find("textarea").val().trim()}, 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)
+                    }
+                });
+            } else if (obj.event == 'file') {
+              activity_id = data.id
+              var content = miniPage.getHrefContent('/missions/activities/' + data.id + "/files");
+              var openWH = miniPage.getOpenWidthHeight();
+              followup_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,
+                success: function (layero, index) {
+                 form.render('select');
+                 }
+               });
+               $(window).on("resize", function () {
+                layer.full(followup_index);
+              });
             }
         });