educode_sales 0.1.0 → 0.1.4

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

@@ -3,7 +3,7 @@
     <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_month" autocomplete="off" name="month">
       </div>
     </div>
     <% if @sale_plan.weekly.present? %>
@@ -46,13 +46,19 @@
 </div>
 
 <script>
-  layui.use(['form', 'table', 'laytpl', 'request'], function () {
+  layui.use(['form', 'table', 'laytpl', 'request', 'laydate'], function () {
     var form = layui.form,
       layer = layui.layer,
       table = layui.table,
       request = layui.request,
+      laydate = layui.laydate,
       $ = layui.$;
 
+      laydate.render({
+        elem: '#edit_week_plan_month',
+        value: "<%= @sale_plan.month.strftime('%Y-%m')%>",
+        type: 'month'
+      });
     form.render();
 
     form.on('submit(update_sale_plan)', function (data) {

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

@@ -1,7 +1,9 @@
 <script type="text/html" id="newWeeklyToolbar">
   <div class="layui-btn-container">
     <span class="table-label">本周计划列表</span>
+    <% if can? :create, EducodeSales::SalePlan %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
+    <% end %>
   </div>
 </script>
 <form class="layui-form layui-form-pane">
@@ -46,9 +48,15 @@
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
 <script type="text/html" id="currentWeekly">
+  <% if can? :read, EducodeSales::SalePlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
+  <% end %>
+  <% if can? :update, EducodeSales::SalePlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can? :destroy, EducodeSales::SalePlan %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
 </script>
 <script>
   layui.use(['rate', 'table', 'request', 'form', 'miniPage', 'jquery'], function () {

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

@@ -8,7 +8,7 @@ json.data do
     json.month d.month.strftime("%Y-%m")
     json.weekly d.weekly
     json.business_id d.business_id
-    json.content d.content.truncate(30)
+    json.content d.content.truncate(40)
     json.follow_ups_count d.business.follow_ups_count
     json.finish_rate "#{d.finish_rate}%"
     json.updated_at d.updated_at.to_s

data/app/views/educode_sales/plans/my_month.json.jbuilder

@@ -7,7 +7,7 @@ json.data do
     json.school d.business.department&.school&.name
     json.month d.month.strftime("%Y-%m")
     json.business_id d.business_id
-    json.content d.content.truncate(30)
+    json.content d.content.truncate(40)
     json.follow_ups_count d.business.follow_ups_count
     json.finish_rate "#{d.finish_rate}%"
     json.updated_at d.updated_at.to_s

data/app/views/educode_sales/plans/my_week.json.jbuilder

@@ -8,7 +8,7 @@ json.data do
     json.month d.month.strftime("%Y-%m")
     json.weekly d.weekly
     json.business_id d.business_id
-    json.content d.content.truncate(30)
+    json.content d.content.truncate(40)
     json.follow_ups_count d.business.follow_ups_count
     json.finish_rate "#{d.finish_rate}%"
     json.updated_at d.updated_at.to_s

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

@@ -3,7 +3,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
-         <%= select_tag "month", options_for_select([Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]), class: 'required' %>
+        <input type="text" class="layui-input" id="new_month_month" autocomplete="off" name="month">
       </div>
     </div>
     <div class="layui-inline">
@@ -48,13 +48,17 @@
 </div>
 
 <script>
-  layui.use(['form', 'table', 'laytpl', 'request'], function () {
+  layui.use(['form', 'table', 'laytpl', 'request', 'laydate'], function () {
     var form = layui.form,
       layer = layui.layer,
       table = layui.table,
       request = layui.request,
+      laydate = layui.laydate,
       $ = layui.$;
-
+      laydate.render({
+        elem: '#new_month_month',
+        type: 'month'
+      });
     form.render();
 
     var parentIndex = layer.index;

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

@@ -1,7 +1,9 @@
 <script type="text/html" id="newMonthlyToolbar">
   <div class="layui-btn-container">
     <span class="table-label">本月计划列表</span>
+    <% if can? :create, EducodeSales::SalePlan %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
+    <% end %>
   </div>
 </script>
 <form class="layui-form layui-form-pane">
@@ -45,9 +47,15 @@
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
 <script type="text/html" id="currentmonthly">
+  <% if can? :read, EducodeSales::SalePlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
+  <% end %>
+  <% if can? :update, EducodeSales::SalePlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can? :destroy, EducodeSales::SalePlan %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
 </script>
 <script>
     layui.use(['rate', 'table', 'request', 'form', 'miniPage', 'jquery'], function () {

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

@@ -3,7 +3,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
-        <%= select_tag "month", options_for_select([Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]), class: 'required' %>
+        <input type="text" class="layui-input" id="new_week_month" autocomplete="off" name="month">
       </div>
     </div>
     <div class="layui-inline">
@@ -55,13 +55,19 @@
 </div>
 
 <script>
-  layui.use(['form', 'table', 'laytpl', 'request'], function () {
+  layui.use(['form', 'table', 'laytpl', 'request', 'laydate'], function () {
     var form = layui.form,
       layer = layui.layer,
       table = layui.table,
       request = layui.request,
+      laydate = layui.laydate,
       $ = layui.$;
 
+      laydate.render({
+        elem: '#new_week_month',
+        type: 'month'
+      });
+
     form.render();
 
     var parentIndex = layer.index;

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

@@ -45,9 +45,15 @@
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
 <script type="text/html" id="currentWeekly">
+  <% if can? :read, EducodeSales::SalePlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
+  <% end %>
+  <% if can? :update, EducodeSales::SalePlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+   <% end %>
+   <% if can? :destroy, EducodeSales::SalePlan %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
 </script>
 <script>
     layui.use(['rate', 'table', 'request', 'form', 'miniPage', 'jquery'], function () {
@@ -82,7 +88,7 @@
         //   }
         // })
 
-    
+
     form.on('submit(add_weekly_report)', function (data) {
       request.authPost("educode_sales/sale_reports", data.field, function (res) {
         if (res.success == false) {

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

@@ -16,8 +16,9 @@
     var $ = layui.jquery,
     form = layui.form,
     request = layui.request,
+        util = layui.util,
     miniPage = layui.miniPage;
-    table = layui.table
+    table = layui.table;
 
     table.render({
       elem: '#role',
@@ -34,6 +35,7 @@
           field: 'name',
           title: '角色',
           width: 120,
+            edit: 'text'
         }, {
           field: 'permissions',
           title: '模块浏览权限',
@@ -48,7 +50,33 @@
       page: true
     })
 
-    table.on('toolbar(role_filter)', function (obj) {
+
+
+
+
+      //监听单元格编辑
+      table.on('edit(role_filter)', function(obj){
+          var value = obj.value //得到修改后的值
+              ,data = obj.data //得到所在行所有键值
+              ,field = obj.field; //得到字段
+          console.log(obj.data);
+          request.authPut('educode_sales/roles/' + data.id + '/update_role/', data,
+              function(res) {
+                  if (res.success) {
+                      // table.reload('role');
+                  } else {
+                      layer.alert(res.msg)
+                  }
+
+              })
+      });
+
+
+
+
+
+
+      table.on('toolbar(role_filter)', function (obj) {
       if (obj.event === 'add') { // 监听添加操作
         var content = miniPage.getHrefContent('/educode_sales/roles/new');
         var openWH = miniPage.getOpenWidthHeight();
@@ -70,6 +98,9 @@
     });
 
 
+
+
+
     table.on('tool(role_filter)', function (obj) {
       var data = obj.data;
       role_id = data.id;

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

@@ -4,7 +4,7 @@ json.data do
     json.staff d.staff.user.real_name
     json.client d.client
     json.amount d.amount
-    json.content d.content.truncate(30)
+    json.content d.content.truncate(40)
     json.finish_rate "#{d.finish_rate}%"
     json.level1_score d.level1_score || 0
     json.level2_score d.level2_score || 0

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

@@ -14,7 +14,9 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
+                    <% if can? :sale_trends, EducodeSales::SaleTrend %>
                     <span class="layui-icon layui-icon-edit pull-right" id="chance_money_edit"></span>
+                    <% end %>
                     <h5>商机目标</h5>
                   </div>
                   <div class="panel-content y-t-10">
@@ -31,7 +33,9 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
+                    <% if can? :sale_trends, EducodeSales::SaleTrend %>
                     <span class="layui-icon layui-icon-edit pull-right" id="ballot_money_edit"></span>
+                    <% end %>
                     <h5>中标目标</h5>
                   </div>
                   <div class="panel-content y-t-10">
@@ -47,7 +51,9 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
+                    <% if can? :sale_trends, EducodeSales::SaleTrend %>
                     <span class="layui-icon layui-icon-edit pull-right" id="sign_money_edit"></span>
+                    <% end %>
                     <h5>签单目标</h5>
                   </div>
                   <div class="panel-content y-t-10">
@@ -63,7 +69,9 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
+                    <% if can? :sale_trends, EducodeSales::SaleTrend %>
                     <span class="layui-icon layui-icon-edit pull-right" id="returned_money_edit"></span>
+                    <% end %>
                     <h5>回款目标</h5>
                   </div>
                   <div class="panel-content y-t-10">

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

@@ -29,7 +29,8 @@
       cols: [
         [{
             field: 'id',
-            title: 'ID'
+            title: 'ID',
+            width: 80
           }, {
             field: 'name',
             title: '姓名'

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

@@ -35,13 +35,16 @@
             cols: [
                 [{
                     field: 'id',
-                    title: 'ID'
+                    title: 'ID',
+                    width: 80
                 }, {
                     field: 'name',
-                    title: '姓名'
+                    title: '姓名',
+                    width: 150
                 }, {
                     field: 'job_type',
                     title: '岗位类型',
+                    width: 120
                 }, {
                     field: 'area',
                     title: '负责区域',

data/app/views/educode_sales/sessions/login.html.erb

@@ -8,7 +8,7 @@
     <div class="center">
       <div class="item">
         <span class="icon icon-2"></span>
-        <input type="text" name="username" lay-verify="required" placeholder="请输入头歌平台上登录账号" maxlength="24" />
+        <input type="text" name="username" lay-verify="required" placeholder="请输入头歌平台上登录账号/手机号/邮箱" maxlength="24" />
       </div>
 
       <div class="item">

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

@@ -33,7 +33,7 @@
     <div class="layui-form-item">
       <label class="layui-form-label required">生效日期</label>
       <div class="layui-input-block">
-        <input type="text" id="day" class="layui-input" lay-verify="required" lay-reqtext="生效日期不能为空"
+        <input type="text" id="day" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="生效日期不能为空"
                name="enabled_at" value="<%= @staff.enabled_at&.to_s(:date) %>" placeholder="">
       </div>
     </div>
@@ -97,7 +97,6 @@
                 return false;
             }
             data.field['area_ids'] = area_ids;
-            console.log(data.field);
             request.authPut("educode_sales/staffs/" + parent.staff_id, data.field, function (res) {
                 console.log(res.success == false)
                 if (res.success == false) {
@@ -105,7 +104,7 @@
                 } else {
                     layer.close(parent.index);
                     parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('staff')
+                    parent.table.reload('staff_filter')
                 }
             })
             return false;

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

@@ -5,7 +5,7 @@
   </div>
 </script>
 
-<table class="layui-hide" id="staff" lay-filter="staff_filter"></table>
+<table class="layui-hide" id="staff_filter" lay-filter="staff_filter"></table>
 
 <script type="text/html" id="staff_bar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
@@ -23,7 +23,7 @@
 
     table = layui.table
     table.render({
-      elem: '#staff',
+      elem: '#staff_filter',
       url: '/educode_sales/staffs',
       toolbar: '#staff_topbar',
       defaultToolbar: [],
@@ -124,14 +124,14 @@
         layer.confirm('确定禁用' + data.name, function (index) {
           request.delete('educode_sales/staffs/'+ data.id + "/disable", {}, function(res) {
             layer.close(index);
-            table.reload("staff")
+            table.reload("staff_filter")
           })
         });
       } else if (obj.event === 'delete') {
         layer.confirm('确定删除' + data.name, function (index) {
           request.delete('educode_sales/staffs/'+ data.id, {}, function(res) {
             layer.close(index);
-            table.reload("staff")
+            table.reload("staff_filter")
           })
         });
       }

data/app/views/educode_sales/staffs/new.html.erb

@@ -64,7 +64,7 @@
                 } else {
                     layer.close(parent.index);
                     parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('table')
+                    parent.table.reload('staff_filter')
                 }
             })
             return false;

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

@@ -1,53 +1,134 @@
-<table class="layui-hide" id="coursesTable" lay-filter="courses_filter"></table>
+<div class="layuimini-main" style="height: 100%;">
+  <div class="layui-form layuimini-form" lay-filter="common_edit">
+    <fieldset class="table-search-fieldset">
+      <legend>添加课程方向</legend>
+      <div class="layui-form-item">
+        <label class="layui-form-label required" >课程名称</label>
+        <div class="layui-input-block">
+          <input type="text" name="name" autocomplete="off" class="layui-input" placeholder="请输入" required lay-verify="required">
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label required" >教学角色</label>
+        <div class="layui-input-block">
+          <input type="text" name="role_name" autocomplete="off" class="layui-input" placeholder="请输入" required lay-verify="required">
+        </div>
+      </div>
+      <hr>
+      <div class="layui-form-item">
+        <div class="layui-input-block">
+          <button class="layui-btn layui-btn-normal" lay-submit lay-filter="add_course">确定添加</button>
+        </div>
+      </div>
+    </fieldset>
+    <h4 class="m-t-10">课程方向列表</h4>
+    <table class="layui-hide" id="coursesTable" lay-filter="coursesTable"></table>
+  </div>
+</div>
 
-<script type="text/html" id="courses_bar">
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+<script type="text/html" id="courses_bar1">
+  <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('element', function () {
-        var element = layui.element;
-    });
     layui.use(['table', 'element'], function () {
-        var $ = layui.jquery,
-            form = layui.form,
+        var form = layui.form,
+            layer = layui.layer,
             table = layui.table,
-            element = layui.element,
-            miniPage = layui.miniPage;
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+
+        // 当前弹出层，防止ID被覆盖
+        var parentIndex = layer.index;
+
+
+        //监听提交
+        form.on('submit(add_course)', function (data) {
+            console.log(data.field)
+            request.authPost('educode_sales/teachers/'+parent.teacher_id +'/create_course', data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    table.reload('teachers_table');
+                    table.reload('coursesTable');
+                    form.val('common_edit', {
+                        'name': '',
+                        'role_name':''
+                    })
+                }
+            })
+            return false;
+        });
+
+
+
         table.render({
             elem: '#coursesTable',
+            url: '/educode_sales/teachers/' + parent.id + "/course_subject",
             defaultToolbar: [],
             cols: [
                 [
                     {
                         field: 'id',
+                        width:100,
                         title: '序号'
                     },
                     {
-                        field: 'username',
-                        title: '课程名称'
+                        field: 'name',
+                        title: '课程名称',
+                        width:300,
+                        edit: true
                     },
                     {
-                        field: 'zhi',
+                        field: 'role_name',
                         title: '教学角色',
+                        width:300,
+                        edit: true
                     },
                     {
                         title: '操作',
-                        toolbar: '#courses_bar',
+                        toolbar: '#courses_bar1',
                         align: "center"
                     }
                 ]
             ],
-            data: [{
-                "id": "1",
-                "username": "大数据导论",
-                "zhi": "主讲教师",
-            }],
             // limits: [10, 15, 20, 25, 50, 100],
             // limit: 15,
             // page: true,
             skin: 'line'
         });
+
+
+
+        table.on('tool(coursesTable)', function (obj) {
+            var data = obj.data;
+            if (obj.event === 'edit') {
+                console.log(data);
+                request.authPut('educode_sales/teachers/' + data.id + '/update_course/', data,
+                    function(res) {
+                        if (res.success) {
+                            table.reload('coursesTable');
+                        } else {
+                            layer.alert(res.msg)
+                        }
+
+                    })
+            } else if (obj.event === 'delete') {
+                console.log(data);
+                layer.confirm('确定删除' + data.name, function (index) {
+                    request.delete('educode_sales/teachers/' + data.id + '/delete_course/', {}, function (res) {
+                        layer.close(index);
+                        table.reload("teachers_table")
+                        table.reload('coursesTable');
+                    })
+                });
+            }
+        });
+
+
     });
 </script>