educode_sales 0.1.1 → 0.1.5

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

@@ -7,13 +7,13 @@ json.data do
     json.school d.teacher.department&.school&.name
     json.month d.month.strftime("%Y-%m")
     json.week d.weekly
-    # json.teacher_id d.teacher_id
+    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_month.json.jbuilder

@@ -6,13 +6,13 @@ json.data do
     json.department d.teacher.department&.name
     json.school d.teacher.department&.school&.name
     json.month d.month.strftime("%Y-%m")
-    # json.teacher_id d.teacher_id
+    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

@@ -7,13 +7,13 @@ json.data do
     json.school d.teacher.department&.school&.name
     json.month d.month.strftime("%Y-%m")
     json.week d.weekly
-    # json.teacher_id d.teacher_id
+    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/new_month.html.erb

@@ -3,7 +3,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
-        <%= select_tag "month", options_for_select([Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]), class: 'required' %>
+        <input type="text" class="layui-input" id="new_month_plan" autocomplete="off" name="month" placeholder="请选择">
       </div>
     </div>
     <div class="layui-inline">
@@ -52,10 +52,16 @@
             layer = layui.layer,
             table = layui.table,
             request = layui.request,
+            laydate = layui.laydate,
             $ = layui.$;
 
         form.render();
 
+        laydate.render({
+            elem: '#new_month_plan',
+            type: 'month'
+        });
+
         var parentIndex = layer.index;
 
         form.on('submit(add_month_plan)', function (data) {
@@ -63,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,
@@ -58,7 +63,7 @@
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
-                    // layer.closeAll();
+                    layer.closeAll();
                     parent.table.reload('monthlyTable');
                     layer.alert('添加成功')
                 }
@@ -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

@@ -3,7 +3,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
-        <%= select_tag "month", options_for_select([Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]), class: 'required' %>
+        <input type="text" class="layui-input" id="new_week_plan" autocomplete="off" name="month" placeholder="请选择">
       </div>
     </div>
     <div class="layui-inline">
@@ -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>
@@ -60,18 +59,26 @@
             layer = layui.layer,
             table = layui.table,
             request = layui.request,
+            laydate = layui.laydate,
             $ = layui.$;
 
         form.render();
 
+        laydate.render({
+            elem: '#new_week_plan',
+            type: 'month'
+        });
+
 
         form.on('submit(add_week_plan)', function (data) {
             request.authPost("educode_sales/operation_plans", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
-                    layer.closeAll()
-                    table.reload('weekPlanTable')
+                    layer.close(parent.add_new_weeklyIndex)
+                    layer.close(parent.new_weelPlan_index)
+                    table.reload("weekPlanTable1")
+                    table.reload("newWeeklyTable")
                 }
             })
             return false;

data/app/views/educode_sales/operation_plans/new_weekly.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: 'weekly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
@@ -35,13 +35,16 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newWeeklyTable" lay-filter="currentWeekly"></table>
+<table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyToolbar"></table>
 
 <script type="text/html" id="currentWeekly">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <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_newWeekly">
+  <a href="javascript:void(0);" lay-event="show_follow_newWeekly" class="layui-table-link">{{ d.count }}</a>
+</script>
 <script>
     layui.use(['rate', 'table', 'request', 'form', 'miniPage', 'jquery'], function () {
         var rate = layui.rate,
@@ -56,7 +59,7 @@
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
-                    // layer.closeAll();
+                    layer.closeAll();
                     parent.table.reload('weeklyTable');
                     layer.alert('添加成功')
                 }
@@ -67,62 +70,63 @@
 
         table.render({
         elem: '#newWeeklyTable',
-        // url: 'api/table.json',
+            url: '/educode_sales/operation_plans/my_week',
         toolbar: '#newWeeklyToolbar',
         defaultToolbar: [],
-        cols: [
-            [
-                {
-                    field: 'id',
-                    width: 80,
-                    title: '序号'
-                },
-                {
-                    field: 'username',
-                    width: 100,
-                    title: '姓名'
-                },
-                {
-                    field: 'chance',
-                    width: 100,
-                    title: '教师姓名',
-                },
-                {
-                    field: 'company',
-                    width: 100,
-                    title: '单位'
-                },
-                {
-                    field: 'dep',
-                    width: 100,
-                    title: '部门'
-                },
-                {
-                    field: 'week',
-                    width: 100,
-                    title: '周次',
-                },
-                {
-                    field: 'plan',
-                    width: 300,
-                    title: '计划内容',
-                },
-                {
-                    field: 'follow',
-                    width: 100,
-                    title: '跟进',
-                },
-                {
-                    field: 'rate',
-                    width: 100,
-                    title: '完成率',
-                },
-                {
-                    field: 'updateTime',
-                    width: 150,
-                    title: '更新时间',
-                    sort: true,
-                },
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 80,
+                        title: '序号'
+                    },
+                    {
+                        field: 'staff',
+                        width: 100,
+                        title: '姓名'
+                    },
+                    {
+                        field: 'teacher_name',
+                        width: 100,
+                        title: '教师姓名',
+                    },
+                    {
+                        field: 'school',
+                        width: 190,
+                        title: '单位'
+                    },
+                    {
+                        field: 'department',
+                        width: 190,
+                        title: '部门'
+                    },
+                    {
+                        field: 'week',
+                        width: 100,
+                        title: '周次',
+                    },
+                    {
+                        field: 'content',
+                        width: 300,
+                        title: '计划内容',
+                    },
+                    {
+                        field: 'count',
+                        width: 100,
+                        title: '跟进',
+                        templet: '#show_follow_newWeekly'
+                    },
+                    {
+                        field: 'rate',
+                        width: 100,
+                        title: '完成率',
+                    },
+                    {
+                        field: 'updated_at',
+                        width: 150,
+                        title: '更新时间',
+                        sort: true,
+                    },
                 {
                     title: '操作',
                     minWidth: 150,
@@ -131,18 +135,6 @@
                 }
             ]
         ],
-        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,
@@ -150,18 +142,118 @@
     });
 
 
+        /**
+         * toolbar事件监听
+         */
+        table.on('toolbar(newWeeklyToolbar)', function (obj) {
+            var data = obj.data;
+            if (obj.event === 'add') { // 监听添加操作
+                var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_week');
+                var openWH = miniPage.getOpenWidthHeight();
+                add_new_weeklyIndex = 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(newWeeklyToolbar)', function (obj) {
+            var data = obj.data;
+            id = data.id
+            if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.id, function (index) {
+                    request.delete('educode_sales/operation_plans/' + data.id, {}, function (res) {
+                        layer.close(index);
+                        table.reload("weekPlanTable1")
+                        table.reload("newWeeklyTable")
+                    })
+                });
+            }
+            else if (obj.event === 'show') {
+                console.log("a");
+                content = miniPage.getHrefContent('/educode_sales/operation_plans/show_week?id='+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_week?id='+id);
+                openWH = miniPage.getOpenWidthHeight();
+                editWeek_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 === 'show_follow_newWeekly') {
+                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);
+                });
+            }
+        });
+
+
 
-        // form.on('submit(add_weekly_report)', function (data) {
-        //     request.authPost("educode_sales/operation_reports", data.field, function (res) {
-        //         if (res.success == false) {
-        //             layer.alert(res.msg)
-        //         } else {
-        //             layer.closeAll()
-        //             table.reload('newWeeklyTable');
-        //             layer.alert('添加成功')
-        //         }
-        //     })
-        //     return false;
-        // });
     })
 </script>