educode_sales 1.10.37 → 1.10.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b46b08f02fd4495dc7dcbe644409b09c38fd9936ce81c574d8747eadeb935dab
-  data.tar.gz: 874c54125a516d0631812e60fb439418cf050550dfd40166777762d4e6b48221
+  metadata.gz: 75f1104743151bb685cb17c27471acf756a43103c059b78fdbbc85d897008420
+  data.tar.gz: 1abca2361e351da1e62f2a04e1a98c72e01f953ab653d6e6fc3904294532e38e
 SHA512:
-  metadata.gz: 6e3f554a6a434861cc05e461b6a7c9b9af265917f2fce21cc947fcf51d206de976fe8d7abe7f2684eaa075cc8f045d601535885dd0b64dbf61db7d9ae1552a8a
-  data.tar.gz: aa3c405230daa0c34902d42a4d6e3fabfeea3b7c6be4611a4535a5dbdcf57f1921e906da9397e7fc3c1d6e0ef60985ef3bc39e632c2f0f190ef703d93c54413e
+  metadata.gz: b93100ae277a43e93b44ed6ba56433123a8427d44b34ec3706b09e62987698d3672b81f8322bc6fc4af43f0e4ea0b2758b71e11368b87b33d7225ca28287b0a2
+  data.tar.gz: 1ddb1e12b4f3102d9ad751d04fc00975cd18c765fa378f454862a73e8f2927b8cc3810ad151ae06b9d1451a26bfb2604ec730822dc63a72da23449d9fe948b17

data/app/controllers/educode_sales/application_controller.rb

@@ -41,6 +41,19 @@ module EducodeSales
       end
     end
 
+    def paginate(relation)
+      limit = params[:limit] || params[:per_page]
+      limit  = (limit.to_i.zero? || limit.to_i > 100) ? 20 : limit.to_i
+      page   = params[:page].to_i.zero? ? 1 : params[:page].to_i
+      offset = (page - 1) * limit
+
+      if relation.is_a?(Array)
+        relation[offset, limit]
+      else
+        relation.limit(limit).offset(offset)
+      end
+    end
+
 
 
     rescue_from CanCan::AccessDenied do |exception|

data/app/controllers/educode_sales/contracts_controller.rb

@@ -206,8 +206,8 @@ module EducodeSales
             @businesses = @businesses.order("educode_sales_businesses.created_at desc")
           end
 
-
-          @businesses = @businesses.select("
+          if params[:page].present?
+            @businesses = @businesses.select("
             distinct
             educode_sales_businesses.*,
             last_follow.invitation_at,
@@ -237,8 +237,38 @@ module EducodeSales
               GROUP BY educode_sales_follow_ups.business_id
             ) AS total_follow_ups ON educode_sales_businesses.id = total_follow_ups.business_id
           ").includes(:users, last_follow_up: [:clazz, :assign_follow_ups]).page(params[:page]).per(params[:limit])
+          end
 
-
+          @businesses = @businesses.select("
+            distinct
+            educode_sales_businesses.*,
+            last_follow.invitation_at,
+            last_follow.budget_amount,
+            last_follow.o_business_deployment,
+            last_follow.service_time_long,
+            last_follow.service_end_time,
+            last_follow.service_start_time,
+            last_follow.reception_at,
+            last_follow.bidded_date,
+            last_follow.signed_date,
+            last_follow.year,
+            last_follow.created_at as latest_time,
+            last_follow.actual_amount,
+            last_follow.divide_rate,
+            last_follow.divide_amount,
+            (last_follow.total_amount - last_follow.actual_amount) as divide_money,
+            (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
+            last_follow.total_amount,
+            total_follow_ups.follow_ups_counts
+            ").joins("
+            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id AND last_follow.deleted_at IS NULL
+            LEFT JOIN (
+              SELECT COUNT(*) AS follow_ups_counts, educode_sales_follow_ups.business_id
+              FROM educode_sales_follow_ups
+              WHERE educode_sales_follow_ups.deleted_at IS NULL
+              GROUP BY educode_sales_follow_ups.business_id
+            ) AS total_follow_ups ON educode_sales_businesses.id = total_follow_ups.business_id
+          ").includes(:users, last_follow_up: [:clazz, :assign_follow_ups])
         end
       end
     end

data/app/controllers/educode_sales/ideas_controller.rb

@@ -44,6 +44,9 @@ module EducodeSales
           @sale_staff_arr = EducodeSales::Staff.joins(:user).where(id: sale_staff_ids).pluck("concat(users.lastname,users.firstname)", :id)
           filter = Filter.find_or_create_by(staff_id: @current_admin.id, clazz: "ideas")
           gon.filter = filter.extras || {}
+
+          #协助人
+          @assist_staffs = Staff.where.not(role_id: 11).includes(:user).map{ |d| {name: d.user.real_name, value: d.id}}
         end
         format.json do
           @ideas = params[:is_deleted].to_s == "true" ? Idea.deleted : Idea.not_deleted
@@ -54,14 +57,14 @@ module EducodeSales
             level = @current_admin.role.role_areas.find_by(clazz: '方案管理').try(:level)
             case level
             when '自己'
-              idea_ids = @ideas.select { |d| Array(d.other_staff_ids).include?(@current_admin.id) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id) || d.staff_id == @current_admin.id }.map { |d| d.id }
+              idea_ids = @ideas.select { |d| Array(d.other_staff_ids).include?(@current_admin.id.to_s) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id.to_s) || d.staff_id == @current_admin.id }.map { |d| d.id }
               @ideas = @ideas.where("educode_sales_ideas.creator_id = ? OR educode_sales_ideas.id in (?)", @current_admin.id, idea_ids)
             when '区域'
               # 查看区域商机，需要排除掉其它人员手上的监管学校
               other_staff_school_id = EducodeSales::StaffSchool.where.not(staff_id: @current_admin.id).where("school_id IN (SELECT school_id FROM educode_sales_staff_schools WHERE staff_id = #{@current_admin.id}) IS NOT TRUE").distinct.pluck :school_id
 
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
-              idea_ids = @ideas.select { |d| Array(d.other_staff_ids).include?(@current_admin.id) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id) || d.staff_id == @current_admin.id }.map { |d| d.id }
+              idea_ids = @ideas.select { |d| Array(d.other_staff_ids).include?(@current_admin.id.to_s) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id.to_s) || d.staff_id == @current_admin.id }.map { |d| d.id }
               @ideas = @ideas.left_joins(department: :school).where("schools.id in (?) OR educode_sales_ideas.creator_id = ? OR educode_sales_ideas.id in (?)", school_ids, @current_admin.id, idea_ids)
             else
               @ideas = @ideas
