educode_sales 0.5.7 → 0.6.1

data/app/views/educode_sales/customers/new_follow_record.html.erb

@@ -0,0 +1,54 @@
+<h1 class="text-center" style="padding: 25px"><%=@school.name %></h1>
+<form class="layui-form layuimini-form " action="">
+    <div class="layui-form-item layui-form-text" style="padding-right: 30px">
+      <label class="layui-form-label required" >跟进内容</label>
+      <div class="layui-input-block">
+        <textarea name="content" placeholder="请输入跟进内容" lay-verify="required" style="height: 200px" class="layui-textarea"></textarea>
+      </div>
+    </div>
+  <div class="layui-form-item ">
+      <label class="layui-form-label ">跟进部门</label>
+      <div class="layui-input-inline" style="width: 300px">
+        <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id)), { include_blank: true}%>
+      </div>
+    </div>
+  <div class="layui-form-item " style="padding-left: 110px">
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_follow_up">提交
+      </button>
+    </div>
+</form>
+
+
+
+
+<script>
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            laydate = layui.laydate,
+            $ = layui.$;
+
+
+        form.render();
+
+        form.on('submit(add_follow_up)', function (data) {
+            data.field.school_id = <%=@school.id %>
+            request.authPost("missions/customer_follows", data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.addFollowIndex);
+                    parent.layer.close(parent.layer.getFrameIndex(window.name))
+                    parent.table.reload('customers_table')
+                    parent.table.reload('unfinish_table')
+                }
+            })
+
+            return false;
+        });
+
+    });
+</script>

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

@@ -0,0 +1,13 @@
+json.data do
+  json.array!  @departments do |d|
+    json.id d.id
+    # json.created_at d.created_at.to_s
+    # json.staff d.staff.user.real_name
+    json.department d.name
+    # json.content d.content
+    # json.is_latest d.id == @latest.id
+  end
+end
+
+json.code 0
+json.count @departments.total_count

data/app/views/educode_sales/customers/show_follow.html.erb

