educode_sales 0.9.48 → 0.9.50

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

@@ -1,654 +1,14 @@
-<div style="margin: 10px 10px 10px 10px">
-  <form class="layui-form layui-form-pane" lay-filter="search_teachers">
-    <div class="layui-form-item">
-      <div class="layui-inline">
-        <label class="layui-form-label">教师姓名</label>
-        <div class="layui-input-inline">
-          <input type="text" name="name" class="layui-input">
-        </div>
-      </div>
-      <div class="layui-inline">
-        <label class="layui-form-label">单位</label>
-        <div class="layui-input-inline">
-          <input type="text" name="school" class="layui-input">
-        </div>
-      </div>
-      <div class="layui-inline">
-        <label class="layui-form-label">职称</label>
-        <div class="layui-input-inline">
-          <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @person&.professional_title), { include_blank: true } %>
-        </div>
-      </div>
-      <div class="layui-inline show_item" style="display:none;">
-        <label class="layui-form-label">导流来源</label>
-        <div class="layui-input-inline">
-          <%= select_tag "teacher_source", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id)), { include_blank: true } %>
-        </div>
-      </div>
-      <div class="layui-inline show_item" style="display:none;">
-        <label class="layui-form-label">态度</label>
-        <div class="layui-input-inline">
-
-          <%= select_tag "attitude", options_for_select(EducodeSales::Common.where(clazz: 'teacher_attitude').pluck(:name, :id)), { include_blank: true } %>
-        </div>
-      </div>
-      <div class="layui-inline show_item" style="display:none;">
-        <label class="layui-form-label">注册时间</label>
-        <div class="layui-input-inline">
-          <input type="text" class="layui-input" id="time" placeholder="请选择时间" autocomplete="off" name="regist_at">
-        </div>
-      </div>
-      <div class="layui-inline show_item" style="display:none;">
-        <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 show_item" style="display:none;">
-        <label class="layui-form-label">区域</label>
-        <div class="layui-input-inline">
-          <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
-        </div>
-      </div>
-      <div class="layui-inline show_item" style="display:none;">
-        <label class="layui-form-label">起止时间</label>
-        <div class="layui-input-inline">
-          <input type="text" class="layui-input" id="date" name="date" autocomplete="off" placeholder=" - ">
-        </div>
-      </div>
-      <div class="layui-inline show_item" style="display:none;">
-        <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">重置
-        </button>
-        <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_teachers">搜 索
-        </button>
-        <a style="padding-left: 20px;color: #0000FF"  href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">高级搜索
-        </a>
-      </div>
+<div class="layui-tab" lay-filter="operation_tab">
+  <ul class="layui-tab-title">
+    <li class="layui-this follows_li">跟进动态</li>
+    <li class="businesses_list_li" >教师列表</li>
+  </ul>
+  <div class="layui-tab-content">
+    <div class="layui-tab-item  layui-show">
+      <%= render 'follows' %>
+    </div>
+    <div class="layui-tab-item follows_div">
+      <%= render 'index' %>
     </div>
-  </form>
-</div>
-
-<script type="text/html" id="toolbarDemo">
-  <div class="layui-btn-container">
-    <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>
-     <% end %>
-     <!-- <div class="layui-btn-container">
-      <span class="table-label">跟进动态</span>
-      <a class="layui-btn layui-btn-normal layui-btn-sm" style="margin-left: 20px;" lay-event="report_day">日报</a>
-    </div> -->
-    <!-- <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="search_new"> 搜索添加 -->
-    </button>
   </div>
-</script>
-<div class="">
-<table class="layui-hide" id="teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
 </div>
-<script type="text/html" id="currentTableBar">
-  <% 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 %>
-    <a class="layui-btn-xs data-count-edit more-btn" data-name={{d.name}} data-id={{d.id}}>更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
-  <% end %>
-</script>
-<script type="text/html" id="name">
-  {{# if (d.login) { }}
-    <a href="<%= base_url%>/users/{{d.login}}" class="layui-table-link" target="_blank">{{ d.name }}</a>
-  {{# } else {}}
-    <a href="javascript:;" class="">{{ d.name }}</a>
-  {{# }}}
-</script>
-<script type="text/html" id="courses">
-  <a href="javascript:void(0);" lay-event="courses" class="layui-table-link">{{ d.course_subjects_count }}</a>
-</script>
-<script type="text/html" id="event">
-  <a href="javascript:void(0);" lay-event="event" class="layui-table-link">{{ d.activities_count }}</a>
-</script>
-<script type="text/html" id="class">
-  <a href="javascript:void(0);" lay-event="class" class="layui-table-link">{{ d.courses_count }}</a>
-</script>
-<script type="text/html" id="follow">
-  <a href="javascript:void(0);" lay-event="follow" class="layui-table-link">{{ d.teacher_follows_count }}</a>
-</script>
-
-<script>
-    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
-        var $ = layui.jquery,
-            form = layui.form,
-            request = layui.request,
-            dropdown = layui.dropdown,
-            miniPage = layui.miniPage,
-            laydate = layui.laydate;
-
-        var laydate = layui.laydate;
-
-        laydate.render({
-          elem: '#date',
-          range: true
-        });
-        laydate.render({
-          elem: '#time',
-        });
-
-        table = layui.table;
-        table.render({
-            elem: '#teachers_table',
-            url: '/missions/teachers',
-            where: {q: form.val('search_form')},
-            toolbar: '#toolbarDemo',
-            totalRow:true,
-            defaultToolbar: ['filter'],
-            cols: [
-              [
-                {
-                    field: 'id',
-                    width: 60,
-                    title:'序号',type: 'numbers',
-                    totalRowText:'合计',
-                    fixed: 'left'
-
-                },
-                {
-                    field: 'name',
-                    width: 80,
-                    title: '姓名',
-                    fixed: 'left',
-                    templet: "#name"
-                },
-                {
-                    field: 'school',
-                    width: 160,
-                    title: '单位',
-                    templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
-
-                },
-                {
-                    field: 'department',
-                    width: 130,
-                    title: '部门',
-                    templet:'<div><span title="{{d.department}}">{{d.department}}</span></div>'
-
-                },
-                {
-                    field: 'professional_title',
-                    title: '职称',
-                    width: 80,
-                    templet: '#show_follow'
-                },
-                {
-                    field: 'job',
-                    width: 80,
-                    title: '职务',
-                    templet: '#show_keys'
-
-                },
-                {
-                  field: 'source',
-                  width: 90,
-                  title: '来源',
-                },
-                {
-                    field: 'attitude',
-                    width: 60,
-                    title: '态度',
-                },
-                {
-                    field: 'course_subjects_count',
-                    width: 90,
-                    title: '课程方向',
-                    templet: "#courses"
-                },
-                {
-                    field: 'teacher_follows_count',
-                    width: 90,
-                    title: '跟进情况',
-                    totalRow:true,
-                    templet: "#follow"
-                },
-                {
-                    field: 'teacher_used',
-                    width: 120,
-                    title: '学院渗透率',
-                },
-                {
-                    field: 'students',
-                    width: 60,
-                    totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-                    title: '学生',
-                },
-                {
-                    field: 'courses_count',
-                    width: 60,
-                    title: '课堂',
-                    totalRow:true,
-                    templet: "#class"
-                },
-                {
-                    field: 'activities_count',
-                    width: 100,
-                    title: '参与活动',
-                    templet: "#event"
-                },
-                {
-                    field: 'created_on',
-                    width: 120,
-                    title: '注册时间',
-                    sort: true,
-                },
-                {
-                    field: 'last_login_on',
-                    width: 120,
-                    title: '最近登录',
-                    sort: true,
-                },
-                {
-                    field: 'created_at',
-                    width: 120,
-                    title: '添加时间',
-                    sort: true,
-                },
-                {
-                    field: 'wechat',
-                    width: 120,
-                    title: '微信号',
-                },
-                {
-                    field: 'teacher_assist',
-                    width: 120,
-                    title: '教研助理',
-                },
-                {
-                    title: '操作',
-                    minWidth: 170,
-                    toolbar: '#currentTableBar',
-                    align: "center",
-                    fixed: 'right'
-                }
-              ]
-            ],
-
-            limit: 20,
-          limits: [10,15,20,30,40,50,60,70,80,90],
-            page: true,
-            done: function (res) {
-                drowpdwonRender()
-            }
-        });
-        var dropmenu = gon.menus;
-
-        drowpdwonRender = function() {
-            dropdown.render({
-                elem: '.more-btn',
-                data: dropmenu,
-                click: function(data, othis){
-                    var elem = $(this.elem);
-                    id = elem.data('id');
-                    switch (data.event) {
-                        case 'week':
-                            week(id);
-                            break;
-                        case 'month':
-                            month(id);
-                            break;
-                        case 'edit':
-                            edit(id);
-                            break;
-                        case 'delete':
-                            deleteBusiness(id, elem.data('name'));
-                            break;
-                    }
-                }
-            });
-        }
-
-        function week(id) {
-            var content = miniPage.getHrefContent('/missions/operation_plans/new_week?teacher_id=' + id);
-            var openWH = miniPage.getOpenWidthHeight();
-
-            teacherindex1 = 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 edit(id) {
-            var content = miniPage.getHrefContent('/missions/teachers/' + id + '/edit');
-            var openWH = miniPage.getOpenWidthHeight();
-            sindex = 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 month(id) {
-            var content = miniPage.getHrefContent('/missions/operation_plans/new_month?teacher_id=' + id);
-            var openWH = miniPage.getOpenWidthHeight();
-            teacherindex2 = 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 deleteBusiness(id, name) {
-            layer.confirm('确定删除' + name, function (index) {
-                request.delete('missions/teachers/' + id, {}, function (res) {
-                    layer.close(index);
-                    table.reload("teachers_table")
-                })
-            });
-        }
-
-        var sort = {}, search = {};
-        table.on('sort(teachers_table)', function (obj) {
-            sort.field = obj.field;
-            sort.order = obj.type;
-            table.reload('teachers_table', {
-                initSort: obj,
-                where: {
-                    sort: sort,
-                    q: search
-                }
-            });
-        })
-
-        // 监听搜索操作
-        form.on('submit(search_teachers)', function (data) {
-            search = data.field
-            table.reload('teachers_table', {
-                page: {
-                    curr: 1
-                },
-                where: {q: search, sort: sort}
-            }, 'data');
-            return false;
-        });
-
-        form.on('submit(reset_business_search)', function (data) {
-            var field = data.field;
-            form.val('search_teachers', {
-                area: "",
-                date: "",
-                attitude: "",
-                name: "",
-                professional_title: "",
-                regist_at: "",
-                status: "",
-                school: "",
-                assist: "",
-                teacher_source: ""
-            })
-            return false;
-        });
-        form.on('submit(show_hide)', function (data) {
-            $(".show_item").toggle()
-            return false;
-        });
-        /**
-         * toolbar事件监听
-         */
-        table.on('toolbar(teachers_table)', function (obj) {
-            if (obj.event === 'add') {  // 手动添加
-                var content = miniPage.getHrefContent('/missions/teachers/new');
-                var openWH = miniPage.getOpenWidthHeight();
-                index = 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(index);
-                });
-            }else if (obj.event === 'import') {  //
-                var content = miniPage.getHrefContent('/missions/teachers/import');
-                var openWH = miniPage.getOpenWidthHeight();
-                import_index = layer.open({
-                    title: '导入数据',
-                    type: 1,
-                    shade: 0.2,
-                    shadeClose: true,
-                    area: ['200px', '100px'],
-                    offset: 'auto',
-                    closeBtn: 0,
-                    content: content,
-                });
-                $(window).on("resize", function () {
-                    layer.full(index);
-                });
-            } else if (obj.event === 'search_new') { // 搜索添加
-                content = miniPage.getHrefContent('/missions/teachers/search_new');
-                openWH = miniPage.getOpenWidthHeight();
-                index = 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(index);
-                });
-            } else if (obj.event === 'report_day') {
-            content = miniPage.getHrefContent('/missions/teachers/daily_paper');
-              openWH = miniPage.getOpenWidthHeight();
-              index = layer.open({
-                  title: '',
-                  type: 1,
-                  shade: 0.2,
-                  // maxmin: true,
-                  shadeClose: true,
-                  area: ['600px', '600px'],
-                  content: content
-              });
-              $(window).on("resize", function () {
-                  layer.full(index);
-              });
-            }
-        });
-
-        //监听表格复选框选择
-        table.on('checkbox(teachers_table)', function (obj) {
-            console.log(obj)
-        });
-
-        table.on('tool(teachers_table)', function (obj) {
-            var data = obj.data;
-            id = data.id
-            if (obj.event === 'add_event') { // 监听添加操作
-                teacher_id = data.id
-                var content = miniPage.getHrefContent('/missions/teachers/new_follow_record?id=' + data.id);
-                var openWH = miniPage.getOpenWidthHeight();
-                sale_plan_index = 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(sale_plan_index);
-                });
-            } else if (obj.event === 'delete') {
-                layer.confirm('确定删除' + data.name, function (index) {
-                    request.delete('missions/teachers/' + data.id, {}, function (res) {
-                        layer.close(index);
-                        table.reload("teachers_table")
-                    })
-                });
-            } else if (obj.event === 'addWeek') {
-                var content = miniPage.getHrefContent('/missions/operation_plans/new_week?teacher_id=' + obj.data.id);
-                var openWH = miniPage.getOpenWidthHeight();
-
-                teacherindex1 = 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);
-                });
-            } else if (obj.event === 'addMonth') {
-                var content = miniPage.getHrefContent('/missions/operation_plans/new_month?teacher_id=' + obj.data.id);
-                var openWH = miniPage.getOpenWidthHeight();
-                teacherindex2 = 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);
-                });
-
-            } else if (obj.event === 'courses') {
-                teacher_id = data.id
-                content = miniPage.getHrefContent('/missions/teachers/add_courses?id='+data.id);
-                openWH = miniPage.getOpenWidthHeight();
-                index = 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) {
-                        // 重新渲染弹层中的下拉选择框select
-                        // form.render('select');
-                    }
-                });
-                $(window).on("resize", function () {
-                    layer.full(index);
-                });
-            } else if (obj.event === 'event') {
-                content = miniPage.getHrefContent('/missions/teachers/add_event');
-                openWH = miniPage.getOpenWidthHeight();
-                teacher_id = obj.data.id;
-                index = 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) {
-                        // 重新渲染弹层中的下拉选择框select
-                        // form.render('select');
-                    }
-                });
-                $(window).on("resize", function () {
-                    layer.full(index);
-                });
-            } else if (obj.event === 'class') {
-                content = miniPage.getHrefContent('/missions/teachers/show_class');
-                openWH = miniPage.getOpenWidthHeight();
-                user_id = obj.data.user_id;
-                index = 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) {
-                        // 重新渲染弹层中的下拉选择框select
-                        // form.render('select');
-                    }
-                });
-                $(window).on("resize", function () {
-                    layer.full(index);
-                });
-            } else if (obj.event === 'follow') {
-                content = miniPage.getHrefContent('/missions/teachers/show_follow?id=' + data.id);
-                openWH = miniPage.getOpenWidthHeight();
-                index = 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) {
-                        // 重新渲染弹层中的下拉选择框select
-                        // form.render('select');
-                    }
-                });
-                $(window).on("resize", function () {
-                    layer.full(index);
-                });
-            }
-        });
-
-    });
-</script>
-<style>
-    .layui-table-tool-temp{
-        padding-right: 30px; !important;
-    }
-</style>

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

@@ -16,8 +16,18 @@ json.data do
     json.source EducodeSales::Common.teacher_source_name[d.source_id]
     json.attitude d.follow_up&.attitude&.name
     json.courses_count d.courses_count
+    json.area d.department&.school&.province
     json.actives d.actives
+    json.experience d['experience'] || 0
+    json.grade d['grade'] || 0
+    json.mobile d.mobile
     json.students d.students_count
+    json.followup_at d.followup_at.to_s
+    json.latest_time (d['latest_time'] ? DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d['latest_time'].strftime("%Y-%m-%d")) : DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d.created_at.strftime("%Y-%m-%d"))).to_i
+
+    json.staff_manage @staff_manages[d.department&.school&.province]&.join(",")
+
+    json.follow_person d.follow_up&.staff&.user&.real_name || ''
     json.created_on 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