educode_sales 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b4a41e482e6776c9768761b3d37e0ad17e0244e
-  data.tar.gz: 56041da1c4e2f2a2d7a87b8d438af0691e398c95
+  metadata.gz: e11b0c160f2894e96d39dff5b6f90e895950940a
+  data.tar.gz: fcb96df55ddd39ed2dc9e67e4cd6313cdd6c8259
 SHA512:
-  metadata.gz: 6d741309b6fce698679dac6cb314da6ba096ab89fdf83067b4cd45c363995954fcc0b183b7bdc1821aa0c1af0a9a3aa62872723cac2f1b50c5c2aa4935870601
-  data.tar.gz: 83d7f4c01c7737dc391c46cf65641c35e714f390b3792cc001968e11b4abb8e3d7f7316f7727ebccceff5299abce8b9459eeb2600f1c11216e2d2f0a5c520f47
+  metadata.gz: f5fba1e9ca510c1803807abb69e41a1482a0858b4e7e54757fdf894ae5460b110ae8bd1faf0559de01cc108f47594bdc2f8cd0e4f90c91e59054a47f7f99d5b8
+  data.tar.gz: 0c6e805fe44da4508bc033bbf63846bda0bd24248a3f8face88ae839fc06ceabb90e9dbb061f6f8cae7fd91b711806f0c841b0c9aa2fcc9541166e77cbce4e7a

data/app/controllers/educode_sales/businesses_controller.rb

@@ -25,13 +25,7 @@ module EducodeSales
             end
           end
           
-          @businesses = @businesses.select("
-            educode_sales_businesses.*,
-            last_follow.invitation_at,
-            last_follow.reception_at,
-            last_follow.total_amount").joins(" 
-            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
-          ")
+          @businesses = @businesses
           if params[:q].present? && params[:q][:name].present?
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
@@ -70,11 +64,23 @@ module EducodeSales
             @businesses = @businesses.where("created_at > ? AND created_at < ?", date[0], date[1])
           end
 
+          @businesses = @businesses.page(params[:page]).per(params[:per_page])
+
           if params[:sort].present? && params[:sort][:field]
             @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
             @businesses = @businesses.order("created_at desc")
           end
+
+          @business_count = @businesses.count
+          
+          @businesses = @businesses.select("
+            educode_sales_businesses.*,
+            last_follow.invitation_at,
+            last_follow.reception_at,
+            last_follow.total_amount").joins(" 
+            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
+          ").page(params[:page]).per(params[:per_page])
         end
       end
     end

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -60,7 +60,7 @@ module EducodeSales
       else
         @weeks = [week]
       end
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       render layout: false
     end
 
@@ -87,7 +87,7 @@ module EducodeSales
 
     def new_month
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       render layout: false
     end
 

data/app/controllers/educode_sales/sessions_controller.rb

@@ -15,6 +15,7 @@ module EducodeSales
       elsif user
         staff = Staff.find_by(user_id: user.id)
         if staff
+          return render_failure('该账号已禁止使用') if staff.expired_at < Time.now
           check_pwd(user, staff)
         else
           render_failure('账号不存在')

data/app/models/educode_sales/operation_plan.rb

@@ -4,6 +4,5 @@ module EducodeSales
     belongs_to :teacher
 
     validates :month, presence: true
-    validates :weekly, presence: true
   end
 end

data/app/models/educode_sales/sale_plan.rb

@@ -4,6 +4,5 @@ module EducodeSales
     belongs_to :staff
 
     validates :month, presence: true
-    validates :weekly, presence: true
   end
 end

data/app/views/educode_sales/businesses/edit_follow_record.html.erb

@@ -17,7 +17,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">项目类型</label>
       <div class="layui-input-inline">
-         <%= select_tag "clazz_id", options_for_select(@clazz, @follow_up.clazz), class: 'required' %>
+         <%= select_tag "clazz_id", options_for_select(@clazz, @follow_up.clazz_id), class: 'required' %>
       </div>
     </div>
     <div class="layui-inline">
@@ -51,7 +51,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">实额</label>
       <div class="layui-input-inline">
-         <input name="actual_amount" type="number" class="layui-input" value="<%= @follow_up.total_amount %>">
+         <input name="actual_amount" type="number" class="layui-input" value="<%= @follow_up.actual_amount %>">
       </div>
     </div>
     <br>

data/app/views/educode_sales/businesses/edit_plan.html.erb

@@ -81,9 +81,10 @@
         if (res.success == false) {
           layer.alert(res.msg)
         } else {
-          layer.close(parent.plan_index);
+          // layer.close(parent.plan_index);
           parent.table.reload('sale_plan_follow_table');
           parent.table.reload('businesses_table');
+          table.reload('return_money_list');
         }
       })
       return false;

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

@@ -17,4 +17,5 @@ json.data do
   end
 end
 json.code 0
+json.count @business_count
 json.msg 'succcess'

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/my_month.json.jbuilder

@@ -8,7 +8,7 @@ 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

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

@@ -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;

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

@@ -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>

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

@@ -7,7 +7,7 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main" id="month_table_wraper">
+<div class="layuimini-main  min-height-table" id="month_table_wraper">
 <form class="layui-form layui-form-pane" lay-filter="month_plan_search_form">
   <div class="layui-form-item">
      <div class="layui-inline">

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

@@ -7,8 +7,8 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main min-height-table" id="monthly_table_wraper">
-  <form class="layui-form layui-form-pane  edit-table" lay-filter="monthly_form_fiter">
+<div class="layuimini-main  min-height-table" id="monthly_table_wraper">
+  <form class="layui-form layui-form-pane" lay-filter="monthly_form_fiter">
     <div class="layui-form-item">
       <div class="layui-inline">
         <label class="layui-form-label">人员</label>

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

@@ -7,8 +7,8 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main min-height-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="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>
@@ -104,6 +104,11 @@
                 width: 170,
                 title: '部门'
               },
+              {
+                field: 'month',
+                width: 100,
+                title: '月份',
+              },
               {
                 field: 'weekly',
                 width: 100,

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

@@ -8,7 +8,7 @@
 </script>
 <!--搜索-->
 <div class="layuimini-main min-height-table" id="sales_weelky_table">
-<form class="layui-form layui-form-pane  edit-table" lay-filter="weekly_form_search">
+<form class="layui-form layui-form-pane" lay-filter="weekly_form_search">
   <div class="layui-form-item">
     <div class="layui-inline">
       <label class="layui-form-label">人员</label>

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

@@ -225,7 +225,7 @@
                 }
               ]
             ],
-            page: true
+            page: true,
         });
 
 

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

@@ -21,4 +21,5 @@ json.data do
   end
 end
 json.code 0
+json.count @teachers.count
 json.msg 'succcess'

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

@@ -79,6 +79,8 @@
                     parent.table.reload('teachers_table')
                     parent.table.reload('weekPlanTable1')
                     parent.table.reload('monthPlanTable')
+                    parent.table.reload('monthlyTable')
+                    parent.table.reload('weeklyTable')
                 }
             })
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails