educode_sales 0.5.5 → 0.5.9

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

@@ -0,0 +1,20 @@
+json.data do
+  json.array! @follow_ups do |d|
+    json.id d.id
+    json.clazz d.clazz.name
+    json.stage d.stage.name
+    json.staff d.staff.user.real_name
+    json.description d.description
+    json.advise d.advise
+    json.school d.business.department.school.name
+    json.created_at d.created_at.to_s
+    json.business d.business.name
+    json.business_id d.business.id
+    teacher_ids = d.key_person.pluck(:teacher_id)
+    json.key_people EducodeSales::Teacher.where(id: teacher_ids).pluck(:name).join('、')
+
+  end
+end
+
+json.code 0
+json.count @follow_ups.total_count

data/app/views/educode_sales/home/sales_place.json.jbuilder

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @places do |d|
+    json.value d.id
+    json.name d.name
+  end
+end
+json.count (@places.total_count/10 + 1)
+json.code 0
+json.msg "success"

data/app/views/educode_sales/operation_plans/_monthPlan.html.erb

@@ -79,6 +79,10 @@
             toolbar: '#monthPlanToolbar',
             totalRow:true,
             defaultToolbar: ['filter'],
+            initSort: {
+                field: 'updated_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
             cols: [
                 [
                     {
@@ -111,6 +115,8 @@
                         field: 'content',
                         width: 400,
                         title: '计划内容',
+                        templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
+
                     },
                     {
                         field: 'count',

data/app/views/educode_sales/operation_plans/_monthly.html.erb

@@ -114,6 +114,8 @@
                         field: 'content',
                         width: 300,
                         title: '个人总结',
+                        templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
+
                     },
                     {
                         field: 'level1_score',

data/app/views/educode_sales/operation_plans/_weekPlan.html.erb

@@ -80,6 +80,10 @@
             toolbar: '#weekPlanToolbar',
             totalRow:true,
             defaultToolbar: ['filter'],
+            initSort: {
+                field: 'updated_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
             cols: [
                 [
                     {
@@ -122,6 +126,8 @@
                         field: 'content',
                         width: 300,
                         title: '计划内容',
+                        templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
+
                     },
                     {
                         field: 'count',

data/app/views/educode_sales/operation_plans/_weekly.html.erb

@@ -115,6 +115,8 @@
                         field: 'content',
                         width: 300,
                         title: '个人总结',
+                        templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
+
                     },
                     {
                         field: 'level1_score',

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

@@ -17,7 +17,7 @@ json.data do
     business_count = EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").count
     json.businesses_count business_count
     all_businesses_count += business_count
-    json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum(:profit_amount).round(2)
+    json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("actual_amount - divide_amount").round(2)
     json.return_mount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").sum(:return_money).round(2)
   end
 end

data/app/views/educode_sales/plans/_monthPlan.html.erb

@@ -77,6 +77,10 @@
             url: '/missions/plans?clazz=month',
             toolbar: '#monthPlanToolbar',
             defaultToolbar: ['filter'],
+            initSort: {
+                field: 'updated_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
             totalRow:true,
             cols: [
                 [
@@ -115,6 +119,7 @@
                 field: 'content',
                 width: 300,
                 title: '计划内容',
+                  templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
               },
               {
                 field: 'follow_ups_count',

data/app/views/educode_sales/plans/_monthly.html.erb

@@ -119,6 +119,7 @@
             field: 'content',
             width: 300,
             title: '个人总结',
+              templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
           },
           {
             field: 'level1_score',

data/app/views/educode_sales/plans/_weekPlan.html.erb

@@ -78,6 +78,10 @@
           toolbar: '#weekPlanToolbar',
             totalRow:true,
             defaultToolbar: ['filter'],
+            initSort: {
+                field: 'updated_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
           cols: [
             [
               {
@@ -120,6 +124,7 @@
                 field: 'content',
                 width: 300,
                 title: '计划内容',
+                  templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
               },
               {
                 field: 'follow_ups_count',

data/app/views/educode_sales/plans/_weekly.html.erb

@@ -121,6 +121,7 @@
               field: 'content',
               width: 300,
               title: '个人总结',
+                templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
             },
             {
               field: 'level1_score',

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

@@ -1,6 +1,6 @@
 <div class="layui-tab" lay-filter="sale_tab">
   <ul class="layui-tab-title">
-    <li class="layui-this" data="business">商机列表</li>
+    <li class="layui-this" data="business">商机</li>
     <li  data="week">周计划</li>
     <li data="weekly">周报</li>
     <li data="month">月计划</li>

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

@@ -36,6 +36,14 @@
             <%= radio_button_tag("business", "全部", @areas.include?("商机管理-全部"), {title: '全部列表', id: 3}) %>
           </div>
         </div>
+        <div class="layui-form-item">
+          <label class="layui-form-label">客户管理</label>
+          <div class="layui-input-block">
+            <%= radio_button_tag("customer", "自己", @areas.include?("客户管理-自己"), {title: '本人负责列表', id: 13}) %>
+            <%= radio_button_tag("customer", "区域", @areas.include?("客户管理-区域"), {title: '本人负责区域列表', id:14}) %>
+            <%= radio_button_tag("customer", "全部", @areas.include?("客户管理-全部"), {title: '全部列表', id: 15}) %>
+          </div>
+        </div>
         <div class="layui-form-item">
           <label class="layui-form-label">销售计划</label>
           <div class="layui-input-block">

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -207,7 +207,7 @@
             <div class="layui-inline m-t-10">
               <label class="layui-form-label">视图</label>
               <div class="layui-input-inline">
-                <%= select_tag "follow_count_range", options_for_select([['按周','week'],['按天','day'],['按月','month'],['按年','year']],params[:follow_count_range]), {'lay-filter': 'follow_count'}%>
+                <%= select_tag "follow_count_range", options_for_select([['按天','day'],['按周','week'],['按月','month'],['按年','year']],params[:follow_count_range] || 'week'), {'lay-filter': 'follow_count'}%>
               </div>
             </div>
             <div class="layui-inline">
@@ -215,7 +215,7 @@
               <div class="layui-input-inline">
                   <input type="text"  class="layui-input month layui-hide" id="date_month" name="date_month" placeholder=" - " value="<%=params[:date_month] %>" >
                   <input type="text"  class="layui-input year layui-hide" id="date_year" name="date_year" placeholder=" - " value="<%=params[:date_year] %>">
-                  <input type="text"  class="layui-input week " id="date_week" name="date_week" placeholder=" - " value="<%=params[:date_week].present? ? params[:date_week] : (Time.now - 30.days).to_s(:date) + ' - ' + Time.now.to_s(:date)   %>">
+                  <input type="text"  class="layui-input week " id="date_week" name="date_week" placeholder=" - " value="<%=params[:date_week].present? ? params[:date_week] : (Time.now - 30.days).beginning_of_week.to_s(:date) + ' - ' + Time.now.end_of_week.to_s(:date)   %>">
                   <input type="text"  class="layui-input day layui-hide" id="date" name="date" placeholder=" - " value="<%=params[:date] %>">
                   </div>
             </div>

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

@@ -1,5 +1,11 @@
 <div class="section">
-  <h4><span>销售人员列表</span></h4>
+  <form class="layui-form select_year" action="">
+    <span>销售人员列表</span>
+    <div class="layui-input-inline" style="float: right">
+      <%= select_tag "years", options_for_select(@years,@year), {'lay-filter': 'year' } %>
+    </div>
+    <span style="float: right;padding-right: 10px">年度</span>
+  </form>
   <hr>
   <table class="layui-hide" id="table" lay-filter="table" ></table>
 </div>
@@ -40,11 +46,18 @@
 </script>
 <script>
   layui.use('table', function () {
-    var table = layui.table;
+      var form = layui.form,
+       table = layui.table;
+
+      form.on('select(year)', function(data){
+          console.log(data, )
+          year = data.value
+          window.location.href = "/missions/sales?year=" + data.value
+      })
 
     table.render({
       elem: '#table',
-      url: '/missions/sales',
+      url: '/missions/sales?year=<%= @year %>',
       cellMinWidth: 80,
         totalRow:true,
       cols: [
@@ -60,6 +73,7 @@
           }, {
             field: 'area',
             title: '负责区域',
+            templet:'<div><span title="{{d.area}}">{{d.area}}</span></div>'
           }, {
             field: 'business_a',
             title: 'A类商机',
@@ -108,12 +122,43 @@
             title: '中标金额',
             totalRow:true,sort:true,
             width: 120
-          }, {
+          },
+            {
             field: 'return_money',
             title: '回款金额',
             totalRow:true,sort:true,
             width: 120
-          }
+          },
+            {
+            field: 'school_count',
+            title: '负责学校数',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_school_count',
+            title: '跟进学校数',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_school_counts',
+            title: '跟进学校次数',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_school_rate',
+            title: '学校覆盖率',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_department_rate',
+            title: '学院覆盖率',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
         ]
       ],
       limit: 20,
@@ -121,19 +166,13 @@
       page: true
     });
 
-      // var sort = {}, search = {};
-      // table.on('sort(table)', function (obj) {
-      //     sort.field = obj.field;
-      //     sort.order = obj.type;
-      //     table.reload('table', {
-      //         initSort: obj,
-      //         where: {
-      //             sort: sort,
-      //             q: search
-      //         }
-      //     });
-      // })
-
 
   });
-</script>
+</script>
+<style>
+    .select_year .layui-form-select .layui-input {
+        padding-right: 30px;
+        cursor: pointer;
+        height: 22px;
+    }
+</style>

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

@@ -26,32 +26,47 @@ json.data do
     else
       json.area  ''
     end
-    business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).count
-    businesses_a_count += business_a
+    if @year == "全部"
+      business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).count
+      business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).count
+      business_c = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @c_clazz&.id).count
+      business_d = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @d_clazz&.id).count
+      business_e = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @e_clazz&.id).count
+      business_o = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @o_clazz&.id).count
+      json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
+      json.return_money @businesses.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", @x).where.not("educode_sales_money_plans.clazz!= ?", 1).sum(:amount).round(2)
+      json.school_count EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
+    else
+      business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      business_c = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @c_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      business_d = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @d_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      business_e = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @e_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      business_o = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @o_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", "#{@year}-01-01", "#{@year}-12-31").sum(:total_amount).round(2)
+      json.return_money @businesses.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 <= ? ", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").sum(:amount).round(2)
+      json.school_count EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
+    end
+
     json.business_a business_a
-    business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).count
-    businesses_b_count += business_b
     json.business_b business_b
-    business_c = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @c_clazz&.id).count
-    businesses_c_count += business_c
     json.business_c business_c
-    business_d = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @d_clazz&.id).count
-    businesses_d_count += business_d
-    json.business_d business_b
-    business_e = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @e_clazz&.id).count
-    businesses_e_count += business_e
-    json.business_e business_b
-    business_o = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @o_clazz&.id).count
-    businesses_o_count += business_o
+    json.business_d business_d
+    json.business_e business_e
     json.business_o business_o
