educode_sales 0.9.59 → 0.9.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7dabca09ad8e4d8ba3ece235b1be8ad3b7e2065999b7879772b5b4a5611227
-  data.tar.gz: c1ae726218dca8cefab50d9d9cc4c9885e10dbe241ec2b2a19fde104b26c79cd
+  metadata.gz: 38a087d439337d97172f9dedbd4c7bc35c85d88d96379f0361bff0da95658d4b
+  data.tar.gz: fd6bc9fd073b19ad2e1be53e2d905fbd0001f759c563cabedf26c27e14f108bc
 SHA512:
-  metadata.gz: 66a79c1b395f00a333e6f10a683ceb527157742c044344cf4dd884ce78ce3f21d6100cd59d269fe92129bb854bffc48a9ff324adf9262933beb9f44368a9af47
-  data.tar.gz: bfec90166d1b05c0f2d3e92f144d582ce2353b0da1aeae2e7386f09fe9f9320e0d38d2fc124d9ecae186d6c2eee6f0b37c6f8d7bd60da66163774ac48071eb50
+  metadata.gz: 4eec669e7e2fcf022da895cb512c8f59041ea02fdeab2b792a3f393d4dc24b753e6b142e9c818ee6c73b127057ab40dd609a785c1179cb1b4862da42a17c6cec
+  data.tar.gz: 8759062ab1edd1b677746bd518e1d71919782b1dd1684c9b9580156f457847bad22cdd1c87eb5bfdc7ac166992ce8c0a48d169b5ac4b70c4a03beadc51934bff

data/app/controllers/educode_sales/activities_controller.rb

@@ -19,17 +19,43 @@ module EducodeSales
     end
 
     def new
+      @clazz = ['全国会议', '区域会议', '单校会议', '国赛', '省赛', '夏令营']
+      gon.staff_manage = Staff.all.map { |d| {name: d.user&.real_name, value: d.id}}
       render layout: false
     end
 
     def edit
       @activity = Activity.find(params[:id])
+      manage_ids = @activity.manages.pluck(:staff_id)
+      assist_ids = @activity.assists.pluck(:staff_id)
+      gon.staff_manage = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: manage_ids.include?(d.id)}}
+      gon.assists = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: assist_ids.include?(d.id)}}
+      gon.experts = @activity.experts.map { |d| {name: d.name, value: d.user_id || d.name, selected: true}}
       render layout: false
     end
 
     def create
-      activity = @current_admin.activities.new(name: params[:name], start_at: params[:start_at], days: params[:days])
+      activity = @current_admin.activities.new(activity_params)
+
+      # render_success
       if activity.save
+        params[:staff_manage_id].each do |d|
+          EducodeSales::ActivityStaff.create(staff_id: d, clazz_id: 'manage', activity_id: activity.id)
+        end
+        params[:staff_assist_id].each do |d|
+          EducodeSales::ActivityStaff.create(staff_id: d, clazz_id: 'assist', activity_id: activity.id)
+        end
+        params[:expert_ids].each do |d|
+          if d[0].to_i > 0
+            u = User.find(d[0].to_i)
+            EducodeSales::ActivityStaff.create(name: u.real_name, clazz_id: 'expert', user_id: d[0].to_i, activity_id: activity.id)
+          else
+            EducodeSales::ActivityStaff.create(name: d[1], clazz_id: 'expert', activity_id: activity.id)
+          end
+        end
+        # file_path = Util::FileManage.disk_filename('educode_sales_activtiy', activity.id)
+        # Util.write_file(params[:file], file_path)
+        # activity.update(filename: file_path)
         render_success
       else
         render_failure activity
@@ -39,6 +65,27 @@ module EducodeSales
     def update
       activity = Activity.find(params[:id])
       activity.assign_attributes(name: params[:name], start_at: params[:start_at], days: params[:days])
