educode_sales 0.9.70 → 0.9.72

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 %>
@@ -390,12 +412,6 @@
                     fixed: 'left',
                     hide: gon.filter.name
                 },
-                {
-                    field: 'area',
-                    width: 100,
-                    title: '地域',
-                    hide: gon.filter.area
-                },
                 {
                     field: 'school',
                     width: 150,
@@ -403,12 +419,6 @@
                     templet: '#school_name',
                     hide: gon.filter.school
                 },
-                {
-                    field: 'property',
-                    width: 150,
-                    title: '客户类型',
-                    hide: gon.filter.property
-                },
                 {
                     field: 'department',
                     width: 150,
@@ -421,6 +431,18 @@
                   width: 160,
                   title: '专业',
                 },
+                {
+                  field: 'area',
+                  width: 100,
+                  title: '地域',
+                  hide: gon.filter.area
+                },
+                {
+                  field: 'property',
+                  width: 150,
+                  title: '客户类型',
+                  hide: gon.filter.property
+                },
                 {
                     field: 'follow_ups_count',
                     title: '跟进',
@@ -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,
@@ -705,6 +733,9 @@
             case 'month':
               month(id);
               break;
+            case 'year':
+              year(id);
+              break;
             case 'edit':
               edit(id);
               break;
@@ -737,6 +768,9 @@
                       case 'month':
                           month(id);
                           break;
+                      case 'year':
+                         year(id);
+                         break;
                       case 'edit':
                           edit(id);
                           break;
@@ -792,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 %>
@@ -807,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,
@@ -861,6 +897,25 @@
           layer.full(sindex);
         });
       }