-    json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
-    json.return_money  @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ?", @x).sum("educode_sales_businesses.return_money").round(2)
+
     json.a_clazz_id @a_clazz&.id
     json.b_clazz_id @b_clazz&.id
     json.c_clazz_id @c_clazz&.id
     json.d_clazz_id @d_clazz&.id
     json.e_clazz_id @e_clazz&.id
     json.o_clazz_id @o_clazz&.id
+    businesses_a_count += business_a
+    businesses_b_count += business_b
+    businesses_c_count += business_c
+    businesses_d_count += business_d
+    businesses_e_count += business_e
+    businesses_o_count += business_o
   end
 end
 

data/app/views/educode_sales/sales/operations.html.erb

@@ -46,18 +46,21 @@
                 }, {
                     field: 'area',
                     title: '负责区域',
+                    templet:'<div><span title="{{d.area}}">{{d.area}}</span></div>'
                 }, {
                     field: 'schools',
                     title: '跟进学校',
                     templet: "#school",
                     totalRow:true,
+                    sort: true,
                     width: 120
                 }, {
                     field: 'departments',
                     title: '跟进二级学院',
                     templet: "#xschool",
                     totalRow:true,
-                    width: 120
+                    sort: true,
+                    width: 170
                 },
                 ]
             ],

data/app/views/educode_sales/teachers/course_list.json.jbuilder

