educode_sales 0.9.71 → 0.9.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f06396ccf8dbcf15c84aecaa042d4c444335c9ef3a09c82d5ccced165beb429a
-  data.tar.gz: 1bbace4be30f8d50b507d9174b40cfec77073ff74e79188443359bdf1f146281
+  metadata.gz: c3ce2eed15225b67592420332087c3ca7284c2908a17643d6199ac829859196f
+  data.tar.gz: eec810ee5dd968d2c0b6af7053138a1ea8649fe57986dd054a91c15aa1f9afc6
 SHA512:
-  metadata.gz: 6034bfe4baf04919a142b18d57cdf9a8489fc9af2ec55597d36556a5ab69b6a9d1749d2c1271556a489f7d4907144e3c0b9db3769b7573cb967291fe3fb04b0b
-  data.tar.gz: 40edd2d1d9f49c081dad0251a573fadf67de0592755c54279d22518a80d2c3dea2777cb7d1daca05c7544f09a915078d79b3a63a9e94e4c2e025371f2a392e16
+  metadata.gz: 2dfefa8e8e30235cdbd3ff7c0e17044788cf76d3d62698455da06d77fe0007571a16ff0dd39cc2e4b60faccede54df20da14dd1cbce40eecc6ebf48c4a87c7b2
+  data.tar.gz: b6765899a3cbeda621f0fa85940e1fec3702b74c88685a90bacff2ac57fdd6b9701fb5f89aaab13e577b5b2bb764ac4050a5a681b56ccf2d1006f381f8e5cb30

data/app/controllers/educode_sales/businesses_controller.rb

@@ -299,6 +299,22 @@ module EducodeSales
             @businesses = @businesses.joins("JOIN educode_sales_business_clazz_changes ON educode_sales_business_clazz_changes.business_id = educode_sales_businesses.id").where("educode_sales_business_clazz_changes.clazz_changed in (?)", clazz_changes)
           end
 
+         if params[:q].present? && params[:q][:property].present?
+            # 客户类型
+            @businesses = @businesses.joins(department: [school: :school_tags]).where("school_tags.id = ?", params[:q][:property])
+            # @businesses = @businesses.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id
+            #                                  JOIN schools ON departments.school_id = schools.id").where("schools.school_property_id = ?", params[:q][:property])
+          end 
+
+          if params[:q].present? && params[:q][:staff_manages].present?
+            # 销售经理
+            @businesses = @businesses.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 = ?)", params[:q][:staff_manages], params[:q][:staff_manages])
+              
+             
+          end
+
           if params[:sort].present? && params[:sort][:field]
             if params[:sort][:field] == "service_end_time"
               @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
@@ -1188,6 +1204,17 @@ module EducodeSales
       end
     end
 
+    def key_person
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          @teachers = EducodeSales::KeyPerson.where(follow_up_id: params[:follow_up_id]).page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
     private
 
     def load_business

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -12,19 +12,34 @@ module EducodeSales
           if @current_admin.is_admin?
             @follow_ups = FollowUp.all
           else
+            permissions = @current_admin.permissions.pluck(:name)
+            area_business_ids = []
+            if permissions.include?("专项管理商机")
+              # 按客户类型查看商机下跟进记录
+              school_tag_ids  = EducodeSales::StaffSchoolTag.where(staff_id: 10009).pluck :school_tag_id
+              school_ids = SchoolTagMiddle.where(school_tag_id: school_tag_ids).pluck :school_id
+              area_business_ids = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id)
+            end
+           
             level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
             case level
             when '自己'
+              if permissions.include?("区域管理商机")
+                # 按负责区域查看商机下跟进记录
+                school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+                area_business_ids += Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id)
+              end
+              
               business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
               @businesses = Business.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
               business_ids = @businesses.pluck(:id)
-              @follow_ups = FollowUp.where(business_id: business_ids)
+              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids)
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
               business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
               @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids)
               business_ids = @businesses.pluck(:id)
-              @follow_ups = FollowUp.where(business_id: business_ids)
+              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids)
             else
               @follow_ups = FollowUp.all
             end
@@ -110,7 +125,7 @@ module EducodeSales
           end
 
         end
