educode_sales 0.1.5 → 0.2.1

data/app/views/educode_sales/operation_reports/audit.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
       <%= hidden_field_tag :id, @sale_report.id, {id: 'sale_report_audito'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
@@ -128,7 +128,7 @@
         content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.teacher_id);
         openWH = miniPage.getOpenWidthHeight();
         index = layer.open({
-          title: '教师列表/' + data.business_name + '的跟进记录',
+          title: '教师列表/' + data.teache_name + '的跟进记录',
           type: 1,
           shade: 0.2,
           maxmin: true,
@@ -151,7 +151,7 @@
             [{
                 field: 'id',
                 width: 80,
-                title: '序号'
+                title:'序号',type: 'numbers',
             },
                 {
                     field: 'staff',

data/app/views/educode_sales/operation_reports/edit.html.erb

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">运营教师:</label>
@@ -72,14 +72,14 @@
 
     table.render({
       elem: '#newWeeklyTable',
-      url: '/educode_sales/operation_plans/my_week',
+        url: '/educode_sales/operation_reports/' + "<%= @sale_report.id%>" + '/plans',
       toolbar: '#newWeeklyToolbar',
       defaultToolbar: [],
       cols: [
         [{
             field: 'id',
             width: 80,
-            title: '序号'
+            title:'序号',type: 'numbers',
         },
             {
                 field: 'staff',
@@ -215,7 +215,7 @@
         content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.teacher_id);
         openWH = miniPage.getOpenWidthHeight();
         index = layer.open({
-          title: '教师列表/' + data.business_name + '的跟进记录',
+          title: '教师列表/' + data.teacher_name + '的跟进记录',
           type: 1,
           shade: 0.2,
           maxmin: true,

data/app/views/educode_sales/operation_reports/show.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">运营教师:</label>
@@ -47,17 +47,25 @@
   </div>
 </form>
 
-<!--表格-->
-<table class="layui-hide" id="showWeeklyTable" lay-filter="currentShowWeekly"></table>
-<script type="text/html" id="currentShowWeekly">
-  <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 type="text/html" id="show_follow_show">
+  <a href="javascript:void(0);" lay-event="show_follow_show" class="layui-table-link">{{ d.count }}</a>
 </script>
+<!--表格-->
+<table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+<!--<script type="text/html" id="currentShowWeekly">-->
+<!--  <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>
     layui.use(['rate', 'table'], function () {
-        var rate = layui.rate;
-        table = layui.table
+        var rate = layui.rate,
+            form = layui.form,
+            $ = layui.jquery,
+            miniPage = layui.miniPage,
+            request = layui.request;
+        table = layui.table;
+
         rate.render({
             elem: '#weekStar4',
             half: true,
@@ -73,36 +81,36 @@
             half: true,
             readonly: true
         })
-    })
+
 
     table.render({
         elem: '#showWeeklyTable',
-        // url: 'api/table.json',
+        url: '/educode_sales/operation_reports/' + "<%= @sale_report.id%>" + '/plans',
+
         defaultToolbar: [],
         cols: [
-            [
-                {
-                    field: 'id',
-                    width: 80,
-                    title: '序号'
-                },
+            [{
+                field: 'id',
+                width: 80,
+                title:'序号',type: 'numbers',
+            },
                 {
-                    field: 'username',
+                    field: 'staff',
                     width: 100,
                     title: '姓名'
                 },
                 {
-                    field: 'chance',
-                    width: 300,
-                    title: '商机名称',
+                    field: 'teacher_name',
+                    width: 100,
+                    title: '教师姓名',
                 },
                 {
-                    field: 'company',
+                    field: 'school',
                     width: 100,
                     title: '单位'
                 },
                 {
-                    field: 'dep',
+                    field: 'department',
                     width: 100,
                     title: '部门'
                 },
@@ -112,14 +120,15 @@
                     title: '周次',
                 },
                 {
-                    field: 'plan',
+                    field: 'content',
                     width: 300,
                     title: '计划内容',
                 },
                 {
-                    field: 'follow',
+                    field: 'count',
                     width: 100,
                     title: '跟进',
+                    templet: '#show_follow_show'
                 },
                 {
                     field: 'rate',
@@ -127,13 +136,116 @@
                     title: '完成率',
                 },
                 {
-                    field: 'updateTime',
-                    width: 150,
+                    field: 'updated_at',
+                    width: 190,
                     title: '更新时间',
                     sort: true,
-                }
+                },
+                // {
+                //     title: '操作',
+                //     minWidth: 190,
+                //     toolbar: '#currentShowWeekly',
+                //     align: "center",
+                //     fixed: 'right'
+                // }
             ]
         ],
         page: true
     });
+
+
+
+        table.on('toolbar(showWeeklyTable)', function (obj) {
+            if (obj.event === 'add') { // 监听添加操作
+                from_weekly = true;
+                var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_week');
+                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,
+                    success: function (layero, index) {
+                        // 重新渲染弹层中的下拉选择框select
+                        form.render('select');
+                    }
+                });
+                $(window).on("resize", function () {
+                    layer.full(sindex);
+                });
+            }
+        });
+        table.on('tool(showWeeklyTable)', function (obj) {
+            var data = obj.data;
+            id = data.id
+            if (obj.event === 'delete') {
+                layer.confirm('确定删除ID为' + id + " 的周计划", function (index) {
+                    request.delete('educode_sales/operation_plans/' + id, {}, function (res) {
+                        layer.close(index);
+                        table.reload("showWeeklyTable")
+                    })
+                });
+            } else if (obj.event === 'show') {
+                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
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+                return false;
+            } else if (obj.event === 'edit') {
+                plan_id = id;
+                from_sales = true;
+                content = miniPage.getHrefContent('/educode_sales/operation_plans/edit_week?id=' + id);
+                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);
+                });
+                return false;
+            } else if (obj.event === 'show_follow_show') {
+                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
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }
+        });
+
+
+
+    })
 </script>

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

@@ -40,7 +40,7 @@
                   {
                       field: 'id',
                       width: 80,
-                      title: '序号'
+                      title:'序号',type: 'numbers',
                   },
                   {
                       field: 'name',
@@ -49,32 +49,32 @@
                   },
                   {
                       field: 'area_id',
-                      width: 300,
                       title: '负责区域',
                   },
                   {
                       field: 'businesses_count',
-                      width: 80,
+                      width: 120,
                       title: '商机'
                   },
                   {
                       field: 'amount',
-                      width: 100,
+                      width: 120,
                       title: '中标(万)'
                   },
                   {
                       field: 'return_mount',
-                      width: 100,
+                      width: 120,
                       title: '回款(万)',
                   },
                   {
                       title: '操作',
-                      minWidth: 150,
+                      width: 120,
                       toolbar: '#currentTableBar',
                       align: "center"
                   }
                 ]
             ],