@@ -19,5 +19,5 @@ json.data do
   end
 end
 json.code 0
-json.count @courses.total_count
+json.count @courses.present? ? @courses.total_count : 0
 json.msg 'succcess'

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

@@ -9,36 +9,48 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label required">职称</label>
+      <label class="layui-form-label ">职称</label>
       <div class="layui-input-block">
         <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @teacher.professional_title), { include_blank: true } %>
       </div>
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label required">职务</label>
+      <label class="layui-form-label ">职务</label>
       <div class="layui-input-block">
-        <input type="text" name="job" autocomplete="off" lay-verify="required"
+        <input type="text" name="job" autocomplete="off"
                class="layui-input" placeholder="请输入" value="<%= @teacher.job %>">
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label required">来源</label>
+      <label class="layui-form-label ">来源</label>
       <div class="layui-input-block">
         <%= select_tag "source_id", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id), @teacher.source_id), { include_blank: true } %>
       </div>
     </div>
     <br>
+    <div class="layui-inline">
+      <label class="layui-form-label ">微信号</label>
+      <div class="layui-input-block">
+        <input type="text" name="wechat" autocomplete="off"
+               class="layui-input" placeholder="请输入" value="<%= @teacher.wechat %>">
+      </div>
+    </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label required">单位部门</label>
       <div class="layui-input-block" id="add_department2" style="width: 400px"></div>