+
+      function year(id) {
+        var content = miniPage.getHrefContent('/missions/plans/new_year?business_id=' + id);
+        var openWH = miniPage.getOpenWidthHeight();
+
+        yindex = layer.open({
+          title: '添加年计划',
+          type: 1,
+          shade: 0.2,
+          maxmin: true,
+          shadeClose: true,
+          area: [openWH[0] + 'px', openWH[1] + 'px'],
+          offset: [openWH[2] + 'px', openWH[3] + 'px'],
+          content: content
+        });
+        $(window).on("resize", function () {
+          layer.full(sindex);
+        });
+      }
         function following(id) {
             $.ajax({
                 type: "get",
@@ -1022,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? %>
@@ -1071,6 +1127,7 @@
             business_step_list.setValue([])
             index_place_list.setValue([])
             staff_list.setValue([])
+            staff_manages_list.setValue([]);
 
             return false;
         });
@@ -1342,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/customers/list.html.erb

@@ -72,13 +72,20 @@
   <% end %>
 </script>
 <script type="text/html" id="business">
-  <a href="/missions/businesses?school={{d.name}}" class="layui-table-link">{{ d.business }}</a>
+  <a href="/missions/businesses?school={{d.unit}}" class="layui-table-link">{{ d.business }}</a>
 </script>
 <script type="text/html" id="name">
   <a href="<%= base_url %>/colleges/{{d.id}}/statistics" class="layui-table-link" target="_blank">{{ d.name }}</a>
 </script>
 <script type="text/html" id="department">
-  <a href="javascript:void(0);" lay-event="department" class="layui-table-link">{{ d.department }}</a>
+  <a href="javascript:void(0);" lay-event="department" class="layui-table-link">{{ d.department || '--' }}</a>
+</script>
+<script type="text/html" id="major">
+  {{# if (d.department_id) { }}
+  <a href="javascript:void(0);" lay-event="major" class="layui-table-link">{{ d.major_count }}</a>
+  {{# } else { }}
+   {{ d.major_count }}
+  {{# }}}
 </script>
 <script type="text/html" id="follow">
   <a href="javascript:void(0);" lay-event="follow" class="layui-table-link">{{ d.follow }}</a>
@@ -145,22 +152,24 @@
                         field: 'department',
                         width: 160,
                         title: '部门',
+                        templet: "#department"
                     },
                     {
-                        field: 'major',
+                        field: 'major_count',
                         width: 160,
                         title: '专业',
+                        templet: "#major"
                     },
-                   // {
-                    //    field: 'teacher_counts',
-                   //     width: 100,
-                   //     title: '教师数',
-                 //   },
-                 //   {
-                  //      field: 'student_counts',
-                  //      width: 100,
-                  //      title: '学生数',
-                //    },
+                   {
+                       field: 'teacher_counts',
+                       width: 100,
+                       title: '教师数',
+                   },
+                   {
+                       field: 'student_counts',
+                       width: 100,
+                       title: '学生数',
+                   },
                     
                     {
                         field: 'area',
@@ -192,7 +201,7 @@
                     },
                     {
                         field: 'staff',
-                        width: 100,
+                        width: 150,
                         title: '负责人',
                     },
                     {
@@ -399,7 +408,6 @@
         table.on('tool(customers_table)', function (obj) {
             var data = obj.data;
             id = data.id;
-            console.log(data)
             department_id = data.department_id;
             major_id = data.major_id;
             if (obj.event === 'edit') { // 监听添加操作
@@ -476,8 +484,6 @@
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content,
                     success: function (layero, index) {
-                        // 重新渲染弹层中的下拉选择框select
-                        // form.render('select');
                     }
                 });
                 $(window).on("resize", function () {
@@ -497,8 +503,7 @@
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content,
                     success: function (layero, index) {
-                        // 重新渲染弹层中的下拉选择框select
-                        form.render('select');
+                      form.render('select');
                     }
                 });
                 $(window).on("resize", function () {
@@ -517,15 +522,56 @@
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content,
                     success: function (layero, index) {
-                        // 重新渲染弹层中的下拉选择框select
                         form.render('select');
                     }
                 });
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
-            } else if (obj.event === 'follow' || obj.event === 'name' || obj.event === 'department') {
+            } else if (obj.event === 'follow' || obj.event === 'name') {
+                id = data.id
+                department_id =  data.department_id;
+                time = data.last_follow_time || ''
+                content = miniPage.getHrefContent('/missions/customers/show_customer_follow?id=' + data.id + "&department_id=" + data.department_id);
+                openWH = miniPage.getOpenWidthHeight();
+                index = layer.open({
+                    title: '客户列表/' + data.name,
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: [openWH[0] + 'px', openWH[1] + 'px'],
+                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content,
+                    success: function (layero, index) {
+                    }
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            } else if (obj.event == 'major') {
+              department_id = obj.data.department_id;
+              content = miniPage.getHrefContent('/missions/customers/show_majors?id='+ department_id);
+              openWH = miniPage.getOpenWidthHeight();
+              edit_index1 = layer.open({
+                  title: '专业',
+                  type: 1,
+                  shade: 0.2,
+                  maxmin: true,
+                  shadeClose: true,
+                  area: [openWH[0] + 'px', openWH[1] + 'px'],
+                  offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                  content: content,
+                  success: function (layero, index) {
+                    form.render('select');
+                  }
+              });
+              $(window).on("resize", function () {
+                  layer.full(index);
+              });
+            } else if (obj.event == 'department') {
                 id = data.id
+                department_id =  data.department_id;
                 time = data.last_follow_time || ''
                 content = miniPage.getHrefContent('/missions/customers/show_follow?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
@@ -539,8 +585,6 @@
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content,
                     success: function (layero, index) {
-                        // 重新渲染弹层中的下拉选择框select
-                        // form.render('select');
                     }
                 });
                 $(window).on("resize", function () {

data/app/views/educode_sales/customers/list.json.jbuilder

@@ -1,9 +1,15 @@
 x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
 json.data do
   json.array! @customers do |d|
-    business_ids = EducodeSales::Business.where(school_id: d.id).ids
+    if d['department_id']
+      business_ids = EducodeSales::Business.where(department_id: d['department_id']).ids
+      customer_follows = EducodeSales::CustomerFollow.where(department_id: d['department_id'])
+    else
+      business_ids = EducodeSales::Business.where(school_id: d.id).ids
+      customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
+    end
     follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
-    customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
+    
     a_last_follow_time = follow_ups.last&.created_at&.to_s
     b_last_follow_time = customer_follows.last&.created_at&.to_s
     if a_last_follow_time.present? && b_last_follow_time.present?
@@ -15,15 +21,21 @@ json.data do
     json.name d.name
     json.area d.province
     json.property d.school_tags.where(for_missions: true).pluck(:name).join("、")
-    json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
-    json.follow follow_ups.size + customer_follows.size
-    json.staff EducodeSales::CustomerExtension.find_by(school_id: d.id)&.customer_staff&.user&.real_name
+    if d['department_id']
+      json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.department_id = ?", d['department_id']).size
+    else
+      json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
+    end
+    json.unit "#{d.name}---#{d['department_name']}"
+   
+    # json.follow follow_ups.size + customer_follows.size
+    json.follow customer_follows.size
+    json.staff EducodeSales::CustomerExtension.where(school_id: d.id).map { |d| d.customer_staff&.user&.real_name }.join("、")
     json.department d['department_name'] || ''
-    json.major d['major'] || ''
-    json.major_id d.major_id || ''
-    json.department_id d.department_id || ''
-   # json.teacher_counts UserExtension.where(department_id: d.department_id, identity: 'teacher').size
-    #json.student_counts UserExtension.where(department_id: d.department_id, identity: 'student').size
+    json.major_count d['major_count']
+    json.department_id d['department_id'] || ''
+    json.teacher_counts UserExtension.where(department_id: d.department_id, identity: 'teacher').size
+    json.student_counts UserExtension.where(department_id: d.department_id, identity: 'student').size
   end
 end