educode_sales 0.1.3 → 0.1.8

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

@@ -18,4 +18,4 @@ json.data do
 end
 
 json.code 0
-json.count @follow_ups.count
+json.count @follow_ups.total_count

data/app/views/educode_sales/businesses/unfinish_plans.json.jbuilder

@@ -11,4 +11,4 @@ json.data do
 end
 
 json.code 0
-json.count @plans.count
+json.count @plans.total_count

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

@@ -10,4 +10,4 @@ json.data do
 end
 
 json.code 0
-json.count @commons.size
+json.count @commons.total_count

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

@@ -8,4 +8,4 @@ json.data do
 end
 
 json.code 0
-json.count @money_plans.count
+json.count @money_plans.total_count

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

@@ -13,4 +13,4 @@ json.data do
 end
 
 json.code 0
-json.count @teachers.count
+json.count @teachers.total_count

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

@@ -7,6 +7,7 @@
   </div>
 </script>
 <!--搜索-->
+<div class="layuimini-main min-height-table" id="o_month_table_wraper">
 <form class="layui-form layui-form-pane" lay-filter="month_plan_form_filter">
   <div class="layui-form-item">
     <div class="layui-inline">
@@ -36,7 +37,7 @@
   </div>
 </form>
 <table class="layui-hide" id="monthPlanTable" lay-filter="currentTableFilter3"></table>
-
+</div>
 <script type="text/html" id="currentTableBar">
   <% if can? :read, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
@@ -181,7 +182,7 @@
                 console.log("a");
                 var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_month');
                 var openWH = miniPage.getOpenWidthHeight();