@@ -74,7 +77,7 @@ module EducodeSales
             @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0] + " 00:00:00", date[1] + " 23:59:59")
           end
           if params[:q].present? && params[:q][:name].present?
-            @ideas = @ideas.where("educode_sales_ideas.name like ?", "%#{params[:q][:name]}%")
+            @ideas = @ideas.joins(:business).where("educode_sales_ideas.name like ? or educode_sales_businesses.name like ?", "%#{params[:q][:name]}%", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:school].present?
             @ideas = @ideas.left_joins(:school).where("schools.name like ?", "%#{params[:q][:school]}%")
@@ -109,7 +112,12 @@ module EducodeSales
             @ideas = @ideas.where(level: params[:q][:level])
           end
 
-          @ideas = @ideas.page(params[:page]).per(params[:limit])
+          if params[:q].present? && params[:q][:assist_staffs].present?
+            @ideas = @ideas.select{|d| d&.assist_staff_ids.include?(params[:q][:assist_staffs])}
+          end
+          @ideas_count = @ideas.count
+
+          @ideas = paginate @ideas
         end
       end
     end
@@ -141,10 +149,11 @@ module EducodeSales
       other_staff_ids = Array(params[:other_staff_ids].to_s.split(","))
       if params[:business_id].present?
         idea.business_id = params[:business_id]
+        idea.school_id = idea.business&.department&.school_id
       elsif params[:school_id].present?
         idea.name = params[:project_name]
       end
-      if params[:school_id].present?
+      if idea.school_id.blank?
         idea.school_id = params[:school_id]
       end
       idea.attachment_ids = attachment_ids
@@ -180,10 +189,11 @@ module EducodeSales
       # @idea.other_staff_ids = other_staff_ids
       if params[:business_id].present?
         @idea.business_id = params[:business_id]
+        @idea.school_id = @idea.business&.department&.school_id
       elsif params[:school_id].present?
         @idea.name = params[:project_name]
       end
-      if params[:school_id].present?
+      if @idea.school_id.blank?
         @idea.school_id = params[:school_id]
       end
       check_changes