-      <!--        <input type="text" name="edit_school" autocomplete="off" lay-verify="required"-->
-      <!--               class="layui-input" placeholder="请输入" value="<%#= Department.find_by(id: @teacher.department_id).name %>-<%#= School.find_by(id: Department.find_by(id: @teacher.department_id).school_id).name %>">-->
     </div>
     <br>
+    <div class="layui-form-item">
+      <label class="layui-form-label">教研助理</label>
+      <div class="layui-input-inline">
+        <div id="edit_teacher_assist" style="width: 400px;"></div>
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">平台账号</label>
-      <div class="layui-input-block" id="user_search" style="width: 300px;"></div>
+      <div class="layui-input-block" id="user_search" style="width: 400px;"></div>
     </div>
      <div class="layui-form-item m-t-20">
        <div class="layui-input-block">
@@ -60,6 +72,35 @@
 
         form.render();
 
+        var edit_teacher_assist_list = xmSelect.render({
+            el: '#edit_teacher_assist',
+            remoteSearch: true,
+            clickClose: true,
+            delay: 1000,
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                $.ajax( '/missions/sales_staff?teacher_assist=true', {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        if (res.code == 0) {
+                            cb(res.data, res.count);
+                        } else {
+                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                        }
+                    }
+                })
+            }
+        })
+        edit_teacher_assist_list.setValue(gon.teacher_assist)
+
         var add_department = selectInput.render({
             elem: '#add_department2',
             name: 'department', // 渲染的input的name值
@@ -125,6 +166,11 @@
             if (department_id == '') {
               return layer.alert("请选择单位部门")
             }
+            var assign_follow = [];
+            edit_teacher_assist_list.getValue().forEach(function(d) {
+                assign_follow.push(d.value);
+            })
+            data.field.teacher_assist = assign_follow;
             data.field.department_id = department_id;
             data.field.user_id = user_id;
             request.authPut("missions/teachers/"+ parent.id, data.field, function (res) {

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

@@ -38,6 +38,12 @@
           <input type="text" class="layui-input" id="time" placeholder="请选择时间" autocomplete="off" name="regist_at">
         </div>
       </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">注册状态</label>
+        <div class="layui-input-inline">
+          <%= select_tag "status", options_for_select([["已注册","1"],["未注册","0"]]), { include_blank: true } %>
+        </div>
+      </div>
       <div class="layui-inline">
         <label class="layui-form-label">区域</label>
         <div class="layui-input-inline">
@@ -50,6 +56,12 @@
           <input type="text" class="layui-input" id="date" name="date" autocomplete="off" placeholder=" - ">
         </div>
       </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">教研助理</label>
+        <div class="layui-input-inline">
+          <%= select_tag "assist", options_for_select(@staffs, params[:assist]), { 'lay-filter': 'assist', 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">重置
@@ -66,7 +78,7 @@
     <span class="table-label">教师列表</span>
     <% if can? :create, EducodeSales::Teacher %>
       <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import">导入数据</button>
-      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加</button>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加老师</button>
   <% end %>
     <!-- <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="search_new"> 搜索添加 -->
     </button>
@@ -86,7 +98,7 @@
   <%# if can? :destroy, EducodeSales::Teacher %>
 <!--  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>-->
    <%# end %>
-  <% if can? :add_follow, EducodeSales::Teacher %>
+  <% if can? :create, EducodeSales::TeacherFollow %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
   <% end %>
   <% if @more %>
@@ -148,6 +160,7 @@
                     width: 60,
                     title:'序号',type: 'numbers',
                     totalRowText:'合计',
+
                 },
                 {
                     field: 'name',
@@ -159,11 +172,15 @@
                     field: 'school',
                     width: 160,
                     title: '单位',
+                    templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
+
                 },
                 {
                     field: 'department',
                     width: 130,
-                    title: '部门'
+                    title: '部门',
+                    templet:'<div><span title="{{d.department}}">{{d.department}}</span></div>'
+
                 },
                 {
                     field: 'professional_title',
@@ -230,6 +247,26 @@
                     width: 120,
                     title: '注册时间',
                 },
+                {
+                    field: 'last_login_on',
+                    width: 120,
+                    title: '最近登录',
+                },
+                {
+                    field: 'created_at',
+                    width: 120,
+                    title: '添加时间',
+                },
+                {
+                    field: 'wechat',
+                    width: 120,
+                    title: '微信号',
+                },
+                {
+                    field: 'teacher_assist',
+                    width: 120,
+                    title: '教研助理',
+                },
                 {
                     title: '操作',
                     minWidth: 170,
@@ -372,7 +409,9 @@
                 name: "",
                 professional_title: "",
                 regist_at: "",
+                status: "",
                 school: "",
+                assist: "",
                 teacher_source: ""
             })
             return false;