-        @business.update(last_follow_up_id: follow_up.id, clazz_id: follow_up.clazz_id)
+        @business.update(last_follow_up_id: follow_up.id, clazz_id: follow_up.clazz_id, p_deploy_time: params[:deploy_time])
         # 增加o商机编号
         add_business_number
         update_department
@@ -154,7 +169,7 @@ module EducodeSales
       if follow_up.save
         # 增加o类商机
         @business = follow_up.business
-        @business.update(clazz_id: follow_up.clazz_id)
+        @business.update(clazz_id: follow_up.clazz_id, p_deploy_time: params[:deploy_time])
         add_business_number
         update_department
         render_success
@@ -284,7 +299,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment, :deploy_time, :rival)
     end
 
     # 更新部门和部门下老师用户的状态

data/app/controllers/educode_sales/staffs_controller.rb

@@ -137,5 +137,40 @@ module EducodeSales
       @schools = (EducodeSales::Business.joins(:follow_ups, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_follow_ups.updated_at") + EducodeSales::Teacher.joins(:follow_up, [department: :school]).where("educode_sales_teacher_follows.staff_id = #{staff.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_teacher_follows.updated_at")).uniq { |s| s.id }
     end
 
+    def list
+      @staffs = EducodeSales::Staff.where.not(id: params[:id]).map { |d| [d.user.real_name, d.id ]}
+      gon.trans_staffs = @staffs.to_h.invert
+      render layout: false
+    end
+
+    def transfer
+      if @current_admin.is_admin?
+        staff = Staff.find(params[:id])
+        to = Staff.find(params[:to_id])
+        staff.businesses.update_all(staff_id: to.id)
+        # 商机
+        staff.follow_ups.update_all(staff_id: to.id)
+        # 销售动态
+        staff.sale_plans.update_all(staff_id: to.id)
+        # 销售计划
+        staff.places.update_all(staff_id: to.id)
+        # 渠道
+        staff.activities.update_all(staff_id: to.id)
+        # 活动
+        staff.teachers.update_all(staff_id: to.id)
+        # 教师
+        staff.teacher_follows.update_all(staff_id: to.id)
+        # 教师动态
+        staff.operation_plans.update_all(staff_id: to.id)
+        # 活动计划
+
+        EducodeSales::Activity.where(sales_id: staff.id).update_all(sales_id: to.id)
+        CustomerExtension.where(staff_id: staff.id).update_all(staff_id: to.id)
+        # 回款计划
+        MoneyPlan.where(staff_id: staff.id).update_all(staff_id: to.id)
+        # 客户
+      end
+      render_success
+    end
   end
 end

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

@@ -141,10 +141,20 @@
                     },
                     {
                         field: 'key_people',
-                        width: 90,
+                        width: 100,
                         title: '关键人',
                         templet:'<div><span title="{{d.key_people}}">{{d.key_people}}</span></div>'
                     },
+                    {
+                      field: 'rival',
+                      width: 100,
+                      title: '竞争对手',
+                    },    
+                    {
+                        field: 'staff_manages',
+                        width: 120,
+                        title: '销售经理',
+                    },
                     {
                         field: 'tel',
                         width: 90,

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

@@ -63,6 +63,14 @@
                id="reception_at_edit" placeholder="请选择日期">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">部署时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" value="<%= @follow_up.business.p_deploy_time %>" name="deploy_time"
+               id="p_deploy_time" placeholder="请选择日期">
+      </div>
+    </div>
+    
     <br>
     <div class="layui-inline service_show layui-hide">
       <label class="layui-form-label required">服务期</label>
@@ -133,6 +141,14 @@
         </div>
       </div>
     </div>
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">竞争对手</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" name="rival" autocomplete="off"  value="<%= @follow_up&.rival%>">
+        </div>
+      </div>
+    </div>
     <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
       <div class="layui-input-inline" style="">
@@ -209,6 +225,9 @@
         laydate.render({
             elem: '#invitation_at_edit'
         })
+        laydate.render({
+            elem: '#p_deploy_time'
+        })
         laydate.render({
             elem: '#service_time',
             range: true

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

@@ -130,6 +130,18 @@
                   </select>
                 </div>
               </div>
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
+                <label class="layui-form-label">销售经理</label>
+                <div class="layui-input-inline">
+                  <div id="staff_manages" style="width: 190px;"></div>
+                </div>
+              </div>
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
+                <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">
                 <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
                 </button>
@@ -228,7 +240,7 @@
 </script>
 
 <script type="text/html" id="show_keys">
-  <a href="javascript:void(0);" lay-event="show_keys" class="layui-table-link">{{ d.teachers_count }}</a>
+  <a href="javascript:void(0);" lay-event="show_keys" class="layui-table-link">{{ d.keys_person_count }}</a>
 </script>
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
@@ -306,6 +318,14 @@
           radio: true,
         })
 
+        var staff_manages_list = xmSelect.render({
+          el: '#staff_manages',
+          data: gon.staffs,
+          filterable: true,
+          radio: true,
+        })
+        
+
         var business_step_list = xmSelect.render({
             el: '#business_step',
             data: gon.business_step
@@ -361,6 +381,8 @@
         data.business_type = business_type_list.getValue('valueStr')
         data.business_step = business_step_list.getValue('valueStr');
         data.staff_id = staff_list.getValue('valueStr');
+        data.staff_manages = staff_manages_list.getValue('valueStr');
+        
         <% if params[:year].present? %>
         data.year = "<%= params[:year] %>";
         <% end %>
@@ -429,12 +451,18 @@
                     totalRow: true,
                     hide: gon.filter.follow_ups_count
                 },
-                // {
-                //   field: 'teachers_count',
-                //   width: 100,
-                //   title: '关键人',
-                //   templet: '#show_keys'
-                // },
+                {
+                  field: 'keys_person_count',
+                  width: 100,
+                  title: '关键人',
+                  templet: '#show_keys'
+                },
+                {
+                  field: 'rival',
+                  width: 100,
+                  title: '竞争对手',
+                  hide: gon.filter.rival
+                },
                 {
                     field: 'clazz',
                     width: 80,
@@ -798,6 +826,7 @@
             data.business_type = business_type.toString();
             data.business_step = business_step.toString();
             data.staff_id = staff_list.getValue('valueStr');
+            data.staff_manages = staff_manages_list.getValue('valueStr');
             <% if params[:year].present? %>
             data.year = "<%= params[:year] %>";
             <% end %>
@@ -813,6 +842,7 @@
                 place_id: data.place_id,
                 select: data.select,
                 staff_id: data.staff_id,
+                staff_manages: data.staff_manages,
                 signed_date: data.signed_date,
                 date_at: data.date_at,
                 bidded_date: data.bidded_date,
@@ -1047,6 +1077,7 @@
             })
             data.field.place_id = index_place_list.getValue('valueStr');
             data.field.staff_id = staff_list.getValue('valueStr');
+            data.field.staff_manages = staff_manages_list.getValue('valueStr');
             data.field.business_type = business_type.toString();
             data.field.business_step = business_step.toString();
             <% if params[:year].present? %>
@@ -1096,6 +1127,7 @@
             business_step_list.setValue([])
             index_place_list.setValue([])
             staff_list.setValue([])
+            staff_manages_list.setValue([]);
 
             return false;
         });