+      manages = []
+      experts = []
+      assists = []
+      params[:staff_manage_id].each do |d|
+        manages << EducodeSales::ActivityStaff.find_or_initialize_by(staff_id: d, clazz_id: 'manage', activity_id: activity.id)
+      end
+   
+      params[:staff_assist_id].each do |d|
+        assists << EducodeSales::ActivityStaff.find_or_initialize_by(staff_id: d, clazz_id: 'assist', activity_id: activity.id)
+      end
+      params[:expert_ids].each do |d|
+        if d[0].to_i > 0
+          u = User.find(d[0].to_i)
+          experts << EducodeSales::ActivityStaff.find_or_initialize_by(name: u.real_name, clazz_id: 'expert', user_id: d[0].to_i, activity_id: activity.id)
+        else
+          experts << EducodeSales::ActivityStaff.find_or_initialize_by(name: d[1], clazz_id: 'expert', activity_id: activity.id)
+        end
+      end
+      activity.manages = manages
+      activity.assists = assists
+      activity.experts = experts
       if activity.save
         render_success
       else
@@ -58,5 +105,11 @@ module EducodeSales
       render layout: false
     end
 
+    private
+
+    def activity_params
+      params.permit(:name, :start_at, :days, :staff_assist_id, :staff_manage_id, :clazz_id, :expert)
+    end
+
   end
 end

data/app/controllers/educode_sales/home_controller.rb

@@ -42,6 +42,10 @@ module EducodeSales
       @data = User.joins(:user_extension).where("identity='teacher'").where("concat(lastname, firstname) like :q OR phone like :q OR mail like :q", q: "%#{params[:q]}%").limit(50)
     end
 
+    def search_edu_user
+      @data = User.joins(:user_extension).where("identity='teacher'").where("concat(lastname, firstname) like :q OR phone like :q OR mail like :q", q: "%#{params[:q]}%").limit(20)
+    end
+
     def sales_staff
       @staffs = Staff
       if params[:teacher_assist].present?

data/app/controllers/educode_sales/ideas_controller.rb

@@ -58,6 +58,8 @@ module EducodeSales
     end
 
     def new
+      staffs = Staff.where.not(role_id: 11).includes(:user)
+      gon.staffs = staffs.map { |d| { name: d.user.real_name, value: d.id } }
       gon.department = { value: '', name: '' }
       gon.value = ''
       render layout: false
@@ -67,6 +69,8 @@ module EducodeSales
       idea = Idea.new(idea_params)
       idea.school_id = Department.find_by_id(idea.department_id)&.school_id
       idea.creator = current_user
+      assist_staff_ids = Array(params[:assist_staff_ids].to_s.split(","))
+      idea.assist_staff_ids = assist_staff_ids
       idea.save
       render_success
     end
@@ -82,6 +86,8 @@ module EducodeSales
     def update
       @idea.assign_attributes(idea_params)
       @idea.school_id = Department.find_by_id(@idea.department_id)&.school_id
+      assist_staff_ids = Array(params[:assist_staff_ids].to_s.split(","))
+      @idea.assist_staff_ids = assist_staff_ids
       check_changes
       @idea.save
       render_success
@@ -93,6 +99,11 @@ module EducodeSales
     end
 
     def edit
+      staffs = Staff.where.not(role_id: 11).includes(:user)
+      gon.staffs = staffs.map { |d| { name: d.user.real_name, value: d.id } }
+      gon.staff_value = [{ name: @idea.staff&.user&.real_name, value: @idea.staff_id }]
+      gon.sale_staff_value = [{ name: @idea.sale_staff&.user&.real_name, value: @idea.sale_staff_id }]
+      gon.assist_staff_value = @idea.assist_staffs.map {|d|{ name: d&.user&.real_name, value: d.id }}
       gon.department = { value: @idea&.department_id, name: "#{@idea&.department&.school&.name}-#{@idea&.department&.name}" }
       gon.value = @idea.department_id
       render layout: false
@@ -104,7 +115,7 @@ module EducodeSales
       params.permit(:name, :level, :staff_id,
                     :status, :types, :model, :hardware, :project,
                     :money, :end_time, :content, :department_id,
-                    :manager_name, :manager_phone)
+                    :manager_name, :manager_phone,:school_name,:department_name,:sale_staff_id,:attachment_id)
     end
 
     def find_idea
@@ -126,5 +137,79 @@ module EducodeSales
       end
     end
 
+    # def upload_file(file)
+    #   folder = File.join(Rails.root, "public", "files", 'educode_sales')
+    #   upload_file = file
+    #   raise "未上传文件" unless upload_file
+    #   save_path = File.join(folder)
+    #   ext = file_ext(upload_file.original_filename)
+    #   local_path, digest = file_save_to_local(save_path, upload_file.tempfile, ext)
+    #   content_type = upload_file.content_type.presence || 'application/octet-stream'
+    #   disk_filename = local_path[save_path.size + 1, local_path.size]
+    #   @attachment = Attachment.where(disk_filename: disk_filename,
+    #                                  author_id: current_user.id).first
+    #   if @attachment.blank?
+    #     @attachment = Attachment.new
+    #     @attachment.filename = upload_file.original_filename
+    #     @attachment.description = "popup_windows"
+    #     @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_user.id
+    #     @attachment.container_id = current_user.id
+    #     @attachment.save!
+    #   else
+    #     logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
+    #   end
+    #   @attachment.id
+    #   # render_ok
+    # end
+    # def edu_setting name
+    #   EduSetting.get(name)
+    # end
+    #
+    #
+    # def file_ext(file_name)
+    #   ext = ''
+    #   exts = file_name.split(".")
+    #   if exts.size > 1
+    #     ext = ".#{exts.last}"
+    #   end
+    #   ext
+    # end
+    #
+    # def file_save_to_local(save_path, temp_file, ext)
+    #   unless Dir.exists?(save_path)
+    #     FileUtils.mkdir_p(save_path) ##不成功这里会抛异常
+    #   end
+    #
+    #   digest = md5_file(temp_file)
+    #   digest = "#{digest}_#{(Time.now.to_f * 1000).to_i}"
+    #   local_file_path = File.join(save_path, digest) + ext
+    #   save_temp_file(temp_file, local_file_path)
+    #
+    #   [local_file_path, digest]
+    # end
+    #
+    #
+    # def md5_file(temp_file)
+    #   md5 = Digest::MD5.new
+    #   temp_file.rewind
+    #   while (buffer = temp_file.read(8192))
+    #     md5.update(buffer)
+    #   end
+    #   md5.hexdigest
+    # end
+    #
+    # def save_temp_file(temp_file, save_file_path)
+    #   File.open(save_file_path, 'wb') do |f|
+    #     temp_file.rewind
+    #     while (buffer = temp_file.read(8192))
+    #       f.write(buffer)
+    #     end
+    #   end
+    # end
+
   end
 end

data/app/controllers/educode_sales/upload_files_controller.rb

@@ -44,7 +44,7 @@ module EducodeSales
       else
         logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
       end
-      render_success
+      render json: { success: true, attachment_id: @attachment.id ,filename: @attachment.filename}
     end
 
     def destroy

data/app/models/educode_sales/activity.rb

@@ -3,5 +3,11 @@ 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
+
+    enum clazz_id: ['全国会议', '区域会议', '单校会议', '国赛', '省赛', '夏令营']
   end
 end

data/app/models/educode_sales/activity_staff.rb

@@ -0,0 +1,9 @@
+module EducodeSales
+  class ActivityStaff < ApplicationRecord
+    belongs_to :activity
+    belongs_to :staff, optional: true
+    belongs_to :user, optional: true
+
+    enum clazz_id: ['manage', 'assist', 'expert']
+  end
+end

data/app/models/educode_sales/idea.rb

@@ -3,8 +3,11 @@ module EducodeSales
     belongs_to :department, optional: true
     belongs_to :staff, optional: true
     belongs_to :school, optional: true
+    belongs_to :attachment, optional: true
     belongs_to :creator, class_name: 'Staff', optional: true
     belongs_to :deleter, class_name: 'Staff', optional: true
