educode_sales 1.10.37 → 1.10.46

data/app/helpers/educode_sales/sale_trends_helper.rb

@@ -1,6 +1,7 @@
 module EducodeSales
   module SaleTrendsHelper
     NAMES = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
+    RETURN_NAMES = %w[实际回款额 计划回款额 实际回款 计划回款额-全部 计划回款额-o类]
 
     def goal_forecast_quarter(labels, selects, staff_id = nil, property)
       plan_get = plan_get(staff_id, labels, "quarter", property)
@@ -337,6 +338,274 @@ module EducodeSales
       end
     end
 
+
+    def return_money_forecast_week(labels, selects, staff_id = nil, property)
+      plan_return = plan_return(staff_id, labels, "week", property)
+      actual_return = actual_return(staff_id, labels, "week", property)
+      plan_return_by_o = plan_return_by_o(staff_id, labels, "week", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == RETURN_NAMES[0]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   actual_return[yearweek].to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[1]
+                 arr = labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_return[yearweek].to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == RETURN_NAMES[2]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   actual_return[yearweek].to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[3]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_return[yearweek].to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[4]
+                 arr = labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_return_by_o[yearweek].to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                 'bar'
+               else
+                 "line"
+               end
+        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                            'rgba(54, 162, 235, 1)'
+                          else
+                            SaleTrend::COLORS[i]
+                            'rgba(54, 162, 235, 0)'
+                          end
+        {
+            type: type,
+            label: select,
+            data: data&.map { |d| d.round(2) },
+            backgroundColor: backgroundColor,
+            borderColor: SaleTrend::COLORS[i],
+            borderWidth: 1
+        }
+      end
+
+      hash_a = {
+          labels: labels,
+          datasets: [datasets[0], datasets[1]]
+      }
+      hash_b = {
+          labels: labels,
+          datasets: [datasets[2], datasets[3], datasets[4]]
+      }
+      [hash_a, hash_b]
+    end
+
+    def return_money_forecast_quarter(labels, selects, staff_id = nil, property)
+      plan_return = plan_return(staff_id, labels, "quarter", property)
+      actual_return = actual_return(staff_id, labels, "quarter", property)
+      plan_return_by_o = plan_return_by_o(staff_id, labels, "quarter", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == RETURN_NAMES[0]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[1]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == RETURN_NAMES[2]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[3]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[4]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return_by_o[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                 'bar'
+               else
+                 "line"
+               end
+        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                            'rgba(54, 162, 235, 1)'
+                          else
+                            SaleTrend::COLORS[i]
+                            'rgba(54, 162, 235, 0)'
+                          end
+        {
+            type: type,
+            label: select,
+            data: data.map { |d| d.round(2) },
+            backgroundColor: backgroundColor,
+            borderColor: SaleTrend::COLORS[i],
+            borderWidth: 1
+        }
+      end
+
+      hash_a = {
+          labels: labels,
+          datasets: [datasets[0], datasets[1]]
+      }
+      hash_b = {
+          labels: labels,
+          datasets: [datasets[2], datasets[3], datasets[4]]
+      }
+      [hash_a, hash_b]
+    end
+
+
+    def return_money_forecast_month(labels, selects, staff_id = nil, property)
+      plan_return = plan_return(staff_id, labels, "month", property)
+      actual_return = actual_return(staff_id, labels, "month", property)
+      plan_return_by_o = plan_return_by_o(staff_id, labels, "month", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == RETURN_NAMES[0]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[1]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == RETURN_NAMES[2]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[3]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+               elsif select == RETURN_NAMES[4]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_return_by_o[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                 'bar'
+               else
+                 "line"
+               end
+        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                            'rgba(54, 162, 235, 1)'
+                          else
+                            SaleTrend::COLORS[i]
+                            'rgba(54, 162, 235, 0)'
+                          end
+        {
+            type: type,
+            label: select,
+            data: data.map { |d| d.round(2) },
+            backgroundColor: backgroundColor,
+            borderColor: SaleTrend::COLORS[i],
+            borderWidth: 1
+        }
+      end
+
+      hash_a = {
+          labels: labels,
+          datasets: [datasets[0], datasets[1]]
+      }
+      hash_b = {
+          labels: labels,
+          datasets: [datasets[2], datasets[3], datasets[4]]
+      }
+      [hash_a, hash_b]
+    end
+
+    def return_money_forecast_year(labels, selects, staff_id = nil, property)
+      plan_return = plan_return(staff_id, labels, "year", property)
+      actual_return = actual_return(staff_id, labels, "year", property)
+      plan_return_by_o = plan_return_by_o(staff_id, labels, "year", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == RETURN_NAMES[0]
+                 labels.map { |d| actual_return[d.to_i] || 0 }
+               elsif select == RETURN_NAMES[1]
+                 arr = labels.map { |d| plan_return[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == RETURN_NAMES[2]
+                 labels.map { |d| actual_return[d.to_i] || 0 }
+               elsif select == RETURN_NAMES[3]
+                 labels.map { |d| plan_return[d.to_i] || 0 }
+               elsif select == RETURN_NAMES[4]
+                 arr = labels.map { |d| plan_return_by_o[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                 'bar'
+               else
+                 "line"
+               end
+        backgroundColor = if RETURN_NAMES[0] || select == RETURN_NAMES[1]
+                            'rgba(54, 162, 235, 1)'
+                          else
+                            SaleTrend::COLORS[i]
+                            'rgba(54, 162, 235, 0)'
+                          end
+        {
+            type: type,
+            label: select,
+            data: data.map { |d| d.round(2) },
+            backgroundColor: backgroundColor,
+            borderColor: SaleTrend::COLORS[i],
+            borderWidth: 1
+        }
+      end
+
+      hash_a = {
+          labels: labels,
+          datasets: [datasets[0], datasets[1]]
+      }
+      hash_b = {
+          labels: labels,
+          datasets: [datasets[2], datasets[3], datasets[4]]
+      }
+      [hash_a, hash_b]
+    end
+
     private
 
     def plan_get(staff_id, time_range, type, property)
@@ -433,5 +702,146 @@ module EducodeSales
       end
     end
 
+    def plan_return(staff_id, time_range, type, property)
+      # plan_return_money 计划回款额
+      start_time = case type
+                   when "month"
+                     time_range.first + "-01"
+                   when "year"
+                     time_range.first + "-01-01"
+                   when "week"
+                     time_range.first.split("-").first + "-01-01"
+                   when "quarter"
+                     time_range.first.split("-").first + "-01-01"
+                   end
+      end_time = case type
+                 when "month"
+                   time_range.last + "-31"
+                 when "year"
+                   time_range.last + "-12-31"
+                 when "week"
+                   time_range.last.split("-").first + "-12-31"
+                 when "quarter"
+                   time_range.last.split("-").first + "-12-31"
+                 end
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = Business.joins(:last_follow_up)
+                 .where("educode_sales_follow_ups.plan_return_date >= ? and educode_sales_follow_ups.plan_return_date <= ?", start_time, end_time)
+      if staff_id.present?
+        data = data.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+            where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", staff_id, staff_id)
+      end
+      if property.present?
+        data = data.joins(department: [school: :school_tags]).where("school_tags.id = ?", property)
+      end
+      case type
+      when "week"
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.plan_return_date) as week").group("yearweek(educode_sales_follow_ups.plan_return_date)").sum("educode_sales_follow_ups.plan_return_money")
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.plan_return_date) as quarter, year(educode_sales_follow_ups.invitation_at) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.plan_return_date) as year, month(educode_sales_follow_ups.plan_return_date) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.plan_return_date) as year").group("year(educode_sales_follow_ups.plan_return_date)").sum("educode_sales_follow_ups.plan_return_money")
+      end
+    end
+
+
+    def actual_return(staff_id, time_range, type, property)
+      # money_plan_records表中 amount: 回款金额
+      start_time = case type
+                   when "month"
+                     time_range.first + "-01"
+                   when "year"
+                     time_range.first + "-01-01"
+                   when "week"
+                     time_range.first.split("-").first + "-01-01"
+                   when "quarter"
+                     time_range.first.split("-").first + "-01-01"
+                   end
+      end_time = case type
+                 when "month"
+                   time_range.last + "-31"
+                 when "year"
+                   time_range.last + "-12-31"
+                 when "week"
+                   time_range.last.split("-").first + "-12-31"
+                 when "quarter"
+                   time_range.last.split("-").first + "-12-31"
+                 end
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = MoneyPlanRecord.joins(business: [department: [school: :school_tags]]).where("educode_sales_money_plan_records.date_at >= ? and educode_sales_money_plan_records.date_at <= ?", start_time, end_time)
+      if staff_id.present?
+        data = data.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+            where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", staff_id, staff_id)
+      end
+      if property.present?
+        data = data.where("school_tags.id = ?", property)
+      end
+      case type
+      when "week"
+        data.select("educode_sales_money_plan_records.*, yearweek(educode_sales_money_plan_records.date_at) as week").group("yearweek(educode_sales_money_plan_records.date_at)").sum("educode_sales_money_plan_records.amount")
+      when "quarter"
+        data = data.select("educode_sales_money_plan_records.*, quarter(educode_sales_money_plan_records.date_at) as quarter, year(educode_sales_money_plan_records.date_at) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_money_plan_records.*, year(educode_sales_money_plan_records.date_at) as year, month(educode_sales_money_plan_records.date_at) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_money_plan_records.*, year(educode_sales_money_plan_records.date_at) as year").group("year(educode_sales_money_plan_records.date_at)").sum("educode_sales_money_plan_records.amount")
+      end
+    end
+
+    def plan_return_by_o(staff_id, time_range, type, property)
+      # plan_return_money 计划回款额-o类
+      clazz_id =  Common.find_by(name: "O类-中标商机", clazz: "business_type", extras: "o_class").id
+      start_time = case type
+                   when "month"
+                     time_range.first + "-01"
+                   when "year"
+                     time_range.first + "-01-01"
+                   when "week"
+                     time_range.first.split("-").first + "-01-01"
+                   when "quarter"
+                     time_range.first.split("-").first + "-01-01"
+                   end
+      end_time = case type
+                 when "month"
+                   time_range.last + "-31"
+                 when "year"
+                   time_range.last + "-12-31"
+                 when "week"
+                   time_range.last.split("-").first + "-12-31"
+                 when "quarter"
+                   time_range.last.split("-").first + "-12-31"
+                 end
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = Business.joins(:last_follow_up).where("educode_sales_businesses.clazz_id = ?", clazz_id)
+                 .where("educode_sales_follow_ups.plan_return_date >= ? and educode_sales_follow_ups.plan_return_date <= ?", start_time, end_time)
+      if staff_id.present?
+        data = data.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+            where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", staff_id, staff_id)
+      end
+      if property.present?
+        data = data.joins(department: [school: :school_tags]).where("school_tags.id = ?", property)
+      end
+      case type
+      when "week"
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.plan_return_date) as week").group("yearweek(educode_sales_follow_ups.plan_return_date)").sum("educode_sales_follow_ups.plan_return_money")
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.plan_return_date) as quarter, year(educode_sales_follow_ups.invitation_at) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.plan_return_date) as year, month(educode_sales_follow_ups.plan_return_date) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.plan_return_date) as year").group("year(educode_sales_follow_ups.plan_return_date)").sum("educode_sales_follow_ups.plan_return_money")
+      end
+    end
   end
 end

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

@@ -838,7 +838,7 @@
             data.year = "<%= params[:year] %>";
             <% end %>
             layer.load(0, {});
-            request.authPost("/missions/businesses/get_export_data", {
+            request.authPost("missions/businesses/get_export_data", {
                 name: data.name,
                 area: data.area,
                 business_step: data.business_step,
@@ -859,7 +859,7 @@
                 data = res.data
                 table.exportFile(business_table.config.id,data, type);
                 layer.closeAll('loading');
-                request.get('/missions/businesses/add_export_records?type=' + type, {}, function (res) {
+                request.get('missions/businesses/add_export_records?type=' + type, {}, function (res) {
                 })
             })
 

data/app/views/educode_sales/contracts/_list.html.erb

@@ -137,6 +137,7 @@
 <script type="text/html" id="toolbar_contract">
   <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="export">导出</button>
   </div>
 </script>
 <script>
@@ -189,11 +190,13 @@
 
       var business_step_list = xmSelect.render({
         el: '#contract_business_step',
+          name: 'contract_business_step',
         data: gon.business_step
       })
 
       var index_place_list = xmSelect.render({
         el: '#contract_index_place',
+          name: 'contract_index_place',
         model: {
           icon: 'hidden',
           label: {
@@ -481,7 +484,7 @@
       $(".show_item_contract").toggle()
       return false;
     });
-      var business_table = table.render({
+      var contract_table = table.render({
         elem: '#contact_table',
         url: '/missions/contracts',
         autoSort: false,
@@ -519,7 +522,7 @@
       if (search['clazz']) {
         data.field['clazz'] = search['clazz']
       }
-      search = data.field
+      search = data.field;
       table.reload('contact_table', {
         url: '/missions/contracts',
         page: {
@@ -543,6 +546,27 @@
       return false;
     });
 
+      /**
+       * toolbar事件监听
+       */
+      table.on('toolbar(contact_table)', function (obj) {
+          if (obj.event === 'export') { //导出
+              layer.load(0, {});
+              var data = form.val("search_form");
+              var business_step = [];
+              business_step_list.getValue().forEach(function(d) {
+                  business_step.push(d.value);
+              });
+              data.business_step = business_step.toString();
+              request.authGet("missions/contracts?" + $.param({q:data}), {
+              }, function (res) {
+                  data = res.data;
+                  table.exportFile(contract_table.config.id, data, 'xls');
+                  layer.closeAll('loading');
+              })
+          }
+      });
+
       table.on('tool(contact_table)', function (obj) {
           var data = obj.data;
           id = data.id

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

@@ -70,5 +70,7 @@ json.totalRow do
   json.follow_ups_count follow_count.to_i.to_s
 end
 json.code 0
-json.count @businesses.total_count
+if params[:page].present?
+  json.count @businesses.total_count
+end
 json.msg 'succcess'

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

@@ -67,6 +67,12 @@
           <input type="text" class="layui-input" id="school" name="school" placeholder=" - " autocomplete="off">
         </div>
       </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">协助人</label>
+        <div class="layui-input-inline">
+          <div id="assist_staffs"></div>
+        </div>
+      </div>
 
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
@@ -156,6 +162,15 @@
             range: true
         });
 
+        //协助人选择
+        var assist_staffs_select = xmSelect.render({
+            el: '#assist_staffs',
+            name: 'assist_staffs',
+            data: <%=raw @assist_staffs.to_json %>,
+            filterable: true,
+            radio: true
+        });
+
         cols_table = [
             [
                 {
@@ -342,7 +357,12 @@
 
         // 监听搜索操作
         form.on('submit(search_ideas)', function (data) {
-            search = data.field
+            var assist_staffs_value = [];
+            assist_staffs_select.getValue().forEach(function (d) {
+                assist_staffs_value.push(d.value)
+            });
+            data.field.assist_staffs = assist_staffs_value.toString();
+            search = data.field;
             table.reload('ideas_table', {
                 page: {
                     curr: 1
@@ -365,7 +385,8 @@
                 types: "",
                 level: "",
                 history_type: ""
-            })
+            });
+            assist_staffs_select.setValue([]);
             return false;
         });
         // form.on('submit(show_hide)', function (data) {

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

@@ -21,4 +21,4 @@ json.data do
   end
 end
 json.code 0
-json.count @ideas.total_count
+json.count @ideas_count

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

@@ -5,6 +5,12 @@
       <div class="layui-row">
         <h2 style="padding-left: 25px">方案信息</h2>
       </div>
+      <div class="layui-col-md6" style="display: none">
+        <labeL class="layui-form-label">部门:</labeL>
+        <div class="layui-input-block">
+          <div id="department_id" style="width: 600px;"></div>
+        </div>
+      </div>
       <div class="layui-row" style="padding-top: 15px">
         <div class="layui-col-md6">
           <labeL class="layui-form-label">单位联系人:</labeL>
@@ -419,11 +425,11 @@
             })
             data.field.school_id = schools[0];
 
-            var departments = [];
-            department_list.getValue().forEach(function (d) {
-                departments.push(d.value);
-            })
-            data.field.department_id = departments[0];
+            // var departments = [];
+            // department_list.getValue().forEach(function (d) {
+            //     departments.push(d.value);
+            // })
+            // data.field.department_id = departments[0];
             var business = [];
             business_list.getValue().forEach(function (d) {
                 business.push(d.value);
@@ -434,7 +440,6 @@
             data.field.assist_staff_ids = assist_staff_list.getValue('valueStr');
             data.field.other_staff_ids = other_staff_list.getValue('valueStr');
             data.field.attachment_ids = attachment_list.getValue('valueStr');
-            data.field.school_id = school_list.getValue('valueStr');
             request.authPost("missions/ideas/", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)

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

@@ -60,6 +60,7 @@
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" id="upload_money_plan_btn" style="margin-left: 20px;">批量导入回款计划</button>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" style="margin-left: 20px;"
         lay-event="add_record">添加回款记录</button>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="export">导出</button>
   <% end %>
 </script>
 
@@ -95,9 +96,10 @@
             range: true
         });
         form.render();
-        table.render({
+        var money_plan_record_table = table.render({
             elem: '#money_plan_record_table',
             url: '/missions/money_plan_records',
+            title: '回款记录列表',
             toolbar: '#toolbar_money_plan_record',
             defaultToolbar: ['filter'],
             totalRow:true,
@@ -174,11 +176,13 @@
         });
 
         var staff_manages_list = xmSelect.render({
-          el: '#staff_manages',
-          data: gon.staffs,
-          filterable: true,
-          radio: true,
-        })
+            el: '#staff_manages',
+            name: 'staff_manages',
+            data: gon.staffs,
+            filterable: true,
+            radio: true,
+        });
+
         var sort = {},
             search = {};
         table.on('sort(money_plan_record_table)', function(obj) {
@@ -243,8 +247,17 @@
                 $(window).on("resize", function() {
                     layer.full(sindex);
                 });
+            }else if(obj.event === 'export'){
+                layer.load(0, {});
+                var data = form.val("submit_form_record");
+                data.staff_manages = staff_manages_list.getValue('valueStr');
+                request.authGet("missions/money_plan_records?"+ $.param({q: data}), {}, function (res) {
+                    data = res.data;
+                    table.exportFile(money_plan_record_table.config.id, data, 'xls');
+                    layer.closeAll('loading');
+                })
             }
-        })
+        });
         table.on('tool(money_plan_record_table)', function(obj) {
             var data = obj.data;
             id = data.id;