@@ -0,0 +1,442 @@
+<script type="text/html" id="toolbarDemo_follow">
+  <div class="layui-btn-container">
+    <span class="table-label">二级部门</span>
+    <% if can? :create_department, EducodeSales::Customer %>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加部门</button>
+    <% end %>
+  </div>
+</script>
+
+<h1 style="padding: 20px">客户：<%=@school_name %></h1>
+<div style="padding-left: 20px">
+  <span>区域：<%=@area %></span>
+  <span style="padding-left: 100px" id="demo"></span>
+  <span style="padding-left: 100px">负责人：<%=@staff %></span>
+</div>
+
+
+<div class="z-index">
+  <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
+</div>
+
+<script type="text/html" id="currentTableBar_follow">
+  <% if can? :update_department, EducodeSales::Customer %>
+<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+ <% end %>
+</script>
+
+
+<script>
+    document.getElementById("demo").innerHTML = "最后跟进时间：" + parent.time;
+
+    layui.use(['form', 'table', 'miniPage', 'element'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            request =layui.request,
+            miniPage = layui.miniPage;
+
+        table = layui.table;
+            table.render({
+                elem: '#sale_plan_follow_table',
+                url: '/missions/customers/show_department?id=' + parent.id ,
+                toolbar: '#toolbarDemo_follow',
+                defaultToolbar: [],
+                cols: [
+                    [
+                        {
+                            field: 'id',
+                            width: 100,
+                            title:'序号',type: 'numbers',
+                        },
+                        {
+                            field: 'department',
+                            title: '学院/部门',
+                        },
+                        {
+                            title: '操作',
+                            width: 190,
+                            toolbar: '#currentTableBar_follow',
+                            align: "center",
+                            fixed: 'right'
+                        }
+                    ]
+                ],
+
+
+                page: true,
+                skin: 'line'
+            });
+
+
+        /**
+         * toolbar事件监听
+         */
+        table.on('toolbar(sale_plan_follow_table)', function (obj) {
+            if (obj.event === 'add') { // 监听添加操作
+                school_id = parent.id
+                var content = miniPage.getHrefContent('/missions/customers/new_department?id=' + parent.id);
+                var openWH = miniPage.getOpenWidthHeight();
+                new_department_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);
+                });
+            }
+        });
+
+        table.on('tool(sale_plan_follow_table)', function (obj) {
+            var data = obj.data;
+            var id = data.id
+            if (obj.event === 'delete') {
+                layer.confirm('确定删除ID为' + data.id + "的跟进记录", function (index) {
+                    request.authDelete("missions/teacher_follows/" + data.id, {}, function() {
+                        obj.del();
+                        layer.close(index);
+                        parent.table.reload('sale_plan_follow_table')
+                        parent.table.reload('teachers_table')
+                        parent.table.reload('weekPlanTable1')
+                        parent.table.reload('monthPlanTable')
+                    })
+                });
+            } else if (obj.event === 'show') { // 监听添加操作
+                var content = miniPage.getHrefContent('/missions/teachers/show_follow_record?id=' + id);
+                var openWH = miniPage.getOpenWidthHeight();
+                sale_plan_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) {
+                        // 重新渲染弹层中的下拉选择框select
+                        form.render('select');
+                    }
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            } else if (obj.event === 'edit') {
+                department_id = obj.data.id
+                content = miniPage.getHrefContent('/missions/customers/edit_department?id='+ obj.data.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) {
+                        // 重新渲染弹层中的下拉选择框select
+                        form.render('select');
+                    }
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            } else if (obj.event === 'add_keys') { // 监听添加操作
+                content = miniPage.getHrefContent('/missions/businesses/add_keys');
+                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 === 'edit_plan') {
+                content = miniPage.getHrefContent('/missions/businesses/edit_plan');
+                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>
+
+
+
+
+
+
+
+<!--未完成计划列表-->
+<script type="text/html" id="unfinish_toolbar">
+  <div class="layui-btn-container">
+    <span class="table-label">跟进记录</span>
+    <% if can? :create_follow, EducodeSales::Customer %>
+  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="addFollow"> 添加跟进记录
+    <%end %>
+    </button>
+  </div>
+</script>
+
+<table class="layui-hide" id="unfinish_table" lay-filter="unfinish_table"></table>
+
+<script type="text/html" id="currentTableBar1234">
+  <% if can? :read_follow, EducodeSales::Customer %>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
+  <% end %>
+  <% if can? :update_follow, EducodeSales::Customer %>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can? :destroy_follow, EducodeSales::Customer %>
+  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
+</script>
+
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            miniPage = layui.miniPage;
+
+        table.render({
+            elem: '#unfinish_table',
+            url: '/missions/customers/show_follow?id=' + parent.id ,
+            toolbar: '#unfinish_toolbar',
+            defaultToolbar: [],
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 100,
+                        title:'序号',type: 'numbers',
+                    },
+                    {
+                        field: 'created_at',
+                        width: 180,
+                        title: '时间',
+                        sort: true
+                    },
+                    {
+                        field: 'staff',
+                        width: 100,
+                        title: '跟进人'
+                    },
+                    {
+                        field: 'department',
+                        width: 100,
+                        title: '跟进部门'
+                    },
+                    {
+                        field: 'content',
+                        title: '跟进内容',
+                        templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
+                    },
+                    {
+                        title: '操作',
+                        width: 300,
+                        toolbar: '#currentTableBar1234',
+                        align: "center"
+                    }
+                ]
+            ],
+
+
+            page: true,
+            skin: 'line'
+        });
+        // 监听搜索操作
+        form.on('submit(data-search-btn)', function (data) {
+            var result = JSON.stringify(data.field);
+            layer.alert(result, {
+                title: '最终的搜索信息'
+            });
+
+            //执行搜索重载
+            table.reload('currentTableId', {
+                page: {
+                    curr: 1
+                },
+                where: {
+                    searchParams: result
+                }
+            }, 'data');
+
+            return false;
+        });
+
+        /**
+         * toolbar事件监听
+         */
+        table.on('toolbar(unfinish_table)', function (obj) {
+            if (obj.event === 'addWeekPlan') { // 监听添加操作
+
+                var content = miniPage.getHrefContent('/missions/operation_plans/new_week');
+                var openWH = miniPage.getOpenWidthHeight();
+                var 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 === 'addFollow') { // 监听添加操作
+                var content = miniPage.getHrefContent('/missions/customers/new_follow_record?id=' + parent.id)
+                var openWH = miniPage.getOpenWidthHeight();
+                 addFollowIndex = 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 === 'delete') { // 监听删除操作
+                var checkStatus = table.checkStatus('currentTableId'),
+                    data = checkStatus.data;
+                layer.alert(JSON.stringify(data));
+            }
+        });
+
+        //监听表格复选框选择
+        table.on('checkbox(unfinish_table)', function (obj) {
+            console.log(obj)
+        });
+
+        table.on('tool(unfinish_table)', function (obj) {
+            var data = obj.data;
+            var id = data.id
+            if (obj.event === 'delete') {
+                layer.confirm('确定删除ID为' + data.id + "的记录", function (index) {
+                    request.authDelete("missions/customer_follows/" + data.id, {}, function() {
+                        obj.del();
+                        parent.table.reload('customers_table')
+                        layer.close(index);
+                    })
+
+                });
+            } else if (obj.event === 'show') {
+                content = miniPage.getHrefContent('/missions/customers/show_follow_record?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
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+                return false;
+            } else if (obj.event === 'edit') {
+                content = miniPage.getHrefContent('/missions/customers/edit_follow_record?id=' + data.id);
+                openWH = miniPage.getOpenWidthHeight();
+                editFollowIndex = 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(sindex);
+                });
+                return false;
+            }  else if (obj.event === 'show_follow') {
+                content = miniPage.getHrefContent('/missions/teachers/show_follow');
+                openWH = miniPage.getOpenWidthHeight();
+                index = layer.open({
+                    title: 'xxxx/跟进记录',
+                    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>
+    .z-index .layui-table-tool{
+        z-index: 10000; !important;
+    }
+</style>

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

@@ -0,0 +1,13 @@
+json.data do
+  json.array!  @follow_ups do |d|
+    json.id d.id
+    json.created_at d.created_at.to_s
+    json.staff d.staff.user.real_name
+    json.department d.department_id.present? ? Department.find(d.department_id)&.name : ''
+    json.content d.content
+    json.is_latest d.id == @latest.id
+  end
+end
+
+json.code 0
+json.count @follow_ups.total_count

data/app/views/educode_sales/customers/show_follow_record.html.erb

@@ -0,0 +1,18 @@
+<h1 class="text-center" style="padding: 25px"><%=@school.name %></h1>
+<form class="layui-form form-value" action="">
+  <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-inline">
+      <label class="layui-form-label">跟进内容：</label>
+      <div class="layui-input-inline">
+        <span><%= @follow_up.content%></span>
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">跟进部门：</label>
+      <div class="layui-input-inline">
+        <span><%=  Department.find(@follow_up.department_id)&.name if @follow_up.department_id.present? %></span>
+      </div>
+    </div>
+  </div>
+</form>

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

@@ -6,6 +6,7 @@ json.data do
     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

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',