@@ -1367,7 +1399,7 @@
             } else if (obj.event === 'show_keys') {
                 business_id = obj.data.id
                 follow_up_id = obj.data.follow_up_id;
-                content = miniPage.getHrefContent('/missions/businesses/show_keys');
+                content = miniPage.getHrefContent('/missions/businesses/' + business_id + '/key_person');
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '关键人',

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

@@ -34,6 +34,9 @@ json.data do
 
     json.majors d.department&.department_majors&.pluck(:name).present? ? d.department&.department_majors&.pluck(:name).join("，") : ""
 
+    json.keys_person_count d.last_follow_up.present? ? EducodeSales::KeyPerson.where("follow_up_id = #{d.last_follow_up.id}").count : 0
+    json.rival d.last_follow_up&.rival || ''
+
     # school_property = d.department.school.school_property
     # property = []
 

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

@@ -0,0 +1,56 @@
+<table class="layui-hide" id="keyTable"></table>
+<script>
+  layui.use(['table'], function () {
+    var table = layui.table
+    table.render({
+      elem: '#keyTable',
+      url: '/missions/businesses/' + parent.business_id + "/key_person?follow_up_id=" + parent.follow_up_id,
+      defaultToolbar: [],
+      cols: [
+        [
+          {
+            field: 'id',
+            width: 80,
+            title:'序号',type: 'numbers',
+          },
+          {
+            field: 'name',
+            width: 140,
+            title: '姓名'
+          },
+          {
+            field: 'job',
+            width: 140,
+            title: '职务',
+          },
+          {
+            field: 'attitude',
+            width: 140,
+            title: '态度'
+          },
+          {
+            field: 'professional_title',
+            width: 140,
+            title: '职称'
+          },
+          {
+            field: 'sex',
+            width: 100,
+            title: '性别'
+          },
+          {
+            field: 'birth_date',
+            width: 200,
+            title: '生日',
+          },
+          {
+            field: 'remark',
+            width: 300,
+            title: '其他信息',
+          }
+        ]
+      ],
+      skin: 'line'
+      });
+    });
+</script>

data/app/views/educode_sales/businesses/key_person.json.jbuilder

@@ -0,0 +1,17 @@
+json.data do
+  json.array! @teachers do |d|
+    json.id d.id
+    json.name d.teacher.name
+    json.professional_title d.professional_title
+    json.job d.job
+    json.attitude_id d.attitude_id.present? ? d.attitude_id : ''
+    json.attitude d.attitude&.name
+    json.sex d.sex
+    json.birth_date d.birth_date
+    json.remark d.remark
+    json.tel d.tel
+  end
+end
+
+json.code 0
+json.count @teachers.total_count

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

@@ -67,6 +67,12 @@
                placeholder="请选择日期">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">部署时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="deploy_time" value="<%= @last_follow_up&.deploy_time %>"  id="p_deploy_time" placeholder="请选择日期">
+      </div>
+    </div>
     <br>
     <div class="layui-inline service_show layui-hide">
       <label class="layui-form-label required">服务期</label>
@@ -132,13 +138,21 @@
       </div>
     </div>
     <div class="layui-form-item">
-    <div class="layui-inline">
-      <label class="layui-form-label required">所属年度</label>
-      <div class="layui-input-inline">
-        <input type="text" class="layui-input" name="year" autocomplete="off"  lay-verify="required" id="year"
-               value="<%= @last_follow_up&.year%>"
-               placeholder="请选择年度">      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label required">所属年度</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" name="year" autocomplete="off"  lay-verify="required" id="year"
+                value="<%= @last_follow_up&.year%>"
+                placeholder="请选择年度">      </div>
+      </div>
     </div>
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">竞争对手</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" name="rival" autocomplete="off"  value="<%= @last_follow_up&.rival%>">
+        </div>
+      </div>
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
@@ -223,7 +237,9 @@
         laydate.render({
             elem: '#invitation_at_add'
         })
-
+        laydate.render({
+            elem: '#p_deploy_time'
+        })
         laydate.render({
             elem: '#reception_at_add'
         });
@@ -322,8 +338,6 @@
             data.field.assign_follow_up = assign_follow;
             data.field.business_id = "<%= @business.id %>";
             data.field.place_id = place_list.getValue('valueStr');
-            console.log("start")
-            console.log(data.field)
             request.authPost("missions/follow_ups", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)

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

@@ -11,6 +11,8 @@ json.data do
     json.created_at d.created_at.to_s
     json.business d.business.name
     json.business_id d.business.id
+    json.rival d.rival || ''
+    json.staff_manages d.business.last_follow_up&.assign_follow_ups.present? ? (d.business.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.business.staff&.user&.real_name
     # teacher_ids = d.key_person.pluck(:teacher_id)
     json.tel d.key_person.pluck(:tel).select { |d| d.present?  }.join("、")
     json.key_people d.key_person.map { |d| d.teacher.name }.join("、")# key_people(teacher_ids)

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

@@ -5,7 +5,7 @@
     <div class="layui-form-item">
       <label class="layui-form-label required">姓名</label>
       <div class="layui-input-block" style="line-height: 36px;">
-        <%= @staff.user.real_name %>
+        <%= "#{@staff.user.real_name} - #{@staff.user.phone}" %>
       </div>
     </div>
     <div class="layui-form-item">

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

@@ -42,6 +42,9 @@
 <table class="layui-hide" id="staff_filter" lay-filter="staff_filter"></table>
 </div>
 <script type="text/html" id="staff_bar">
+  <% if @current_admin.is_admin? %>
+    <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="transfer"> 一键转移</a>
+  <% end %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <a class="layui-btn layui-btn-xs layui-btn-warm data-count-delete" lay-event="disable">禁用</a>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
@@ -111,7 +114,7 @@
           },
           {
             title: '操作',
-              width: 200,
+            width: 260,
             toolbar: '#staff_bar',
             align: "center"
           }
@@ -210,6 +213,22 @@
             table.reload("staff_filter")
           })
         });
