educode_sales 0.1.0 → 0.1.4

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

@@ -3,19 +3,20 @@
     <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">
       <label class="layui-form-label required">周次</label>
       <div class="layui-input-inline">
-        <%#= select_tag "weekly", options_for_select(@weeks), class: 'required' %>
+        <%= select_tag "weekly", options_for_select(@weeks), class: 'required' %>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">教师</label>
       <div class="layui-input-inline">
-        <%#= select_tag "business_id", options_for_select(@businesses), class: 'required' %>
+
+        <%= select_tag "teacher_id", options_for_select(@teachers), {"lay-verify": "required", include_blank: true} %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
@@ -58,20 +59,26 @@
             layer = layui.layer,
             table = layui.table,
             request = layui.request,
+            laydate = layui.laydate,
             $ = layui.$;
 
         form.render();
 
-        var parentIndex = layer.index;
+        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.close(parent.sindex);
-                    parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('businesses_table')
+                    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,138 +8,125 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span>80%</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">
-      <label style="margin-left: 100px">运营教师:</label>
-      <span>5</span>
-    </div>
+    <label style="margin-left: 100px">运营教师:</label>
+    <span><%= @departments_count%></span>
+    <%= hidden_field_tag 'client', @departments_count, {id: 'weekly_client_hide'} %>
+  </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">个人总结</label>
       <div class="layui-input-block">
-        <textarea name="desc" placeholder="此处填写要点：
+        <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
 3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">大区意见</label>
-      <div class="layui-input-block">
-        <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" class="layui-textarea"></textarea>
-      </div>
-    </div>
-    <div id="weekStar4"></div>
-    <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">总监意见</label>
-      <div class="layui-input-block">
-        <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" class="layui-textarea"></textarea>
-      </div>
-    </div>
-    <div id="weekStar5"></div>
-    <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">副总意见</label>
-      <div class="layui-input-block">
-        <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" class="layui-textarea"></textarea>
-      </div>
-    </div>
-    <div id="weekStar6"></div>
-    <br>
     <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn" style="margin-left: 18px">提交
-      </button>
-      <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn">取消
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_weekly_report" style="margin-left: 18px">提交
       </button>
     </div>
   </div>
 </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'], function () {
-        var rate = layui.rate;
-        table = layui.table
-        rate.render({
-            elem: '#weekStar4'
-            , half: true
-        })
-        rate.render({
-            elem: '#weekStar5'
-            , half: true
-        })
-        rate.render({
-            elem: '#weekStar6'
-            , half: true
-        })
-    })
+    layui.use(['rate', 'table', 'request', 'form', 'miniPage', 'jquery'], function () {
+        var rate = layui.rate,
+            form = layui.form,
+            $ = layui.jquery,
+            miniPage = layui.miniPage,
+            request = layui.request;
+        table = layui.table;
 
-    table.render({
+        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();
+                    parent.table.reload('weeklyTable');
+                    layer.alert('添加成功')
+                }
+            })
+            return false;
+        });
+
+
+        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,
@@ -148,27 +135,125 @@
                 }
             ]
         ],
-        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'
     });
-</script>
-<style>
-    .layui-form-item {
-        margin-bottom: 0px;
-    }
 
-</style>
+
+        /**
+         * 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);
+                });
+            }
+        });
+
+
+
+    })
+</script>

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

@@ -3,15 +3,13 @@
     <div class="layui-inline">
       <label class="layui-form-label">月份</label>
       <div class="layui-input-block">
-        <input type="text" name="title" lay-verify="title" autocomplete="off" disabled
-               class="layui-input">
+        <%= @sale_plan.month.strftime("%Y-%m") %>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">教师</label>
       <div class="layui-input-block">
-        <input type="text" name="title" lay-verify="title" autocomplete="off" disabled
-               class="layui-input" id="show_chance3">
+        <%= @sale_plan.teacher.name %>
       </div>
     </div>
     <br>
@@ -19,17 +17,13 @@
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">计划内容</label>
       <div class="layui-input-block">
-        <textarea name="desc" id="show_plan3" placeholder="简要填写具体的营销计划，例如：
-1、推动xx老师用起来；
-2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" disabled></textarea>
+        <pre><%= @sale_plan.content %></pre>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-input-label">完成率</label>
       <div class="layui-input-block">
-        <input type="text" name="title" lay-verify="title" autocomplete="off" disabled
-               class="layui-input" id="show_rate3">
+        <%= @sale_plan.finish_rate %>%
       </div>
     </div>
   </div>