@@ -357,7 +367,7 @@ module EducodeSales
       params.permit(:name, :level, :staff_id,
                     :status, :types, :model, :hardware, :project,
                     :money, :end_time, :content, :department_id,
-                    :manager_name, :manager_phone, :school_name, :department_name, :attachment_id, :idea_type)
+                    :manager_name, :manager_phone, :school_name, :department_name, :attachment_id, :idea_type, :school_id, :business_id)
     end
 
     def find_idea

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -18,6 +18,7 @@ module EducodeSales
         format.json do
           @money_plan_records = MoneyPlanRecord.left_joins(:money_plan_claims).group("educode_sales_money_plan_records.id").select("educode_sales_money_plan_records.*, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
           if @current_admin.is_admin?
+            @money_plan_records = @money_plan_records
           else
             level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level
             case level
@@ -79,7 +80,11 @@ module EducodeSales
           else
             @money_plan_records = @money_plan_records.order(created_at: :desc)
           end
-          @money_plan_records = @money_plan_records.page(params[:page]).per(params[:limit])
+
+          if params[:page].present?
+            @money_plan_records = @money_plan_records.page(params[:page]).per(params[:limit])
+          end
+          @money_plan_records = @money_plan_records
         end
       end
     end
@@ -195,12 +200,14 @@ module EducodeSales
               key_person.save
             end
 
-            last_follow_up.money_plans.each do |d|
-              money = d.dup
-              money.staff = @current_admin
-              money.follow_up_id = follow_up.id
-              money.save
-            end
+            # last_follow_up.money_plans.each do |d|
+            #   money = d.dup
+            #   money.staff = @current_admin
+            #   money.follow_up_id = follow_up.id
+            #   money.save
+            # end
+             # 上次的回款计划的跟进也要同步到最新的跟进id，不然回款计划列表会找不到
+             EducodeSales::MoneyPlan.where(business_id: d.id, id: params[:money_plan_ids]).update_all(follow_up_id: follow_up.id)
 
             # 合同里签到日期全同步到最新跟进
             last_follow_up.contract_date_lists.update_all(follow_up_id: follow_up.id)

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -59,7 +59,11 @@ module EducodeSales
           else
             @money_plans = @money_plans.order(date_at: :desc)
           end
-          @money_plans = @money_plans.page(params[:page]).per(params[:limit])
+
+          if params[:page].present?
+            @money_plans = @money_plans.page(params[:page]).per(params[:limit])
+          end
+          @money_plans = @money_plans
         end
       end
     end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -537,7 +537,7 @@ module EducodeSales
       data_1_hash = {}
       data_1_total_hash = {}
       data_1.each do |d|
-        data_1_hash[d.month] = d.count_type.round(2)
+        data_1_hash[d.month] = d.count_type ? d.count_type.round(2) : 0
       end
 
       last_month = 0
@@ -577,10 +577,14 @@ module EducodeSales
         last_month = month.split("-")[0]
       end
 
-      data_3 = business.joins(last_follow_up: :money_plans).
-        where("educode_sales_follow_ups.clazz_id != ?", x).
-        where.not("educode_sales_money_plans.clazz!= ?", 1).
-        where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at <= ?", begin_at, end_at).
+      data_3 = EducodeSales::MoneyPlanRecord.from("(
+                  SELECT distinct(educode_sales_money_plan_records.id), educode_sales_money_plan_records.amount, date_at
+                  FROM educode_sales_money_plan_records
+                  JOIN educode_sales_money_plan_claims ON educode_sales_money_plan_claims.money_plan_record_id = educode_sales_money_plan_records.id
+                  GROUP BY educode_sales_money_plan_records.id
+                  ) AS educode_sales_money_plan_records
+                ").
+        where("educode_sales_money_plan_records.date_at >= ?  AND educode_sales_money_plan_records.date_at <= ? ",  begin_at, end_at).
         select("SUM(amount) AS count_type, DATE_FORMAT(date_at, '%Y-%m') AS month").
         group("DATE_FORMAT(date_at, '%Y-%m')").
         order("DATE_FORMAT(date_at, '%Y-%m')")
@@ -692,10 +696,14 @@ module EducodeSales
         last_month = month.split("-")[0]
       end
 
-      data_3 = EducodeSales::Business.joins(last_follow_up: :money_plans).
-        where("educode_sales_follow_ups.clazz_id != ?", x).
-        where.not("educode_sales_money_plans.clazz!= ?", 1).
-        where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at <= ?", begin_at, end_at).
+      data_3 = EducodeSales::MoneyPlanRecord.from("(
+                  SELECT distinct(educode_sales_money_plan_records.id), educode_sales_money_plan_records.amount, date_at
+                  FROM educode_sales_money_plan_records
+                  JOIN educode_sales_money_plan_claims ON educode_sales_money_plan_claims.money_plan_record_id = educode_sales_money_plan_records.id
+                  GROUP BY educode_sales_money_plan_records.id
+                  ) AS educode_sales_money_plan_records
+                ").
+        where("educode_sales_money_plan_records.date_at >= ?  AND educode_sales_money_plan_records.date_at <= ? ",  begin_at, end_at).
         select("SUM(amount) AS count_type, DATE_FORMAT(date_at, '%Y') AS year").
         group("DATE_FORMAT(date_at, '%Y')").
         order("DATE_FORMAT(date_at, '%Y')")

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;

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

@@ -30,4 +30,6 @@ json.data do
 end
 
 json.code 0
-json.count @money_plan_records.total_count
+if params[:page].present?
+  json.count @money_plan_records.total_count
+end

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

@@ -1,50 +1,52 @@
 <%= Gon::Base.render_data %>
 <div style="margin: 10px 10px 10px 10px" id="money_plan_list">
-    <form class="layui-form layui-form-pane" lay-filter="search_plans">
-        <div class="layui-form-item">
-            <div class="layui-inline">
-                <label class="layui-form-label">商机名称</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="business" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label">客户名称</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="school" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label">销售经理</label>
-                <div class="layui-input-inline">
-                <div id="plan_staff_manages" style="width: 190px;"></div>
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label">客户类型</label>
-                <div class="layui-input-inline">
-                <%= select_tag "property", options_for_select(SchoolTag.where(for_missions: true).pluck(:name, :id)), { include_blank: true } %>
-                </div>
-            </div>
-            <div class="layui-inline">
-                <label class="layui-form-label" style="width: 120px">计划回款时间</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="date_at" class="layui-input" id="date">
-                </div>
-            </div>
-            <div class="layui-inline">
-                <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+  <form class="layui-form layui-form-pane" lay-filter="search_plans">
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">销售经理</label>
+        <div class="layui-input-inline">
+          <div id="plan_staff_manages" style="width: 190px;"></div>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">商机名称</label>
+        <div class="layui-input-inline">
+          <input type="text" name="business" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">客户名称</label>
+        <div class="layui-input-inline">
+          <input type="text" name="school" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">客户类型</label>
+        <div class="layui-input-inline">
+          <%= select_tag "property", options_for_select(SchoolTag.where(for_missions: true).pluck(:name, :id)), {include_blank: true} %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label" style="width: 120px">计划回款时间</label>
+        <div class="layui-input-inline">
+          <input type="text" name="date_at" class="layui-input" id="date">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
         </button>
-                <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索
+        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索
         </button>
-            </div>
-        </div>
-    </form>
+      </div>
+    </div>
+  </form>
 </div>
 <script type="text/html" id="toolbar_money_plan">
+  <span class="table-label">回款计划列表</span>
   <% if can? :create, EducodeSales::MoneyPlan %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" style="margin-left: 20px;" lay-event="addMoney">添加回款计划</button>
-    <% end %>
+  <% end %>
+  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="export">导出</button>
 </script>
 
 <table class="layui-hide" id="money_plan_table" lay-filter="money_plan_table"></table>
@@ -82,15 +84,18 @@
 
         var staff_manages_list = xmSelect.render({
             el: '#plan_staff_manages',
+            name: 'plan_staff_manages',
             data: gon.staffs,
             filterable: true,
             radio: true,
-          })
-        table.render({
+          });
+
+        var money_plan_table = table.render({
             elem: '#money_plan_table',
             url: '/missions/money_plans',
             toolbar: '#toolbar_money_plan',
             defaultToolbar: ['filter'],
+            title: '回款计划列表',
             initSort: {
                 field: 'date_at',
                 type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
@@ -245,8 +250,17 @@
                 $(window).on("resize", function() {
                     layer.full(sindex);
                 });
+            }else if (obj.event === 'export') {
+                layer.load(0, {});
+                var data = form.val("search_plans");
+                data.staff_manages = staff_manages_list.getValue('valueStr');
+                request.authGet("missions/money_plans?type='export'"+ $.param({q: data}), {}, function (res) {
+                    data = res.data;
+                    table.exportFile(money_plan_table.config.id, data, 'xls');
+                    layer.closeAll('loading');
+                })
             }
-        })
+        });
 
         table.on('tool(money_plan_table)', function(obj) {
             var data = obj.data;

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

@@ -67,4 +67,6 @@ json.data do
 end
 
 json.code 0
-json.count @money_plans.total_count
+if params[:page].present?
+  json.count @money_plans.total_count
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.37'
+  VERSION = '1.10.41'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.37
+  version: 1.10.41
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-20 00:00:00.000000000 Z
+date: 2023-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -758,7 +757,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -774,7 +773,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.9
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []