educode_sales 0.4.3 → 0.4.7

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

@@ -114,14 +114,16 @@
           elem: '#businesses_table',
           url: '/missions/businesses',
           where: {q: form.val('search_form')},
+          defaultToolbar: ['filter'],
           toolbar: '#bussinessBar',
-          defaultToolbar: [],
+          totalRow: true,//开启合并行
           cols: [
             [
               {
                 field: 'id',
                 width: 60,
                 title:'序号',type: 'numbers',
+                  totalRowText: '合计',
               },
               {
                 field: 'name',
@@ -130,19 +132,20 @@
               },
               {
                 field: 'school',
-                width: 200,
+                width: 150,
                 title: '单位',
               },
               {
                 field: 'department',
-                width: 140,
+                width: 150,
                 title: '部门'
               },
               {
                 field: 'follow_ups_count',
                 title: '跟进',
                 width: 60,
-                templet: '#show_follow'
+                templet: '#show_follow',
+                  totalRow: true,
               },
               // {
               //   field: 'teachers_count',
@@ -152,12 +155,12 @@
               // },
               {
                 field: 'clazz',
-                width: 120,
+                width: 80,
                 title: '类型'
               },
               {
                 field: 'stage',
-                width: 100,
+                width: 90,
                 title: '阶段'
               },
               {
@@ -176,27 +179,29 @@
                 field: 'total_amount',
                 width: 100,
                 title: '总额',
+                  totalRow: true,
                 sort: true
               },
               {
                 field: 'return_money',
                 width: 100,
                 title: '回款',
-                sort: true
+                sort: true,
+                  totalRow: true
               },
               {
                 field: 'place',
-                width: 110,
+                width: 80,
                 title: '渠道'
               },
               {
                 field: 'source',
-                width: 110,
+                width: 90,
                 title: '商机来源'
               },
               {
                 field: 'last_follow_person',
-                width: 120,
+                width: 100,
                 title: '最新跟进人'
               },
               {

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

@@ -1,3 +1,4 @@
+follow_ups_count = 0
 json.data do
   json.array! @businesses do |d|
     json.id d.id
@@ -5,6 +6,7 @@ json.data do
     json.department d.department.name
     json.school d.department.school.name
     json.follow_ups_count d.follow_ups_count
+    follow_ups_count += d.follow_ups_count
     json.follow_up_id d.last_follow_up_id
     # json.teachers_count d.follow_ups.sum(:key_people_count)
     # json.teachers_count EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).present? ? EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).key_people_count : 0
@@ -15,7 +17,7 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.return_money d.return_money
     json.place d.last_follow_up&.place&.name
-    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : ''
+    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
     json.source d.source
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
     json.current_staff_id @current_admin.id
@@ -23,6 +25,10 @@ json.data do
     json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
   end
 end
+
+json.totalRow do
+  json.follow_ups_count follow_ups_count.to_s
+end
 json.code 0
 json.count @businesses.total_count
 json.msg 'succcess'

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

@@ -75,7 +75,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成</label>
       <div class="layui-input-inline">
-        <input name="divide_rate" class="layui-input" value="<%= @last_follow_up&.divide_rate%>">
+        <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
       </div>
     </div>
      <div class="layui-form-item">

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

@@ -72,7 +72,7 @@
           elem: '#sale_plan_follow_table',
           url: '/missions/businesses/show_follow?id=' + parent.id ,
           toolbar: '#toolbarDemo_follow',
-          defaultToolbar: [],
+          defaultToolbar: ['filter'],
           cols: [
             [
               {
@@ -128,7 +128,7 @@
                 title: '合同额',
               },
               {
-                field: 'divide_rate',
+                field: 'divide_amount',
                 width: 100,
                 title: '渠道分成',
               },

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

@@ -9,11 +9,11 @@ json.data do
     json.reception_at d.reception_at&.to_s(:date)
     json.total_amount d.total_amount
     json.actual_amount d.actual_amount
-    json.divide_rate d.divide_amount ? d.divide_amount : ""
+    json.divide_amount d.divide_amount ? d.divide_amount : ""
     json.staff d.staff.user.real_name
     json.place d.place&.name
     json.money_plans_count d.money_plans_count
-    json.money d.money_plans.where(clazz: 1).sum(:amount)
+    json.money d.money_plans.where(clazz: 1).sum(:amount).round(2)
     json.is_latest d.id == @latest&.id
   end
 end

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

@@ -62,7 +62,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.divide_rate %>
+        <%= @follow_up.divide_amount %>
       </div>
     </div>
     <div class="ayui-form-item">

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

@@ -1 +1 @@
-<div style="text-align:center;"><%= image_tag "educode_sales/indexlogo.png", width: "900" %></div>
+<div style="text-align:center;"><%= image_tag "educode_sales/indexLogo.png", width: "900" %></div>

data/app/views/educode_sales/home/search_operation_teacher.json.jbuilder

@@ -0,0 +1,12 @@
+json.data do
+  json.array! @data do |d|
+      json.value d.id
+      if d.department.present?
+        json.name "#{d.name}(#{d.department&.school&.name}-#{d.department&.name})"
+      else
+        json.name "#{d.name}"
+      end
+  end
+end
+json.code 0
+json.msg 'succcess'

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

@@ -77,32 +77,34 @@
             elem: '#monthPlanTable',
             url: '/missions/operation_plans?clazz=month',
             toolbar: '#monthPlanToolbar',
-            defaultToolbar: [],
+            totalRow:true,
+            defaultToolbar: ['filter'],
             cols: [
                 [
                     {
                         field: 'id',
-                        width: 80,
+                        width: 60,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
-                        width: 100,
+                        width: 90,
                         title: '姓名'
                     },
                     {
                         field: 'teacher_name',
-                        width: 100,
+                        width: 120,
                         title: '教师姓名',
                     },
                     {
                         field: 'school',
-                        width: 190,
+                        width: 170,
                         title: '单位'
                     },
                     {
                         field: 'department',
-                        width: 190,
+                        width: 170,
                         title: '部门'
                     },
                     {
@@ -112,14 +114,16 @@
                     },
                     {
                         field: 'count',
-                        width: 100,
+                        width: 80,
                         title: '跟进',
+                        totalRow:true,
                         templet: '#show_follow2'
                     },
                     {
-                        field: 'rate',
+                        field: 'finish_rate',
                         width: 80,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'updated_at',

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

@@ -78,27 +78,36 @@
             elem: '#monthlyTable',
             url: '/missions/operation_reports?clazz=month',
             toolbar: '#monthlyToolbar',
-            defaultToolbar: [],
+            defaultToolbar: ['filter'],
+            totalRow:true,
             cols: [
                 [
                     {
                         field: 'id',
-                        width: 80,
+                        width: 60,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
-                        width: 100,
+                        width: 90,
                         title: '姓名'
                     },
                     {
-                        field: 'finish_rate',
+                        field: 'month',
                         width: 100,
+                        title: '月份'
+                    },
+                    {
+                        field: 'finish_rate',
+                        width: 80,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'client',
                         width: 100,
+                        totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                         title: '运营教师'
                     },
                     {
@@ -130,6 +139,11 @@
                             return '<div class="star3"></div>'
                         }
                     },
+                    {
+                        field: 'created_at',
+                        width: 300,
+                        title: '提交时间',
+                    },
                     {
                         title: '操作',
                         minWidth: 220,

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

@@ -78,32 +78,34 @@
             elem: '#weekPlanTable1',
             url: '/missions/operation_plans?clazz=week',
             toolbar: '#weekPlanToolbar',
-            defaultToolbar: [],
+            totalRow:true,
+            defaultToolbar: ['filter'],
             cols: [
                 [
                     {
                         field: 'id',
-                        width: 80,
+                        width: 60,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
-                        width: 100,
+                        width: 80,
                         title: '姓名'
                     },
                     {
                         field: 'teacher_name',
-                        width: 100,
+                        width: 120,
                         title: '教师姓名',
                     },
                     {
                         field: 'school',
-                        width: 190,
+                        width: 170,
                         title: '单位'
                     },
                     {
                         field: 'department',
-                        width: 190,
+                        width: 170,
                         title: '部门'
                     },
                     {
@@ -113,7 +115,7 @@
                     },
                     {
                         field: 'week',
-                        width: 100,
+                        width: 80,
                         title: '周次',
                     },
                     {
@@ -123,14 +125,16 @@
                     },
                     {
                         field: 'count',
-                        width: 100,
+                        width: 80,
                         title: '跟进',
+                        totalRow:true,
                         templet: '#show_follow1'
                     },
                     {
-                        field: 'rate',
+                        field: 'finish_rate',
                         width: 80,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'updated_at',

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

@@ -79,27 +79,36 @@
             elem: '#weeklyTable',
             url: '/missions/operation_reports?clazz=week',
             toolbar: '#weeklyToolbar',
-            defaultToolbar: [],
+            totalRow:true,
+            defaultToolbar: ['filter'],
             cols: [
                 [
                     {
                         field: 'id',
-                        width: 80,
+                        width: 60,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
-                        width: 100,
+                        width: 90,
                         title: '姓名'
                     },
+                    {
+                        field: 'weekly',
+                        width: 60,
+                        title: '周次'
+                    },
                     {
                         field: 'finish_rate',
-                        width: 100,
+                        width: 80,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'client',
                         width: 100,
+                        totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                         title: '运营教师'
                     },
                     {
@@ -131,6 +140,11 @@
                             return '<div class="star3"></div>'
                         }
                     },
+                    {
+                        field: 'created_at',
+                        width: 300,
+                        title: '提交时间',
+                    },
                     {
                         title: '操作',
                         minWidth: 220,

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

@@ -1,3 +1,4 @@
+counts = 0
 json.data do
   json.array! @sale_plans do |d|
     json.id d.id
@@ -9,11 +10,18 @@ json.data do
     json.week d.weekly
     json.teacher_id d.teacher_id
     json.content d.content.truncate(30)
-    json.count d.teacher.teacher_follows_count
-    json.rate "#{d.finish_rate}%"
+    count = d.teacher.teacher_follows_count
+    json.count count
+    counts += count
+    json.finish_rate "#{d.finish_rate}%"
     json.updated_at d.updated_at.to_s
   end
 end
 
+json.totalRow do
+  sum = @sale_plans.inject(0) { |score, i| score + i.finish_rate}
+  json.finish_rate ( @sale_plans.size > 0 ? (sum.to_f / @sale_plans.size).round(2).to_s : '0' ) + '%'
+  json.count counts.to_s
+end
 json.code 0
 json.count @sale_plans.total_count

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

@@ -8,9 +8,7 @@
     </div>
     <div class="layui-inline">
       <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} %>
-      </div>
+      <div class="layui-input-block" id="add_teacher" style="width: 400px"></div>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">计划内容</label>
@@ -55,9 +53,41 @@
             request = layui.request,
             laydate = layui.laydate,
             $ = layui.$;
+        selectInput = layui.selectInput;
+
 
         form.render();
 
+        var add_teacher = selectInput.render({
+            elem: '#add_teacher',
+            name: 'teacher_id', // 渲染的input的name值
+            layFilter: 'teacher_id', //同layui form参数lay-filter
+            layVerify: 'required', //同layui form参数lay-verify
+            layVerType: 'tips', // 同layui form参数lay-verType
+            layReqText: '请填写文本', //同layui form参数lay-ReqText
+            initValue: '', // 渲染初始化默认值
+            hasSelectIcon: false,
+            placeholder: '支持姓名搜索', // 渲染的inputplaceholder值
+            data: [],
+            remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
+            remoteMethod: function (value, cb) { // 远程搜索的回调函数
+                if (!value) {
+                    return cb([]);
+                }
+                request.get('missions/search_operation_teacher?q=' + value, {}, function (res) {
+                    return cb(res)
+                })
+            }
+        });
+
+        add_teacher.on('itemSelect(add_teacher)', function (obj) {
+            teacher_id = obj.data;
+            var name = obj.textContent
+            add_teacher.setValue(name)
+        });
+
+
+
         laydate.render({
             elem: '#new_month_plan',
             type: 'month'
@@ -66,6 +96,7 @@
         var parentIndex = layer.index;
 
         form.on('submit(add_month_plan)', function (data) {
+            data.field.teacher_id = teacher_id
             request.authPost("missions/operation_plans", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)

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

@@ -4,7 +4,14 @@
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
   </div>
 </script>
-<form class="layui-form layui-form-pane" action="">
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
+  <div class="layui-form-item">
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label>负责区域:</label>
+      <span><%= @area %></span>
+    </div>
+  </div>
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -16,6 +23,11 @@
       <span><%= @departments_count%></span>
       <%= hidden_field_tag 'client', @departments_count, {id: 'monthly_client_hide'} %>
     </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= Time.now %></span>
+      <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">
@@ -35,7 +47,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newMonthlyTable" lay-filter="newMonthlyToolbar"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newMonthlyTable" lay-filter="newMonthlyToolbar"></table>
+</div>
 
 <script type="text/html" id="currentMonthly">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>

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

@@ -14,10 +14,7 @@
     </div>
     <div class="layui-inline">
       <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} %>
-      </div>
+      <div class="layui-input-block" id="add_teacher" style="width: 400px"></div>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">计划内容</label>
@@ -62,9 +59,39 @@
             request = layui.request,
             laydate = layui.laydate,
             $ = layui.$;
+        selectInput = layui.selectInput;
 
         form.render();
 
+        var add_teacher = selectInput.render({
+            elem: '#add_teacher',
+            name: 'teacher_id', // 渲染的input的name值
+            layFilter: 'teacher_id', //同layui form参数lay-filter
+            layVerify: 'required', //同layui form参数lay-verify
+            layVerType: 'tips', // 同layui form参数lay-verType
+            layReqText: '请填写文本', //同layui form参数lay-ReqText
+            initValue: '', // 渲染初始化默认值
+            hasSelectIcon: false,
+            placeholder: '支持姓名搜索', // 渲染的inputplaceholder值
+            data: [],
+            remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
+            remoteMethod: function (value, cb) { // 远程搜索的回调函数
+                if (!value) {
+                    return cb([]);
+                }
+                request.get('missions/search_operation_teacher?q=' + value, {}, function (res) {
+                    return cb(res)
+                })
+            }
+        });
+
+        add_teacher.on('itemSelect(add_teacher)', function (obj) {
+            teacher_id = obj.data;
+            var name = obj.textContent
+            add_teacher.setValue(name)
+        });
+
+
         laydate.render({
             elem: '#new_week_plan',
             type: 'month'
@@ -72,6 +99,7 @@
 
 
         form.on('submit(add_week_plan)', function (data) {
+            data.field.teacher_id = teacher_id
             request.authPost("missions/operation_plans", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)

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

@@ -4,7 +4,14 @@
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
   </div>
 </script>
-<form class="layui-form layui-form-pane" action="">
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
+  <div class="layui-form-item">
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label>负责区域:</label>
+      <span><%= @area %></span>
+    </div>
+  </div>
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -16,6 +23,11 @@
     <span><%= @departments_count%></span>
     <%= hidden_field_tag 'client', @departments_count, {id: 'weekly_client_hide'} %>
   </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= Time.now %></span>
+      <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">
@@ -35,7 +47,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyToolbar"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyToolbar"></table>
+</div>
 
 <script type="text/html" id="currentWeekly">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>