-                var index = layer.open({
+                monthPlanIndex = layer.open({
                     title: '添加计划',
                     type: 1,
                     shade: 0.2,
@@ -236,7 +237,7 @@
             } else if (obj.event === 'edit') {
                 content = miniPage.getHrefContent('/educode_sales/operation_plans/edit_month?id='+data.id);
                 openWH = miniPage.getOpenWidthHeight();
-                index = layer.open({
+                indexOfmonthPlan = layer.open({
                     title: '编辑',
                     type: 1,
                     shade: 0.2,
@@ -258,7 +259,7 @@
                 content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.teacher_id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
-                    title: 'xxxx/跟进记录',
+                    title: data.teacher_name + '/跟进记录',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,

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

@@ -7,7 +7,7 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main edit-table" id="monthly_table_wraper">
+<div class="layuimini-main min-height-table" id="o_monthly_table_wraper">
 
 <form class="layui-form layui-form-pane" lay-filter="monthly_form_filter">
   <div class="layui-form-item">
@@ -139,7 +139,7 @@
                     }
                 ]
             ],   done: function (res) {
-                $("#monthly_table_wraper .star1").each(function (i) {
+                $("#o_monthly_table_wraper .star1").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level1_score,
@@ -147,7 +147,7 @@
                         readonly: true
                     });
                 })
-                $("#monthly_table_wraper .star2").each(function (i) {
+                $("#o_monthly_table_wraper .star2").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level2_score,
@@ -155,7 +155,7 @@
                         readonly: true
                     });
                 })
-                $("#monthly_table_wraper .star3").each(function (i) {
+                $("#o_monthly_table_wraper .star3").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level3_score,

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

@@ -7,8 +7,8 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main edit-table" id="week_table_wraper">
-<div class="layui-form layui-form-pane edit-table" lay-filter="week_plan_form_filter">
+<div class="layuimini-main min-height-table" id="o_week_table_wraper">
+<div class="layui-form layui-form-pane" lay-filter="week_plan_form_filter">
   <div class="layui-form-item">
     <div class="layui-inline">
       <label class="layui-form-label">人员</label>
@@ -106,6 +106,11 @@
                         width: 190,
                         title: '部门'
                     },
+                    {
+                        field: 'month',
+                        width: 100,
+                        title: '月份',
+                    },
                     {
                         field: 'week',
                         width: 100,
@@ -187,7 +192,7 @@
             if (obj.event === 'add') { // 监听添加操作
                 var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_week');
                 var openWH = miniPage.getOpenWidthHeight();
-                var index = layer.open({
+                new_weelPlan_index = layer.open({
                     title: '添加计划',
                     type: 1,
                     shade: 0.2,
@@ -276,7 +281,7 @@
                 content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.teacher_id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
-                    title: 'xxxx/跟进记录',
+                    title: data.teacher_name + '/跟进记录',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,

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

@@ -7,8 +7,7 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main edit-table" id="sales_weelky_table">
-
+<div class="layuimini-main min-height-table" id="o_sales_weelky_table">
 <form class="layui-form layui-form-pane" lay-filter="weekly_plan_form_filter">
   <div class="layui-form-item">
     <div class="layui-inline">
@@ -141,7 +140,7 @@
                     }
                 ]
             ], done: function (res) {
-                $("#sales_weelky_table .star1").each(function (i) {
+                $("#o_sales_weelky_table .star1").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level1_score,
@@ -149,7 +148,7 @@
                         readonly: true
                     });
                 })
-                $("#sales_weelky_table .star2").each(function (i) {
+                $("#o_sales_weelky_table .star2").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level2_score,
@@ -157,7 +156,7 @@
                         readonly: true
                     });
                 })
-                $("#sales_weelky_table .star3").each(function (i) {
+                $("#o_sales_weelky_table .star3").each(function (i) {
                     rate.render({
                         elem: this,
                         value: res.data[i].level3_score,

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

@@ -60,8 +60,10 @@
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
-                    layer.closeAll()
+                    layer.close(parent.indexOfmonthPlan)
+                    layer.close(parent.indexOfmonthly)
                     table.reload('monthPlanTable')
+                    table.reload("newMonthlyTable")
                 }
             })
             return false;

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

@@ -1,9 +1,9 @@
-<div class="layui-tab">
+<div class="layui-tab" lay-filter="operation_tab">
   <ul class="layui-tab-title">
-    <li class="layui-this">周计划</li>
-    <li>周报</li>
-    <li>月计划</li>
-    <li>月报</li>
+    <li class="layui-this" data="week">周计划</li>
+    <li data="weekly">周报</li>
+    <li data="month">月计划</li>
+    <li data="monthly">月报</li>
   </ul>
   <div class="layui-tab-content">
     <div class="layui-tab-item layui-show">
@@ -20,3 +20,33 @@
     </div>
   </div>
 </div>
+<script>
+  layui.use(['element', 'table', 'jquery'], function () {
+    var $ = layui.jquery,
+      table = layui.table,
+      element = layui.element;
+    element.on('tab(operation_tab)', function (data) {
+      var status = $(this).attr('data')
+      switch (status) {
+        case 'week':
+          $("#o_week_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
+          $("#o_week_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height = "auto";
+          break;
+        case 'weekly':
+          $("#o_sales_weelky_table .layui-table-fixed-r")[0].classList.remove('layui-hide');
+          $("#o_sales_weelky_table .layui-table-fixed-r .layui-table-body")[0].style.height = "auto";
+          break;;
+        case 'monthly':
+          $("#o_monthly_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
+          $("#o_monthly_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height = "auto";
+          break;
+        case 'month':
+          $("#o_month_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
+          $("#o_month_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height = "auto";
+          break;
+      }
+
+
+    })
+  })
+</script>

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

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/operation_plans/my_month.json.jbuilder

@@ -8,11 +8,11 @@ json.data do
     json.month d.month.strftime("%Y-%m")
     json.teacher_id d.teacher_id
     json.content d.content.truncate(30)
-    # json.follow_ups_count d.teacher.follow_ups_count
+    json.count d.teacher.teacher_follows_count
     json.rate "#{d.finish_rate}%"
     json.updated_at d.updated_at.to_s
   end
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/operation_plans/my_week.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

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

@@ -69,8 +69,10 @@
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
-                    layer.closeAll()
+                    layer.close(parent.new_monthly_index)
+                    layer.close(parent.monthPlanIndex)
                     table.reload('monthPlanTable')
+                    table.reload("newMonthlyTable")
                 }
             })
             return false;

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

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @rate %></span>
+      <span><%= @rate %>%</span>
       <%= hidden_field_tag 'finish_rate', @rate, {id: 'monthly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
@@ -35,7 +35,7 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newMonthlyTable" lay-filter="currentMonthly"></table>
+<table class="layui-hide" id="newMonthlyTable" lay-filter="newMonthlyToolbar"></table>
 
 <script type="text/html" id="currentMonthly">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
@@ -43,6 +43,11 @@
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
 </script>
 
+<script type="text/html" id="show_follow_newMonthly">
+  <a href="javascript:void(0);" lay-event="show_follow_newMonthly" class="layui-table-link">{{ d.count }}</a>
+</script>
+
+
 <script>
     layui.use(['rate', 'table'], function () {
         var rate = layui.rate,
@@ -69,7 +74,7 @@
 
     table.render({
         elem: '#newMonthlyTable',
-        // url: 'api/table.json',
+        url: '/educode_sales/operation_plans/my_month',
         toolbar: '#newMonthlyToolbar',
         defaultToolbar: [],
         cols: [
@@ -80,39 +85,35 @@
                     title: '序号'
                 },
                 {
-                    field: 'username',
+                    field: 'staff',
                     width: 100,
                     title: '姓名'
                 },
                 {
-                    field: 'chance',
+                    field: 'teacher_name',
                     width: 100,
                     title: '教师姓名',
                 },
                 {
-                    field: 'company',
-                    width: 100,
+                    field: 'school',
+                    width: 190,
                     title: '单位'
                 },
                 {
-                    field: 'dep',
-                    width: 100,
+                    field: 'department',
+                    width: 190,
                     title: '部门'
                 },
                 {
-                    field: 'week',
-                    width: 100,
-                    title: '周次',
-                },
-                {
-                    field: 'plan',
-                    width: 300,
+                    field: 'content',
+                    width: 400,
                     title: '计划内容',
                 },
                 {
-                    field: 'follow',
+                    field: 'count',
                     width: 100,
                     title: '跟进',
+                    templet: '#show_follow_newMonthly'
                 },
                 {
                     field: 'rate',
@@ -120,7 +121,7 @@
                     title: '完成率',
                 },
                 {
-                    field: 'updateTime',
+                    field: 'updated_at',
                     width: 150,
                     title: '更新时间',
                     sort: true,
@@ -133,25 +134,130 @@
                 }
             ]
         ],
-        data: [{
-            "id": "1",
-            "username": "丁亚莲",
-            "chance": "人工智能实验室建设",
-            "company": "中南大学",
-            "dep": "计算机学院",
-            "week": "2021-33周",
-            "plan": "对接决策人",
-            "follow": "120",
-            "rate": "100%",
-            "updateTime": "2021-07-27",
-        }],
         limits: [10, 15, 20, 25, 50, 100],
         limit: 15,
         page: true,
         skin: 'line'
     });
+
+
+
+
+        /**
+         * toolbar事件监听
+         */
+        table.on('toolbar(newMonthlyToolbar)', function (obj) {
+            if (obj.event === 'add') { // 监听添加操作
+                var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_month');
+                var openWH = miniPage.getOpenWidthHeight();
+                new_monthly_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(newMonthlyToolbar)', function (obj) {
+            var data = obj.data;
+            if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.id, function (index) {
+                    console.log("aaaaa");
+                    request.delete('educode_sales/operation_plans/' + data.id, {}, function (res) {
+                        layer.close(index);
+                        table.reload("newMonthlyTable")
+                    })
+                });
+            }
+            else if (obj.event === 'show') {
+                content = miniPage.getHrefContent('/educode_sales/operation_plans/show_week?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) {
+                        form.render('select');
+                    },
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+                return false;
+            } else if (obj.event === 'edit') {
+                content = miniPage.getHrefContent('/educode_sales/operation_plans/edit_month?id='+data.id);
+                openWH = miniPage.getOpenWidthHeight();
+                indexOfmonthly = layer.open({
+                    title: '编辑',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: [openWH[0] + 'px', openWH[1] + 'px'],
+                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content,
+                    success: function (layero, index) {
+                        form.render('select');
+                    },
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+                return false;
+            }else if (obj.event === 'show_follow_newMonthly') {
+                id = data.teacher_id
+                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.teacher_id);
+                openWH = miniPage.getOpenWidthHeight();
+                index = layer.open({
+                    title: data.teacher_name + '/跟进记录',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: [openWH[0] + 'px', openWH[1] + 'px'],
+                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content,
+                    success: function (layero, index) {
+                        // 重新渲染弹层中的下拉选择框select
+                        // form.render('select');
+                    }
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }
+        });
+
+
+
+
+
+
+
+
+
+
     })
 </script>
+
 <style>
     .layui-form-item {
         margin-bottom: 0px;

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

@@ -16,7 +16,6 @@
       <label class="layui-form-label required">教师</label>
       <div class="layui-input-inline">
 
-        <%#= select_tag "teacher_id", options_for_select(@teachers, @teacher&.id), {"lay-verify": "required", include_blank: true} %>
         <%= select_tag "teacher_id", options_for_select(@teachers), {"lay-verify": "required", include_blank: true} %>
       </div>
     </div>
@@ -76,8 +75,10 @@
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
-                    layer.closeAll()
-                    table.reload('weekPlanTable1')
+                    layer.close(parent.add_new_weeklyIndex)
+                    layer.close(parent.new_weelPlan_index)
+                    table.reload("weekPlanTable1")
+                    table.reload("newWeeklyTable")
                 }
             })
             return false;