+    belongs_to :sale_staff, class_name: 'Staff', optional: true
+    belongs_to :idea_staff, class_name: 'Staff', optional: true
 
     has_many :idea_histories, dependent: :destroy
 
@@ -12,16 +15,22 @@ module EducodeSales
     scope :not_deleted, -> { where(is_deleted: false) }
 
     enum level: %w[高 中 低]
-    enum status: %w[已完成 未完成]
+    enum status: %w[未完成 已完成]
     enum types: %w[定制 非定制]
     enum model: %w[本地版 线上版 混合版]
 
+    serialize :assist_staff_ids,Array
+
     # before_save :check_changes
 
     def recycle
       self.update(deleted_at: nil, deleter_id: nil, is_deleted: false)
     end
 
+    def assist_staffs
+      Staff.where(id: self.assist_staff_ids)
+    end
+
     def soft_destroy(staff_id)
       self.update(deleted_at: Time.now, deleter_id: staff_id, is_deleted: true)
     end
@@ -43,10 +52,14 @@ module EducodeSales
 
     def save_history(attr, old_value, new_value)
       case attr
-      when "school_id"
-        old_value = School.find_by(id: old_value)&.name
-        new_value = School.find_by(id: new_value)&.name
+      when "school_name"
         "学校/单位由“#{old_value}”变更为“#{new_value}”"
+      when "department_name"
+        "院系/部门由“#{old_value}”变更为“#{new_value}”"
+      # when "school_id"
+      #   old_value = School.find_by(id: old_value)&.name
+      #   new_value = School.find_by(id: new_value)&.name
+      #   "学校/单位由“#{old_value}”变更为“#{new_value}”"
       when "name"
         "项目名称由“#{old_value}”变更为“#{new_value}”"
       when "level"
@@ -54,7 +67,7 @@ module EducodeSales
       when "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}”"
+        "方案指派人由“#{old_value}”变更为“#{new_value}”"
       when "status"
         "状态由“#{old_value}”变更为“#{new_value}”"
       when "types"
@@ -64,17 +77,17 @@ module EducodeSales
       when "hardware"
         "硬件规模(万)由“#{old_value}”变更为“#{new_value}”"
       when "project"
-        "项目规模(人)由“#{old_value}”变更为“#{new_value}”"
+        "并发规模(人)由“#{old_value}”变更为“#{new_value}”"
       when "money"
         "项目预算(万)由“#{old_value}”变更为“#{new_value}”"
       when "end_time"
         "截止时间由“#{old_value}”变更为“#{new_value}”"
       when "content"
         "反馈情况由“#{old_value}”变更为“#{new_value}”"
-      when "department_id"
-        old_value = Department.find_by(id: old_value)&.name
-        new_value = Department.find_by(id: new_value)&.name
-        "院系/部门由“#{old_value}”变更为“#{new_value}”"
+      # when "department_id"
+      #   old_value = Department.find_by(id: old_value)&.name
+      #   new_value = Department.find_by(id: new_value)&.name
+      #   "院系/部门由“#{old_value}”变更为“#{new_value}”"
       when "manager_name"
         "学校负责人由“#{old_value}”变更为“#{new_value}”"
       when "manager_phone"

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

@@ -1,4 +1,4 @@
-<%#= Gon::Base.render_data %>
+<%= Gon::Base.render_data %>
 <div class="layuimini-main">
   <form class="layui-form  layuimini-form" action="">
   <div class="layui-form-item" style="padding: 25px">
@@ -23,6 +23,30 @@
                class="layui-input" value="<%= @activity.days %>">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">生态经理</label>
+      <div class="layui-input-block">
+        <div id="staff_manage_list" style="width: 163px;"></div>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">协助人员</label>
+      <div class="layui-input-block">
+        <div id="staff_assist_list" style="width: 193px;"></div>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">报告专家</label>
+      <div class="layui-input-block">
+        <div id="expert_list" style="width: 600px;"></div>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">上传附件</label>
+      <div class="layui-input-block">
+        <button type="button" class="layui-btn" id="upload_file">上传文件</button>
+      </div>
+    </div>
     <div class="layui-inline" style="padding-left: 30px">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
       </button>
