educode_sales 0.1.1 → 0.1.5

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

@@ -54,8 +54,8 @@
 
 <!--表格-->
 <table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
-<script type="text/html" id="show_follow">
-  <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
+<script type="text/html" id="show_follow_audit">
+  <a href="javascript:void(0);" lay-event="show_follow_audit" class="layui-table-link">{{ d.count }}</a>
 </script>
 <script>
   layui.use(['rate', 'table', 'miniPage', 'jquery', 'request', 'form'], function () {
@@ -123,12 +123,12 @@
 
     table.on('tool(showWeeklyTable)', function (obj) {
       var data = obj.data;
-      if (obj.event === 'show_follow') {
-        id = data.business_id
-        content = miniPage.getHrefContent('/educode_sales/businesses/show_follow?id=' + data.business_id);
+      if (obj.event === 'show_follow_audit') {
+        id = data.teacher_id
+        content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.teacher_id);
         openWH = miniPage.getOpenWidthHeight();
         index = layer.open({
-          title: '商机列表/' + data.business_name + '的跟进记录',
+          title: '教师列表/' + data.business_name + '的跟进记录',
           type: 1,
           shade: 0.2,
           maxmin: true,
@@ -184,10 +184,10 @@
                     title: '计划内容',
                 },
                 {
-                    field: 'follow',
+                    field: 'count',
                     width: 100,
                     title: '跟进',
-                    templet: '#show_follow'
+                    templet: '#show_follow_audit'
                 },
                 {
                     field: 'rate',
@@ -196,7 +196,7 @@
                 },
                 {
                     field: 'updated_at',
-                    width: 150,
+                    width: 190,
                     title: '更新时间',
                     sort: true,
                 },

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

@@ -35,9 +35,9 @@
 
 <!--表格-->
 <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
-<!--<script type="text/html" id="show_follow">-->
-<!--  <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>-->
-<!--</script>-->
+<script type="text/html" id="show_follow_edit">
+  <a href="javascript:void(0);" lay-event="show_follow_edit" class="layui-table-link">{{ d.count }}</a>
+</script>
 <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>
@@ -59,15 +59,12 @@
           layer.alert(res.msg)
         } else {
           layer.close(parent.sindex);
+          layer.close(parent.WeeklyIndex);
+          layer.close(parent.MonthlyIndex);
           parent.layer.close(parent.layer.getFrameIndex(window.name))
-          if (parent.from_edit_monthly) {
-            parent.table.reload('monthlyTable');
-          } else {
-            parent.table.reload('weeklyTable');
             parent.table.reload('monthlyTable');
-          }
-         
-          layer.alert('更改成功')
+              parent.table.reload('weeklyTable');
+              parent.table.reload('monthlyTable');
         }
       })
       return false;
@@ -115,10 +112,10 @@
                 title: '计划内容',
             },
             {
-                field: 'follow',
+                field: 'count',
                 width: 100,
                 title: '跟进',
-                templet: '#show_follow'
+                templet: '#show_follow_edit'
             },
             {
                 field: 'rate',
@@ -127,7 +124,7 @@
             },
             {
                 field: 'updated_at',
-                width: 150,
+                width: 190,
                 title: '更新时间',
                 sort: true,
             },
@@ -213,12 +210,12 @@
           layer.full(sindex);
         });
         return false;
-      } else if (obj.event === 'show_follow') {
-        id = data.business_id
-        content = miniPage.getHrefContent('/educode_sales/teacher/show_follow?id=' + data.business_id);
+      } else if (obj.event === 'show_follow_edit') {
+        id = data.teacher_id
+        content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.teacher_id);
         openWH = miniPage.getOpenWidthHeight();
         index = layer.open({
-          title: '商机列表/' + data.business_name + '的跟进记录',
+          title: '教师列表/' + data.business_name + '的跟进记录',
           type: 1,
           shade: 0.2,
           maxmin: true,

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

@@ -4,6 +4,7 @@ json.data do
     json.staff d.staff.user.real_name
     json.client d.client
     # json.amount d.amount
+    json.month d.month.strftime("%Y-%m")
     json.content d.content.truncate(30)
     json.finish_rate "#{d.finish_rate}%"
     json.level1_score d.level1_score || 0
@@ -14,4 +15,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_reports.count
+json.count @sale_reports.total_count

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

@@ -9,11 +9,11 @@ json.data do
     json.week d.weekly
     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
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

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

@@ -5,9 +5,9 @@ json.data do
     json.area_id d.areas.present? ? d.areas.pluck(:name).join("、") : ''
     json.businesses_count EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.place_id = #{d.id}").count
     json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum(:profit_amount)
-    json.return_mount  EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum(:return_money)
+    json.return_mount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.place_id = #{d.id}").sum(:return_money)
   end
 end
 
 json.code 0
-json.count @places.size
+json.count @places.total_count

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 edit-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 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="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

@@ -7,8 +7,8 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main edit-table" id="sales_weelky_table">
-<form class="layui-form layui-form-pane  edit-table" lay-filter="weekly_form_search">
+<div class="layuimini-main min-height-table" id="sales_weelky_table">
+<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/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/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
@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

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
@@ -15,4 +15,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

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
@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

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

@@ -10,7 +10,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @rate %></span>
+      <span><%= @rate %>%</span>
       <%= hidden_field_tag 'finish_rate', @rate, {id: 'monthly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">

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

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @rate %></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">

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

@@ -7,4 +7,4 @@ json.data do
 end
 
 json.code 0
-json.count @roles.size
+json.count @roles.total_count