educode_sales 0.5.3 → 0.5.7

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 %>
@@ -230,6 +242,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 +404,9 @@
                 name: "",
                 professional_title: "",
                 regist_at: "",
+                status: "",
                 school: "",
+                assist: "",
                 teacher_source: ""
             })
             return false;

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

@@ -19,8 +19,11 @@ json.data do
     json.actives d.actives
     json.students d.students_count
     json.regist_at d.user.present? ? d.user.created_on.to_s(:date) : ''
+    json.last_login_on (d.user.present? && d.user.last_login_on.present?) ? d.user.last_login_on.to_s(:date) : ''
     json.teacher_used d.teacher_used
-
+    json.wechat d.wechat
+    json.created_at d.created_at.to_s(:date)
+    json.teacher_assist d.teacher_assign_follows.map{|t| t.staff.user.real_name}.join(',')
     teacher_follows_count += d.teacher_follows_count
     courses_counts += d.courses_count
   end

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

@@ -5,6 +5,8 @@
         <label class="layui-form-label required">姓名</label>
         <div class="layui-input-block" id="add_teacher" style="width: 400px"></div>
       </div>
+      </div>
+      <div class="layui-block">
       <div class="layui-inline">
         <label class="layui-form-label required">单位/部门</label>
         <div class="layui-input-block" id="add_department" style="width: 400px"></div>
@@ -12,34 +14,38 @@
     </div>
     <div class="layui-block">
       <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(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @person&.professional_title), { include_blank: true, "lay-verify": "required"} %>
+          <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @person&.professional_title), { include_blank: true} %>
         </div>
       </div>
-      </div>
-      <div class="layui-block">
       <div class="layui-inline">
-        <label class="layui-form-label required">职务</label>
+        <label class="layui-form-label ">职务</label>
         <div class="layui-input-block" style="width: 188px;">
-          <input type="text" name="job" autocomplete="off" lay-verify="required" class="layui-input" placeholder="请输入职务">
+          <input type="text" name="job" autocomplete="off"  class="layui-input" placeholder="请输入职务">
         </div>
       </div>
       </div>
       <div class="layui-block">
        <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)), { include_blank: true } %>
+         </div>
+       </div>
+       <div class="layui-inline">
+         <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)), { include_blank: true, "lay-verify": "required" } %>
+           <input type="text" name="wechat" autocomplete="off"  class="layui-input" placeholder="请输入微信号">
          </div>
        </div>
     </div>
-   
-    <!-- <br>
-    <div class="layui-inline">
-      <label class="layui-form-label ">账号</label>
-      <div class="layui-input-block" id="search_teachers" style="width: 300px;"></div>
-    </div> -->
+    <div class="layui-form-item">
+      <label class="layui-form-label">教研助理</label>
+      <div class="layui-input-inline" style="z-index: 100">
+        <div id="teacher_assist" style="width: 400px;"></div>
+      </div>
+    </div>
     <div class="layui-form-item m-t-20">
       <div class="layui-input-block">
         <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="create_teachers"
@@ -47,9 +53,6 @@
         </button>
       </div>
     </div>
-    <!-- <div class="layui-block">
-      <button class="layui-btn layui-btn-normal" lay-submit lay-filter="create_teachers">提交</button>
-    </div> -->
   </div>
 </div>
 <script>
@@ -58,12 +61,42 @@
             layer = layui.layer,
             table = layui.table,
             laytpl = layui.laytpl,
+            xmSelect = layui.xmSelect,
             request = layui.request,
             $ = layui.$;
         selectInput = layui.selectInput;
 
         form.render();
 
+        var teacher_assist_list = xmSelect.render({
+            el: '#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});
+                        }
+
+                    }
+                })
+            }
+        })
+
         var add_teacher = selectInput.render({
             elem: '#add_teacher',
             name: 'name', // 渲染的input的name值
@@ -141,6 +174,11 @@
 
         //监听提交
         form.on('submit(create_teachers)', function (data) {
+            var teacher_assist = [];
+            teacher_assist_list.getValue().forEach(function(d) {
+                teacher_assist.push(d.value);
+            })
+            data.field.teacher_assist = teacher_assist;
           data.field.user_id = user_id;
           data.field.department_id = department_id;
           data.field.activity_id = parent.activity_id;

data/config/routes.rb

@@ -11,6 +11,7 @@ EducodeSales::Engine.routes.draw do
   get :search, to: "home#search"
   get :no_permission, to: "home#no_permission"
   get :sales_staff, to: "home#sales_staff"
+  get :sales_place, to: "home#sales_place"
 
   resources :sessions do
   end

data/db/migrate/20211201023750_create_educode_sales_teacher_assign_follows.rb

@@ -0,0 +1,11 @@
+class CreateEducodeSalesTeacherAssignFollows < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_teacher_assign_follows do |t|
+      t.references :staff
+      t.references :teacher
+
+      t.timestamps
+    end
+    add_column :educode_sales_teachers, :wechat, :string
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.5.3'
+  VERSION = '0.5.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.7
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,12 +192,14 @@ files:
 - app/models/educode_sales/sale_trend.rb
 - app/models/educode_sales/staff.rb
 - app/models/educode_sales/teacher.rb
+- app/models/educode_sales/teacher_assign_follow.rb
 - app/models/educode_sales/teacher_follow.rb
 - app/views/educode_sales/activities/edit.html.erb
 - app/views/educode_sales/activities/index.html.erb
 - app/views/educode_sales/activities/index.json.jbuilder
 - app/views/educode_sales/activities/new.html.erb
 - app/views/educode_sales/activities/show_teachers.html.erb
+- app/views/educode_sales/businesses/_follows.html.erb
 - app/views/educode_sales/businesses/edit.html.erb
 - app/views/educode_sales/businesses/edit_follow_record.html.erb
 - app/views/educode_sales/businesses/edit_plan.html.erb
@@ -218,10 +220,12 @@ files:
 - app/views/educode_sales/commons/index.json.jbuilder
 - app/views/educode_sales/commons/new.html.erb
 - app/views/educode_sales/commons/show.json.jbuilder
+- app/views/educode_sales/follow_ups/index.json.jbuilder
 - app/views/educode_sales/follow_ups/money_plans.json.jbuilder
 - app/views/educode_sales/follow_ups/teachers.json.jbuilder
 - app/views/educode_sales/home/index.html.erb
 - app/views/educode_sales/home/no_permission.html.erb
+- app/views/educode_sales/home/sales_place.json.jbuilder
 - app/views/educode_sales/home/sales_staff.json.jbuilder
 - app/views/educode_sales/home/search.json.jbuilder
 - app/views/educode_sales/home/search_edu_teacher.json.jbuilder
@@ -377,6 +381,7 @@ files:
 - db/migrate/20211022085324_add_teacher_used_to_teachers.rb
 - db/migrate/20211102085743_add_bidded_date_educode_sales_follow_ups.rb
 - db/migrate/20211109015617_create_educode_sales_recycles.rb
+- db/migrate/20211201023750_create_educode_sales_teacher_assign_follows.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb