educode_sales 0.1.2 → 0.1.7

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

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

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

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">运营教师:</label>

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

@@ -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/operation_reports/show.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">运营教师:</label>

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">
@@ -201,12 +201,7 @@
 
         table.on('tool(monthPlanTable)', function (obj) {
             var data = obj.data;
-            if (obj.event === 'delete') {
-                layer.confirm('真的删除行么', function (index) {
-                    obj.del();
-                    layer.close(index);
-                });
-            } else if (obj.event === 'show') {
+            if (obj.event === 'show') {
                 content = miniPage.getHrefContent('/educode_sales/plans/show_month?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
@@ -259,6 +254,14 @@
               $(window).on("resize", function () {
                   layer.full(index);
               });
+            } else if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.id, function (index) {
+                    console.log("aaaaa");
+                    request.delete('educode_sales/plans/' + data.id, {}, function (res) {
+                        layer.close(index);
+                        table.reload("monthPlanTable")
+                    })
+                });
             }
         });
 

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

@@ -73,7 +73,7 @@
           } else {
             parent.table.reload('unfinish_table')
           }
-          
+          parent.table.reload('newWeeklyTable')
         }
       })
       return false;

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

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

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

@@ -87,7 +87,9 @@
           else {
             parent.table.reload('businesses_table')
           }
-         
+            parent.table.reload('newWeeklyTable')
+
+
         }
       })
       return false;

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">
@@ -97,6 +97,7 @@
           layer.close(parent.sindex);
           parent.layer.close(parent.layer.getFrameIndex(window.name))
           parent.table.reload('newWeeklyTable');
+          table.reload('weeklyTable');
           layer.alert('添加成功')
         }
       })

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

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

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

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

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">覆盖客户:</label>

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

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

@@ -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/sale_reports/show.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">覆盖客户:</label>

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

@@ -65,7 +65,7 @@
                 </div>
               </div>
             </div>
-            <div class="layui-col-xs3">
+            <div class="layui-col-xs3" >
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">

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

@@ -14,4 +14,4 @@ json.data do
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

data/app/views/educode_sales/sales/operations.json.jbuilder

@@ -11,4 +11,4 @@ json.data do
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

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

@@ -104,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/follow_up_departments.json.jbuilder

@@ -10,4 +10,4 @@ json.data do
 end
 
 json.code 0
-json.count @schools.count
+json.count @schools.total_count

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

@@ -12,4 +12,4 @@ json.data do
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

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

@@ -86,7 +86,7 @@
             elem: '#user_search',
             name: 'user_id', // 渲染的input的name值
             layFilter: 'user_id', //同layui form参数lay-filter
-            layVerify: 'required', //同layui form参数lay-verify
+            // layVerify: 'required', //同layui form参数lay-verify
             layVerType: 'tips', // 同layui form参数lay-verType
             layReqText: '请填写文本', //同layui form参数lay-ReqText
             initValue: '', // 渲染初始化默认值

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

@@ -218,14 +218,14 @@
                 },
                 {
                     title: '操作',
-                    minWidth: 350,
+                    minWidth: 300,
                     toolbar: '#currentTableBar',
                     align: "center",
                     fixed: 'right'
                 }
               ]
             ],
-            page: true
+            page: true,
         });
 
 
@@ -260,7 +260,7 @@
             form.val('search_teachers', {
                 area: "",
                 date: "",
-                key_attitude: "",
+                attitude: "",
                 name: "",
                 professional_title: "",
                 regist_at: "",

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

@@ -12,13 +12,14 @@ json.data do
     json.teacher_follows_count d.teacher_follows_count
     json.activities_count d.activity_teachers_count
     json.source EducodeSales::Common.teacher_source_name[d.source_id]
-    json.attitude EducodeSales::Common.key_attitude_name[d.attitude_id]
+    json.attitude EducodeSales::Common.teacher_attitude_name[d.attitude_id]
     json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).count : 0
     json.actives d.actives
-    json.students d.students
+    json.students d.students_count
     json.regist_at d.regist_at ? d.regist_at.to_s(:date) : ''
     json.teacher_used d.teacher_used_of_department
   end
 end
 json.code 0
+json.count @teachers.total_count
 json.msg 'succcess'