+            limit: 20,
             page: true
         });
 

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

@@ -82,7 +82,7 @@
                     {
                 field: 'id',
                 width: 80,
-                title: '序号'
+                title:'序号',type: 'numbers',
               },
               {
                 field: 'staff',
@@ -140,6 +140,7 @@
               }
               ]
             ],
+            limit: 20,
             page: true,
         });
 
@@ -201,12 +202,7 @@
 
         table.on('tool(monthPlanTable)', function (obj) {
             var data = obj.data;
-            if (obj.event === 'delete') {
-                layer.confirm('真的删除行么', function (index) {
-                    obj.del();
-                    layer.close(index);
-                });
-            } else if (obj.event === 'show') {
+            if (obj.event === 'show') {
                 content = miniPage.getHrefContent('/educode_sales/plans/show_month?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
@@ -259,6 +255,14 @@
               $(window).on("resize", function () {
                   layer.full(index);
               });
+            } else if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.id, function (index) {
+                    console.log("aaaaa");
+                    request.delete('educode_sales/plans/' + data.id, {}, function (res) {
+                        layer.close(index);
+                        table.reload("monthPlanTable")
+                    })
+                });
             }
         });
 

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

@@ -83,7 +83,7 @@
         [{
             field: 'id',
             width: 60,
-            title: '序号'
+            title:'序号',type: 'numbers',
           },
           {
             field: 'staff',
@@ -169,6 +169,7 @@
           });
         })
       },
+      limit: 20,
       page: true
     });
 

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

@@ -82,7 +82,7 @@
               {
                 field: 'id',
                 width: 80,
-                title: '序号'
+                title:'序号',type: 'numbers',
               },
               {
                 field: 'staff',
@@ -145,6 +145,7 @@
               }
             ]
           ],
+          limit: 20,
           page: true,
           skin: 'line'
         });

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

@@ -85,7 +85,7 @@
             {
               field: 'id',
               width: 60,
-              title: '序号'
+              title:'序号',type: 'numbers',
             },
             {
               field: 'staff',
@@ -170,6 +170,7 @@
               });
             })
           },
+          limit: 20,
           page: true
         });
 

data/app/views/educode_sales/plans/audit_weekly.html.erb

@@ -101,7 +101,7 @@
                 {
                     field: 'id',
                     width: 80,
-                    title: '序号'
+                    title:'序号',type: 'numbers',
                 },
                 {
                     field: 'username',
@@ -169,8 +169,8 @@
             "rate": "100%",
             "updateTime": "2021-07-27",
         }],