@@ -32,7 +56,7 @@
 </div>
 <script>
 
-    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer', 'xmSelect'], function () {
         var form = layui.form,
             layer = layui.layer,
             table = layui.table,
@@ -40,6 +64,7 @@
             laytpl = layui.laytpl,
             request = layui.request,
             $ = layui.$,
+            xmSelect = layui.xmSelect,
             laydate = layui.laydate;
 
         //常规用法
@@ -64,9 +89,51 @@
             }
         })
 
+        var staff_manage = xmSelect.render({
+          el: '#staff_manage_list',
+          data: gon.staff_manage,
+          filterable: true,
+        })
+
+        var staff_assist = xmSelect.render({
+          el: '#staff_assist_list',
+          data: gon.assists,
+          filterable: true,
+        })
+        var expert = xmSelect.render({
+          el: '#expert_list', 
+          filterable: true,
+          name: 'expert_ids',
+          remoteSearch: true,
+          remoteMethod: function(val, cb, show){
+            if(!val){
+              return cb([]);
+            }
+            request.get('missions/search_edu_user?q=' + val, {}, function (res) {
+              if (res.data.length == 0) {
+                 cb([{value: val, name: val}])
+              } else {
+                cb(res.data);
+              }
+              
+            })
+          },
+          data: gon.experts
+        })
 
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
+          data.field.staff_manage_id = staff_manage.getValue('value');
+          data.field.staff_assist_id = staff_assist.getValue('value');
+          var expertids = [];
+          expert.getValue().forEach(function(d) {
+            if (typeof(d.value) == 'number') {
+              expertids.push([d.value, d.name]);
+            } else {
+              expertids.push(['', d.name]);
+            }
+          })
+          data.field.expert_ids = expertids;
             request.authPut("missions/activities/" + <%= @activity.id %>, data.field, function (res) {
                 if (res.success === false) {
                     layer.alert(res.msg)

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

@@ -46,14 +46,40 @@
                 {
                   field: 'id',
                   title:'序号',type: 'numbers',
-                    totalRowText:'合计',
+                  totalRowText:'合计',
                   width: 60
                 },
                 {
                   field: 'name',
                   title: '活动名称',
+                  width: 180,
                   templet: '#teachers'
                 },
+                {
+                  field: 'clazz_id',
+                  width: 120,
+                  title: '会议类型'
+                },
+                {
+                  field: 'staff',
+                  width: 120,
+                  title: '销售经理'
+                },
+                {
+                  field: 'staff_manage',
+                  width: 180,
+                  title: '生态经理'
+                },
+                {
+                  field: 'staff_assist',
+                  width: 180,
+                  title: '协助人员'
+                },
+                {
+                  field: 'expert',
+                  width: 180,
+                  title: '报告专家'
+                },
                 {
                   field: 'start_at',
                   width: 200,

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

@@ -10,6 +10,11 @@ json.data do
     json.students_count d.students_count || 0
     json.course_rate d.course_rate
     json.start_at d.start_at ? d.start_at.to_s(:date) : ''
+    json.clazz_id d.clazz_id
+    json.staff d.staff&.user&.real_name
+    json.staff_manage d.manages.map { |d| d.staff.user.real_name}.uniq.join("、")
+    json.staff_assist d.assists.map { |d| d.staff.user.real_name}.uniq.join("、")
+    json.expert d.experts.pluck(:name).join("、")
   end
 end
 

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

@@ -1,12 +1,17 @@
-<%#= Gon::Base.render_data %>
+<%= Gon::Base.render_data %>
 <div class="layuimini-main">
-<form class="layui-form  layuimini-form" action="">
+<div class="layui-form  layuimini-form">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
       <label class="layui-form-label required">活动名称</label>
       <div class="layui-input-block">
-        <input type="text" name="name" required lay-verify="required" placeholder="请输入"
-               class="layui-input" id="inputFocus">
+        <input type="text" name="name" required lay-verify="required" placeholder="请输入" class="layui-input" id="inputFocus">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required">活动类型</label>
+      <div class="layui-input-block">
+        <%= select_tag "clazz_id", options_for_select(@clazz), { 'lay-filter': 'clazz_id', class: 'required' } %>
       </div>
     </div>
     <div class="layui-inline">
@@ -18,22 +23,44 @@
     <div class="layui-inline">
       <label class="layui-form-label required">活动天数</label>
       <div class="layui-input-block">
-        <input type="text" name="days" required lay-verify="required"
-               class="layui-input">
+        <input type="text" name="days" required lay-verify="required" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">生态经理</label>
+      <div class="layui-input-block">
+        <div id="staff_manage_list" style="width: 163px;"></div>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">协助人员</label>
+      <div class="layui-input-block">
+        <div id="staff_assist_list" style="width: 193px;"></div>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">报告专家</label>
+      <div class="layui-input-block">
+        <div id="expert_list" style="width: 600px;"></div>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">上传附件</label>
+      <div class="layui-input-block">
+        <button type="button" class="layui-btn" id="upload_file">上传文件</button>
       </div>
     </div>
     <div class="layui-inline" style="padding-left: 30px">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
-      </button>
+      <button class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交 </button>
     </div>
   </div>
-</form>
+</div>
 </div>
 
 <script>
     document.getElementById("inputFocus").focus();
 
-    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer', 'xmSelect'], function () {
         var form = layui.form,
             layer = layui.layer,
             table = layui.table,
@@ -41,6 +68,9 @@
             laytpl = layui.laytpl,
             request = layui.request,
             laydate = layui.laydate,
+            xmSelect = layui.xmSelect,
+            upload = layui.upload,
+            selectInput = layui.selectInput
             $ = layui.$;
 
         //常规用法
@@ -48,6 +78,49 @@
             elem: '#new_time'
         });
 
+        var staff_manage = xmSelect.render({
+          el: '#staff_manage_list',
+          data: gon.staff_manage,
+          filterable: true,
+        })
+
+        var staff_assist = xmSelect.render({
+          el: '#staff_assist_list',
+          data: gon.staff_manage,
+          filterable: true,
+        })
+        var expert = xmSelect.render({
+          el: '#expert_list', 
+          filterable: true,
+          name: 'expert_ids',
+          remoteSearch: true,
+          remoteMethod: function(val, cb, show){
+            if(!val){
+              return cb([]);
+            }
+            request.get('missions/search_edu_user?q=' + val, {}, function (res) {
+              if (res.data.length == 0) {
+                 cb([{value: val, name: val}])
+              } else {
+                cb(res.data);
+              }
+              
+            })
+          },
+          data: []
+        })
+
+
+
+        upload.render({
+          elem: '#upload_file'
+          ,url: '' //此处配置你自己的上传接口即可
+          ,accept: 'file' //普通文件
+          ,auto: false
+          ,done: function(res){
+            layer.msg('上传成功');
+          }
+        });
 
         form.render();
 
@@ -69,15 +142,27 @@
 
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
+            data.field.staff_manage_id = staff_manage.getValue('value');
+            data.field.staff_assist_id = staff_assist.getValue('value');
+            var expertids = [];
+            expert.getValue().forEach(function(d) {
+              if (typeof(d.value) == 'number') {
+                expertids.push([d.value, d.name]);
+              } else {
+                expertids.push(['', d.name]);
+               
+              }
+            })
+            data.field.expert_ids = expertids;
             request.authPost("missions/activities", data.field, function (res) {
                 if (res.success === false) {
-                    layer.alert(res.msg)
+                  layer.alert(res.msg)
                 } else {
-                    layer.closeAll(); //关闭所有层
-                    table.reload('activities_table')
+                  layer.closeAll(); //关闭所有层
+                  table.reload('activities_table')
                 }
             })
-            return false;
-        });
+           return false;
+      });
     });
 </script>