+      } else if (obj.event == 'transfer') {
+        var content = miniPage.getHrefContent('/missions/staffs/'+ data.id + '/list');
+        var openWH = miniPage.getOpenWidthHeight();
+        name = data.name;
+        index = layer.open({
+          title: '转移该人员数据到其它人员上',
+          type: 1,
+          shade: 0.2,
+          maxmin: false,
+          shadeClose: true,
+          area: ['700px', '600px'],
+          content: content,
+        });
+        $(window).on("resize", function () {
+          layer.full(index);
+        });
       }
     });
 

data/app/views/educode_sales/staffs/list.html.erb

@@ -0,0 +1,39 @@
+
+  <%= Gon::Base.render_data %>
+  <div class="layui-form layuimini-form" style="padding:30px">
+    <div class="layui-form-item">
+      <label class="layui-form-label required">人员</label>
+      <div class="layui-input-block" style="width: 300px">
+        <%= select_tag "staff_id",  options_for_select(@staffs), { 'lay-filter': 'staff_id' } %>
+      </div>
+    </div>
+    <hr>
+    <div class="layui-form-item">
+      <div class="layui-input-block">
+        <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+      </div>
+    </div>
+  </div>
+
+<script>
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+        var parentIndex = layer.index;
+        form.on('submit(saveBtn)', function (data) {
+            layer.confirm('确定转移 ' + parent.name  +  " 的数据到 " + gon.trans_staffs[data.field.staff_id] + " ?", function (index) {
+              request.post('missions/staffs/' + parent.staff_id +"/transfer", {to_id: data.field.staff_id}, function (res) {
+                  layer.close(index);
+                  layer.close(parentIndex)
+              })
+          });
+            return false;
+        });
+    });
+</script>