-        limits: [10, 15, 20, 25, 50, 100],
-        limit: 15,
+
+
         page: true,
         skin: 'line'
     });

data/app/views/educode_sales/plans/edit_monthly.html.erb

@@ -105,7 +105,7 @@
                 {
                     field: 'id',
                     width: 80,
-                    title: '序号'
+                    title:'序号',type: 'numbers',
                 },
                 {
                     field: 'username',
@@ -173,8 +173,8 @@
             "rate": "100%",
             "updateTime": "2021-07-27",
         }],
-        limits: [10, 15, 20, 25, 50, 100],
-        limit: 15,
+
+
         page: true,
         skin: 'line'
     });

data/app/views/educode_sales/plans/edit_week.html.erb

@@ -73,7 +73,7 @@
           } else {
             parent.table.reload('unfinish_table')
           }
-          
+          parent.table.reload('newWeeklyTable')
         }
       })
       return false;

data/app/views/educode_sales/plans/edit_weekly.html.erb

@@ -91,7 +91,7 @@
         [{
             field: 'id',
             width: 60,
-            title: '序号'
+            title:'序号',type: 'numbers',
           },
           {
             field: 'staff',

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

@@ -92,7 +92,7 @@
             {
               field: 'id',
               width: 60,
-              title: '序号'
+              title:'序号',type: 'numbers',
             },
             {
               field: 'staff',

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

@@ -87,7 +87,9 @@
           else {
             parent.table.reload('businesses_table')
           }
-         
+            parent.table.reload('newWeeklyTable')
+
+
         }
       })
       return false;

data/app/views/educode_sales/plans/new_weekly.html.erb

@@ -97,6 +97,7 @@
           layer.close(parent.sindex);
           parent.layer.close(parent.layer.getFrameIndex(window.name))
           parent.table.reload('newWeeklyTable');
+          table.reload('weeklyTable');
           layer.alert('添加成功')
         }
       })
@@ -113,7 +114,7 @@
             {
               field: 'id',
               width: 60,
-              title: '序号'
+              title:'序号',type: 'numbers',
             },
             {
               field: 'staff',

data/app/views/educode_sales/plans/show_monthly.html.erb

@@ -93,7 +93,7 @@
                 {
                     field: 'id',
                     width: 80,
-                    title: '序号'
+                    title:'序号',type: 'numbers',
                 },
                 {
                     field: 'username',
@@ -161,8 +161,8 @@
             "rate": "100%",
             "updateTime": "2021-07-27",
         }],
-        limits: [10, 15, 20, 25, 50, 100],
-        limit: 15,
+
+
         page: true,
         skin: 'line'
     });

data/app/views/educode_sales/plans/show_weekly.html.erb

@@ -88,7 +88,7 @@
                 {
                     field: 'id',
                     width: 80,
-                    title: '序号'
+                    title:'序号',type: 'numbers',
                 },
                 {
                     field: 'username',

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

@@ -29,7 +29,7 @@
       cols: [
         [{
           field: 'id',
-          title: 'ID',
+          title:'序号',type: 'numbers',
           width: 80
         }, {
           field: 'name',
@@ -47,6 +47,7 @@
         align: "center"
         }]
       ],
+      limit: 20,
       page: true
     })
 

data/app/views/educode_sales/sale_reports/audit.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
       <%= hidden_field_tag :id, @sale_report.id, {id: 'sale_report_audito'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
@@ -152,7 +152,7 @@
         [{
             field: 'id',
             width: 60,
-            title: '序号'
+            title:'序号',type: 'numbers',
           },
           {
             field: 'staff',

data/app/views/educode_sales/sale_reports/edit.html.erb

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">覆盖客户:</label>
@@ -78,14 +78,14 @@
 
     table.render({
       elem: '#newWeeklyTable',
-      url: '/educode_sales/plans/my_week',
-      toolbar: '#newWeeklyToolbar',
+        url: '/educode_sales/sale_reports/' + "<%= @sale_report.id%>" + '/plans',
+        toolbar: '#newWeeklyToolbar',
       defaultToolbar: [],
       cols: [
         [{
             field: 'id',
             width: 60,
-            title: '序号'
+            title:'序号',type: 'numbers',
           },
           {
             field: 'staff',

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">覆盖客户:</label>
@@ -113,7 +113,7 @@
         {
           field: 'id',
           width: 60,
-          title: '序号'
+          title:'序号',type: 'numbers',
         },
         {
           field: 'staff',

data/app/views/educode_sales/sale_trends/operations.html.erb

@@ -19,7 +19,7 @@
       cols: [
         [{
           field: 'id',
-          title: 'ID'
+          title:'序号',type: 'numbers',
         }, {
           field: 'name',
           title: '姓名'