educode_sales 0.1.1 → 0.1.5

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

@@ -1,11 +1,13 @@
 <script type="text/html" id="monthlyToolbar">
   <div class="layui-btn-container">
     <span class="table-label">月报列表</span>
+    <% if can? :create, EducodeSales::OperationPlan %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加月报</button>
+    <% end %>
   </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">
@@ -38,12 +40,18 @@
 <table class="layui-hide" id="monthlyTable" lay-filter="currentTableFilter4"></table>
 </div>
 <script type="text/html" id="monthlyTableBar">
+  <% if can? :read, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
+  <% end %>
+  <% if can? :create, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
-  <%# if can? :audit, EducodeSales::SaleReport %>
+  <% end %>
+  <% if can? :audit, EducodeSales::OperationReport %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="audit">审查</a>
-  <%# end %>
+  <% end %>
+  <% if can? :destroy, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+   <% end %>
 </script>
 
 
@@ -131,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,
@@ -139,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,
@@ -147,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,
@@ -228,11 +236,11 @@
             var data = obj.data;
             if (obj.event === 'edit') {
 
-                var content = miniPage.getHrefContent('/educode_sales/operation_reports/' + data.id + "/edit");
+                var content = miniPage.getHrefContent('/educode_sales/operation_reports/' + data.id + '/edit');
                 var openWH = miniPage.getOpenWidthHeight();
 
-                var index = layer.open({
-                    title: '编辑用户',
+                MonthlyIndex = layer.open({
+                    title: '编辑',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,

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

@@ -1,12 +1,14 @@
 <script type="text/html" id="weekPlanToolbar">
   <div class="layui-btn-container">
     <span class="table-label">周计划列表</span>
+     <% if can? :create, EducodeSales::OperationPlan %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
+    <% end %>
   </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>
@@ -34,16 +36,22 @@
     </div>
   </div>
 </div>
-<table class="layui-hide" id="weekPlanTable" lay-filter="weekPlanTable"></table>
+<table class="layui-hide" id="weekPlanTable1" lay-filter="weekPlanTable1"></table>
 </div>
 <script type="text/html" id="week_plan_currentTableBar">
+  <% if can? :read, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
+  <% end %>
+  <% if can? :update, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can? :destroy, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
 </script>
 
-<script type="text/html" id="show_follow">
-  <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow }}</a>
+<script type="text/html" id="show_follow1">
+  <a href="javascript:void(0);" lay-event="show_follow1" class="layui-table-link">{{ d.count }}</a>
 </script>
 
 <script>
@@ -67,7 +75,7 @@
 
 
         table.render({
-            elem: '#weekPlanTable',
+            elem: '#weekPlanTable1',
             url: '/educode_sales/operation_plans?clazz=week',
             toolbar: '#weekPlanToolbar',
             defaultToolbar: [],
@@ -90,14 +98,19 @@
                     },
                     {
                         field: 'school',
-                        width: 100,
+                        width: 190,
                         title: '单位'
                     },
                     {
                         field: 'department',
-                        width: 100,
+                        width: 190,
                         title: '部门'
                     },
+                    {
+                        field: 'month',
+                        width: 100,
+                        title: '月份',
+                    },
                     {
                         field: 'week',
                         width: 100,
@@ -109,10 +122,10 @@
                         title: '计划内容',
                     },
                     {
-                        field: 'follow',
+                        field: 'count',
                         width: 100,
                         title: '跟进',
-                        templet: '#show_follow'
+                        templet: '#show_follow1'
                     },
                     {
                         field: 'rate',
@@ -140,10 +153,10 @@
             skin: 'line'
         });
         var sort = {}, search = {};
-        table.on('sort(weekPlanTable)', function(obj) {
+        table.on('sort(weekPlanTable1)', function(obj) {
             sort.field = obj.field;
             sort.order = obj.type;
-            table.reload('weekPlanTable', {
+            table.reload('weekPlanTable1', {
                 initSort: obj,
                 where: {
                     sort: sort,
@@ -155,7 +168,7 @@
         // 监听搜索操作
         form.on('submit(week_plan_search)', function (data) {
             search = data.field
-            table.reload('weekPlanTable', {
+            table.reload('weekPlanTable1', {
                 page: {
                     curr: 1
                 },
@@ -174,12 +187,12 @@
         /**
          * toolbar事件监听
          */
-        table.on('toolbar(weekPlanTable)', function (obj) {
+        table.on('toolbar(weekPlanTable1)', function (obj) {
             var data = obj.data;
             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,
@@ -200,7 +213,7 @@
         });
 
 
-        table.on('tool(weekPlanTable)', function (obj) {
+        table.on('tool(weekPlanTable1)', function (obj) {
             var data = obj.data;
              id = data.id
             if (obj.event === 'delete') {
@@ -208,7 +221,7 @@
                     console.log("aaaaa");
                     request.delete('educode_sales/operation_plans/' + data.id, {}, function (res) {
                         layer.close(index);
-                        table.reload("weekPlanTable")
+                        table.reload("weekPlanTable1")
                     })
                 });
             }
@@ -241,7 +254,7 @@
             } else if (obj.event === 'edit') {
                 content = miniPage.getHrefContent('/educode_sales/operation_plans/edit_week?id='+id);
                 openWH = miniPage.getOpenWidthHeight();
-                index = layer.open({
+                editWeek_index = layer.open({
                     title: '编辑',
                     type: 1,
                     shade: 0.2,
@@ -251,10 +264,10 @@
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content,
                     success: function (layero, index) {
-                        $("#edit_chance1").val(data.chance);
-                        $("#edit_plan1").val(data.plan);
-                        $("#edit_rate1").val(data.rate);
-                        $("#edit_week1").val(data.week);
+                        // $("#edit_chance1").val(data.chance);
+                        // $("#edit_plan1").val(data.plan);
+                        // $("#edit_rate1").val(data.rate);
+                        // $("#edit_week1").val(data.week);
                         // 重新渲染弹层中的下拉选择框select
                         form.render('select');
                     },
@@ -263,11 +276,12 @@
                     layer.full(index);
                 });
                 return false;
-            } else if (obj.event === 'show_follow') {
-                content = miniPage.getHrefContent('/educode_sales/businesses/show_follow');
+            } else if (obj.event === 'show_follow1') {
+                id = data.teacher_id
+                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

@@ -1,12 +1,13 @@
 <script type="text/html" id="weeklyToolbar">
   <div class="layui-btn-container">
     <span class="table-label">周报列表</span>
+    <% if can? :create, EducodeSales::OperationPlan %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加周报</button>
+    <% end %>
   </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">
@@ -40,12 +41,18 @@
 <table class="layui-hide" id="weeklyTable" lay-filter="currentTableFilter2"></table>
 </div>
 <script type="text/html" id="currentWeekTableBar">
+  <% if can? :read, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
+  <% end %>
+  <% if can? :update, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
-  <%# if can? :audit, EducodeSales::SaleReport %>
+  <% end %>
+  <% if can? :audit, EducodeSales::OperationReport %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="audit">审查</a>
-  <%# end %>
+  <% end %>
+  <% if can? :destroy, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
 </script>
 
 <script>
@@ -133,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,
@@ -141,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,
@@ -149,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,
@@ -232,9 +239,9 @@
         table.on('tool(currentTableFilter2)', function (obj) {
             var data = obj.data;
             if (obj.event === 'edit') {
-                var content = miniPage.getHrefContent('/educode_sales/operation_reports/' + data.id + "/edit")
+                var content = miniPage.getHrefContent('/educode_sales/operation_reports/' + data.id + '/edit')
                 var openWH = miniPage.getOpenWidthHeight();
-                var index = layer.open({
+                   WeeklyIndex = layer.open({
                     title: '编辑周报',
                     type: 1,
                     shade: 0.2,

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

@@ -3,7 +3,9 @@
     <div class="layui-inline">
       <label class="layui-form-label">月份</label>
       <div class="layui-input-inline">
-        <%= select_tag "month", options_for_select(@months, @sale_plan.month.strftime("%Y-%m")), class: 'required' %>
+        <input type="text" class="layui-input" id="edit_month_plan" autocomplete="off" name="month" placeholder="请选择" value="<%=@sale_plan.month.strftime("%Y-%m") %>">
+
+        <%#= select_tag "month", options_for_select(@months, @sale_plan.month.strftime("%Y-%m")), class: 'required' %>
       </div>
     </div>
     <div class="layui-inline">
@@ -43,18 +45,25 @@
             layer = layui.layer,
             table = layui.table,
             request = layui.request,
+            laydate = layui.laydate,
             $ = layui.$;
 
         form.render();
 
+        laydate.render({
+            elem: '#edit_month_plan',
+            type: 'month'
+        });
         form.on('submit(update_sale_plan)', function (data) {
             console.log(data.field);
             request.authPut("educode_sales/operation_plans/"+ <%= @sale_plan.id %> , data.field, function (res) {
                 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/edit_monthly.html.erb

@@ -137,7 +137,7 @@
                 },
                 {
                     field: 'updateTime',
-                    width: 150,
+                    width: 190,
                     title: '更新时间',
                     sort: true,
                 },

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

@@ -3,7 +3,8 @@
     <div class="layui-inline">
       <label class="layui-form-label">月份</label>
       <div class="layui-input-inline">
-        <%= select_tag "month", options_for_select(@months, @sale_plan.month.strftime("%Y-%m")), class: 'required' %>
+        <input type="text" class="layui-input" id="edit_week_plan" autocomplete="off" name="month" placeholder="请选择" value="<%=@sale_plan.month.strftime("%Y-%m") %>">
+        <%#= select_tag "month", options_for_select(@months, @sale_plan.month.strftime("%Y-%m")), class: 'required' %>
       </div>
     </div>
     <% if @sale_plan.weekly.present? %>
@@ -52,19 +53,27 @@
             layer = layui.layer,
             table = layui.table,
             request = layui.request,
+            laydate = layui.laydate,
             $ = layui.$;
 
         form.render();
 
+        laydate.render({
+            elem: '#edit_week_plan',
+            type: 'month'
+        });
+
         form.on('submit(update_sale_plan)', function (data) {
             console.log(data.field);
             request.authPut("educode_sales/operation_plans/"+ <%= @sale_plan.id %> , data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
-                    layer.close(parent.sindex);
-                    table.reload('weekPlanTable')
+                    layer.close(parent.index10)
+                    layer.close(parent.editWeek_index)
+                    table.reload('weekPlanTable1')
                     table.reload('newWeeklyTable')
+                    table.reload('unfinish_table')
                 }
             })
             return false;

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

@@ -135,7 +135,7 @@
                 },
                 {
                     field: 'updateTime',
-                    width: 150,
+                    width: 190,
                     title: '更新时间',
                     sort: true,
                 },

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>