data/config/routes.rb

@@ -135,6 +135,7 @@ EducodeSales::Engine.routes.draw do
       put :update_follow_up
       put :audit
       put :update_advise
+      get :key_person
     end
   end
 
@@ -332,6 +333,8 @@ EducodeSales::Engine.routes.draw do
       delete :disable
       get :follow_up_schools
       get :follow_up_departments
+      get :list
+      post :transfer
     end
   end
 

data/db/migrate/20230428015007_add_deploy_time_follow_ups.rb

@@ -0,0 +1,6 @@
+class AddDeployTimeFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :deploy_time, :date
+    add_column :educode_sales_follow_ups, :rival, :string
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.71'
+  VERSION = '0.9.72'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.71
+  version: 0.9.72
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -280,6 +280,8 @@ files:
 - app/views/educode_sales/businesses/get_export_data.json.jbuilder
 - app/views/educode_sales/businesses/index.html.erb
 - app/views/educode_sales/businesses/index.json.jbuilder
+- app/views/educode_sales/businesses/key_person.html.erb
+- app/views/educode_sales/businesses/key_person.json.jbuilder
 - app/views/educode_sales/businesses/new.html.erb
 - app/views/educode_sales/businesses/new_follow_record.html.erb
 - app/views/educode_sales/businesses/no_permission.html.erb
@@ -499,6 +501,7 @@ files:
 - app/views/educode_sales/staffs/follow_up_schools.json.jbuilder
 - app/views/educode_sales/staffs/index.html.erb
 - app/views/educode_sales/staffs/index.json.jbuilder
+- app/views/educode_sales/staffs/list.html.erb
 - app/views/educode_sales/staffs/new.html.erb
 - app/views/educode_sales/teacher_follows/index.json.jbuilder
 - app/views/educode_sales/teachers/_follows.html.erb
@@ -615,6 +618,7 @@ files:
 - db/migrate/20230413031029_add_pre_time_to_businesses.rb
 - db/migrate/20230414031409_add_major_educode_sales_customer_follows.rb
 - db/migrate/20230414035655_create_educode_sales_eco_staffs.rb
+- db/migrate/20230428015007_add_deploy_time_follow_ups.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb