educode_sales 0.9.71 → 0.9.73

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)